X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=c9f9ba753df50b740d06fe6d7d32415beb5500c6;hb=d43b090816f61e77d8054084e85202de1a1ebeb7;hp=678f67b8a92cce2f8814cdc0e6cc7b1277b49372;hpb=e73ffd4238c6d1be58d3fcdcf7f100200f033856;p=libsigrok.git diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c index 678f67b8..c9f9ba75 100644 --- a/hardware/brymen-dmm/api.c +++ b/hardware/brymen-dmm/api.c @@ -34,36 +34,14 @@ static const int32_t hwcaps[] = { SR_PRIV struct sr_dev_driver brymen_bm857_driver_info; static struct sr_dev_driver *di = &brymen_bm857_driver_info; -static int hw_init(struct sr_context *sr_ctx) +static int init(struct sr_context *sr_ctx) { - return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); + return std_init(sr_ctx, di, LOG_PREFIX); } -static void free_instance(void *inst) +static int dev_clear(void) { - struct sr_dev_inst *sdi; - struct dev_context *devc; - - if (!(sdi = inst)) - return; - if (!(devc = sdi->priv)) - return; - sr_serial_dev_inst_free(devc->serial); - sr_dev_inst_free(sdi); -} - -/* Properly close and free all devices. */ -static int clear_instances(void) -{ - struct drv_context *drvc; - - if (!(drvc = di->priv)) - return SR_OK; - - g_slist_free_full(drvc->instances, free_instance); - drvc->instances = NULL; - - return SR_OK; + return std_dev_clear(di, NULL); } static GSList *brymen_scan(const char *conn, const char *serialcomm) @@ -110,7 +88,8 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm) goto scan_cleanup; } - devc->serial = serial; + sdi->inst_type = SR_INST_SERIAL; + sdi->conn = serial; drvc = di->priv; sdi->priv = devc; sdi->driver = di; @@ -128,15 +107,13 @@ scan_cleanup: return devices; } -static GSList *hw_scan(GSList *options) +static GSList *scan(GSList *options) { struct drv_context *drvc; struct sr_config *src; GSList *devices, *l; const char *conn, *serialcomm; - (void)options; - devices = NULL; drvc = di->priv; drvc->instances = NULL; @@ -153,9 +130,8 @@ static GSList *hw_scan(GSList *options) break; } } - if (!conn) { + if (!conn) return NULL; - } if (serialcomm) { /* Use the provided comm specs. */ @@ -168,21 +144,17 @@ static GSList *hw_scan(GSList *options) return devices; } -static GSList *hw_dev_list(void) +static GSList *dev_list(void) { return ((struct drv_context *)(di->priv))->instances; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int dev_open(struct sr_dev_inst *sdi) { - struct dev_context *devc; - - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } + struct sr_serial_dev_inst *serial; - if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + serial = sdi->conn; + if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) return SR_ERR; sdi->status = SR_ST_ACTIVE; @@ -190,32 +162,19 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int cleanup(void) { - struct dev_context *devc; - - devc = sdi->priv; - - if (devc->serial && devc->serial->fd != -1) { - serial_close(devc->serial); - sdi->status = SR_ST_INACTIVE; - } - - return SR_OK; -} - -static int hw_cleanup(void) -{ - clear_instances(); - - return SR_OK; + return dev_clear(); } -static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { struct dev_context *devc; int ret; + (void)probe_group; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -239,9 +198,11 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) return ret; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { (void)sdi; + (void)probe_group; switch (key) { case SR_CONF_SCAN_OPTIONS: @@ -259,10 +220,10 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct dev_context *devc; + struct sr_serial_dev_inst *serial; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -283,36 +244,37 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->starttime = g_get_monotonic_time(); /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + std_session_send_df_header(cb_data, LOG_PREFIX); /* Poll every 50ms, or whenever some data comes in. */ - sr_source_add(devc->serial->fd, G_IO_IN, 50, + serial = sdi->conn; + serial_source_add(serial, G_IO_IN, 50, brymen_dmm_receive_data, (void *)sdi); return SR_OK; } -static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close, - ((struct dev_context *)(sdi->priv))->serial, DRIVER_LOG_DOMAIN); + return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, + sdi->conn, LOG_PREFIX); } SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = { .name = "brymen-bm857", .longname = "Brymen BM857", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .scan = hw_scan, - .dev_list = hw_dev_list, - .dev_clear = clear_instances, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, .config_get = NULL, .config_set = config_set, .config_list = config_list, - .dev_open = hw_dev_open, - .dev_close = hw_dev_close, - .dev_acquisition_start = hw_dev_acquisition_start, - .dev_acquisition_stop = hw_dev_acquisition_stop, + .dev_open = dev_open, + .dev_close = std_serial_dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL, };