X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=2bf20627a02d1381cb7bc3c3a9e045d489bad6d0;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=ea6650463bc520e6f31d021a78c3ec7d64904c69;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;p=libsigrok.git diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index ea665046..2bf20627 100644 --- a/src/hardware/mic-985xx/api.c +++ b/src/hardware/mic-985xx/api.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "protocol.h" static const uint32_t scanopts[] = { @@ -56,11 +57,6 @@ SR_PRIV const struct mic_dev_info mic_devs[] = { }, }; -static int dev_clear(int idx) -{ - return std_dev_clear(mic_devs[idx].di, NULL); -} - static int init(struct sr_context *sr_ctx, int idx) { return std_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX); @@ -71,17 +67,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) != SR_OK) return NULL; - drvc = mic_devs[idx].di->priv; + drvc = mic_devs[idx].di->context; devices = NULL; serial_flush(serial); @@ -101,20 +95,14 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx) 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; @@ -154,12 +142,7 @@ static GSList *scan(GSList *options, int idx) static GSList *dev_list(int idx) { - return ((struct drv_context *)(mic_devs[idx].di->priv))->instances; -} - -static int cleanup(int idx) -{ - return dev_clear(idx); + return ((struct drv_context *)(mic_devs[idx].di->context))->instances; } static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, @@ -177,13 +160,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; @@ -223,8 +202,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; @@ -233,12 +211,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; @@ -248,38 +224,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); } -#define HW_CLEANUP(X) \ -static int cleanup_##X(void) { return cleanup(X); } +static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \ + (void)di; return init(sr_ctx, 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); } -#define HW_DEV_CLEAR(X) \ -static int dev_clear_##X(void) { return dev_clear(X); } +static GSList *dev_list_##X(const struct sr_dev_driver *di) { \ + (void)di; return dev_list(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) \ HW_INIT(ID_UPPER) \ -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 = { \ @@ -287,10 +260,9 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .longname = LONGNAME, \ .api_version = 1, \ .init = init_##ID_UPPER, \ - .cleanup = cleanup_##ID_UPPER, \ + .cleanup = std_cleanup, \ .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_##ID_UPPER, \ @@ -298,7 +270,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .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")