X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=275bbf99d5f7775bf72ecbf1b5990764e9e29208;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=082d05b6add33ca84080a3a14fa7bd6ae244a128;hpb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 082d05b6..275bbf99 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, @@ -160,11 +160,10 @@ static const char *coupling[] = { "GND", }; -SR_PRIV struct sr_dev_driver hantek_dso_driver_info; +static int dev_acquisition_stop(struct sr_dev_inst *sdi); -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); - -static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) +static struct sr_dev_inst *dso_dev_new(struct sr_dev_driver *di, + const struct dso_profile *prof) { struct sr_dev_inst *sdi; struct sr_channel *ch; @@ -177,7 +176,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) sdi->status = SR_ST_INITIALIZING; sdi->vendor = g_strdup(prof->vendor); sdi->model = g_strdup(prof->model); - sdi->driver = &hantek_dso_driver_info; + sdi->driver = di; /* * Add only the real channels -- EXT isn't a source of data, only @@ -209,7 +208,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE); devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS; sdi->priv = devc; - drvc = hantek_dso_driver_info.context; + drvc = di->context; drvc->instances = g_slist_append(drvc->instances, sdi); return sdi; @@ -254,11 +253,6 @@ static int dev_clear(const struct sr_dev_driver *di) return std_dev_clear(di, clear_dev_context); } -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct drv_context *drvc; @@ -319,7 +313,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) /* Device matches the pre-firmware profile. */ prof = &dev_profiles[j]; sr_dbg("Found a %s %s.", prof->vendor, prof->model); - sdi = dso_dev_new(prof); + sdi = dso_dev_new(di, prof); sdi->connection_id = g_strdup(connection_id); devices = g_slist_append(devices, sdi); devc = sdi->priv; @@ -338,7 +332,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) /* Device matches the post-firmware profile. */ prof = &dev_profiles[j]; sr_dbg("Found a %s %s.", prof->vendor, prof->model); - sdi = dso_dev_new(prof); + sdi = dso_dev_new(di, prof); sdi->connection_id = g_strdup(connection_id); sdi->status = SR_ST_INACTIVE; devices = g_slist_append(devices, sdi); @@ -358,11 +352,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; @@ -418,11 +407,6 @@ 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) { @@ -755,7 +739,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); } @@ -844,7 +828,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 */ @@ -967,7 +951,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; @@ -977,7 +961,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."); @@ -993,17 +976,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); - 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; @@ -1013,14 +994,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { +static struct sr_dev_driver hantek_dso_driver_info = { .name = "hantek-dso", .longname = "Hantek DSO", .api_version = 1, - .init = init, - .cleanup = cleanup, + .init = std_init, + .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, @@ -1031,3 +1012,4 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(hantek_dso_driver_info);