X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fapi.c;h=0aa012a1a3b54e90d1ed3a15137aa565e8eefac0;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=45fff2bc3b417f411385cbfd3302094d6d1cbcc1;hpb=b165a24234b44a39e87661132ee0c92b49dac5ea;p=libsigrok.git diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c index 45fff2bc..0aa012a1 100644 --- a/src/hardware/hung-chang-dso-2100/api.c +++ b/src/hardware/hung-chang-dso-2100/api.c @@ -22,8 +22,6 @@ #include #include "protocol.h" -SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info; - static const uint32_t scanopts[] = { SR_CONF_CONN, }; @@ -104,19 +102,12 @@ static const uint8_t coupling_map[] = { 0x00, 0x08, 0x04 }; -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - -static GSList *scan_port(GSList *devices, struct sr_dev_driver *di, - struct parport *port) +static GSList *scan_port(GSList *devices, struct parport *port) { struct sr_dev_inst *sdi; struct sr_channel *ch; struct sr_channel_group *cg; struct dev_context *devc; - struct drv_context *drvc; int i; if (ieee1284_open(port, 0, &i) != E1284_OK) { @@ -142,8 +133,6 @@ static GSList *scan_port(GSList *devices, struct sr_dev_driver *di, sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("Hung-Chang"); sdi->model = g_strdup("DSO-2100"); - sdi->driver = di; - drvc = di->context; sdi->inst_type = 0; /* FIXME */ sdi->conn = port; ieee1284_ref(port); @@ -176,7 +165,6 @@ static GSList *scan_port(GSList *devices, struct sr_dev_driver *di, devc->last_step = 0; /* buffersize = 1000 */ sdi->priv = devc; - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); fail3: @@ -216,7 +204,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) for (i = 0; i < ports.portc; i++) if (!strcmp(ports.portv[i]->name, conn)) { port_found = TRUE; - devices = scan_port(devices, di, ports.portv[i]); + devices = scan_port(devices, ports.portv[i]); } if (!port_found) { @@ -227,12 +215,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) ieee1284_free_ports(&ports); - return devices; -} - -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; + return std_scan_complete(di, devices); } static void clear_private(void *priv) @@ -263,9 +246,6 @@ static int dev_open(struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; int i; - if (sdi->status != SR_ST_INACTIVE) - goto fail1; - if (ieee1284_open(sdi->conn, 0, &i) != E1284_OK) goto fail1; @@ -282,8 +262,6 @@ static int dev_open(struct sr_dev_inst *sdi) if (!devc->samples) goto fail3; - sdi->status = SR_ST_ACTIVE; - return SR_OK; fail3: @@ -299,30 +277,14 @@ static int dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_OK; - g_free(devc->samples); hung_chang_dso_2100_reset_port(sdi->conn); ieee1284_release(sdi->conn); ieee1284_close(sdi->conn); - sdi->status = SR_ST_INACTIVE; return SR_OK; } -static int cleanup(const struct sr_dev_driver *di) -{ - struct drv_context *drvc = di->context; - int ret; - - ret = dev_clear(di); - - g_free(drvc); - - return ret; -} - static int find_in_array(GVariant *data, const GVariantType *type, const void *arr, int n) { @@ -463,9 +425,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd if (cg) /* sr_config_set will validate cg using config_list */ ch = ((struct sr_channel *)cg->channels->data)->index; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - ret = SR_OK; switch (key) { case SR_CONF_LIMIT_FRAMES: @@ -578,9 +537,6 @@ static int config_commit(const struct sr_dev_inst *sdi) uint8_t state = hung_chang_dso_2100_read_mbox(sdi->conn, 0.02); int ret; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - switch (state) { case 0x03: case 0x14: @@ -589,10 +545,12 @@ static int config_commit(const struct sr_dev_inst *sdi) break; case 0x00: state = 0x01; + /* Fallthrough */ default: ret = hung_chang_dso_2100_move_to(sdi, 1); if (ret != SR_OK) return ret; + /* Fallthrough */ case 0x01: hung_chang_dso_2100_write_mbox(sdi->conn, 4); } @@ -686,15 +644,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -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 = sdi->priv; int ret; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - if (devc->channel) { static const float res_array[] = {0.5, 1, 2, 5}; static const uint8_t relays[] = {100, 10, 10, 1}; @@ -703,7 +657,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, devc->factor /= relays[(devc->cctl[devc->channel - 1] >> 4) & 0x03]; } devc->frame = 0; - devc->cb_data = cb_data; devc->state_known = TRUE; devc->step = 0; devc->adc2 = FALSE; @@ -713,7 +666,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, if (ret != SR_OK) return ret; - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi); sr_session_source_add(sdi->session, -1, 0, 8, hung_chang_dso_2100_poll, (void *)sdi); @@ -721,35 +674,23 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - struct sr_datafeed_packet packet = { .type = SR_DF_END }; - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - sr_session_send(cb_data, &packet); + std_session_send_df_end(sdi); sr_session_source_remove(sdi->session, -1); - hung_chang_dso_2100_move_to(sdi, 1); return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) -{ - return hung_chang_dso_2100_dev_acquisition_stop(sdi, cb_data); -} - -SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = { +static struct sr_dev_driver hung_chang_dso_2100_driver_info = { .name = "hung-chang-dso-2100", .longname = "Hung-Chang DSO-2100", .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, @@ -762,3 +703,4 @@ SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(hung_chang_dso_2100_driver_info);