Minor cosmetics, cleanups.

[libsigrok.git] / src / hardware / mic-985xx / api.c

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 6e834bd4b23d866a3f3e8ce3c19ec37bf8d55447..df9cc22e027b55eaab291845107b09e9938ff848 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -71,12 +71,10 @@ 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;
@@ -101,13 +99,10 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
        sdi->priv = devc;
        sdi->driver = mic_devs[idx].di;
 
-       ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Temperature");
-       sdi->channels = g_slist_append(sdi->channels, ch);
+       sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temperature");
 
-       if (mic_devs[idx].has_humidity) {
-               ch = sr_channel_new(1, SR_CHANNEL_ANALOG, TRUE, "Humidity");
-               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);
@@ -253,15 +248,20 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 /* 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) { \