]> sigrok.org Git - libsigrok.git/commitdiff
Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
authorDaniel Ribeiro <redacted>
Mon, 10 Jan 2011 17:58:05 +0000 (15:58 -0200)
committerDaniel Ribeiro <redacted>
Mon, 10 Jan 2011 17:58:05 +0000 (15:58 -0200)
13 files changed:
hardware/Makefile.am
hardware/asix-sigma/asix-sigma.c
hardware/common/serial.c
hardware/demo/demo.c
hardware/link-mso19/Makefile.am [new file with mode: 0644]
hardware/link-mso19/link-mso19.c [new file with mode: 0644]
hardware/link-mso19/link-mso19.h [new file with mode: 0644]
hardware/openbench-logic-sniffer/ols.c
hardware/saleae-logic/saleae-logic.c
hardware/zeroplus-logic-cube/zeroplus.c
hwplugin.c
input/input_binary.c
sigrok.h

index 1f559ba0091cb55f41b3fb64010bb7504298aed4..3b805e1e8a58ed897a4038c6a96982afab4c7a93 100644 (file)
@@ -21,6 +21,7 @@ SUBDIRS = \
        asix-sigma \
        common \
        demo \
+       link-mso19 \
        openbench-logic-sniffer \
        saleae-logic \
        zeroplus-logic-cube
@@ -37,6 +38,10 @@ if LA_ASIX_SIGMA
 libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la
 endif
 
+if LA_LINK_MSO19
+libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
+endif
+
 if LA_OLS
 libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
 endif
index 09c8799301f8a9c58cd013993b46271c2b8dd808..d4d9fddfdaf6a765ffc50c52d134c832b8008549 100644 (file)
@@ -1219,7 +1219,8 @@ 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_probes;
+       header.num_logic_probes = num_probes;
+       header.num_analog_probes = 0;
        session_bus(session_device_id, &packet);
 
        /* Add capture source. */
index cebca29e418dd833007c37572a747d2c84d85cbc..18b62d0c048ba1ddff72ee4596c15a23d118fad0 100644 (file)
@@ -228,16 +228,17 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
                return SIGROK_ERR;
        }
 
-       term.c_iflag &= ~(IGNPAR | PARODD | PARENB);
+       term.c_iflag &= ~IGNPAR;
+       term.c_cflag &= ~(PARODD | PARENB);
        switch (parity) {
        case 0:
                term.c_iflag |= IGNPAR;
                break;
        case 1:
-               term.c_iflag |= PARENB;
+               term.c_cflag |= PARENB;
                break;
        case 2:
-               term.c_iflag |= PARENB | PARODD;
+               term.c_cflag |= PARENB | PARODD;
                break;
        default:
                return SIGROK_ERR;
index cb627ef56a8947f3ca12cde7445e38922334db64..f3f71fa5728ec49a59f74400b3e39c9d29743266 100644 (file)
@@ -318,7 +318,8 @@ 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_PROBES;
+       header->num_logic_probes = NUM_PROBES;
+       header->num_analog_probes = 0;
        session_bus(session_device_id, packet);
        free(header);
        free(packet);
diff --git a/hardware/link-mso19/Makefile.am b/hardware/link-mso19/Makefile.am
new file mode 100644 (file)
index 0000000..4745f6e
--- /dev/null
@@ -0,0 +1,32 @@
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+if LA_LINK_MSO19
+
+# Local lib, this is NOT meant to be installed!
+noinst_LTLIBRARIES = libsigrokhwlinkmso19.la
+
+libsigrokhwlinkmso19_la_SOURCES = \
+       link-mso19.c
+
+libsigrokhwlinkmso19_la_CFLAGS = \
+       -I$(top_srcdir)/libsigrok
+
+endif
+
diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
new file mode 100644 (file)
index 0000000..308fb50
--- /dev/null
@@ -0,0 +1,758 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <inttypes.h>
+#include <glib.h>
+#include <libudev.h>
+#include <sigrok.h>
+#include <arpa/inet.h>
+#include "config.h"
+#include "link-mso19.h"
+
+#define USB_VENDOR "3195"
+#define USB_PRODUCT "f190"
+
+static int capabilities[] = {
+       HWCAP_LOGIC_ANALYZER,
+//     HWCAP_OSCILLOSCOPE,
+//     HWCAP_PAT_GENERATOR,
+
+       HWCAP_SAMPLERATE,
+//     HWCAP_CAPTURE_RATIO,
+       HWCAP_LIMIT_SAMPLES,
+       0,
+};
+
+static uint64_t supported_samplerates[] = {
+       100, 200, 500, KHZ(1), KHZ(2), KHZ(5), KHZ(10), KHZ(20),
+       KHZ(50), KHZ(100), KHZ(200), KHZ(500), MHZ(1), MHZ(2), MHZ(5),
+       MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0
+};
+
+static struct samplerates samplerates = {
+       100, MHZ(200), 0, supported_samplerates,
+};
+
+static GSList *device_instances = NULL;
+
+static int mso_send_control_message(struct sigrok_device_instance *sdi,
+               uint16_t payload[], int n)
+{
+       int fd = sdi->serial->fd;
+       int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot);
+       char *p, *buf;
+
+       if (fd < 0)
+               goto ret;
+
+       buf = malloc(s);
+       if (!buf)
+               goto ret;
+
+       p = buf;
+       memcpy(p, mso_head, sizeof(mso_head));
+       p += sizeof(mso_head);
+
+       for (i = 0; i < n; i++) {
+               *(uint16_t *) p = htons(payload[i]);
+               p += 2;
+       }
+       memcpy(p, mso_foot, sizeof(mso_foot));
+
+       w = 0;
+       while (w < s) {
+               ret = write(fd, buf + w, s - w);
+               if (ret < 0) {
+                       ret = SIGROK_ERR;
+                       goto free;
+               }
+               w += ret;
+       }
+       ret = SIGROK_OK;
+free:
+       free(buf);
+ret:
+       return ret;
+}
+
+static int mso_reset_adc(struct sigrok_device_instance *sdi)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[2];
+
+       ops[0] = mso_trans(REG_CTL, (mso->ctlbase | BIT_CTL_RESETADC));
+       ops[1] = mso_trans(REG_CTL, mso->ctlbase);
+       mso->ctlbase |= BIT_CTL_ADC_UNKNOWN4;
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_reset_fsm(struct sigrok_device_instance *sdi)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[1];
+
+       mso->ctlbase |= BIT_CTL_RESETFSM;
+       ops[0] = mso_trans(REG_CTL, mso->ctlbase);
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_toggle_led(struct sigrok_device_instance *sdi, int state)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[1];
+
+       mso->ctlbase &= BIT_CTL_LED;
+       if (state)
+               mso->ctlbase |= BIT_CTL_LED;
+       ops[0] = mso_trans(REG_CTL, mso->ctlbase);
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_check_trigger(struct sigrok_device_instance *sdi,
+               uint8_t *info)
+{
+       uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) };
+       char buf[1];
+       int ret;
+
+       ret = mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+       if (info == NULL || ret != SIGROK_OK)
+               return ret;
+
+       buf[0] = 0;
+       if (read(sdi->serial->fd, buf, 1) != 1) /* FIXME: Need timeout */
+               ret = SIGROK_ERR;
+       *info = buf[0];
+
+       return ret;
+}
+
+static int mso_read_buffer(struct sigrok_device_instance *sdi)
+{
+       uint16_t ops[] = { mso_trans(REG_BUFFER, 0) };
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_arm(struct sigrok_device_instance *sdi)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[] = {
+               mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_RESETFSM),
+               mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_ARM),
+               mso_trans(REG_CTL, mso->ctlbase),
+       };
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_force_capture(struct sigrok_device_instance *sdi)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[] = {
+               mso_trans(REG_CTL, mso->ctlbase | 8),
+               mso_trans(REG_CTL, mso->ctlbase),
+       };
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_dac_out(struct sigrok_device_instance *sdi, uint16_t val)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[] = {
+               mso_trans(REG_DAC1, (val >> 8) & 0xff),
+               mso_trans(REG_DAC2, val & 0xff),
+               mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_RESETADC),
+       };
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_clkrate_out(struct sigrok_device_instance *sdi, uint16_t val)
+{
+       uint16_t ops[] = {
+               mso_trans(REG_CLKRATE1, (val >> 8) & 0xff),
+               mso_trans(REG_CLKRATE2, val & 0xff),
+       };
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_configure_rate(struct sigrok_device_instance *sdi,
+               uint32_t rate)
+{
+       struct mso *mso = sdi->priv;
+       unsigned int i;
+       int ret = SIGROK_ERR;
+
+       for (i = 0; i < ARRAY_SIZE(rate_map); i++) {
+               if (rate_map[i].rate == rate) {
+                       mso->slowmode = rate_map[i].slowmode;
+                       ret = mso_clkrate_out(sdi, rate_map[i].val);
+                       if (ret == SIGROK_OK)
+                               mso->cur_rate = rate;
+                       return ret;
+               }
+       }
+       return ret;
+}
+
+
+static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
+{
+       return (uint16_t) (0x200 -
+                       ((mso->dso_trigger_voltage / mso->dso_probe_attn) /
+                        mso->vbit));
+}
+
+static int mso_configure_trigger(struct sigrok_device_instance *sdi)
+{
+       struct mso *mso = sdi->priv;
+       uint16_t ops[16];
+       uint16_t dso_trigger = mso_calc_raw_from_mv(mso);
+
+       dso_trigger &= 0x3ff;
+       if ((!mso->trigger_slope && mso->trigger_chan == 1) ||
+                       (mso->trigger_slope &&
+                        (mso->trigger_chan == 0 ||
+                         mso->trigger_chan == 2 ||
+                         mso->trigger_chan == 3)))
+               dso_trigger |= 0x400;
+
+       switch (mso->trigger_chan) {
+       case 1:
+               dso_trigger |= 0xe000;
+       case 2:
+               dso_trigger |= 0x4000;
+               break;
+       case 3:
+               dso_trigger |= 0x2000;
+               break;
+       case 4:
+               dso_trigger |= 0xa000;
+               break;
+       case 5:
+               dso_trigger |= 0x8000;
+               break;
+       default:
+       case 0:
+               break;
+       }
+
+       switch (mso->trigger_outsrc) {
+       case 1:
+               dso_trigger |= 0x800;
+               break;
+       case 2:
+               dso_trigger |= 0x1000;
+               break;
+       case 3:
+               dso_trigger |= 0x1800;
+               break;
+
+       }
+
+       ops[0] = mso_trans(5, mso->la_trigger);
+       ops[1] = mso_trans(6, mso->la_trigger_mask);
+       ops[2] = mso_trans(3, dso_trigger & 0xff);
+       ops[3] = mso_trans(4, (dso_trigger >> 8) & 0xff);
+       ops[4] = mso_trans(11,
+                       mso->dso_trigger_width / HZ_TO_NS(mso->cur_rate));
+       ops[5] = mso_trans(15, (2 | mso->slowmode));
+
+       /* FIXME SPI/I2C Triggers */
+       ops[6] = mso_trans(0, 0);
+       ops[7] = mso_trans(1, 0);
+       ops[8] = mso_trans(2, 0);
+       ops[9] = mso_trans(3, 0);
+       ops[10] = mso_trans(4, 0xff);
+       ops[11] = mso_trans(5, 0xff);
+       ops[12] = mso_trans(6, 0xff);
+       ops[13] = mso_trans(7, 0xff);
+       ops[14] = mso_trans(8, mso->trigger_spimode);
+       ops[15] = mso_trans(15, mso->slowmode);
+
+       return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
+}
+
+static int mso_configure_threshold_level(struct sigrok_device_instance *sdi)
+{
+       struct mso *mso = sdi->priv;
+
+       return mso_dac_out(sdi, la_threshold_map[mso->la_threshold]);
+}
+
+static int mso_parse_serial(const char *iSerial, const char *iProduct,
+               struct mso *mso)
+{
+       unsigned int u1, u2, u3, u4, u5, u6;
+
+       iProduct = iProduct;
+       /* FIXME: This code is in the original app, but I think its
+        * used only for the GUI */
+/*     if (strstr(iProduct, "REV_02") || strstr(iProduct, "REV_03"))
+               mso->num_sample_rates = 0x16;
+       else
+               mso->num_sample_rates = 0x10; */
+
+       /* parse iSerial */
+       if (iSerial[0] != '4' || sscanf(iSerial, "%5u%3u%3u%1u%1u%6u",
+                               &u1, &u2, &u3, &u4, &u5, &u6) != 6)
+               return SIGROK_ERR;
+       mso->hwmodel = u4;
+       mso->hwrev = u5;
+       mso->serial = u6;
+       mso->vbit = u1 / 10000;
+       if (mso->vbit == 0)
+               mso->vbit = 4.19195;
+       mso->dac_offset = u2;
+       if (mso->dac_offset == 0)
+               mso->dac_offset = 0x1ff;
+       mso->offset_range = u3;
+       if (mso->offset_range == 0)
+               mso->offset_range = 0x17d;
+
+       /*
+        * FIXME: There is more code on the original software to handle
+        * bigger iSerial strings, but as I can't test on my device
+        * I will not implement it yet
+        */
+
+       return SIGROK_OK;
+}
+
+static int hw_init(char *deviceinfo)
+{
+       struct sigrok_device_instance *sdi;
+       int devcnt = 0;
+       struct udev *udev;
+       struct udev_enumerate *enumerate;
+       struct udev_list_entry *devices, *dev_list_entry;
+       struct mso *mso;
+
+       deviceinfo = deviceinfo;
+
+       /* It's easier to map usb<->serial using udev */
+       /*
+        * FIXME: On windows we can get the same information from the
+        * registry, add an #ifdef here later
+        */
+       udev = udev_new();
+       if (!udev) {
+               g_warning("Failed to initialize udev.");
+               goto ret;
+       }
+       enumerate = udev_enumerate_new(udev);
+       udev_enumerate_add_match_subsystem(enumerate, "usb-serial");
+       udev_enumerate_scan_devices(enumerate);
+       devices = udev_enumerate_get_list_entry(enumerate);
+       udev_list_entry_foreach(dev_list_entry, devices) {
+               const char *syspath, *sysname, *idVendor, *idProduct,
+                       *iSerial, *iProduct;
+               char path[32], manufacturer[32], product[32], hwrev[32];
+               struct udev_device *dev, *parent;
+               size_t s;
+
+               syspath = udev_list_entry_get_name(dev_list_entry);
+               dev = udev_device_new_from_syspath(udev, syspath);
+               sysname = udev_device_get_sysname(dev);
+               parent = udev_device_get_parent_with_subsystem_devtype(
+                               dev, "usb", "usb_device");
+               if (!parent) {
+                       g_warning("Unable to find parent usb device for %s",
+                                       sysname);
+                       continue;
+               }
+
+               idVendor = udev_device_get_sysattr_value(parent, "idVendor");
+               idProduct = udev_device_get_sysattr_value(parent, "idProduct");
+               if (strcmp(USB_VENDOR, idVendor)
+                               || strcmp(USB_PRODUCT, idProduct))
+                       continue;
+
+               iSerial = udev_device_get_sysattr_value(parent, "serial");
+               iProduct = udev_device_get_sysattr_value(parent, "product");
+
+               snprintf(path, sizeof(path), "/dev/%s", sysname);
+
+               s = strcspn(iProduct, " ");
+               if (s > sizeof(product) ||
+                               strlen(iProduct) - s > sizeof(manufacturer)) {
+                       g_warning("Could not parse iProduct: %s", iProduct);
+                       continue;
+               }
+               strncpy(product, iProduct, s);
+               product[s] = 0;
+               strcpy(manufacturer, iProduct + s);
+               sprintf(hwrev, "r%d", mso->hwrev);
+
+               mso = malloc(sizeof(struct mso));
+               if (!mso)
+                       continue;
+               memset(mso, 0, sizeof(struct mso));
+
+               if (mso_parse_serial(iSerial, iProduct, mso) != SIGROK_OK) {
+                       g_warning("Invalid iSerial: %s", iSerial);
+                       goto err_free_mso;
+               }
+               /* hardware initial state */
+               mso->ctlbase = 0;
+
+               sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING,
+                       manufacturer, product, hwrev);
+               if (!sdi) {
+                       g_warning("Unable to create device instance for %s",
+                                       sysname);
+                       goto err_free_mso;
+               }
+
+               /* save a pointer to our private instance data */
+               sdi->priv = mso;
+
+               sdi->serial = serial_device_instance_new(path, -1);
+               if (!sdi->serial)
+                       goto err_device_instance_free;
+
+               device_instances = g_slist_append(device_instances, sdi);
+               devcnt++;
+               continue;
+
+err_device_instance_free:
+               sigrok_device_instance_free(sdi);
+err_free_mso:
+               free(mso);
+       }
+
+       udev_enumerate_unref(enumerate);
+       udev_unref(udev);
+
+ret:
+       return devcnt;
+}
+
+static void hw_cleanup(void)
+{
+       GSList *l;
+       struct sigrok_device_instance *sdi;
+
+       /* Properly close all devices. */
+       for (l = device_instances; l; l = l->next) {
+               sdi = l->data;
+               if (sdi->serial->fd != -1)
+                       serial_close(sdi->serial->fd);
+               if (sdi->priv != NULL)
+                       free(sdi->priv);
+               sigrok_device_instance_free(sdi);
+       }
+       g_slist_free(device_instances);
+       device_instances = NULL;
+}
+
+static int hw_opendev(int device_index)
+{
+       struct sigrok_device_instance *sdi;
+       struct mso *mso;
+       int ret = SIGROK_ERR;
+
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+               return ret;
+
+       mso = sdi->priv;
+       sdi->serial->fd = serial_open(sdi->serial->port, O_RDWR);
+       if (sdi->serial->fd == -1)
+               return ret;
+
+       ret = serial_set_params(sdi->serial->fd, 460800, 8, 0, 1, 2);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       sdi->status = ST_ACTIVE;
+
+       /* FIXME: discard serial buffer */
+
+       mso_check_trigger(sdi, &mso->trigger_state);
+//     g_warning("trigger state: %c", mso->trigger_state);
+
+       ret = mso_reset_adc(sdi);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       mso_check_trigger(sdi, &mso->trigger_state);
+//     g_warning("trigger state: %c", mso->trigger_state);
+
+//     ret = mso_reset_fsm(sdi);
+//     if (ret != SIGROK_OK)
+//             return ret;
+
+//     return SIGROK_ERR;
+       return SIGROK_OK;
+}
+
+static void hw_closedev(int device_index)
+{
+       struct sigrok_device_instance *sdi;
+
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+               return;
+
+       if (sdi->serial->fd != -1) {
+               serial_close(sdi->serial->fd);
+               sdi->serial->fd = -1;
+               sdi->status = ST_INACTIVE;
+       }
+}
+
+static void *hw_get_device_info(int device_index, int device_info_id)
+{
+       struct sigrok_device_instance *sdi;
+       struct mso *mso;
+       void *info = NULL;
+
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+               return NULL;
+       mso = sdi->priv;
+
+       switch (device_info_id) {
+       case DI_INSTANCE:
+               info = sdi;
+               break;
+       case DI_NUM_PROBES: /* FIXME: How to report analog probe? */
+               info = GINT_TO_POINTER(8);
+               break;
+       case DI_SAMPLERATES:
+               info = &samplerates;
+               break;
+       case DI_TRIGGER_TYPES:
+               info = "01"; /* FIXME */
+               break;
+       case DI_CUR_SAMPLERATE:
+               info = &mso->cur_rate;
+               break;
+       }
+       return info;
+}
+
+static int hw_get_status(int device_index)
+{
+       struct sigrok_device_instance *sdi;
+
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+               return ST_NOT_FOUND;
+
+       return sdi->status;
+}
+
+static int *hw_get_capabilities(void)
+{
+       return capabilities;
+}
+
+static int hw_set_configuration(int device_index, int capability, void *value)
+{
+       struct sigrok_device_instance *sdi;
+
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+               return SIGROK_ERR;
+
+       switch (capability) {
+       case HWCAP_SAMPLERATE:
+               return mso_configure_rate(sdi, *(uint64_t *) value);
+       case HWCAP_PROBECONFIG:
+       case HWCAP_LIMIT_SAMPLES:
+       default:
+               return SIGROK_OK; /* FIXME */
+       }
+
+}
+
+#define MSO_TRIGGER_UNKNOWN    '!'
+#define MSO_TRIGGER_UNKNOWN1   '1'
+#define MSO_TRIGGER_UNKNOWN2   '2'
+#define MSO_TRIGGER_UNKNOWN3   '3'
+#define MSO_TRIGGER_WAIT       '4'
+#define MSO_TRIGGER_FIRED      '5'
+#define MSO_TRIGGER_DATAREADY  '6'
+
+/* FIXME: Pass errors? */
+static int receive_data(int fd, int revents, void *user_data)
+{
+       struct sigrok_device_instance *sdi = user_data;
+       struct mso *mso = sdi->priv;
+       struct datafeed_packet packet;
+       uint8_t in[1024], logic_out[1024];
+       double analog_out[1024];
+       size_t i, s;
+
+       revents = revents;
+
+       s = read(fd, in, sizeof(in));
+       if (s <= 0)
+               return FALSE;
+
+       /* No samples */
+       if (mso->trigger_state != MSO_TRIGGER_DATAREADY) {
+               mso->trigger_state = in[0];
+               if (mso->trigger_state == MSO_TRIGGER_DATAREADY) {
+                       mso_read_buffer(sdi);
+                       mso->buffer_n = 0;
+               } else {
+                       mso_check_trigger(sdi, NULL);
+               }
+               return FALSE;
+       }
+
+       /* the hardware always dumps 1024 samples, 24bits each */
+       if (mso->buffer_n < 3072) {
+               memcpy(mso->buffer + mso->buffer_n, in, s);
+               mso->buffer_n += s;
+       }
+       if (mso->buffer_n < 3072)
+               return FALSE;
+
+       /* do the conversion */
+       for (i = 0; i < 1024; i++) {
+               /* FIXME: Need to do conversion to mV */
+               analog_out[i] = (mso->buffer[i * 3] & 0x3f) |
+                       ((mso->buffer[i * 3 + 1] & 0xf) << 6);
+               logic_out[i] = ((mso->buffer[i * 3 + 1] & 0x30) >> 4) |
+                       ((mso->buffer[i * 3 + 2] & 0x3f) << 2);
+       }
+
+       packet.type = DF_LOGIC;
+       packet.length = 1024;
+       packet.unitsize = 1;
+       packet.payload = logic_out;
+       session_bus(mso->session_id, &packet);
+
+
+       packet.type = DF_ANALOG;
+       packet.length = 1024;
+       packet.unitsize = sizeof(double);
+       packet.payload = analog_out;
+       session_bus(mso->session_id, &packet);
+
+       packet.type = DF_END;
+       session_bus(mso->session_id, &packet);
+
+       return TRUE;
+}
+
+static int hw_start_acquisition(int device_index, gpointer session_device_id)
+{
+       struct sigrok_device_instance *sdi;
+       struct mso *mso;
+       struct datafeed_packet packet;
+       struct datafeed_header header;
+       int ret = SIGROK_ERR;
+
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+               return ret;
+       mso = sdi->priv;
+
+       /* FIXME: No need to do full reconfigure every time */
+//     ret = mso_reset_fsm(sdi);
+//     if (ret != SIGROK_OK)
+//             return ret;
+
+       /* FIXME: ACDC Mode */
+       mso->ctlbase &= 0x7f;
+//     mso->ctlbase |= mso->acdcmode;
+
+       ret = mso_configure_rate(sdi, mso->cur_rate);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       /* set dac offset */
+       ret = mso_dac_out(sdi, mso->dac_offset);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       ret = mso_configure_threshold_level(sdi);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       ret = mso_configure_trigger(sdi);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       /* FIXME: trigger_position */
+
+
+       /* END of config hardware part */
+
+       /* with trigger */
+       ret = mso_arm(sdi);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       /* without trigger */
+//     ret = mso_force_capture(sdi);
+//     if (ret != SIGROK_OK)
+//             return ret;
+
+       mso_check_trigger(sdi, &mso->trigger_state);
+       ret = mso_check_trigger(sdi, NULL);
+       if (ret != SIGROK_OK)
+               return ret;
+
+       mso->session_id = session_device_id;
+       source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
+
+       packet.type = DF_HEADER;
+       packet.length = sizeof(struct datafeed_header);
+       packet.payload = (unsigned char *) &header;
+       header.feed_version = 1;
+       gettimeofday(&header.starttime, NULL);
+       header.samplerate = mso->cur_rate;
+       header.num_analog_probes = 1;
+       header.num_logic_probes = 8;
+       header.protocol_id = PROTO_RAW;
+       session_bus(session_device_id, &packet);
+
+       return ret;
+}
+
+/* FIXME */
+static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+{
+       struct datafeed_packet packet;
+
+       device_index = device_index;
+
+       packet.type = DF_END;
+       session_bus(session_device_id, &packet);
+}
+
+struct device_plugin link_mso19_plugin_info = {
+       .name = "link-mso19",
+       .api_version = 1,
+       .init = hw_init,
+       .cleanup = hw_cleanup,
+
+       .open = hw_opendev,
+       .close = hw_closedev,
+       .get_device_info = hw_get_device_info,
+       .get_status = hw_get_status,
+       .get_capabilities = hw_get_capabilities,
+       .set_configuration = hw_set_configuration,
+       .start_acquisition = hw_start_acquisition,
+       .stop_acquisition = hw_stop_acquisition,
+};
diff --git a/hardware/link-mso19/link-mso19.h b/hardware/link-mso19/link-mso19.h
new file mode 100644 (file)
index 0000000..7bf598e
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the sigrok project.
+ *
+ * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef LINK_MSO19_H
+#define LINK_MSO19_H
+
+/* our private per-instance data */
+struct mso {
+       /* info */
+       uint8_t hwmodel;
+       uint8_t hwrev;
+       uint32_t serial;
+//     uint8_t num_sample_rates;
+       /* calibration */
+       double vbit;
+       uint16_t dac_offset;
+       uint16_t offset_range;
+       /* register cache */
+       uint8_t ctlbase;
+       uint8_t slowmode;
+       /* state */
+       uint8_t la_threshold;
+       uint64_t cur_rate;
+       uint8_t dso_probe_attn;
+       uint8_t trigger_chan;
+       uint8_t trigger_slope;
+       uint8_t trigger_spimode;
+       uint8_t trigger_outsrc;
+       uint8_t trigger_state;
+       uint8_t la_trigger;
+       uint8_t la_trigger_mask;
+       double dso_trigger_voltage;
+       uint16_t dso_trigger_width;
+       gpointer session_id;
+       uint16_t buffer_n;
+       char buffer[4096];
+};
+
+/* serial protocol */
+#define mso_trans(a, v) \
+       (((v) & 0x3f) | (((v) & 0xc0) << 6) | (((a) & 0xf) << 8) | \
+       ((~(v) & 0x20) << 1) | ((~(v) & 0x80) << 7))
+
+const char mso_head[] = { 0x40, 0x4c, 0x44, 0x53, 0x7e };
+const char mso_foot[] = { 0x7e };
+
+/* registers */
+#define REG_BUFFER             1
+#define REG_TRIGGER            2
+#define REG_CLKRATE1           9
+#define REG_CLKRATE2           10
+#define REG_DAC1               12
+#define REG_DAC2               13
+#define REG_CTL                        14
+
+/* bits */
+#define BIT_CTL_RESETFSM       (1 << 0)
+#define BIT_CTL_ARM            (1 << 1)
+#define BIT_CTL_ADC_UNKNOWN4   (1 << 4) /* adc enable? */
+#define BIT_CTL_RESETADC       (1 << 6)
+#define BIT_CTL_LED            (1 << 7)
+
+struct rate_map {
+       uint32_t rate;
+       uint16_t val;
+       uint8_t slowmode;
+};
+
+static struct rate_map rate_map[] = {
+       { MHZ(200),     0x0205, 0       },
+       { MHZ(100),     0x0105, 0       },
+       { MHZ(50),      0x0005, 0       },
+       { MHZ(20),      0x0303, 0       },
+       { MHZ(10),      0x0308, 0       },
+       { MHZ(5),       0x030c, 0       },
+       { MHZ(2),       0x0330, 0       },
+       { MHZ(1),       0x0362, 0       },
+       { KHZ(500),     0x03c6, 0       },
+       { KHZ(200),     0x07f2, 0       },
+       { KHZ(100),     0x0fe6, 0       },
+       { KHZ(50),      0x1fce, 0       },
+       { KHZ(20),      0x4f86, 0       },
+       { KHZ(10),      0x9f0e, 0       },
+       { KHZ(5),       0x03c7, 0x20    },
+       { KHZ(2),       0x07f3, 0x20    },
+       { KHZ(1),       0x0fe7, 0x20    },
+       { 500,          0x1fcf, 0x20    },
+       { 200,          0x4f87, 0x20    },
+       { 100,          0x9f0f, 0x20    },
+};
+
+/* FIXME: Determine corresponding voltages */
+uint16_t la_threshold_map[] = {
+       0x8600,
+       0x8770,
+       0x88ff,
+       0x8c70,
+       0x8eff,
+       0x8fff,
+};
+#endif
+
index 0e7914570527d8056f17338617e77cb8a4ba620b..7f44788e4a012d2a2742aaaaee894dffdc0f13c6 100644 (file)
@@ -760,7 +760,8 @@ 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_PROBES;
+       header->num_logic_probes = NUM_PROBES;
+       header->num_analog_probes = 0;
        session_bus(session_device_id, packet);
        g_free(header);
        g_free(packet);
index b80808db35dc49045cb52a74195fb1afa84b632b..f89d3ee2c29b96f27024246e7740bb6e07ad22e9 100644 (file)
@@ -713,7 +713,8 @@ 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_PROBES;
+       header->num_logic_probes = NUM_PROBES;
+       header->num_analog_probes = 0;
        session_bus(session_device_id, packet);
        g_free(header);
        g_free(packet);
index eef93cbfe265e592f187c578105484886f5873c9..e034dfcc24f588f0b4bcd0441287a93c2b22928a 100644 (file)
@@ -512,7 +512,8 @@ 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);
index 4ae0088e1a41b991bcad86b2601c891aa0149dd7..c5a0b2e9852aa2cedb08b3981c3ed182e97cc62f 100644 (file)
@@ -55,6 +55,10 @@ extern struct device_plugin zeroplus_logic_cube_plugin_info;
 #ifdef HAVE_LA_ASIX_SIGMA
 extern struct device_plugin asix_sigma_plugin_info;
 #endif
+#ifdef HAVE_LA_LINK_MSO19
+extern struct device_plugin link_mso19_plugin_info;
+#endif
+
 
 /* TODO: No linked list needed, this can be a simple array. */
 int load_hwplugins(void)
@@ -74,6 +78,9 @@ int load_hwplugins(void)
 #ifdef HAVE_LA_ASIX_SIGMA
        plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info);
 #endif
+#ifdef HAVE_LA_LINK_MSO19
+       plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info);
+#endif
 
        return SIGROK_OK;
 }
@@ -97,6 +104,7 @@ struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
        sdi->vendor = strdup(vendor);
        sdi->model = strdup(model);
        sdi->version = strdup(version);
+       sdi->priv = NULL;
        sdi->usb = NULL;
 
        return sdi;
index 7c9f96ba9f3d9a99bfa4b42a8344260f879b4b7e..2f1462d07dc5f9424e34bd308d35224c9466ef31 100644 (file)
@@ -48,7 +48,8 @@ static int in_loadfile(const char *filename)
        device = device_new(NULL, 0, num_probes);
 
        header.feed_version = 1;
-       header.num_probes = num_probes;
+       header.num_logic_probes = num_probes;
+       header.num_analog_probes = 0; /* FIXME */
        header.protocol_id = PROTO_RAW;
        header.samplerate = 0;
        gettimeofday(&header.starttime, NULL);
index 4373fcb497266c6663e64e059923fef8373daae7..59d6b1a3082978d361b7692ba67a892c7cf56f1b 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -60,6 +60,8 @@
 #define MHZ(n) ((n) * 1000000)
 #define GHZ(n) ((n) * 1000000000)
 
+#define HZ_TO_NS(n) (1000000000 / (n))
+
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #endif
@@ -113,7 +115,8 @@ struct datafeed_header {
        struct timeval starttime;
        uint64_t samplerate;
        int protocol_id;
-       int num_probes;
+       int num_analog_probes;
+       int num_logic_probes;
 };
 
 
@@ -190,8 +193,14 @@ struct device {
        struct datastore *datastore;
 };
 
+enum {
+       PROBE_TYPE_LOGIC,
+       PROBE_TYPE_ANALOG,
+};
+
 struct probe {
        int index;
+       int type;
        gboolean enabled;
        char *name;
        char *trigger;