Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 5d8c534f27eb56c7f8c86b3462649886f84ef848..62577a1451ae27001cf9c6fa73a70e760a2c475f 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -76,7 +76,6 @@ static const char *channel_names[] = {
        "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
        "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7",
        "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
-       NULL,
 };
 
 SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
@@ -175,7 +174,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        (void)options;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        devices = NULL;
 
@@ -263,7 +262,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -276,7 +275,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        int device_count, ret, i;
        char connection_id[64];
 
-       drvc = di->priv;
+       drvc = di->context;
        usb = sdi->conn;
 
        if (!(devc = sdi->priv)) {
@@ -391,35 +390,26 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
+       GVariant *range[2];
 
        (void)cg;
 
+       if (!sdi)
+               return SR_ERR_ARG;
+
+       devc = sdi->priv;
+
        switch (key) {
        case SR_CONF_SAMPLERATE:
-               if (sdi) {
-                       devc = sdi->priv;
-                       *data = g_variant_new_uint64(devc->cur_samplerate);
-                       sr_spew("Returning samplerate: %" PRIu64 "Hz.",
-                               devc->cur_samplerate);
-               } else
-                       return SR_ERR_ARG;
+               *data = g_variant_new_uint64(devc->cur_samplerate);
                break;
        case SR_CONF_CAPTURE_RATIO:
-               if (sdi) {
-                       devc = sdi->priv;
-                       *data = g_variant_new_uint64(devc->capture_ratio);
-               } else
-                       return SR_ERR_ARG;
+               *data = g_variant_new_uint64(devc->capture_ratio);
                break;
        case SR_CONF_VOLTAGE_THRESHOLD:
-               if (sdi) {
-                       GVariant *range[2];
-                       devc = sdi->priv;
-                       range[0] = g_variant_new_double(devc->cur_threshold);
-                       range[1] = g_variant_new_double(devc->cur_threshold);
-                       *data = g_variant_new_tuple(range, 2);
-               } else
-                       return SR_ERR_ARG;
+               range[0] = g_variant_new_double(devc->cur_threshold);
+               range[1] = g_variant_new_double(devc->cur_threshold);
+               *data = g_variant_new_tuple(range, 2);
                break;
        default:
                return SR_ERR_NA;
@@ -602,10 +592,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_OK;
        }
 
-       if (!(buf = g_try_malloc(PACKET_SIZE))) {
-               sr_err("Packet buffer malloc failed.");
-               return SR_ERR_MALLOC;
-       }
+       buf = g_malloc(PACKET_SIZE);
 
        /* Check if the trigger is in the samples we are throwing away */
        trigger_now = now_address == trigger_address ||
@@ -753,5 +740,5 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };