Route sr_source_add for all serial devices through a serial_source_add wrapper.

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

diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c
index 858f2a3e92c5c2f0b651962635ce402c731a9ddc..7983c4aec7e7d6bd808550ce1af6002169738261 100644 (file)
--- a/hardware/mic-985xx/api.c
+++ b/hardware/mic-985xx/api.c
@@ -49,7 +49,7 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
        },
 };
 
-static int clear_instances(int idx)
+static int dev_clear(int idx)
 {
        return std_dev_clear(mic_devs[idx].di, NULL);
 }
@@ -185,13 +185,16 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(int idx)
 {
-       return clear_instances(idx);
+       return dev_clear(idx);
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        struct dev_context *devc;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -215,9 +218,11 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -254,7 +259,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 100,
+       serial_source_add(serial, G_IO_IN, 100,
                      mic_devs[idx].receive_data, (void *)sdi);
 
        return SR_OK;
@@ -275,8 +280,8 @@ static int cleanup_##X(void) { return cleanup(X); }
 static GSList *scan_##X(GSList *options) { return scan(options, X); }
 #define HW_DEV_LIST(X) \
 static GSList *dev_list_##X(void) { return dev_list(X); }
-#define CLEAR_INSTANCES(X) \
-static int clear_instances_##X(void) { return clear_instances(X); }
+#define HW_DEV_CLEAR(X) \
+static int dev_clear_##X(void) { return dev_clear(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); }
@@ -287,7 +292,7 @@ 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, \
@@ -297,7 +302,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .cleanup = cleanup_##ID_UPPER, \
        .scan = scan_##ID_UPPER, \
        .dev_list = dev_list_##ID_UPPER, \
-       .dev_clear = clear_instances_##ID_UPPER, \
+       .dev_clear = dev_clear_##ID_UPPER, \
        .config_get = NULL, \
        .config_set = config_set, \
        .config_list = config_list, \