Fix #442 by renaming sr_dev_driver.priv to .context

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

diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index da6d171a3ac8c52aedb64c549fb7a395c84eb096..0ac6a32ceae4ccfb84cb98762eedd8da29d5c8fa 100644 (file)
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -36,8 +36,9 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-unsigned char TESTO_x35_REQUEST[] = { 0x12, 0, 0, 0, 1, 1, 0x55, 0xd1, 0xb7 };
-struct testo_model models[] = {
+static const uint8_t TESTO_x35_REQUEST[] = { 0x12, 0, 0, 0, 1, 1, 0x55, 0xd1, 0xb7 };
+
+static const struct testo_model models[] = {
        { "435", 9, TESTO_x35_REQUEST },
 };
 
@@ -62,7 +63,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        char manufacturer[64], product[64], connection_id[64];
 
        devices = NULL;
-       drvc = di->priv;
+       drvc = di->context;
        drvc->instances = NULL;
 
        conn_devices = NULL;
@@ -150,7 +151,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_clear(const struct sr_dev_driver *di)
@@ -161,13 +162,13 @@ static int dev_clear(const struct sr_dev_driver *di)
 static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di = sdi->driver;
-       struct drv_context *drvc = di->priv;
+       struct drv_context *drvc = di->context;
        struct sr_usb_dev_inst *usb;
        libusb_device **devlist;
        int ret, i;
        char connection_id[64];
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -214,7 +215,7 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct sr_dev_driver *di = sdi->driver;
        struct sr_usb_dev_inst *usb;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -237,7 +238,7 @@ static int cleanup(const struct sr_dev_driver *di)
        int ret;
        struct drv_context *drvc;
 
-       if (!(drvc = di->priv))
+       if (!(drvc = di->context))
                return SR_OK;
 
        ret = dev_clear(di);
@@ -282,7 +283,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -294,13 +295,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                devc->limit_msec = g_variant_get_uint64(data);
                now = g_get_monotonic_time() / 1000;
                devc->end_time = now + devc->limit_msec;
-               sr_dbg("Setting time limit to %" PRIu64 "ms.",
-                      devc->limit_msec);
                break;
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
-               sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
                break;
        default:
                ret = SR_ERR_NA;
@@ -375,7 +372,7 @@ static void receive_data(struct sr_dev_inst *sdi, unsigned char *data, int len)
 
 }
 
-SR_PRIV void receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 {
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
@@ -430,7 +427,7 @@ static int handle_events(int fd, int revents, void *cb_data)
        sdi = cb_data;
        devc = sdi->priv;
        di = sdi->driver;
-       drvc = di->priv;
+       drvc = di->context;
 
        if (devc->limit_msec) {
                now = g_get_monotonic_time() / 1000;
@@ -464,11 +461,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        int ret;
        unsigned char *buf;
 
-       drvc = di->priv;
+       drvc = di->context;
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -493,7 +490,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (testo_request_packet(sdi) != SR_OK)
                return SR_ERR;
 
-       buf = g_try_malloc(MAX_REPLY_SIZE);
+       buf = g_malloc(MAX_REPLY_SIZE);
        transfer = libusb_alloc_transfer(0);
        libusb_fill_bulk_transfer(transfer, usb->devhdl, EP_IN, buf,
                        MAX_REPLY_SIZE, receive_transfer, (void *)sdi, 100);
@@ -513,7 +510,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        struct sr_dev_driver *di = sdi->driver;
        (void)cb_data;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -542,5 +539,5 @@ SR_PRIV struct sr_dev_driver testo_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };