X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fapi.c;h=9801732a8e70ce1211757abf7030dc9eb029f6f8;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=14273ce3d4fcfcb32fc7b391ef060ec0b0acb4e0;hpb=a95f142e88fa5368adfabf87544acfdeed7d7604;p=libsigrok.git diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c index 14273ce3..9801732a 100644 --- a/src/hardware/lascar-el-usb/api.c +++ b/src/hardware/lascar-el-usb/api.c @@ -17,14 +17,13 @@ * along with this program. If not, see . */ +#include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "protocol.h" -SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; - static const uint32_t scanopts[] = { SR_CONF_CONN, }; @@ -37,11 +36,6 @@ static const uint32_t devopts[] = { SR_CONF_DATALOG | SR_CONF_GET | SR_CONF_SET, }; -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; @@ -51,7 +45,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) GSList *usb_devices, *devices, *l; const char *conn; - drvc = di->priv; + drvc = di->context; conn = NULL; for (l = options; l; l = l->next) { @@ -78,33 +72,22 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) } sdi->inst_type = SR_INST_USB; sdi->conn = usb; - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); } g_slist_free(usb_devices); } else g_slist_free_full(usb_devices, g_free); - return devices; -} - -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->priv))->instances; + return std_scan_complete(di, devices); } static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; - struct drv_context *drvc; + struct drv_context *drvc = di->context;; struct sr_usb_dev_inst *usb; int ret; - if (!(drvc = di->priv)) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - usb = sdi->conn; if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK) @@ -114,50 +97,26 @@ static int dev_open(struct sr_dev_inst *sdi) sr_err("Failed to claim interface: %s.", libusb_error_name(ret)); return SR_ERR; } - sdi->status = SR_ST_ACTIVE; - return ret; + return SR_OK; } static int dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_driver *di = sdi->driver; struct sr_usb_dev_inst *usb; - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - usb = sdi->conn; if (!usb->devhdl) - /* Nothing to do. */ - return SR_OK; + return SR_ERR_BUG; libusb_release_interface(usb->devhdl, LASCAR_INTERFACE); libusb_close(usb->devhdl); usb->devhdl = NULL; - sdi->status = SR_ST_INACTIVE; return SR_OK; } -static int cleanup(const struct sr_dev_driver *di) -{ - int ret; - struct drv_context *drvc; - - if (!(drvc = di->priv)) - /* Can get called on an unused driver, doesn't matter. */ - return SR_OK; - - ret = std_dev_clear(di, NULL); - g_free(drvc); - - return ret; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -197,20 +156,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - struct sr_dev_driver *di = sdi->driver; struct dev_context *devc; int ret; (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - devc = sdi->priv; ret = SR_OK; switch (key) { @@ -252,7 +202,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static void mark_xfer(struct libusb_transfer *xfer) +static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer) { if (xfer->status == LIBUSB_TRANSFER_COMPLETED) @@ -322,7 +272,7 @@ static int lascar_proc_config(const struct sr_dev_inst *sdi) return ret; } -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 sr_dev_driver *di = sdi->driver; struct sr_datafeed_packet packet; @@ -337,39 +287,28 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) int ret; unsigned char cmd[3], resp[4], *buf; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - - drvc = di->priv; + drvc = di->context; devc = sdi->priv; usb = sdi->conn; - devc->cb_data = cb_data; if (lascar_proc_config(sdi) != SR_OK) return SR_ERR; sr_dbg("Starting log retrieval."); - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi); interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000; packet.type = SR_DF_META; packet.payload = &meta; src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, g_variant_new_uint64(interval)); meta.config = g_slist_append(NULL, src); - sr_session_send(devc->cb_data, &packet); + sr_session_send(sdi, &packet); g_free(src); if (devc->logged_samples == 0) { /* This ensures the frontend knows the session is done. */ - packet.type = SR_DF_END; - sr_session_send(devc->cb_data, &packet); + std_session_send_df_end(sdi); return SR_OK; } @@ -415,7 +354,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv); } if (xfer_in->user_data != GINT_TO_POINTER(1) || - xfer_in->user_data != GINT_TO_POINTER(1)) { + xfer_out->user_data != GINT_TO_POINTER(1)) { sr_dbg("no response to log transfer request"); libusb_free_transfer(xfer_in); libusb_free_transfer(xfer_out); @@ -435,7 +374,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) buf = g_malloc(4096); libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN, - buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100); + buf, 4096, lascar_el_usb_receive_transfer, + (struct sr_dev_inst *)sdi, 100); if ((ret = libusb_submit_transfer(xfer_in) != 0)) { sr_err("Unable to submit transfer: %s.", libusb_error_name(ret)); libusb_free_transfer(xfer_in); @@ -446,21 +386,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - struct sr_dev_driver *di = sdi->driver; - (void)cb_data; - - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - - if (sdi->status != SR_ST_ACTIVE) { - sr_err("Device inactive, can't stop acquisition."); - return SR_ERR; - } - sdi->status = SR_ST_STOPPING; /* TODO: free ongoing transfers? */ @@ -471,10 +398,10 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = { .name = "lascar-el-usb", .longname = "Lascar EL-USB", .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 = NULL, .config_get = config_get, .config_set = config_set, @@ -483,5 +410,6 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, }; +SR_REGISTER_DEV_DRIVER(lascar_el_usb_driver_info);