X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=8d530e5779dc6877d1c9d9e9d43bfa188bd6e389;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=2207e3da19e6f5a9ed94e7ec0ecd64a8c1df4922;hpb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;p=libsigrok.git diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c index 2207e3da..8d530e57 100644 --- a/src/hardware/zeroplus-logic-cube/api.c +++ b/src/hardware/zeroplus-logic-cube/api.c @@ -54,8 +54,11 @@ static const struct zp_model zeroplus_models[] = { ALL_ZERO }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_LOGIC_ANALYZER, +}; + +static const uint32_t devopts[] = { SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_LIST, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_MATCH | SR_CONF_LIST, @@ -79,8 +82,6 @@ static const char *channel_names[] = { "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", }; -SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info; - /* * The hardware supports more samplerates than these, but these are the * options hardcoded into the vendor's Windows GUI. @@ -126,8 +127,6 @@ const uint64_t samplerates_200[] = { SR_MHZ(200), }; -static int dev_close(struct sr_dev_inst *sdi); - SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate) { int i; @@ -214,7 +213,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup(VENDOR_NAME); sdi->model = g_strdup(prof->model_name); - sdi->driver = di; sdi->serial_num = g_strdup(serial_num); sdi->connection_id = g_strdup(connection_id); @@ -240,7 +238,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) channel_names[j]); devices = g_slist_append(devices, sdi); - drvc->instances = g_slist_append(drvc->instances, sdi); sdi->inst_type = SR_INST_USB; sdi->conn = sr_usb_dev_inst_new( libusb_get_bus_number(devlist[i]), @@ -248,7 +245,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) } libusb_free_device_list(devlist, 1); - return devices; + return std_scan_complete(di, devices); } static int dev_open(struct sr_dev_inst *sdi) @@ -267,8 +264,6 @@ static int dev_open(struct sr_dev_inst *sdi) if (ret != SR_OK) return ret; - sdi->status = SR_ST_ACTIVE; - ret = libusb_set_configuration(usb->devhdl, USB_CONFIGURATION); if (ret < 0) { sr_err("Unable to set USB configuration %d: %s.", @@ -324,7 +319,7 @@ static int dev_close(struct sr_dev_inst *sdi) usb = sdi->conn; if (!usb->devhdl) - return SR_ERR; + return SR_ERR_BUG; sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.", usb->bus, usb->address, sdi->connection_id, USB_INTERFACE); @@ -332,7 +327,6 @@ static int dev_close(struct sr_dev_inst *sdi) libusb_reset_device(usb->devhdl); libusb_close(usb->devhdl); usb->devhdl = NULL; - sdi->status = SR_ST_INACTIVE; return SR_OK; } @@ -377,13 +371,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - if (!(devc = sdi->priv)) { - sr_err("%s: sdi->priv was NULL", __func__); - return SR_ERR_ARG; - } + devc = sdi->priv; switch (key) { case SR_CONF_SAMPLERATE: @@ -415,8 +403,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + if (!sdi) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + } else { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); + } break; case SR_CONF_SAMPLERATE: devc = sdi->priv; @@ -489,9 +482,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) unsigned int discard; int trigger_now; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; if (analyzer_add_triggers(sdi) != SR_OK) { @@ -529,11 +519,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) sr_info("Ramsize trigger = 0x%x.", ramsize_trigger); sr_info("Memory size = 0x%x.", memory_size); - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); /* Check for empty capture */ if ((status & STATUS_READY) && !stop_address) { - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); return SR_OK; } @@ -641,7 +631,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) analyzer_read_stop(usb->devhdl); g_free(buf); - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); return SR_OK; } @@ -651,7 +641,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct sr_usb_dev_inst *usb; - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); usb = sdi->conn; analyzer_reset(usb->devhdl); @@ -660,7 +650,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) return SR_OK; } -SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = { +static struct sr_dev_driver zeroplus_logic_cube_driver_info = { .name = "zeroplus-logic-cube", .longname = "ZEROPLUS Logic Cube LAP-C series", .api_version = 1, @@ -678,3 +668,4 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(zeroplus_logic_cube_driver_info);