Replace 'probe' with 'channel' in most places.

[libsigrok.git] / hardware / lascar-el-usb / protocol.c

diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c
index 032db07e69c620c827b9f5d2cdba7ad2f1b4f520..eeb22199f36fdfe2dd74e17afed64fa6b5548d2c 100644 (file)
--- a/hardware/lascar-el-usb/protocol.c
+++ b/hardware/lascar-el-usb/protocol.c
@@ -55,7 +55,7 @@ static const struct elusb_profile profiles[] = {
 };
 
 
-SR_PRIV libusb_device_handle *lascar_open(struct libusb_device *dev)
+static libusb_device_handle *lascar_open(struct libusb_device *dev)
 {
        libusb_device_handle *dev_hdl;
        int ret;
@@ -202,7 +202,7 @@ cleanup:
        return *configlen ? SR_OK : SR_ERR;
 }
 
-SR_PRIV int lascar_save_config(libusb_device_handle *dev_hdl,
+static int lascar_save_config(libusb_device_handle *dev_hdl,
                unsigned char *config, int configlen)
 {
        struct drv_context *drvc;
@@ -293,7 +293,7 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
        struct dev_context *devc;
        const struct elusb_profile *profile;
        struct sr_dev_inst *sdi;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        int modelid, i;
        char firmware[5];
 
@@ -329,21 +329,21 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
                sdi->driver = di;
 
                if (profile->logformat == LOG_TEMP_RH) {
-                       /* Model this as two probes: temperature and humidity. */
-                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Temp")))
+                       /* Model this as two channels: temperature and humidity. */
+                       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Temp")))
                                return NULL;
-                       sdi->probes = g_slist_append(NULL, probe);
-                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Hum")))
+                       sdi->channels = g_slist_append(NULL, ch);
+                       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Hum")))
                                return NULL;
-                       sdi->probes = g_slist_append(sdi->probes, probe);
+                       sdi->channels = g_slist_append(sdi->channels, ch);
                } else if (profile->logformat == LOG_CO) {
-                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "CO")))
+                       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "CO")))
                                return NULL;
-                       sdi->probes = g_slist_append(NULL, probe);
+                       sdi->channels = g_slist_append(NULL, ch);
                } else {
-                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+                       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
                                return NULL;
-                       sdi->probes = g_slist_append(NULL, probe);
+                       sdi->channels = g_slist_append(NULL, ch);
                }
 
                if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
@@ -398,7 +398,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        float *temp, *rh;
        uint16_t s;
        int samples, samples_left, i, j;
@@ -435,9 +435,9 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                }
                analog.num_samples = j;
 
-               probe = sdi->probes->data;
-               if (probe->enabled) {
-                       analog.probes = g_slist_append(NULL, probe);
+               ch = sdi->channels->data;
+               if (ch->enabled) {
+                       analog.channels = g_slist_append(NULL, ch);
                        analog.mq = SR_MQ_TEMPERATURE;
                        if (devc->temp_unit == 1)
                                analog.unit = SR_UNIT_FAHRENHEIT;
@@ -447,9 +447,9 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                        sr_session_send(devc->cb_data, &packet);
                }
 
-               probe = sdi->probes->next->data;
-               if (probe->enabled) {
-                       analog.probes = g_slist_append(NULL, probe);
+               ch = sdi->channels->next->data;
+               if (ch->enabled) {
+                       analog.channels = g_slist_append(NULL, ch);
                        analog.mq = SR_MQ_RELATIVE_HUMIDITY;
                        analog.unit = SR_UNIT_PERCENTAGE;
                        analog.data = rh;
@@ -462,7 +462,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
        case LOG_CO:
                packet.type = SR_DF_ANALOG;
                packet.payload = &analog;
-               analog.probes = sdi->probes;
+               analog.channels = sdi->channels;
                analog.num_samples = samples;
                analog.mq = SR_MQ_CARBON_MONOXIDE;
                analog.unit = SR_UNIT_CONCENTRATION;