X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.c;h=66d6978f24bbd3d720d8796bc8315c7cfafd1b6a;hb=d3b38ad389a6186e2822d62b20b9f0d9d9e7c21c;hp=0f1285a33d69ebbfc05122f1d6bea7b597e167d7;hpb=e98b7f1be0a97207b9a0b4d7c9a8d397fb542eb1;p=libsigrok.git diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c index 0f1285a3..66d6978f 100644 --- a/hardware/hantek-dso/dso.c +++ b/hardware/hantek-dso/dso.c @@ -39,7 +39,8 @@ static int send_begin(struct dev_context *devc) if ((ret = libusb_control_transfer(devc->usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR, CTRL_BEGINCOMMAND, 0, 0, buffer, sizeof(buffer), 200)) != sizeof(buffer)) { - sr_err("Failed to send begincommand: %d.", ret); + sr_err("Failed to send begincommand: %s.", + libusb_error_name(ret)); return SR_ERR; } @@ -106,6 +107,7 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi) libusb_device **devlist; struct libusb_device_descriptor des; struct dev_context *devc; + struct drv_context *drvc = hantek_dso_driver_info.priv; int err, skip, i; devc = sdi->priv; @@ -115,10 +117,11 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi) return SR_ERR; skip = 0; - libusb_get_device_list(NULL, &devlist); + libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { if ((err = libusb_get_device_descriptor(devlist[i], &des))) { - sr_err("Failed to get device descriptor: %d.", err); + sr_err("Failed to get device descriptor: %s.", + libusb_error_name(err)); continue; } @@ -160,7 +163,8 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi) devc->usb->address, USB_INTERFACE); } } else { - sr_err("Failed to open device: %d.", err); + sr_err("Failed to open device: %s.", + libusb_error_name(err)); } /* If we made it here, we handled the device (somehow). */ @@ -205,7 +209,8 @@ static int get_channel_offsets(struct dev_context *devc) (unsigned char *)&devc->channel_levels, sizeof(devc->channel_levels), 200); if (ret != sizeof(devc->channel_levels)) { - sr_err("Failed to get channel offsets: %d.", ret); + sr_err("Failed to get channel offsets: %s.", + libusb_error_name(ret)); return SR_ERR; } @@ -232,7 +237,7 @@ static int get_channel_offsets(struct dev_context *devc) devc->channel_levels[chan][v][0], devc->channel_levels[chan][v][1]); } - sr_dbg(gs->str); + sr_dbg("%s", gs->str); } g_string_free(gs, TRUE); } @@ -348,7 +353,8 @@ SR_PRIV int dso_set_trigger_samplerate(struct dev_context *devc) DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) { - sr_err("Failed to set trigger/samplerate: %d.", ret); + sr_err("Failed to set trigger/samplerate: %s.", + libusb_error_name(ret)); return SR_ERR; } sr_dbg("Sent CMD_SET_TRIGGER_SAMPLERATE."); @@ -387,7 +393,7 @@ SR_PRIV int dso_set_filters(struct dev_context *devc) DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) { - sr_err("Failed to set filters: %d", ret); + sr_err("Failed to set filters: %s.", libusb_error_name(ret)); return SR_ERR; } sr_dbg("Sent CMD_SET_FILTERS."); @@ -454,7 +460,7 @@ SR_PRIV int dso_set_voltage(struct dev_context *devc) DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) { - sr_err("Failed to set voltage: %d.", ret); + sr_err("Failed to set voltage: %s.", libusb_error_name(ret)); return SR_ERR; } sr_dbg("Sent CMD_SET_VOLTAGE."); @@ -499,14 +505,14 @@ SR_PRIV int dso_set_relays(struct dev_context *devc) g_string_printf(gs, "Relays:"); for (i = 0; i < 17; i++) g_string_append_printf(gs, " %.2x", relays[i]); - sr_dbg(gs->str); + sr_dbg("%s", gs->str); g_string_free(gs, TRUE); } if ((ret = libusb_control_transfer(devc->usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETRELAYS, 0, 0, relays, 17, 100)) != sizeof(relays)) { - sr_err("Failed to set relays: %d.", ret); + sr_err("Failed to set relays: %s.", libusb_error_name(ret)); return SR_ERR; } sr_dbg("Sent CTRL_SETRELAYS."); @@ -549,7 +555,7 @@ SR_PRIV int dso_set_voffsets(struct dev_context *devc) if ((ret = libusb_control_transfer(devc->usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETOFFSET, 0, 0, offsets, sizeof(offsets), 100)) != sizeof(offsets)) { - sr_err("Failed to set offsets: %d.", ret); + sr_err("Failed to set offsets: %s.", libusb_error_name(ret)); return SR_ERR; } sr_dbg("Sent CTRL_SETOFFSET."); @@ -575,7 +581,7 @@ SR_PRIV int dso_enable_trigger(struct dev_context *devc) DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) { - sr_err("Failed to enable trigger: %d.", ret); + sr_err("Failed to enable trigger: %s.", libusb_error_name(ret)); return SR_ERR; } @@ -600,7 +606,7 @@ SR_PRIV int dso_force_trigger(struct dev_context *devc) DSO_EP_OUT | LIBUSB_ENDPOINT_OUT, cmdstring, sizeof(cmdstring), &tmp, 100)) != 0) { - sr_err("Failed to force trigger: %d.", ret); + sr_err("Failed to force trigger: %s.", libusb_error_name(ret)); return SR_ERR; } @@ -650,14 +656,16 @@ SR_PRIV int dso_get_capturestate(struct dev_context *devc, cmdstring[1] = 0; if ((ret = send_bulkcmd(devc, cmdstring, sizeof(cmdstring))) != SR_OK) { - sr_dbg("Failed to send get_capturestate command: %d.", ret); + sr_dbg("Failed to send get_capturestate command: %s.", + libusb_error_name(ret)); return SR_ERR; } if ((ret = libusb_bulk_transfer(devc->usb->devhdl, DSO_EP_IN | LIBUSB_ENDPOINT_IN, inbuf, 512, &tmp, 100)) != 0) { - sr_dbg("Failed to get capturestate: %d.", ret); + sr_dbg("Failed to get capturestate: %s.", + libusb_error_name(ret)); return SR_ERR; } *capturestate = inbuf[0]; @@ -691,27 +699,32 @@ SR_PRIV int dso_capture_start(struct dev_context *devc) cmdstring[1] = 0; if ((ret = send_bulkcmd(devc, cmdstring, sizeof(cmdstring))) != SR_OK) { - sr_err("Failed to send capture_start command: %d.", ret); + sr_err("Failed to send capture_start command: %s.", + libusb_error_name(ret)); return SR_ERR; } return SR_OK; } -SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn cb) +SR_PRIV int dso_get_channeldata(const struct sr_dev_inst *sdi, + libusb_transfer_cb_fn cb) { + struct dev_context *devc; struct libusb_transfer *transfer; int num_transfers, ret, i; uint8_t cmdstring[2]; unsigned char *buf; + devc = sdi->priv; sr_dbg("Sending CMD_GET_CHANNELDATA."); cmdstring[0] = CMD_GET_CHANNELDATA; cmdstring[1] = 0; if ((ret = send_bulkcmd(devc, cmdstring, sizeof(cmdstring))) != SR_OK) { - sr_err("Failed to get channel data: %d.", ret); + sr_err("Failed to get channel data: %s.", + libusb_error_name(ret)); return SR_ERR; } @@ -727,9 +740,10 @@ SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn transfer = libusb_alloc_transfer(0); libusb_fill_bulk_transfer(transfer, devc->usb->devhdl, DSO_EP_IN | LIBUSB_ENDPOINT_IN, buf, - devc->epin_maxpacketsize, cb, devc, 40); + devc->epin_maxpacketsize, cb, (void *)sdi, 40); if ((ret = libusb_submit_transfer(transfer)) != 0) { - sr_err("Failed to submit transfer: %d.", ret); + sr_err("Failed to submit transfer: %s.", + libusb_error_name(ret)); /* TODO: Free them all. */ libusb_free_transfer(transfer); g_free(buf);