X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fmic-985xx%2Fapi.c;h=6cfc5efde05dbcbb58ecb6ec1424796a8ded1db2;hb=102f12396660e0784134bccce5cc0679db325751;hp=2920ca8240512da7e757224f50a429a96b77f98a;hpb=cd2f0fe22c35dcf3b010411ff6f123701be2a2d6;p=libsigrok.git diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c index 2920ca82..6cfc5efd 100644 --- a/hardware/mic-985xx/api.c +++ b/hardware/mic-985xx/api.c @@ -20,71 +20,53 @@ #include "protocol.h" -static const int hwopts[] = { +static const int32_t hwopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, - 0, }; -static const int hwcaps[] = { +static const int32_t hwcaps[] = { SR_CONF_THERMOMETER, SR_CONF_HYGROMETER, SR_CONF_LIMIT_SAMPLES, SR_CONF_LIMIT_MSEC, SR_CONF_CONTINUOUS, - 0, }; +SR_PRIV struct sr_dev_driver mic_98581_driver_info; SR_PRIV struct sr_dev_driver mic_98583_driver_info; SR_PRIV const struct mic_dev_info mic_devs[] = { { - "MIC", "98583", "38400/8n2", 32000, TRUE, TRUE, + "MIC", "98581", "38400/8n2", 32000, TRUE, FALSE, 6, + packet_valid_temp, + &mic_98581_driver_info, receive_data_MIC_98581, + }, + { + "MIC", "98583", "38400/8n2", 32000, TRUE, TRUE, 10, + packet_valid_temp_hum, &mic_98583_driver_info, receive_data_MIC_98583, }, }; -static int clear_instances(int idx) +static int dev_clear(int idx) { - struct sr_dev_inst *sdi; - struct drv_context *drvc; - struct dev_context *devc; - GSList *l; - struct sr_dev_driver *di; - - di = mic_devs[idx].di; - - if (!(drvc = di->priv)) - return SR_OK; - - for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) - continue; - if (!(devc = sdi->priv)) - continue; - sr_serial_dev_inst_free(devc->serial); - sr_dev_inst_free(sdi); - } - - g_slist_free(drvc->instances); - drvc->instances = NULL; - - return SR_OK; + return std_dev_clear(mic_devs[idx].di, NULL); } -static int hw_init(struct sr_context *sr_ctx, int idx) +static int init(struct sr_context *sr_ctx, int idx) { sr_dbg("Selected '%s' subdriver.", mic_devs[idx].di->name); - return std_hw_init(sr_ctx, mic_devs[idx].di, DRIVER_LOG_DOMAIN); + return std_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX); } -static GSList *scan(const char *conn, const char *serialcomm, int idx) +static GSList *mic_scan(const char *conn, const char *serialcomm, int idx) { struct sr_dev_inst *sdi; struct drv_context *drvc; struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_serial_dev_inst *serial; GSList *devices; @@ -105,7 +87,7 @@ static GSList *scan(const char *conn, const char *serialcomm, int idx) /* TODO: Fill in version from protocol response. */ if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, mic_devs[idx].vendor, - mic_devs[idx].device, ""))) + mic_devs[idx].device, NULL))) goto scan_cleanup; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { @@ -113,18 +95,21 @@ static GSList *scan(const char *conn, const char *serialcomm, int idx) goto scan_cleanup; } - devc->serial = serial; + sdi->inst_type = SR_INST_SERIAL; + sdi->conn = serial; sdi->priv = devc; sdi->driver = mic_devs[idx].di; - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Temperature"))) + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Temperature"))) goto scan_cleanup; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); - if (!(probe = sr_probe_new(1, SR_PROBE_ANALOG, TRUE, "Humidity"))) - goto scan_cleanup; - sdi->probes = g_slist_append(sdi->probes, probe); + if (mic_devs[idx].has_humidity) { + if (!(ch = sr_channel_new(1, SR_CHANNEL_ANALOG, TRUE, "Humidity"))) + goto scan_cleanup; + sdi->channels = g_slist_append(sdi->channels, ch); + } drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); @@ -135,7 +120,7 @@ scan_cleanup: return devices; } -static GSList *hw_scan(GSList *options, int idx) +static GSList *scan(GSList *options, int idx) { struct sr_config *src; GSList *l, *devices; @@ -146,10 +131,10 @@ static GSList *hw_scan(GSList *options, int idx) src = l->data; switch (src->key) { case SR_CONF_CONN: - conn = src->value; + conn = g_variant_get_string(src->data, NULL); break; case SR_CONF_SERIALCOMM: - serialcomm = src->value; + serialcomm = g_variant_get_string(src->data, NULL); break; } } @@ -158,143 +143,122 @@ static GSList *hw_scan(GSList *options, int idx) if (serialcomm) { /* Use the provided comm specs. */ - devices = scan(conn, serialcomm, idx); + devices = mic_scan(conn, serialcomm, idx); } else { /* Try the default. */ - devices = scan(conn, mic_devs[idx].conn, idx); + devices = mic_scan(conn, mic_devs[idx].conn, idx); } return devices; } -static GSList *hw_dev_list(int idx) +static GSList *dev_list(int idx) { return ((struct drv_context *)(mic_devs[idx].di->priv))->instances; } -static int hw_dev_open(struct sr_dev_inst *sdi) +static int cleanup(int idx) { - struct dev_context *devc; - - devc = sdi->priv; - - if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; - - return SR_OK; + return dev_clear(idx); } -static int hw_dev_close(struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_channel_group *cg) { 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(int idx) -{ - clear_instances(idx); - - return SR_OK; -} - -static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) -{ - struct dev_context *devc; + (void)cg; if (sdi->status != SR_ST_ACTIVE) - return SR_ERR; + return SR_ERR_DEV_CLOSED; devc = sdi->priv; switch (id) { case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = *(const uint64_t *)value; + devc->limit_samples = g_variant_get_uint64(data); sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; case SR_CONF_LIMIT_MSEC: - devc->limit_msec = *(const uint64_t *)value; + devc->limit_msec = g_variant_get_uint64(data); sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec); break; default: - sr_err("Unknown config: %d.", id); - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int config_list(int key, const void **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) { (void)sdi; + (void)cg; switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = hwopts; + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); break; case SR_CONF_DEVICE_OPTIONS: - *data = hwcaps; + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data, int idx) { struct dev_context *devc; + struct sr_serial_dev_inst *serial; - devc = sdi->priv; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + devc = sdi->priv; devc->cb_data = cb_data; - devc->num_samples = 0; 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 100ms, or whenever some data comes in. */ - sr_source_add(devc->serial->fd, G_IO_IN, 100, + serial = sdi->conn; + serial_source_add(sdi->session, serial, G_IO_IN, 100, mic_devs[idx].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); } /* Driver-specific API function wrappers */ #define HW_INIT(X) \ -static int hw_init_##X(struct sr_context *sr_ctx) { return hw_init(sr_ctx, X); } +static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } #define HW_CLEANUP(X) \ -static int hw_cleanup_##X(void) { return hw_cleanup(X); } +static int cleanup_##X(void) { return cleanup(X); } #define HW_SCAN(X) \ -static GSList *hw_scan_##X(GSList *options) { return hw_scan(options, X); } +static GSList *scan_##X(GSList *options) { return scan(options, X); } #define HW_DEV_LIST(X) \ -static GSList *hw_dev_list_##X(void) { return hw_dev_list(X); } -#define CLEAR_INSTANCES(X) \ -static int clear_instances_##X(void) { return clear_instances(X); } +static GSList *dev_list_##X(void) { return dev_list(X); } +#define HW_DEV_CLEAR(X) \ +static int dev_clear_##X(void) { return dev_clear(X); } #define HW_DEV_ACQUISITION_START(X) \ -static int hw_dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ -void *cb_data) { return hw_dev_acquisition_start(sdi, cb_data, X); } +static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ +void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } /* Driver structs and API function wrappers */ #define DRV(ID, ID_UPPER, NAME, LONGNAME) \ @@ -302,25 +266,26 @@ HW_INIT(ID_UPPER) \ HW_CLEANUP(ID_UPPER) \ HW_SCAN(ID_UPPER) \ HW_DEV_LIST(ID_UPPER) \ -CLEAR_INSTANCES(ID_UPPER) \ +HW_DEV_CLEAR(ID_UPPER) \ HW_DEV_ACQUISITION_START(ID_UPPER) \ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .name = NAME, \ .longname = LONGNAME, \ .api_version = 1, \ - .init = hw_init_##ID_UPPER, \ - .cleanup = hw_cleanup_##ID_UPPER, \ - .scan = hw_scan_##ID_UPPER, \ - .dev_list = hw_dev_list_##ID_UPPER, \ - .dev_clear = clear_instances_##ID_UPPER, \ + .init = init_##ID_UPPER, \ + .cleanup = cleanup_##ID_UPPER, \ + .scan = scan_##ID_UPPER, \ + .dev_list = dev_list_##ID_UPPER, \ + .dev_clear = dev_clear_##ID_UPPER, \ .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_##ID_UPPER, \ - .dev_acquisition_stop = hw_dev_acquisition_stop, \ + .dev_open = std_serial_dev_open, \ + .dev_close = std_serial_dev_close, \ + .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ + .dev_acquisition_stop = dev_acquisition_stop, \ .priv = NULL, \ }; +DRV(mic_98581, MIC_98581, "mic-98581", "MIC 98581") DRV(mic_98583, MIC_98583, "mic-98583", "MIC 98583")