X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=58f31acfaef37c191b8d4d7d4ecba436cff1a3b1;hb=af812219f655b286f5a2a0146846d9b97e25435c;hp=75bf6c13889267e041aa234b4f47b4b86a595e62;hpb=b5698bd71e96561ba08a481abaa9c64ee687bda2;p=libsigrok.git diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c index 75bf6c13..58f31acf 100644 --- a/hardware/saleae-logic/saleae-logic.c +++ b/hardware/saleae-logic/saleae-logic.c @@ -231,7 +231,7 @@ static void close_device(struct sigrok_device_instance *sdi) if (sdi->usb->devhdl == NULL) return; - g_message("closing device %d on %d.%d interface %d", sdi->index, + g_message("saleae: closing device %d on %d.%d interface %d", sdi->index, sdi->usb->bus, sdi->usb->address, USB_INTERFACE); libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE); libusb_close(sdi->usb->devhdl); @@ -303,7 +303,6 @@ static int hw_init(char *deviceinfo) g_warning("Failed to initialize USB."); return 0; } - libusb_set_debug(usb_context, 3); /* Find all Saleae Logic devices and upload firmware to all of them. */ devcnt = 0; @@ -365,7 +364,7 @@ static int hw_opendev(int device_index) timediff = cur - upd; if (timediff < FIRMWARE_RENUM_DELAY) { timediff = FIRMWARE_RENUM_DELAY - timediff; - g_message("waiting %d ms for device to reset", + g_message("saleae: waiting %d ms for device to reset", timediff); g_usleep(timediff * 1000); firmware_updated.tv_sec = 0; @@ -481,7 +480,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi, divider = (uint8_t) (48 / (samplerate / 1000000.0)) - 1; - g_message("setting samplerate to %" PRIu64 " Hz (divider %d)", + g_message("saleae: setting samplerate to %" PRIu64 " Hz (divider %d)", samplerate, divider); buf[0] = 0x01; buf[1] = divider; @@ -559,7 +558,7 @@ void receive_transfer(struct libusb_transfer *transfer) return; } - g_message("receive_transfer(): status %d received %d bytes", + g_message("saleae: receive_transfer(): status %d received %d bytes", transfer->status, transfer->actual_length); /* Save incoming transfer before reusing the transfer struct. */