X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=34853a0cbe9873c469fc536f9de09c29a4f795c3;hb=a4e435eb49c1fa30c31d5851b404001324cafe33;hp=3b3082844cc4dad70cd20248f0c49da19f82a7b3;hpb=4c22355f046fefff812042ef9764199df17fb809;p=libsigrok.git diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c index 3b308284..34853a0c 100644 --- a/hardware/cem-dt-885x/api.c +++ b/hardware/cem-dt-885x/api.c @@ -39,6 +39,7 @@ static const int32_t hwcaps[] = { SR_CONF_HOLD_MAX, SR_CONF_HOLD_MIN, SR_CONF_POWER_OFF, + SR_CONF_DATA_SOURCE, }; static const char *weight_freq[] = { @@ -58,6 +59,10 @@ static const uint64_t meas_ranges[][2] = { { 80, 130 }, }; +static const char *data_sources[] = { + "Live", + "Memory", +}; SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info; static struct sr_dev_driver *di = &cem_dt_885x_driver_info; @@ -74,7 +79,7 @@ static GSList *scan(GSList *options) struct sr_config *src; struct sr_serial_dev_inst *serial; struct sr_dev_inst *sdi; - struct sr_probe *probe; + struct sr_channel *ch; GSList *l, *devices; gint64 start; const char *conn; @@ -112,6 +117,8 @@ static GSList *scan(GSList *options) devc->cur_mqflags = 0; devc->recording = -1; devc->cur_meas_range = 0; + devc->cur_data_source = DATA_SOURCE_LIVE; + devc->enable_data_source_memory = FALSE; if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM))) return NULL; @@ -119,9 +126,9 @@ static GSList *scan(GSList *options) sdi->inst_type = SR_INST_SERIAL; sdi->priv = devc; sdi->driver = di; - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "SPL"))) + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL"))) return NULL; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); break; @@ -137,16 +144,7 @@ static GSList *scan(GSList *options) static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; -} - -static int dev_clear(void) -{ - return std_dev_clear(di, NULL); + return ((struct drv_context *)(di->priv))->instances; } static int dev_open(struct sr_dev_inst *sdi) @@ -162,31 +160,21 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int dev_close(struct sr_dev_inst *sdi) -{ - struct sr_serial_dev_inst *serial; - - serial = sdi->conn; - if (serial && serial->fd != -1) { - serial_close(serial); - sdi->status = SR_ST_INACTIVE; - } - - return SR_OK; -} - static int cleanup(void) { - return dev_clear(); + return std_dev_clear(di, NULL); } -static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; GVariant *range[2]; uint64_t low, high; int tmp, ret; + (void)cg; + if (!sdi) return SR_ERR_ARG; @@ -236,6 +224,12 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) case SR_CONF_POWER_OFF: *data = g_variant_new_boolean(FALSE); break; + case SR_CONF_DATA_SOURCE: + if (devc->cur_data_source == DATA_SOURCE_LIVE) + *data = g_variant_new_string("Live"); + else + *data = g_variant_new_string("Memory"); + break; default: return SR_ERR_NA; } @@ -243,7 +237,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) return ret; } -static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { struct dev_context *devc; uint64_t tmp_u64, low, high; @@ -251,6 +246,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) int tmp, ret; const char *tmp_str; + (void)cg; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -313,6 +310,16 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) if (g_variant_get_boolean(data)) ret = cem_dt_885x_power_off(sdi); break; + case SR_CONF_DATA_SOURCE: + tmp_str = g_variant_get_string(data, NULL); + if (!strcmp(tmp_str, "Live")) + devc->cur_data_source = DATA_SOURCE_LIVE; + else if (!strcmp(tmp_str, "Memory")) + devc->cur_data_source = DATA_SOURCE_MEMORY; + else + return SR_ERR; + devc->enable_data_source_memory = devc->cur_data_source == DATA_SOURCE_MEMORY; + break; default: ret = SR_ERR_NA; } @@ -320,7 +327,8 @@ static int config_set(int key, 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_channel_group *cg) { GVariant *tuple, *range[2]; GVariantBuilder gvb; @@ -328,6 +336,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) int ret; (void)sdi; + (void)cg; ret = SR_OK; switch (key) { @@ -355,6 +364,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) } *data = g_variant_builder_end(&gvb); break; + case SR_CONF_DATA_SOURCE: + *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources)); + break; default: return SR_ERR_NA; } @@ -385,7 +397,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) /* Poll every 100ms, or whenever some data comes in. */ serial = sdi->conn; - sr_source_add(serial->fd, G_IO_IN, 150, cem_dt_885x_receive_data, + serial_source_add(serial, G_IO_IN, 150, cem_dt_885x_receive_data, (void *)sdi); return SR_OK; @@ -393,15 +405,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - (void)cb_data; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close, + return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, sdi->conn, LOG_PREFIX); - - return SR_OK; } SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = { @@ -412,12 +420,12 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = { .cleanup = cleanup, .scan = scan, .dev_list = dev_list, - .dev_clear = dev_clear, + .dev_clear = NULL, .config_get = config_get, .config_set = config_set, .config_list = config_list, .dev_open = dev_open, - .dev_close = dev_close, + .dev_close = std_serial_dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, .priv = NULL,