]> sigrok.org Git - libsigrok.git/blobdiff - hardware/asix-sigma/asix-sigma.c
Sigma: Support for low samplerates
[libsigrok.git] / hardware / asix-sigma / asix-sigma.c
index e6a1c17e45de198cbf8512ce1e3c7abfc9e5b2d0..6efa266f1f0ae8c54dbb40eda1c35ec9c205a676 100644 (file)
 #define USB_VENDOR_NAME                        "ASIX"
 #define USB_MODEL_NAME                 "SIGMA"
 #define USB_MODEL_VERSION              ""
-#define FIRMWARE                       FIRMWARE_DIR "/asix-sigma-200.firmware"
 
 static GSList *device_instances = NULL;
 
 // XXX These should be per device
 static struct ftdi_context ftdic;
-static uint64_t cur_samplerate = MHZ(200);
+static uint64_t cur_samplerate = 0;
 static uint32_t limit_msec = 0;
 static struct timeval start_tv;
+static int cur_firmware = -1;
+static int num_probes = 0;
+static int samples_per_event = 0;
 
 static uint64_t supported_samplerates[] = {
+       KHZ(250),
+       MHZ(1),
+       MHZ(10),
+       MHZ(25),
+       MHZ(50),
+       MHZ(100),
        MHZ(200),
        0,
 };
 
 static struct samplerates samplerates = {
-       MHZ(200),
+       KHZ(250),
        MHZ(200),
        0,
        supported_samplerates,
@@ -82,7 +90,16 @@ static uint8_t logic_mode_start[] = {
        0x2a, 0x3a, 0x40, 0x03, 0x20, 0x38,
 };
 
-static int sigma_read(void *buf, size_t size)
+static const char *firmware_files[] =
+{
+       "asix-sigma-50.fw",     /* 50 MHz, supports 8 bit fractions */
+       "asix-sigma-100.fw",    /* 100 MHz */
+       "asix-sigma-200.fw",    /* 200 MHz */
+       "asix-sigma-50sync.fw", /* Asynchronous sampling */
+       "asix-sigma-phasor.fw", /* Frequency counter */
+};
+
+static int sigma_read(void* buf, size_t size)
 {
        int ret;
 
@@ -327,14 +344,14 @@ static int hw_init(char *deviceinfo)
        return 1;
 }
 
-static int hw_opendev(int device_index)
+static int upload_firmware(int firmware_idx)
 {
        int ret;
        unsigned char *buf;
        unsigned char pins;
        size_t buf_size;
-       struct sigrok_device_instance *sdi;
        unsigned char result[32];
+       char firmware_path[128];
 
        /* Make sure it's an ASIX SIGMA. */
        if ((ret = ftdi_usb_open_desc(&ftdic,
@@ -375,10 +392,13 @@ static int hw_opendev(int device_index)
                        break;
        }
 
-       /* Prepare firmware. */
-       if (-1 == bin2bitbang(FIRMWARE, &buf, &buf_size)) {
+       /* Prepare firmware */
+       snprintf(firmware_path, sizeof(firmware_path), "%s/%s", FIRMWARE_DIR,
+                firmware_files[firmware_idx]);
+
+       if (-1 == bin2bitbang(firmware_path, &buf, &buf_size)) {
                g_warning("An error occured while reading the firmware: %s",
-                         FIRMWARE);
+                         firmware_path);
                return SIGROK_ERR;
        }
 
@@ -388,7 +408,7 @@ static int hw_opendev(int device_index)
        g_free(buf);
 
        if ((ret = ftdi_set_bitmode(&ftdic, 0x00, BITMODE_RESET)) < 0) {
-               g_warning("ftdi_set_bitmode failed: %s",
+                                   g_warning("ftdi_set_bitmode failed: %s",
                          ftdi_get_error_string(&ftdic));
                return SIGROK_ERR;
        }
@@ -410,16 +430,67 @@ static int hw_opendev(int device_index)
                return SIGROK_ERR;
        }
 
-       /* Works like a charm... */
+       cur_firmware = firmware_idx;
+
+       return SIGROK_OK;
+}
+
+static int hw_opendev(int device_index)
+{
+       struct sigrok_device_instance *sdi;
+       int ret;
+
+       /* Make sure it's an ASIX SIGMA */
+       if ((ret = ftdi_usb_open_desc(&ftdic,
+               USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) {
+
+               g_warning("ftdi_usb_open failed: %s",
+                       ftdi_get_error_string(&ftdic));
+
+               return 0;
+       }
 
        if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
                return SIGROK_ERR;
 
        sdi->status = ST_ACTIVE;
 
+       return SIGROK_OK;
+}
+
+static int set_samplerate(struct sigrok_device_instance *sdi, uint64_t samplerate)
+{
+       int i, ret;
+
+       sdi = sdi;
+
+       for (i = 0; supported_samplerates[i]; i++) {
+               if (supported_samplerates[i] == samplerate)
+                       break;
+       }
+       if (supported_samplerates[i] == 0)
+               return SIGROK_ERR_SAMPLERATE;
+
+       if (samplerate <= MHZ(50)) {
+               ret = upload_firmware(0);
+               num_probes = 16;
+               // XXX: Setup divider if < 50 MHz
+       }
+       if (samplerate == MHZ(100)) {
+               ret = upload_firmware(1);
+               num_probes = 8;
+       }
+       else if (samplerate == MHZ(200)) {
+               ret = upload_firmware(2);
+               num_probes = 4;
+       }
+
+       cur_samplerate = samplerate;
+       samples_per_event = 16 / num_probes;
+
        g_message("Firmware uploaded");
 
-       return SIGROK_OK;
+       return ret;
 }
 
 static void hw_closedev(int device_index)
@@ -448,7 +519,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
                info = sdi;
                break;
        case DI_NUM_PROBES:
-               info = GINT_TO_POINTER(4);
+               info = GINT_TO_POINTER(16);
                break;
        case DI_SAMPLERATES:
                info = &samplerates;
@@ -484,15 +555,12 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 {
        struct sigrok_device_instance *sdi;
        int ret;
-       uint64_t *tmp_u64;
 
        if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
                return SIGROK_ERR;
 
        if (capability == HWCAP_SAMPLERATE) {
-               tmp_u64 = (uint64_t *) value;
-               /* Only 200 MHz implemented */
-               ret = SIGROK_OK;
+               ret = set_samplerate(sdi, *(uint64_t*) value);
        } else if (capability == HWCAP_PROBECONFIG) {
                ret = SIGROK_OK;
        } else if (capability == HWCAP_LIMIT_MSEC) {
@@ -508,20 +576,23 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 /*
  * Decode chunk of 1024 bytes, 64 clusters, 7 events per cluster.
  * Each event is 20ns apart, and can contain multiple samples.
- * For 200 MHz, an event contains 4 samples for each channel,
- * spread 5 ns apart.
+ *
+ * For 200 MHz, events contain 4 samples for each channel, spread 5 ns apart.
+ * For 100 MHz, events contain 2 samples for each channel, spread 10 ns apart.
+ * For 50 MHz and below, events contain one sample for each channel,
+ * spread 20 ns apart.
  */
 static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
-                          uint8_t *lastsample, void *user_data)
+                          uint16_t *lastsample, void *user_data)
 {
-       const int samples_per_event = 4;
        uint16_t tsdiff, ts;
-       uint8_t samples[65536 * samples_per_event];
+       uint16_t samples[65536 * samples_per_event];
        struct datafeed_packet packet;
-       int i, j, k, numpad, tosend;
+       int i, j, k, l, numpad, tosend;
        size_t n = 0, sent = 0;
-       int clustersize = EVENTS_PER_CLUSTER * samples_per_event; /* 4 for 200 MHz */
+       int clustersize = EVENTS_PER_CLUSTER * samples_per_event;
        uint16_t *event;
+       uint16_t cur_sample;
 
        /* For each ts */
        for (i = 0; i < 64; ++i) {
@@ -532,25 +603,30 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                /* Pad last sample up to current point. */
                numpad = tsdiff * samples_per_event - clustersize;
                if (numpad > 0) {
-                       memset(samples, *lastsample,
-                              tsdiff * samples_per_event - clustersize);
-                       n = tsdiff * samples_per_event - clustersize;
+                       for (j = 0; j < numpad; ++j)
+                               samples[j] = *lastsample;
+
+                       n = numpad;
                }
 
                event = (uint16_t *) &buf[i * 16 + 2];
 
-               /* For each sample in cluster. */
+               cur_sample = 0;
+
+               /* For each event in cluster. */
                for (j = 0; j < 7; ++j) {
+
+                       /* For each sample in event. */
                        for (k = 0; k < samples_per_event; ++k) {
-                               /*
-                                * Extract samples from bytestream.
-                                * Samples are packed together in a short.
-                                */
-                               samples[n++] =
-                                   ((!!(event[j] & (1 << (k + 0x0)))) << 0) |
-                                   ((!!(event[j] & (1 << (k + 0x4)))) << 1) |
-                                   ((!!(event[j] & (1 << (k + 0x8)))) << 2) |
-                                   ((!!(event[j] & (1 << (k + 0xc)))) << 3);
+                               cur_sample = 0;
+
+                               /* For each probe. */
+                               for (l = 0; l < num_probes; ++l)
+                                       cur_sample |= (!!(event[j] & (1 << (l *
+                                                     samples_per_event + k))))
+                                                     << l;
+
+                               samples[n++] = cur_sample;
                        }
                }
 
@@ -559,10 +635,10 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                /* Send to sigrok. */
                sent = 0;
                while (sent < n) {
-                       tosend = MIN(4096, n - sent);
+                       tosend = MIN(2048, n - sent);
 
-                       packet.type = DF_LOGIC8;
-                       packet.length = tosend;
+                       packet.type = DF_LOGIC16;
+                       packet.length = tosend * sizeof(uint16_t);
                        packet.payload = samples + sent;
                        session_bus(user_data, &packet);
 
@@ -570,7 +646,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                }
        }
 
-       return 0;
+       return SIGROK_OK;
 }
 
 static int receive_data(int fd, int revents, void *user_data)
@@ -582,7 +658,7 @@ static int receive_data(int fd, int revents, void *user_data)
        uint32_t triggerpos, stoppos, running_msec;
        struct timeval tv;
        uint16_t lastts = 0;
-       uint8_t lastsample = 0;
+       uint16_t lastsample = 0;
 
        fd = fd;
        revents = revents;
@@ -608,6 +684,9 @@ static int receive_data(int fd, int revents, void *user_data)
        /* Get the current position. */
        sigma_read_pos(&stoppos, &triggerpos);
 
+       /* Read mode status. We will care for this later. */
+       sigma_get_register(READ_MODE);
+
        /* Download sample data. */
        for (curchunk = 0; curchunk < numchunks;) {
                newchunks = MIN(chunks_per_read, numchunks - curchunk);
@@ -652,6 +731,11 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 
        device_index = device_index;
 
+       if (cur_firmware == -1) {
+               /* Samplerate has not been set. Default to 200 MHz */
+               set_samplerate(sdi, 200);
+       }
+
        /* Setup trigger (by trigger-in). */
        sigma_set_register(WRITE_TRIGGER_SELECT1, 0x20);
 
@@ -662,8 +746,33 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        /* Trigger normal (falling edge). */
        sigma_set_register(WRITE_TRIGGER_SELECT1, 0x08);
 
-       /* Enable pins (200 MHz, 4 pins). */
-       sigma_set_register(WRITE_CLOCK_SELECT, 0xf0);
+       /* Set clock select register. */
+       if (cur_samplerate == MHZ(200))
+               /* Enable 4 probes. */
+               sigma_set_register(WRITE_CLOCK_SELECT, 0xf0);
+       else if (cur_samplerate == MHZ(100))
+               /* Enable 8 probes. */
+               sigma_set_register(WRITE_CLOCK_SELECT, 0x00);
+       else {
+               /*
+                * 50 MHz mode (or fraction thereof)
+                * Any fraction down to 50 MHz / 256 can be used,
+                * but is not suppoted by Sigrok API.
+                */
+
+               int frac = MHZ(50) / cur_samplerate - 1;
+
+               struct clockselect_50 clockselect = {
+                       .async = 0,
+                       .fraction = frac,
+                       .disabled_probes = 0,
+               };
+
+               sigma_write_register(WRITE_CLOCK_SELECT,
+                                   (uint8_t *) &clockselect,
+                                   sizeof(clockselect));
+       }
+
 
        /* Setup maximum post trigger time. */
        sigma_set_register(WRITE_POST_TRIGGER, 0xff);
@@ -685,7 +794,7 @@ 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 = 4;
+       header.num_probes = num_probes;
        session_bus(session_device_id, &packet);
 
        return SIGROK_OK;