X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=8a2f42c5f7335864bcdccf70080616670dc86de8;hb=e91bb0a6c4a94957e4e998ca134dc806bec49a7f;hp=4e8ac83fcac5804a9cb599cf6c114cffc1842e94;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 4e8ac83f..8a2f42c5 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -52,7 +52,7 @@ static const uint32_t drvopts[] = { }; static const uint32_t devopts[] = { - SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_CONTINUOUS, SR_CONF_LIMIT_FRAMES | SR_CONF_SET, SR_CONF_CONN | SR_CONF_GET, SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, @@ -88,24 +88,24 @@ static const struct dso_profile dev_profiles[] = { { 0x04b4, 0x2090, 0x04b5, 0x2090, "Hantek", "DSO-2090", buffersizes_32k, - FIRMWARE_DIR "/hantek-dso-2090.fw" }, + "hantek-dso-2090.fw" }, { 0x04b4, 0x2150, 0x04b5, 0x2150, "Hantek", "DSO-2150", buffersizes_32k, - FIRMWARE_DIR "/hantek-dso-2150.fw" }, + "hantek-dso-2150.fw" }, { 0x04b4, 0x2250, 0x04b5, 0x2250, "Hantek", "DSO-2250", buffersizes_512k, - FIRMWARE_DIR "/hantek-dso-2250.fw" }, + "hantek-dso-2250.fw" }, { 0x04b4, 0x5200, 0x04b5, 0x5200, "Hantek", "DSO-5200", buffersizes_14k, - FIRMWARE_DIR "/hantek-dso-5200.fw" }, + "hantek-dso-5200.fw" }, { 0x04b4, 0x520a, 0x04b5, 0x520a, "Hantek", "DSO-5200A", buffersizes_512k, - FIRMWARE_DIR "/hantek-dso-5200A.fw" }, - { 0, 0, 0, 0, 0, 0, 0, 0 }, + "hantek-dso-5200A.fw" }, + ALL_ZERO }; static const uint64_t timebases[][2] = { @@ -162,7 +162,7 @@ static const char *coupling[] = { SR_PRIV struct sr_dev_driver hantek_dso_driver_info; -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); +static int dev_acquisition_stop(struct sr_dev_inst *sdi); static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) { @@ -270,7 +270,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) GSList *l, *devices, *conn_devices; struct libusb_device_descriptor des; libusb_device **devlist; - int ret, i, j; + int i, j; const char *conn; char connection_id[64]; @@ -308,11 +308,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) continue; } - if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { - sr_err("Failed to get device descriptor: %s.", - libusb_error_name(ret)); - continue; - } + libusb_get_device_descriptor(devlist[i], &des); usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); @@ -327,8 +323,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->connection_id = g_strdup(connection_id); devices = g_slist_append(devices, sdi); devc = sdi->priv; - if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, - prof->firmware) == SR_OK) + if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i], + USB_CONFIGURATION, prof->firmware) == SR_OK) /* Remember when the firmware on this device was updated */ devc->fw_updated = g_get_monotonic_time(); else @@ -362,11 +358,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -422,17 +413,13 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(const struct sr_dev_driver *di) -{ - return dev_clear(di); -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_usb_dev_inst *usb; - char str[128], *s; + char str[128]; + const char *s; const uint64_t *vdiv; int ch_idx; @@ -712,14 +699,14 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, int num_samples) { struct sr_datafeed_packet packet; - struct sr_datafeed_analog analog; + struct sr_datafeed_analog_old analog; struct dev_context *devc; float ch1, ch2, range; int num_channels, data_offset, i; devc = sdi->priv; num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1; - packet.type = SR_DF_ANALOG; + packet.type = SR_DF_ANALOG_OLD; packet.payload = &analog; /* TODO: support for 5xxx series 9-bit samples */ analog.channels = devc->enabled_channels; @@ -758,7 +745,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, analog.data[data_offset++] = ch2; } } - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); g_free(analog.data); } @@ -777,8 +764,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) sdi = transfer->user_data; devc = sdi->priv; - sr_spew("receive_transfer(): status %d received %d bytes.", - transfer->status, transfer->actual_length); + sr_spew("receive_transfer(): status %s received %d bytes.", + libusb_error_name(transfer->status), transfer->actual_length); if (transfer->actual_length == 0) /* Nothing to send to the bus. */ @@ -847,7 +834,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) /* Mark the end of this frame. */ packet.type = SR_DF_FRAME_END; - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) { /* Terminate session */ @@ -886,8 +873,7 @@ static int handle_event(int fd, int revents, void *cb_data) */ usb_source_remove(sdi->session, drvc->sr_ctx); - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi, LOG_PREFIX); devc->dev_state = IDLE; @@ -971,7 +957,7 @@ static int handle_event(int fd, int revents, void *cb_data) return TRUE; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_dev_driver *di = sdi->driver; @@ -981,7 +967,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_ERR_DEV_CLOSED; devc = sdi->priv; - devc->cb_data = cb_data; if (configure_channels(sdi) != SR_OK) { sr_err("Failed to configure channels."); @@ -997,18 +982,15 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->dev_state = CAPTURE; usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi); - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc; - (void)cb_data; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR; @@ -1023,9 +1005,9 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { .longname = "Hantek DSO", .api_version = 1, .init = init, - .cleanup = cleanup, + .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set,