X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=b8e694653ee0f66a017575a8d0feb244067a5bf5;hp=0a1e25825ffaff488f6a35d1169638f5d05a02be;hb=6525d819eef098a43b1f438ae4af50e67c9c4335;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750 diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index 0a1e2582..b8e69465 100644 --- a/src/hardware/mic-985xx/api.c +++ b/src/hardware/mic-985xx/api.c @@ -18,19 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "protocol.h" -static const uint32_t hwopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; -static const uint32_t hwcaps[] = { +static const uint32_t drvopts_temp[] = { + SR_CONF_THERMOMETER, +}; + +static const uint32_t drvopts_temp_hum[] = { SR_CONF_THERMOMETER, SR_CONF_HYGROMETER, - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, - SR_CONF_CONTINUOUS, +}; + +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_SET, }; SR_PRIV struct sr_dev_driver mic_98581_driver_info; @@ -64,17 +72,15 @@ 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_channel *ch; struct sr_serial_dev_inst *serial; GSList *devices; - if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) - return NULL; + serial = sr_serial_dev_inst_new(conn, serialcomm); - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - drvc = mic_devs[idx].di->priv; + drvc = mic_devs[idx].di->context; devices = NULL; serial_flush(serial); @@ -84,35 +90,24 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx) sr_info("Found device on port %s.", conn); /* 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, NULL))) - goto scan_cleanup; - - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - goto scan_cleanup; - } - + sdi = g_malloc0(sizeof(struct sr_dev_inst)); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup(mic_devs[idx].vendor); + sdi->model = g_strdup(mic_devs[idx].device); + devc = g_malloc0(sizeof(struct dev_context)); sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - sdi->priv = devc; sdi->driver = mic_devs[idx].di; - if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Temperature"))) - goto scan_cleanup; - sdi->channels = g_slist_append(sdi->channels, ch); + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temperature"); - 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); - } + if (mic_devs[idx].has_humidity) + sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "Humidity"); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); -scan_cleanup: serial_close(serial); return devices; @@ -152,7 +147,7 @@ static GSList *scan(GSList *options, int idx) static GSList *dev_list(int idx) { - return ((struct drv_context *)(mic_devs[idx].di->priv))->instances; + return ((struct drv_context *)(mic_devs[idx].di->context))->instances; } static int cleanup(int idx) @@ -175,13 +170,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_LIMIT_SAMPLES: 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 = g_variant_get_uint64(data); - sr_dbg("Setting time limit to %" PRIu64 "ms.", - devc->limit_msec); break; default: return SR_ERR_NA; @@ -191,19 +182,28 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) + const struct sr_channel_group *cg, int idx) { - (void)sdi; (void)cg; switch (key) { case SR_CONF_SCAN_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t)); + scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); break; case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t)); + if (!sdi && !mic_devs[idx].has_humidity) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts_temp, ARRAY_SIZE(drvopts_temp), + sizeof(uint32_t)); + } else if (!sdi && mic_devs[idx].has_humidity) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts_temp_hum, ARRAY_SIZE(drvopts_temp_hum), + sizeof(uint32_t)); + } else { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); + } break; default: return SR_ERR_NA; @@ -212,8 +212,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data, int idx) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx) { struct dev_context *devc; struct sr_serial_dev_inst *serial; @@ -222,12 +221,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, 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, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); /* Poll every 100ms, or whenever some data comes in. */ serial = sdi->conn; @@ -237,26 +234,35 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, + return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close, sdi->conn, LOG_PREFIX); } /* Driver-specific API function wrappers */ #define HW_INIT(X) \ -static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } +static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \ + (void)di; return init(sr_ctx, X); } #define HW_CLEANUP(X) \ -static int cleanup_##X(void) { return cleanup(X); } +static int cleanup_##X(const struct sr_dev_driver *di) { \ + (void)di; return cleanup(X); } #define HW_SCAN(X) \ -static GSList *scan_##X(GSList *options) { return scan(options, X); } +static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \ + (void)di; return scan(options, X); } #define HW_DEV_LIST(X) \ -static GSList *dev_list_##X(void) { return dev_list(X); } +static GSList *dev_list_##X(const struct sr_dev_driver *di) { \ + (void)di; return dev_list(X); } #define HW_DEV_CLEAR(X) \ -static int dev_clear_##X(void) { return dev_clear(X); } +static int dev_clear_##X(const struct sr_dev_driver *di) { \ + (void)di; return dev_clear(X); } +#define HW_CONFIG_LIST(X) \ +static int config_list_##X(uint32_t key, GVariant **data, \ +const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { \ +return config_list(key, data, sdi, cg, X); } #define HW_DEV_ACQUISITION_START(X) \ -static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ -void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } +static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi \ +) { return dev_acquisition_start(sdi, X); } /* Driver structs and API function wrappers */ #define DRV(ID, ID_UPPER, NAME, LONGNAME) \ @@ -265,6 +271,7 @@ HW_CLEANUP(ID_UPPER) \ HW_SCAN(ID_UPPER) \ HW_DEV_LIST(ID_UPPER) \ HW_DEV_CLEAR(ID_UPPER) \ +HW_CONFIG_LIST(ID_UPPER) \ HW_DEV_ACQUISITION_START(ID_UPPER) \ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .name = NAME, \ @@ -277,12 +284,12 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .dev_clear = dev_clear_##ID_UPPER, \ .config_get = NULL, \ .config_set = config_set, \ - .config_list = config_list, \ + .config_list = config_list_##ID_UPPER, \ .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, \ + .context = NULL, \ }; DRV(mic_98581, MIC_98581, "mic-98581", "MIC 98581")