X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.c;h=52cafce880a95aebaf5a228a6917142a378740c6;hb=8489264f1e3ef07ba8f1143ed62fa88d90980f94;hp=f83232268f86e9f985cf9f0d397809ada6efcecf;hpb=e7ee300a12391640ff499eaa4d54089fe7e825f2;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c index f8323226..52cafce8 100644 --- a/hardware/zeroplus-logic-cube/gl_usb.c +++ b/hardware/zeroplus-logic-cube/gl_usb.c @@ -58,7 +58,7 @@ static int gl_write_address(libusb_device_handle *devh, unsigned int address) ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEADDR, 0, packet, 1, TIMEOUT); if (ret != 1) - sr_err("%s: libusb_control_transfer returned %d\n", + sr_err("zp: %s: libusb_control_transfer returned %d.", __func__, ret); return ret; } @@ -71,7 +71,7 @@ static int gl_write_data(libusb_device_handle *devh, unsigned int val) ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEDATA, 0, packet, 1, TIMEOUT); if (ret != 1) - sr_err("%s: libusb_control_transfer returned %d\n", + sr_err("zp: %s: libusb_control_transfer returned %d.", __func__, ret); return ret; } @@ -84,8 +84,8 @@ static int gl_read_data(libusb_device_handle *devh) ret = libusb_control_transfer(devh, CTRL_IN, 0xc, REQ_READDATA, 0, packet, 1, TIMEOUT); if (ret != 1) - sr_err("%s: libusb_control_transfer returned %d, val=%hhx\n", - __func__, ret, packet[0]); + sr_err("zp: %s: libusb_control_transfer returned %d, " + "val=%hhx.", __func__, ret, packet[0]); return (ret == 1) ? packet[0] : ret; } @@ -100,13 +100,13 @@ SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer, ret = libusb_control_transfer(devh, CTRL_OUT, 0x4, REQ_READBULK, 0, packet, 8, TIMEOUT); if (ret != 8) - sr_err("%s: libusb_control_transfer returned %d\n", + sr_err("zp: %s: libusb_control_transfer returned %d.", __func__, ret); ret = libusb_bulk_transfer(devh, EP1_BULK_IN, buffer, size, &transferred, TIMEOUT); if (ret < 0) - sr_err("Bulk read error %d\n", ret); + sr_err("zp: Bulk read error %d.", ret); return transferred; }