Consistency and whitespace fixes for switch statements.

[libsigrok.git] / src / hardware / fx2lafw / api.c

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 46520eb44b1b01fc36eeafed2addd59f672b019b..6fd89795624f3a79a1f1e95e74c810cdebf2cb8a 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -158,20 +158,18 @@ static const uint64_t dslogic_samplerates[] = {
 };
 
 SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
-static struct sr_dev_driver *di = &fx2lafw_driver_info;
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
        struct sr_usb_dev_inst *usb;
-       struct sr_channel *ch;
        struct sr_config *src;
        const struct fx2lafw_profile *prof;
        GSList *l, *devices, *conn_devices;
@@ -288,11 +286,9 @@ static GSList *scan(GSList *options)
 
                /* Fill in channellist according to this device's profile. */
                num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
-               for (j = 0; j < num_logic_channels; j++) {
-                       ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE,
+               for (j = 0; j < num_logic_channels; j++)
+                       sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE,
                                        channel_names[j]);
-                       sdi->channels = g_slist_append(sdi->channels, ch);
-               }
 
                devc = fx2lafw_dev_new();
                devc->profile = prof;
@@ -343,13 +339,14 @@ static GSList *scan(GSList *options)
        return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
        return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
+       struct sr_dev_driver *di = sdi->driver;
        struct sr_usb_dev_inst *usb;
        struct dev_context *devc;
        int ret;
@@ -443,7 +440,7 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
        int ret;
        struct drv_context *drvc;
@@ -454,7 +451,6 @@ static int cleanup(void)
        ret = std_dev_clear(di, NULL);
 
        g_free(drvc);
-       di->priv = NULL;
 
        return ret;
 }
@@ -522,30 +518,30 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        ret = SR_OK;
 
        switch (key) {
-               case SR_CONF_SAMPLERATE:
-                       arg = g_variant_get_uint64(data);
-                       for (i = 0; i < ARRAY_SIZE(samplerates); i++) {
-                               if (samplerates[i] == arg) {
-                                       devc->cur_samplerate = arg;
-                                       break;
-                               }
+       case SR_CONF_SAMPLERATE:
+               arg = g_variant_get_uint64(data);
+               for (i = 0; i < ARRAY_SIZE(samplerates); i++) {
+                       if (samplerates[i] == arg) {
+                               devc->cur_samplerate = arg;
+                               break;
                        }
-                       if (i == ARRAY_SIZE(samplerates))
-                               ret = SR_ERR_ARG;
-                       break;
-               case SR_CONF_LIMIT_SAMPLES:
-                       devc->limit_samples = g_variant_get_uint64(data);
-                       break;
-               case SR_CONF_CAPTURE_RATIO:
-                       devc->capture_ratio = g_variant_get_uint64(data);
-                       if (devc->capture_ratio > 100) {
-                               devc->capture_ratio = 0;
-                               ret = SR_ERR;
-                       } else
-                               ret = SR_OK;
-                       break;
-               default:
-                       ret = SR_ERR_NA;
+               }
+               if (i == ARRAY_SIZE(samplerates))
+                       ret = SR_ERR_ARG;
+               break;
+       case SR_CONF_LIMIT_SAMPLES:
+               devc->limit_samples = g_variant_get_uint64(data);
+               break;
+       case SR_CONF_CAPTURE_RATIO:
+               devc->capture_ratio = g_variant_get_uint64(data);
+               if (devc->capture_ratio > 100) {
+                       devc->capture_ratio = 0;
+                       ret = SR_ERR;
+               } else
+                       ret = SR_OK;
+               break;
+       default:
+               ret = SR_ERR_NA;
        }
 
        return ret;
@@ -602,9 +598,8 @@ static int receive_data(int fd, int revents, void *cb_data)
 
        (void)fd;
        (void)revents;
-       (void)cb_data;
 
-       drvc = di->priv;
+       drvc = (struct drv_context *)cb_data;
 
        tv.tv_sec = tv.tv_usec = 0;
        libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
@@ -738,6 +733,7 @@ static int dslogic_trigger_request(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
+       struct sr_dev_driver *di;
        struct drv_context *drvc;
        struct dev_context *devc;
        int timeout, ret;
@@ -745,6 +741,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
+       di = sdi->driver;
        drvc = di->priv;
        devc = sdi->priv;
 
@@ -755,7 +752,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc->acq_aborted = FALSE;
 
        timeout = fx2lafw_get_timeout(devc);
-       usb_source_add(sdi->session, devc->ctx, timeout, receive_data, NULL);
+       usb_source_add(sdi->session, devc->ctx, timeout, receive_data, drvc);
 
        if (devc->dslogic) {
                dslogic_trigger_request(sdi);