static void log_message(am7xxx_context *ctx,
int level,
- const char *function,
+ const char *function_name,
int line,
const char *fmt,
...) __attribute__ ((format (printf, 5, 6)));
{
/* The 3 below is the length of "xx " where xx is the hex string
* representation of a byte */
- return ((i+1) % (80/3));
+ return ((i + 1) % (80 / 3));
}
static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
static int read_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
{
int ret;
- int transferred = 0;
+ int transferred;
+ transferred = 0;
ret = libusb_bulk_transfer(dev->usb_device, 0x81, buffer, len, &transferred, 0);
if (ret != 0 || (unsigned int)transferred != len) {
error(dev->ctx, "%s. Transferred: %d (expected %u)\n",
static int send_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
{
int ret;
- int transferred = 0;
+ int transferred;
trace_dump_buffer(dev->ctx, "sending -->", buffer, len);
+ transferred = 0;
ret = libusb_bulk_transfer(dev->usb_device, 0x1, buffer, len, &transferred, 0);
if (ret != 0 || (unsigned int)transferred != len) {
error(dev->ctx, "%s. Transferred: %d (expected %u)\n",
* set up */
static void log_message(am7xxx_context *ctx,
int level,
- const char *function,
+ const char *function_name,
int line,
const char *fmt,
...)
va_list ap;
if (level == AM7XXX_LOG_FATAL || (ctx && level <= ctx->log_level)) {
- if (function) {
- fprintf(stderr, "%s", function);
+ if (function_name) {
+ fprintf(stderr, "%s", function_name);
if (line)
fprintf(stderr, "[%d]", line);
fprintf(stderr, ": ");
new_device = malloc(sizeof(*new_device));
if (new_device == NULL) {
- fatal("cannot allocate a new device (%s)\n", strerror(errno));
+ debug(ctx, "cannot allocate a new device (%s)\n", strerror(errno));
return NULL;
}
memset(new_device, 0, sizeof(*new_device));
/* the usb device has already been opened */
if ((*dev)->usb_device) {
- debug(ctx, "(*dev)->usb_device already set\n");
ret = 1;
goto out;
}
}
if (current_configuration != (*dev)->desc->configuration) {
- debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n",
+ debug(ctx, "libusb configuration changed (expected: %hhu, current: %d\n",
(*dev)->desc->configuration, current_configuration);
ret = -EINVAL;
goto out_libusb_release_interface;