]> sigrok.org Git - libsigrok.git/blobdiff - hardware/zeroplus-logic-cube/zeroplus.c
Add SR_ prefix to the KHZ/MHZ/GHZ macros.
[libsigrok.git] / hardware / zeroplus-logic-cube / zeroplus.c
index e034dfcc24f588f0b4bcd0441287a93c2b22928a..e9b599b839fc0c316e4061232cdafc216a97a203 100644 (file)
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
@@ -24,7 +25,7 @@
 #include <glib.h>
 #include <libusb.h>
 #include <sigrok.h>
-#include "config.h"
+#include <sigrok-internal.h>
 #include "analyzer.h"
 
 #define USB_VENDOR                     0x0c12
@@ -51,7 +52,7 @@ typedef struct {
  * Note -- 16032, 16064 and 16128 *usually* -- but not always -- have the
  * same 128K sample depth.
  */
-model_t zeroplus_models[] = {
+static model_t zeroplus_models[] = {
        {0x7009, "LAP-C(16064)",  16, 64,   100},
        {0x700A, "LAP-C(16128)",  16, 128,  200},
        {0x700B, "LAP-C(32128)",  32, 128,  200},
@@ -62,17 +63,17 @@ model_t zeroplus_models[] = {
 };
 
 static int capabilities[] = {
-       HWCAP_LOGIC_ANALYZER,
-       HWCAP_SAMPLERATE,
-       HWCAP_PROBECONFIG,
-       HWCAP_CAPTURE_RATIO,
+       SR_HWCAP_LOGIC_ANALYZER,
+       SR_HWCAP_SAMPLERATE,
+       SR_HWCAP_PROBECONFIG,
+       SR_HWCAP_CAPTURE_RATIO,
 
        /* These are really implemented in the driver, not the hardware. */
-       HWCAP_LIMIT_SAMPLES,
+       SR_HWCAP_LIMIT_SAMPLES,
        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;
@@ -89,26 +90,26 @@ static libusb_context *usb_context = NULL;
 static uint64_t supported_samplerates[] = {
        100,
        500,
-       KHZ(1),
-       KHZ(5),
-       KHZ(25),
-       KHZ(50),
-       KHZ(100),
-       KHZ(200),
-       KHZ(400),
-       KHZ(800),
-       MHZ(1),
-       MHZ(10),
-       MHZ(25),
-       MHZ(50),
-       MHZ(80),
-       MHZ(100),
-       MHZ(150),
-       MHZ(200),
+       SR_KHZ(1),
+       SR_KHZ(5),
+       SR_KHZ(25),
+       SR_KHZ(50),
+       SR_KHZ(100),
+       SR_KHZ(200),
+       SR_KHZ(400),
+       SR_KHZ(800),
+       SR_MHZ(1),
+       SR_MHZ(10),
+       SR_MHZ(25),
+       SR_MHZ(50),
+       SR_MHZ(80),
+       SR_MHZ(100),
+       SR_MHZ(150),
+       SR_MHZ(200),
        0,
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        0, 0, 0,
        supported_samplerates,
 };
@@ -116,8 +117,8 @@ static struct samplerates samplerates = {
 /* TODO: All of these should go in a device-specific struct. */
 static uint64_t cur_samplerate = 0;
 static uint64_t limit_samples = 0;
-int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
-uint64_t memory_size = 0;
+static int num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
+static uint64_t memory_size = 0;
 static uint8_t probe_mask = 0;
 static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 };
 static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 };
@@ -140,7 +141,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;
@@ -176,7 +177,7 @@ static int opendev4(struct sigrok_device_instance **sdi, libusb_device *dev,
 
                /* Found it. */
                if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
-                       (*sdi)->status = ST_ACTIVE;
+                       (*sdi)->status = SR_ST_ACTIVE;
                        g_message("opened device %d on %d.%d interface %d",
                             (*sdi)->index, (*sdi)->usb->bus,
                             (*sdi)->usb->address, USB_INTERFACE);
@@ -189,18 +190,18 @@ static int opendev4(struct sigrok_device_instance **sdi, libusb_device *dev,
        return 0;
 }
 
-struct sigrok_device_instance *zp_open_device(int device_index)
+static 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 = sr_get_device_instance(device_instances, device_index)))
                return NULL;
 
        libusb_get_device_list(usb_context, &devlist);
-       if (sdi->status == ST_INACTIVE) {
+       if (sdi->status == SR_ST_INACTIVE) {
                /* Find the device by vendor, product, bus and address. */
                libusb_get_device_list(usb_context, &devlist);
                for (i = 0; devlist[i]; i++) {
@@ -208,18 +209,18 @@ struct sigrok_device_instance *zp_open_device(int device_index)
                        err = opendev4(&sdi, devlist[i], &des);
                }
        } else {
-               /* Status must be ST_ACTIVE, i.e. already in use... */
+               /* Status must be SR_ST_ACTIVE, i.e. already in use... */
                sdi = NULL;
        }
        libusb_free_device_list(devlist, 1);
 
-       if (sdi && sdi->status != ST_ACTIVE)
+       if (sdi && sdi->status != SR_ST_ACTIVE)
                sdi = NULL;
 
        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;
@@ -229,12 +230,12 @@ static void close_device(struct sigrok_device_instance *sdi)
        libusb_release_interface(sdi->usb->devhdl, USB_INTERFACE);
        libusb_close(sdi->usb->devhdl);
        sdi->usb->devhdl = NULL;
-       sdi->status = ST_INACTIVE;
+       sdi->status = SR_ST_INACTIVE;
 }
 
 static int configure_probes(GSList *probes)
 {
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int probe_bit, stage, i;
        char *tc;
@@ -247,7 +248,7 @@ static int configure_probes(GSList *probes)
 
        stage = -1;
        for (l = probes; l; l = l->next) {
-               probe = (struct probe *)l->data;
+               probe = (struct sr_probe *)l->data;
                if (probe->enabled == FALSE)
                        continue;
                probe_bit = 1 << (probe->index - 1);
@@ -261,26 +262,26 @@ 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;
 }
 
 /*
  * API callbacks
  */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const 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,14 +306,14 @@ static int hw_init(char *deviceinfo)
                         * TODO: Any way to detect specific model/version in
                         * the zeroplus range?
                         */
-                       sdi = sigrok_device_instance_new(devcnt,
-                                       ST_INACTIVE, USB_VENDOR_NAME,
+                       sdi = sr_device_instance_new(devcnt,
+                                       SR_ST_INACTIVE, USB_VENDOR_NAME,
                                        USB_MODEL_NAME, USB_MODEL_VERSION);
                        if (!sdi)
                                return 0;
                        device_instances =
                            g_slist_append(device_instances, sdi);
-                       sdi->usb = usb_device_instance_new(
+                       sdi->usb = sr_usb_device_instance_new(
                                libusb_get_bus_number(devlist[i]),
                                libusb_get_device_address(devlist[i]), NULL);
                        devcnt++;
@@ -325,18 +326,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);
@@ -360,19 +361,19 @@ 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;
+               if (hw_set_configuration(device_index, SR_HWCAP_SAMPLERATE,
+                    &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 = sr_get_device_instance(device_instances, device_index)))
                close_device(sdi);
 }
 
@@ -382,7 +383,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,26 +398,26 @@ 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 = sr_get_device_instance(device_instances, device_index)))
                return NULL;
 
        switch (device_info_id) {
-       case DI_INSTANCE:
+       case SR_DI_INSTANCE:
                info = sdi;
                break;
-       case DI_NUM_PROBES:
+       case SR_DI_NUM_PROBES:
                info = GINT_TO_POINTER(num_channels);
                break;
-       case DI_SAMPLERATES:
+       case SR_DI_SAMPLERATES:
                info = &samplerates;
                break;
-       case DI_TRIGGER_TYPES:
+       case SR_DI_TRIGGER_TYPES:
                info = TRIGGER_TYPES;
                break;
-       case DI_CUR_SAMPLERATE:
+       case SR_DI_CUR_SAMPLERATE:
                info = &cur_samplerate;
                break;
        }
@@ -426,13 +427,13 @@ 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 = sr_get_device_instance(device_instances, device_index);
        if (sdi)
                return sdi->status;
        else
-               return ST_NOT_FOUND;
+               return SR_ST_NOT_FOUND;
 }
 
 static int *hw_get_capabilities(void)
@@ -444,52 +445,52 @@ static int *hw_get_capabilities(void)
 static int set_configuration_samplerate(uint64_t 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))
-               analyzer_set_freq(samplerate / KHZ(1), FREQ_SCALE_KHZ);
+       if (samplerate > SR_MHZ(1))
+               analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
+       else if (samplerate > SR_KHZ(1))
+               analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ);
        else
                analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
 
        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 = sr_get_device_instance(device_instances, device_index)))
+               return SR_ERR;
 
        switch (capability) {
-       case HWCAP_SAMPLERATE:
+       case SR_HWCAP_SAMPLERATE:
                tmp_u64 = value;
                return set_configuration_samplerate(*tmp_u64);
-       case HWCAP_PROBECONFIG:
+       case SR_HWCAP_PROBECONFIG:
                return configure_probes((GSList *) value);
-       case HWCAP_LIMIT_SAMPLES:
+       case SR_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 datafeed_packet packet;
-       struct datafeed_header header;
+       struct sr_device_instance *sdi;
+       struct sr_datafeed_packet packet;
+       struct sr_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 = sr_get_device_instance(device_instances, device_index)))
+               return SR_ERR;
 
        /* push configured settings to device */
        analyzer_configure(sdi->usb->devhdl);
@@ -505,20 +506,20 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        g_message("Trigger address = 0x%x",
                  analyzer_get_trigger_address(sdi->usb->devhdl));
 
-       packet.type = DF_HEADER;
-       packet.length = sizeof(struct datafeed_header);
+       packet.type = SR_DF_HEADER;
+       packet.length = sizeof(struct sr_datafeed_header);
        packet.payload = (unsigned char *)&header;
        header.feed_version = 1;
        gettimeofday(&header.starttime, NULL);
        header.samplerate = cur_samplerate;
-       header.protocol_id = PROTO_RAW;
+       header.protocol_id = SR_PROTO_RAW;
        header.num_logic_probes = num_channels;
        header.num_analog_probes = 0;
-       session_bus(session_device_id, &packet);
+       sr_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);
@@ -529,39 +530,40 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
                          PACKET_SIZE, res);
 #endif
 
-               packet.type = DF_LOGIC;
+               packet.type = SR_DF_LOGIC;
                packet.length = PACKET_SIZE;
                packet.unitsize = 4;
                packet.payload = buf;
-               session_bus(session_device_id, &packet);
+               sr_session_bus(session_device_id, &packet);
        }
        analyzer_read_stop(sdi->usb->devhdl);
        g_free(buf);
 
-       packet.type = DF_END;
-       session_bus(session_device_id, &packet);
+       packet.type = SR_DF_END;
+       sr_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_datafeed_packet packet;
+       struct sr_device_instance *sdi;
 
-       packet.type = DF_END;
-       session_bus(session_device_id, &packet);
+       packet.type = SR_DF_END;
+       sr_session_bus(session_device_id, &packet);
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return; /* TODO: Cry? */
 
        analyzer_reset(sdi->usb->devhdl);
        /* TODO: Need to cancel and free any queued up transfers. */
 }
 
-struct device_plugin zeroplus_logic_cube_plugin_info = {
+struct sr_device_plugin zeroplus_logic_cube_plugin_info = {
        "zeroplus-logic-cube",
+       "Zeroplus Logic Cube LAP-C series",
        1,
        hw_init,
        hw_cleanup,