X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fapi.c;h=8f20f599fca7ead98f9cffe0ce06b11d45ba930c;hb=efa9840222f2925c187715377e3646679fd8496c;hp=c1620161c953eb38acd5dc82eb05fb5c8b322d6d;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;p=libsigrok.git diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c index c1620161..8f20f599 100644 --- a/src/hardware/victor-dmm/api.c +++ b/src/hardware/victor-dmm/api.c @@ -17,11 +17,12 @@ * along with this program. If not, see . */ +#include #include #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "protocol.h" @@ -29,15 +30,15 @@ #define VICTOR_PID 0xd237 #define VICTOR_VENDOR "Victor" #define VICTOR_INTERFACE 0 -#define VICTOR_ENDPOINT LIBUSB_ENDPOINT_IN | 1 +#define VICTOR_ENDPOINT (LIBUSB_ENDPOINT_IN | 1) SR_PRIV struct sr_dev_driver victor_dmm_driver_info; -static struct sr_dev_driver *di = &victor_dmm_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 const uint32_t drvopts[] = { SR_CONF_MULTIMETER, }; + static const uint32_t scanopts[] = { SR_CONF_CONN, }; @@ -49,35 +50,30 @@ static const uint32_t devopts[] = { SR_CONF_CONN | SR_CONF_GET, }; -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct drv_context *drvc; struct dev_context *devc; struct sr_dev_inst *sdi; - struct sr_channel *ch; struct libusb_device_descriptor des; libusb_device **devlist; GSList *devices; - int ret, i; + int i; char connection_id[64]; (void)options; - drvc = di->priv; + drvc = di->context; devices = NULL; libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { - if ((ret = libusb_get_device_descriptor(devlist[i], &des)) != 0) { - sr_warn("Failed to get device descriptor: %s", - libusb_error_name(ret)); - continue; - } + libusb_get_device_descriptor(devlist[i], &des); if (des.idVendor != VICTOR_VID || des.idProduct != VICTOR_PID) continue; @@ -92,13 +88,9 @@ static GSList *scan(GSList *options) devc = g_malloc0(sizeof(struct dev_context)); sdi->priv = devc; - if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) - return NULL; - sdi->channels = g_slist_append(NULL, ch); - - if (!(sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), - libusb_get_device_address(devlist[i]), NULL))) - return NULL; + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); + sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), + libusb_get_device_address(devlist[i]), NULL); sdi->inst_type = SR_INST_USB; drvc->instances = g_slist_append(drvc->instances, sdi); @@ -109,24 +101,15 @@ static GSList *scan(GSList *options) return devices; } -static GSList *dev_list(void) -{ - return ((struct drv_context *)(di->priv))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { - struct drv_context *drvc = di->priv; + struct sr_dev_driver *di = sdi->driver; + struct drv_context *drvc = di->context; struct sr_usb_dev_inst *usb; libusb_device **devlist; int ret, i; char connection_id[64]; - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - usb = sdi->conn; libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); @@ -170,11 +153,6 @@ static int dev_close(struct sr_dev_inst *sdi) { struct sr_usb_dev_inst *usb; - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - usb = sdi->conn; if (!usb->devhdl) @@ -189,23 +167,6 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) -{ - 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); - di->priv = NULL; - - return ret; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -234,38 +195,28 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd { struct dev_context *devc; gint64 now; - 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) { case SR_CONF_LIMIT_MSEC: devc->limit_msec = g_variant_get_uint64(data); now = g_get_monotonic_time() / 1000; devc->end_time = now + devc->limit_msec; - sr_dbg("Setting time limit to %" PRIu64 "ms.", - devc->limit_msec); break; case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = g_variant_get_uint64(data); - sr_dbg("Setting sample limit to %" PRIu64 ".", - devc->limit_samples); break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } - return ret; + return SR_OK; } static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, @@ -294,7 +245,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static void receive_transfer(struct libusb_transfer *transfer) +static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) { struct dev_context *devc; struct sr_dev_inst *sdi; @@ -304,14 +255,14 @@ static void receive_transfer(struct libusb_transfer *transfer) devc = sdi->priv; if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE) { /* USB device was unplugged. */ - dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi); } else if (transfer->status == LIBUSB_TRANSFER_COMPLETED) { sr_dbg("Got %d-byte packet.", transfer->actual_length); if (transfer->actual_length == DMM_DATA_SIZE) { victor_dmm_receive_data(sdi, transfer->buffer); if (devc->limit_samples) { if (devc->num_samples >= devc->limit_samples) - dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi); } } } @@ -325,7 +276,7 @@ static void receive_transfer(struct libusb_transfer *transfer) libusb_error_name(ret)); g_free(transfer->buffer); libusb_free_transfer(transfer); - dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi); } } else { /* This was the last transfer we're going to receive, so @@ -338,9 +289,9 @@ static void receive_transfer(struct libusb_transfer *transfer) static int handle_events(int fd, int revents, void *cb_data) { struct dev_context *devc; - struct drv_context *drvc = di->priv; - struct sr_datafeed_packet packet; + struct drv_context *drvc; struct sr_dev_inst *sdi; + struct sr_dev_driver *di; struct timeval tv; gint64 now; @@ -349,20 +300,19 @@ static int handle_events(int fd, int revents, void *cb_data) sdi = cb_data; devc = sdi->priv; + di = sdi->driver; + drvc = di->context; if (devc->limit_msec) { now = g_get_monotonic_time() / 1000; if (now > devc->end_time) - dev_acquisition_stop(sdi, sdi); + dev_acquisition_stop(sdi); } if (sdi->status == SR_ST_STOPPING) { usb_source_remove(sdi->session, drvc->sr_ctx); - dev_close(sdi); - - packet.type = SR_DF_END; - sr_session_send(cb_data, &packet); + std_session_send_df_end(sdi, LOG_PREFIX); } memset(&tv, 0, sizeof(struct timeval)); @@ -372,10 +322,10 @@ static int handle_events(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 drv_context *drvc = di->priv; + struct sr_dev_driver *di = sdi->driver; + struct drv_context *drvc = di->context; struct sr_usb_dev_inst *usb; struct libusb_transfer *transfer; int ret; @@ -384,22 +334,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) 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; usb = sdi->conn; - devc->cb_data = cb_data; - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); usb_source_add(sdi->session, drvc->sr_ctx, 100, handle_events, (void *)sdi); - buf = g_try_malloc(DMM_DATA_SIZE); + buf = g_malloc(DMM_DATA_SIZE); transfer = libusb_alloc_transfer(0); /* Each transfer request gets 100ms to arrive before it's restarted. * The device only sends 1 transfer/second no matter how many @@ -407,7 +349,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) * handling above. */ libusb_fill_interrupt_transfer(transfer, usb->devhdl, VICTOR_ENDPOINT, buf, DMM_DATA_SIZE, receive_transfer, - cb_data, 100); + (struct sr_dev_inst *)sdi, 100); if ((ret = libusb_submit_transfer(transfer) != 0)) { sr_err("Unable to submit transfer: %s.", libusb_error_name(ret)); libusb_free_transfer(transfer); @@ -418,15 +360,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) 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) { - (void)cb_data; - - if (!di->priv) { - sr_err("Driver was not initialized."); - return SR_ERR; - } - if (sdi->status != SR_ST_ACTIVE) { sr_err("Device not active, can't stop acquisition."); return SR_ERR; @@ -442,9 +377,9 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = { .longname = "Victor DMMs", .api_version = 1, .init = init, - .cleanup = cleanup, + .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, @@ -453,5 +388,5 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };