X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=e1e4b2e4895abb295fdabebc6d787ca857220f2f;hb=813aab691b255580d3247b9fec7ab3f7b4fc8a18;hp=fb309fe2592c55029c10cdfddbc683591a9f8627;hpb=f157b2eebb8523792bd085eeb8fb3632b5d4c172;p=libsigrok.git diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c index fb309fe2..e1e4b2e4 100644 --- a/hardware/cem-dt-885x/api.c +++ b/hardware/cem-dt-885x/api.c @@ -32,12 +32,14 @@ static const int32_t hwcaps[] = { SR_CONF_SOUNDLEVELMETER, SR_CONF_LIMIT_SAMPLES, SR_CONF_CONTINUOUS, - SR_CONF_DATALOG, SR_CONF_SPL_WEIGHT_FREQ, SR_CONF_SPL_WEIGHT_TIME, + SR_CONF_SPL_MEASUREMENT_RANGE, + SR_CONF_DATALOG, SR_CONF_HOLD_MAX, SR_CONF_HOLD_MIN, - SR_CONF_SPL_MEASUREMENT_RANGE, + SR_CONF_POWER_OFF, + SR_CONF_DATA_SOURCE, }; static const char *weight_freq[] = { @@ -57,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; @@ -111,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; @@ -136,11 +144,7 @@ static GSList *scan(GSList *options) static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int dev_clear(void) @@ -161,31 +165,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(); } -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_probe_group *probe_group) { struct dev_context *devc; GVariant *range[2]; uint64_t low, high; int tmp, ret; + (void)probe_group; + if (!sdi) return SR_ERR_ARG; @@ -232,6 +226,15 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) *data = g_variant_new_tuple(range, 2); } break; + 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; } @@ -239,7 +242,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_probe_group *probe_group) { struct dev_context *devc; uint64_t tmp_u64, low, high; @@ -247,6 +251,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) int tmp, ret; const char *tmp_str; + (void)probe_group; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -305,6 +311,20 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) } } break; + case SR_CONF_POWER_OFF: + 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; } @@ -312,7 +332,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_probe_group *probe_group) { GVariant *tuple, *range[2]; GVariantBuilder gvb; @@ -320,6 +341,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) int ret; (void)sdi; + (void)probe_group; ret = SR_OK; switch (key) { @@ -347,6 +369,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; } @@ -377,7 +402,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; @@ -390,10 +415,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, 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 = { @@ -409,7 +432,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = { .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,