X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ftondaj-sl-814%2Fapi.c;h=b6d38cd160cbe9cb7c542866377ac805e5e91595;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=c1d8abf8bc2206600ce10a197446470b092253ca;hpb=19ee7dff78f7195bfc82f14ef659751cdd0f6476;p=libsigrok.git diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c index c1d8abf8..b6d38cd1 100644 --- a/hardware/tondaj-sl-814/api.c +++ b/hardware/tondaj-sl-814/api.c @@ -27,23 +27,18 @@ #define SERIALCOMM "9600/8e1" static const int hwopts[] = { - SR_HWOPT_CONN, - SR_HWOPT_SERIALCOMM, + SR_CONF_CONN, + SR_CONF_SERIALCOMM, 0, }; static const int hwcaps[] = { - SR_HWCAP_SOUNDLEVELMETER, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_CONTINUOUS, + SR_CONF_SOUNDLEVELMETER, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_CONTINUOUS, 0, }; -static const char *probe_names[] = { - "P1", - NULL, -}; - SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info; static struct sr_dev_driver *di = &tondaj_sl_814_driver_info; @@ -73,18 +68,9 @@ static int clear_instances(void) return SR_OK; } -static int hw_init(void) +static int hw_init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("Driver context malloc failed."); - return SR_ERR_MALLOC; - } - - di->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_scan(GSList *options) @@ -92,37 +78,36 @@ static GSList *hw_scan(GSList *options) struct drv_context *drvc; struct dev_context *devc; struct sr_dev_inst *sdi; - struct sr_hwopt *opt; + struct sr_config *src; struct sr_probe *probe; GSList *devices, *l; const char *conn, *serialcomm; - devices = NULL; drvc = di->priv; drvc->instances = NULL; + devices = NULL; + conn = serialcomm = NULL; for (l = options; l; l = l->next) { - if (!(opt = l->data)) { + if (!(src = l->data)) { sr_err("Invalid option data, skipping."); continue; } - switch (opt->hwopt) { - case SR_HWOPT_CONN: - conn = opt->value; + switch (src->key) { + case SR_CONF_CONN: + conn = src->value; break; - case SR_HWOPT_SERIALCOMM: - serialcomm = opt->value; + case SR_CONF_SERIALCOMM: + serialcomm = src->value; break; default: - sr_err("Unknown option %d, skipping.", opt->hwopt); + sr_err("Unknown option %d, skipping.", src->key); break; } } - if (!conn) { - sr_dbg("Couldn't determine connection options."); + if (!conn) return NULL; - } if (!serialcomm) serialcomm = SERIALCOMM; @@ -140,12 +125,12 @@ static GSList *hw_scan(GSList *options) if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK) + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) return NULL; sdi->priv = devc; sdi->driver = di; - probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, probe_names[0]); + probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"); if (!probe) { sr_err("Failed to create probe."); return NULL; @@ -159,11 +144,7 @@ static GSList *hw_scan(GSList *options) static GSList *hw_dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int hw_dev_open(struct sr_dev_inst *sdi) @@ -172,7 +153,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi) devc = sdi->priv; - if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK) + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) return SR_ERR; sdi->status = SR_ST_ACTIVE; @@ -201,34 +182,7 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) -{ - (void)sdi; - - switch (info_id) { - case SR_DI_HWOPTS: - *data = hwopts; - break; - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - *data = GINT_TO_POINTER(1); - break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - default: - sr_err("Unknown info_id: %d.", info_id); - return SR_ERR_ARG; - } - - return SR_OK; -} - -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -239,14 +193,33 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, devc = sdi->priv; - switch (hwcap) { - case SR_HWCAP_LIMIT_SAMPLES: + switch (id) { + case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = *(const uint64_t *)value; sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; default: - sr_err("Unknown hardware capability: %d.", hwcap); + sr_err("Unknown hardware capability: %d.", id); + return SR_ERR_ARG; + } + + return SR_OK; +} + +static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = hwopts; + break; + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; + default: return SR_ERR_ARG; } @@ -256,28 +229,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet packet; - struct sr_datafeed_header header; - struct sr_datafeed_meta_analog meta; struct dev_context *devc; devc = sdi->priv; devc->cb_data = cb_data; /* Send header packet to the session bus. */ - sr_dbg("Sending SR_DF_HEADER."); - packet.type = SR_DF_HEADER; - packet.payload = (uint8_t *)&header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - sr_session_send(devc->cb_data, &packet); - - /* Send metadata about the SR_DF_ANALOG packets to come. */ - sr_dbg("Sending SR_DF_META_ANALOG."); - packet.type = SR_DF_META_ANALOG; - packet.payload = &meta; - meta.num_probes = 1; - sr_session_send(devc->cb_data, &packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); /* Poll every 500ms, or whenever some data comes in. */ sr_source_add(devc->serial->fd, G_IO_IN, 500, @@ -328,10 +286,10 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,