sr: Some more s/device_instance/dev_inst/.

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

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index deea5ae4b00dba04433eef39d247bf7b91db7625..722aed6f50bcd8f8fd7a42c5ae356118e48803ce 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -110,8 +110,8 @@ static const char *probe_names[] = {
        NULL,
 };
 
-/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
-static GSList *device_instances = NULL;
+/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+static GSList *dev_insts = NULL;
 
 static libusb_context *usb_context = NULL;
 
@@ -163,7 +163,7 @@ struct zp {
        uint8_t trigger_value[NUM_TRIGGER_STAGES];
        // uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
 
-       struct sr_usb_device_instance *usb;
+       struct sr_usb_dev_inst *usb;
 };
 
 static int hw_set_configuration(int device_index, int capability, void *value);
@@ -182,7 +182,7 @@ static unsigned int get_memory_size(int type)
                return 0;
 }
 
-static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
+static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
                    struct libusb_device_descriptor *des)
 {
        struct zp *zp;
@@ -197,7 +197,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
        }
 
        if ((err = libusb_get_device_descriptor(dev, des))) {
-               sr_err("failed to get device descriptor: %d", err);
+               sr_err("zp: failed to get device descriptor: %d", err);
                return -1;
        }
 
@@ -211,26 +211,27 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
                        if (!(des->idProduct == zeroplus_models[i].pid))
                                continue;
 
-                       sr_info("Found PID=%04X (%s)", des->idProduct,
-                               zeroplus_models[i].model_name);
+                       sr_info("zp: Found ZeroPlus device 0x%04x (%s)",
+                               des->idProduct, zeroplus_models[i].model_name);
                        zp->num_channels = zeroplus_models[i].channels;
                        zp->memory_size = zeroplus_models[i].sample_depth * 1024;
                        break;
                }
 
                if (zp->num_channels == 0) {
-                       sr_err("Unknown ZeroPlus device %04X", des->idProduct);
+                       sr_err("zp: Unknown ZeroPlus device 0x%04x",
+                              des->idProduct);
                        return -2;
                }
 
                /* Found it. */
                if (!(err = libusb_open(dev, &(zp->usb->devhdl)))) {
                        (*sdi)->status = SR_ST_ACTIVE;
-                       sr_info("opened device %d on %d.%d interface %d",
+                       sr_info("zp: opened device %d on %d.%d interface %d",
                                (*sdi)->index, zp->usb->bus,
                                zp->usb->address, USB_INTERFACE);
                } else {
-                       sr_err("failed to open device: %d", err);
+                       sr_err("zp: failed to open device: %d", err);
                        *sdi = NULL;
                }
        }
@@ -238,14 +239,14 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
        return 0;
 }
 
-static struct sr_device_instance *zp_open_device(int device_index)
+static struct sr_dev_inst *zp_open_device(int device_index)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        libusb_device **devlist;
        struct libusb_device_descriptor des;
        int err, i;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
                return NULL;
 
        libusb_get_device_list(usb_context, &devlist);
@@ -268,7 +269,7 @@ static struct sr_device_instance *zp_open_device(int device_index)
        return sdi;
 }
 
-static void close_device(struct sr_device_instance *sdi)
+static void close_device(struct sr_dev_inst *sdi)
 {
        struct zp *zp;
 
@@ -280,7 +281,7 @@ static void close_device(struct sr_device_instance *sdi)
        if (!zp->usb->devhdl)
                return;
 
-       sr_info("closing device %d on %d.%d interface %d", sdi->index,
+       sr_info("zp: closing device %d on %d.%d interface %d", sdi->index,
                zp->usb->bus, zp->usb->address, USB_INTERFACE);
        libusb_release_interface(zp->usb->devhdl, USB_INTERFACE);
        libusb_reset_device(zp->usb->devhdl);
@@ -290,7 +291,7 @@ static void close_device(struct sr_device_instance *sdi)
        sdi->status = SR_ST_INACTIVE;
 }
 
-static int configure_probes(struct sr_device_instance *sdi, GSList *probes)
+static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
 {
        struct zp *zp;
        struct sr_probe *probe;
@@ -337,7 +338,7 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes)
 
 static int hw_init(const char *deviceinfo)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
        int err, devcnt, i;
@@ -363,7 +364,7 @@ static int hw_init(const char *deviceinfo)
        // memset(zp->trigger_buffer, 0, NUM_TRIGGER_STAGES);
 
        if (libusb_init(&usb_context) != 0) {
-               sr_err("Failed to initialize USB.");
+               sr_err("zp: Failed to initialize USB.");
                return 0;
        }
 
@@ -374,7 +375,7 @@ static int hw_init(const char *deviceinfo)
        for (i = 0; devlist[i]; i++) {
                err = libusb_get_device_descriptor(devlist[i], &des);
                if (err != 0) {
-                       sr_err("failed to get device descriptor: %d", err);
+                       sr_err("zp: failed to get device descriptor: %d", err);
                        continue;
                }
 
@@ -385,19 +386,18 @@ static int hw_init(const char *deviceinfo)
                         * the zeroplus range?
                         */
                        /* Register the device with libsigrok. */
-                       sdi = sr_dev_inst_new(devcnt,
+                       if (!(sdi = sr_dev_inst_new(devcnt,
                                        SR_ST_INACTIVE, USB_VENDOR_NAME,
-                                       USB_MODEL_NAME, USB_MODEL_VERSION);
-                       if (!sdi) {
-                               sr_err("zp: %s: sr_device_instance_new failed",
+                                       USB_MODEL_NAME, USB_MODEL_VERSION))) {
+                               sr_err("zp: %s: sr_dev_inst_new failed",
                                       __func__);
                                return 0;
                        }
 
                        sdi->priv = zp;
 
-                       device_instances =
-                           g_slist_append(device_instances, sdi);
+                       dev_insts =
+                           g_slist_append(dev_insts, sdi);
                        zp->usb = sr_usb_dev_inst_new(
                                libusb_get_bus_number(devlist[i]),
                                libusb_get_device_address(devlist[i]), NULL);
@@ -411,12 +411,12 @@ static int hw_init(const char *deviceinfo)
 
 static int hw_opendev(int device_index)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct zp *zp;
        int err;
 
        if (!(sdi = zp_open_device(device_index))) {
-               sr_err("unable to open device");
+               sr_err("zp: unable to open device");
                return SR_ERR;
        }
 
@@ -436,7 +436,7 @@ static int hw_opendev(int device_index)
 
        err = libusb_claim_interface(zp->usb->devhdl, USB_INTERFACE);
        if (err != 0) {
-               sr_err("Unable to claim interface: %d", err);
+               sr_err("zp: Unable to claim interface: %d", err);
                return SR_ERR;
        }
 
@@ -472,9 +472,9 @@ static int hw_opendev(int device_index)
 
 static int hw_closedev(int device_index)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
                return SR_ERR; /* TODO: SR_ERR_ARG? */
        }
@@ -488,17 +488,17 @@ static int hw_closedev(int device_index)
 static int hw_cleanup(void)
 {
        GSList *l;
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
 
-       for (l = device_instances; l; l = l->next) {
+       for (l = dev_insts; l; l = l->next) {
                sdi = l->data;
                /* Properly close all devices... */
                close_device(sdi);
                /* ...and free all their memory. */
                sr_dev_inst_free(sdi);
        }
-       g_slist_free(device_instances);
-       device_instances = NULL;
+       g_slist_free(dev_insts);
+       dev_insts = NULL;
 
        if (usb_context)
                libusb_exit(usb_context);
@@ -509,11 +509,11 @@ static int hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct zp *zp;
        void *info;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
                return NULL;
        }
@@ -554,9 +554,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
 
-       sdi = sr_dev_inst_get(device_instances, device_index);
+       sdi = sr_dev_inst_get(dev_insts, device_index);
        if (sdi)
                return sdi->status;
        else
@@ -568,7 +568,7 @@ static int *hw_get_capabilities(void)
        return capabilities;
 }
 
-static int set_configuration_samplerate(struct sr_device_instance *sdi,
+static int set_configuration_samplerate(struct sr_dev_inst *sdi,
                                        uint64_t samplerate)
 {
        struct zp *zp;
@@ -599,11 +599,11 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi,
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        uint64_t *tmp_u64;
        struct zp *zp;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
                return SR_ERR;
        }
@@ -630,7 +630,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
 static int hw_start_acquisition(int device_index, gpointer session_data)
 {
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
        struct sr_datafeed_header header;
@@ -640,7 +640,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
        unsigned char *buf;
        struct zp *zp;
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
                return SR_ERR;
        }
@@ -654,12 +654,15 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
        analyzer_configure(zp->usb->devhdl);
 
        analyzer_start(zp->usb->devhdl);
-       sr_info("Waiting for data");
+       sr_info("zp: Waiting for data");
        analyzer_wait_data(zp->usb->devhdl);
 
-       sr_info("Stop address    = 0x%x", analyzer_get_stop_address(zp->usb->devhdl));
-       sr_info("Now address     = 0x%x", analyzer_get_now_address(zp->usb->devhdl));
-       sr_info("Trigger address = 0x%x", analyzer_get_trigger_address(zp->usb->devhdl));
+       sr_info("zp: Stop address    = 0x%x",
+               analyzer_get_stop_address(zp->usb->devhdl));
+       sr_info("zp: Now address     = 0x%x",
+               analyzer_get_now_address(zp->usb->devhdl));
+       sr_info("zp: Trigger address = 0x%x",
+               analyzer_get_trigger_address(zp->usb->devhdl));
 
        packet.type = SR_DF_HEADER;
        packet.payload = &header;
@@ -680,7 +683,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
        for (packet_num = 0; packet_num < (zp->memory_size * 4 / PACKET_SIZE);
             packet_num++) {
                res = analyzer_read_data(zp->usb->devhdl, buf, PACKET_SIZE);
-               sr_info("Tried to read %llx bytes, actually read %x bytes",
+               sr_info("zp: Tried to read %llx bytes, actually read %x bytes",
                        PACKET_SIZE, res);
 
                packet.type = SR_DF_LOGIC;
@@ -704,13 +707,13 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 static int hw_stop_acquisition(int device_index, gpointer session_device_id)
 {
        struct sr_datafeed_packet packet;
-       struct sr_device_instance *sdi;
+       struct sr_dev_inst *sdi;
        struct zp *zp;
 
        packet.type = SR_DF_END;
        sr_session_bus(session_device_id, &packet);
 
-       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
                return SR_ERR_BUG;
        }