Change all sigrok_ prefixes to sr_.

[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 e12ed6f98a81eb1f924f60854f323240a7a55e9f..ab48aa55cc3440fd775d8703bfdb50252b8f4103 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -72,7 +72,7 @@ static int capabilities[] = {
        0,
 };
 
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
 static GSList *device_instances = NULL;
 
 static libusb_context *usb_context = NULL;
@@ -140,7 +140,7 @@ static unsigned int get_memory_size(int type)
                return 0;
 }
 
-static int opendev4(struct sigrok_device_instance **sdi, libusb_device *dev,
+static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
                    struct libusb_device_descriptor *des)
 {
        unsigned int i;
@@ -189,14 +189,14 @@ static int opendev4(struct sigrok_device_instance **sdi, libusb_device *dev,
        return 0;
 }
 
-struct sigrok_device_instance *zp_open_device(int device_index)
+struct sr_device_instance *zp_open_device(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        libusb_device **devlist;
        struct libusb_device_descriptor des;
        int err, i;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
                return NULL;
 
        libusb_get_device_list(usb_context, &devlist);
@@ -219,7 +219,7 @@ struct sigrok_device_instance *zp_open_device(int device_index)
        return sdi;
 }
 
-static void close_device(struct sigrok_device_instance *sdi)
+static void close_device(struct sr_device_instance *sdi)
 {
        if (!sdi->usb->devhdl)
                return;
@@ -261,12 +261,12 @@ static int configure_probes(GSList *probes)
                                        trigger_value[stage] |= probe_bit;
                                stage++;
                                if (stage > NUM_TRIGGER_STAGES)
-                                       return SIGROK_ERR;
+                                       return SR_ERR;
                        }
                }
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 /*
@@ -275,12 +275,12 @@ static int configure_probes(GSList *probes)
 
 static int hw_init(char *deviceinfo)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
        int err, devcnt, i;
 
-       /* QUICK HACK */
+       /* Avoid compiler warnings. */
        deviceinfo = deviceinfo;
 
        if (libusb_init(&usb_context) != 0) {
@@ -305,7 +305,7 @@ static int hw_init(char *deviceinfo)
                         * TODO: Any way to detect specific model/version in
                         * the zeroplus range?
                         */
-                       sdi = sigrok_device_instance_new(devcnt,
+                       sdi = sr_device_instance_new(devcnt,
                                        ST_INACTIVE, USB_VENDOR_NAME,
                                        USB_MODEL_NAME, USB_MODEL_VERSION);
                        if (!sdi)
@@ -325,18 +325,18 @@ static int hw_init(char *deviceinfo)
 
 static int hw_opendev(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        int err;
 
        if (!(sdi = zp_open_device(device_index))) {
                g_warning("unable to open device");
-               return SIGROK_ERR;
+               return SR_ERR;
        }
 
        err = libusb_claim_interface(sdi->usb->devhdl, USB_INTERFACE);
        if (err != 0) {
                g_warning("Unable to claim interface: %d", err);
-               return SIGROK_ERR;
+               return SR_ERR;
        }
        analyzer_reset(sdi->usb->devhdl);
        analyzer_initialize(sdi->usb->devhdl);
@@ -361,18 +361,18 @@ static int hw_opendev(int device_index)
        if (cur_samplerate == 0) {
                /* Samplerate hasn't been set. Default to the slowest one. */
                if (hw_set_configuration(device_index, HWCAP_SAMPLERATE,
-                    &samplerates.low) == SIGROK_ERR)
-                       return SIGROK_ERR;
+                    &samplerates.low) == SR_ERR)
+                       return SR_ERR;
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 static void hw_closedev(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
-       if ((sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if ((sdi = get_sr_device_instance(device_instances, device_index)))
                close_device(sdi);
 }
 
@@ -382,7 +382,7 @@ static void hw_cleanup(void)
 
        /* Properly close all devices... */
        for (l = device_instances; l; l = l->next)
-               close_device((struct sigrok_device_instance *)l->data);
+               close_device((struct sr_device_instance *)l->data);
 
        /* ...and free all their memory. */
        for (l = device_instances; l; l = l->next)
@@ -397,10 +397,10 @@ static void hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        void *info = NULL;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
                return NULL;
 
        switch (device_info_id) {
@@ -426,9 +426,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
-       sdi = get_sigrok_device_instance(device_instances, device_index);
+       sdi = get_sr_device_instance(device_instances, device_index);
        if (sdi)
                return sdi->status;
        else
@@ -443,7 +443,7 @@ static int *hw_get_capabilities(void)
 /* TODO: This will set the same samplerate for all devices. */
 static int set_configuration_samplerate(uint64_t samplerate)
 {
-       g_message("%s(%llu)", __FUNCTION__, samplerate);
+       g_message("%s(%" PRIu64 ")", __FUNCTION__, samplerate);
        if (samplerate > MHZ(1))
                analyzer_set_freq(samplerate / MHZ(1), FREQ_SCALE_MHZ);
        else if (samplerate > KHZ(1))
@@ -453,16 +453,16 @@ static int set_configuration_samplerate(uint64_t samplerate)
 
        cur_samplerate = samplerate;
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        uint64_t *tmp_u64;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-               return SIGROK_ERR;
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+               return SR_ERR;
 
        switch (capability) {
        case HWCAP_SAMPLERATE:
@@ -473,23 +473,23 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        case HWCAP_LIMIT_SAMPLES:
                tmp_u64 = value;
                limit_samples = *tmp_u64;
-               return SIGROK_OK;
+               return SR_OK;
        default:
-               return SIGROK_ERR;
+               return SR_ERR;
        }
 }
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        struct datafeed_packet packet;
        struct datafeed_header header;
        int res;
        unsigned int packet_num;
        unsigned char *buf;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-               return SIGROK_ERR;
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+               return SR_ERR;
 
        /* push configured settings to device */
        analyzer_configure(sdi->usb->devhdl);
@@ -512,12 +512,13 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        gettimeofday(&header.starttime, NULL);
        header.samplerate = cur_samplerate;
        header.protocol_id = PROTO_RAW;
-       header.num_probes = num_channels;
+       header.num_logic_probes = num_channels;
+       header.num_analog_probes = 0;
        session_bus(session_device_id, &packet);
 
        buf = g_malloc(PACKET_SIZE);
        if (!buf)
-               return SIGROK_ERR;
+               return SR_ERR;
        analyzer_read_start(sdi->usb->devhdl);
        /* Send the incoming transfer to the session bus. */
        for (packet_num = 0; packet_num < (memory_size * 4 / PACKET_SIZE);
@@ -528,8 +529,9 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
                          PACKET_SIZE, res);
 #endif
 
-               packet.type = DF_LOGIC32;
+               packet.type = DF_LOGIC;
                packet.length = PACKET_SIZE;
+               packet.unitsize = 4;
                packet.payload = buf;
                session_bus(session_device_id, &packet);
        }
@@ -539,19 +541,19 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        packet.type = DF_END;
        session_bus(session_device_id, &packet);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 /* This stops acquisition on ALL devices, ignoring device_index. */
 static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 {
        struct datafeed_packet packet;
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
        packet.type = DF_END;
        session_bus(session_device_id, &packet);
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
                return; /* TODO: Cry? */
 
        analyzer_reset(sdi->usb->devhdl);