Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

[libsigrok.git] / hardware / gmc-mh-1x-2x / api.c

diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c
index 8c413e600017812dd9e58f872d810ae1a7af9eab..ce849765a0fd1b61f89177d794f34c20c3feea05 100644 (file)
--- a/hardware/gmc-mh-1x-2x/api.c
+++ b/hardware/gmc-mh-1x-2x/api.c
@@ -162,7 +162,7 @@ static GSList *scan_1x_2x_rs232(GSList *options)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        const char *conn, *serialcomm;
@@ -259,7 +259,7 @@ static GSList *scan_2x_bd232(GSList *options)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        const char *conn, *serialcomm;
@@ -393,16 +393,6 @@ static GSList *dev_list_2x_bd232(void)
                        ->instances;
 }
 
-static int dev_clear_1x_2x_rs232(void)
-{
-       return std_dev_clear(&gmc_mh_1x_2x_rs232_driver_info, NULL);
-}
-
-static int dev_clear_2x_bd232(void)
-{
-       return std_dev_clear(&gmc_mh_2x_bd232_driver_info, NULL);
-}
-
 static int dev_close(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -423,28 +413,28 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup_sm_rs232(void)
 {
-       return dev_clear_1x_2x_rs232();
+       return std_dev_clear(&gmc_mh_1x_2x_rs232_driver_info, NULL);
 }
 
 static int cleanup_2x_bd232(void)
 {
-       return dev_clear_2x_bd232();
+       return std_dev_clear(&gmc_mh_2x_bd232_driver_info, NULL);
 }
 
 /** Get value of configuration item */
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
-                     const struct sr_probe_group *probe_group)
+                     const struct sr_channel_group *cg)
 {
        int ret;
        struct dev_context *devc;
 
        (void)sdi;
        (void)data;
-       (void)probe_group;
+       (void)cg;
 
        ret = SR_OK;
 
-       (void)probe_group;
+       (void)cg;
 
        if (!sdi || !(devc = sdi->priv))
                return SR_ERR_ARG;
@@ -470,10 +460,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 
 /** Implementation of config_list, auxiliary function for common parts, */
 static int config_list_common(int key, GVariant **data, const struct sr_dev_inst *sdi,
-                             const struct sr_probe_group *probe_group)
+                             const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -489,10 +479,9 @@ static int config_list_common(int key, GVariant **data, const struct sr_dev_inst
 
 /** Implementation of config_list for Metrahit 1x/2x send mode */
 static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sdi,
-                         const struct sr_probe_group *probe_group)
+                         const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)probe_group;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
@@ -500,7 +489,7 @@ static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sd
                                                  hwcaps_sm, ARRAY_SIZE(hwcaps_sm), sizeof(int32_t));
                break;
        default:
-               return config_list_common(key, data, sdi, probe_group);
+               return config_list_common(key, data, sdi, cg);
        }
 
        return SR_OK;
@@ -508,10 +497,9 @@ static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sd
 
 /** Implementation of config_list for Metrahit 2x bidirectional mode */
 static int config_list_bd(int key, GVariant **data, const struct sr_dev_inst *sdi,
-                         const struct sr_probe_group *probe_group)
+                         const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)probe_group;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
@@ -519,7 +507,7 @@ static int config_list_bd(int key, GVariant **data, const struct sr_dev_inst *sd
                                                  hwcaps_bd, ARRAY_SIZE(hwcaps_bd), sizeof(int32_t));
                break;
        default:
-               return config_list_common(key, data, sdi, probe_group);
+               return config_list_common(key, data, sdi, cg);
        }
 
        return SR_OK;
@@ -602,13 +590,13 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
        .name = "gmc-mh-1x-2x-rs232",
-       .longname = "Gossen Metrawatt Metrahit 1x/2x, 'RS232' interface",
+       .longname = "Gossen Metrawatt Metrahit 1x/2x, RS232 interface",
        .api_version = 1,
        .init = init_1x_2x_rs232,
        .cleanup = cleanup_sm_rs232,
        .scan = scan_1x_2x_rs232,
        .dev_list = dev_list_1x_2x_rs232,
-       .dev_clear = dev_clear_1x_2x_rs232,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list_sm,
@@ -621,13 +609,13 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
 
 SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
        .name = "gmc-mh-2x-bd232",
-       .longname = "Gossen Metrawatt Metrahit 2x, 'BD232'/'SI232-II' interface",
+       .longname = "Gossen Metrawatt Metrahit 2x, BD232/SI232-II interface",
        .api_version = 1,
        .init = init_2x_bd232,
        .cleanup = cleanup_2x_bd232,
        .scan = scan_2x_bd232,
        .dev_list = dev_list_2x_bd232,
-       .dev_clear = dev_clear_2x_bd232,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list_bd,