X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fprotocol.c;h=82a0f9c20405f5946f71c08ea45aac723d256662;hb=f06fb3e9f1fdfc3780bfa8cb06f76a2d630d6f1c;hp=f8289ba749d86491064bc94f75d0139a731c4851;hpb=3281cf59aa822563e6ce2f5a21597e59327296ad;p=libsigrok.git diff --git a/src/hardware/asix-sigma/protocol.c b/src/hardware/asix-sigma/protocol.c index f8289ba7..82a0f9c2 100644 --- a/src/hardware/asix-sigma/protocol.c +++ b/src/hardware/asix-sigma/protocol.c @@ -184,14 +184,16 @@ static int sigma_read_dram(uint16_t startchunk, size_t numchunks, { size_t i; uint8_t buf[4096]; - int idx = 0; + int idx; /* Send the startchunk. Index start with 1. */ - buf[0] = startchunk >> 8; - buf[1] = startchunk & 0xff; - sigma_write_register(WRITE_MEMROW, buf, 2, devc); + idx = 0; + buf[idx++] = startchunk >> 8; + buf[idx++] = startchunk & 0xff; + sigma_write_register(WRITE_MEMROW, buf, idx, devc); /* Read the DRAM. */ + idx = 0; buf[idx++] = REG_DRAM_BLOCK; buf[idx++] = REG_DRAM_WAIT_ACK; @@ -330,7 +332,7 @@ static int sigma_fpga_init_la(struct dev_context *devc) /* Initialize the logic analyzer mode. */ uint8_t logic_mode_start[] = { REG_ADDR_LOW | (READ_ID & 0xf), - REG_ADDR_HIGH | (READ_ID >> 8), + REG_ADDR_HIGH | (READ_ID >> 4), REG_READ_ADDR, /* Read ID register. */ REG_ADDR_LOW | (WRITE_TEST & 0xf), @@ -442,10 +444,18 @@ static int upload_firmware(struct sr_context *ctx, unsigned char *buf; unsigned char pins; size_t buf_size; - const char *firmware = sigma_firmware_files[firmware_idx]; - struct ftdi_context *ftdic = &devc->ftdic; + const char *firmware; + struct ftdi_context *ftdic; + + /* Avoid downloading the same firmware multiple times. */ + firmware = sigma_firmware_files[firmware_idx]; + if (devc->cur_firmware == firmware_idx) { + sr_info("Not uploading firmware file '%s' again.", firmware); + return SR_OK; + } /* Make sure it's an ASIX SIGMA. */ + ftdic = &devc->ftdic; ret = ftdi_usb_open_desc(ftdic, USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL); if (ret < 0) { @@ -740,12 +750,59 @@ static uint16_t sigma_dram_cluster_data(struct sigma_dram_cluster *cl, int idx) return sample; } +/* + * Deinterlace sample data that was retrieved at 100MHz samplerate. + * One 16bit item contains two samples of 8bits each. The bits of + * multiple samples are interleaved. + */ +static uint16_t sigma_deinterlace_100mhz_data(uint16_t indata, int idx) +{ + uint16_t outdata; + + indata >>= idx; + outdata = 0; + outdata |= (indata >> (0 * 2 - 0)) & (1 << 0); + outdata |= (indata >> (1 * 2 - 1)) & (1 << 1); + outdata |= (indata >> (2 * 2 - 2)) & (1 << 2); + outdata |= (indata >> (3 * 2 - 3)) & (1 << 3); + outdata |= (indata >> (4 * 2 - 4)) & (1 << 4); + outdata |= (indata >> (5 * 2 - 5)) & (1 << 5); + outdata |= (indata >> (6 * 2 - 6)) & (1 << 6); + outdata |= (indata >> (7 * 2 - 7)) & (1 << 7); + return outdata; +} + +/* + * Deinterlace sample data that was retrieved at 200MHz samplerate. + * One 16bit item contains four samples of 4bits each. The bits of + * multiple samples are interleaved. + */ +static uint16_t sigma_deinterlace_200mhz_data(uint16_t indata, int idx) +{ + uint16_t outdata; + + indata >>= idx; + outdata = 0; + outdata |= (indata >> (0 * 4 - 0)) & (1 << 0); + outdata |= (indata >> (1 * 4 - 1)) & (1 << 1); + outdata |= (indata >> (2 * 4 - 2)) & (1 << 2); + outdata |= (indata >> (3 * 4 - 3)) & (1 << 3); + return outdata; +} + static void store_sr_sample(uint8_t *samples, int idx, uint16_t data) { samples[2 * idx + 0] = (data >> 0) & 0xff; samples[2 * idx + 1] = (data >> 8) & 0xff; } +/* + * This size translates to: event count (1K events per cluster), times + * the sample width (unitsize, 16bits per event), times the maximum + * number of samples per event. + */ +#define SAMPLES_BUFFER_SIZE (1024 * 2 * 4) + static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster, unsigned int events_in_cluster, unsigned int triggered, @@ -755,9 +812,12 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster, struct sigma_state *ss = &devc->state; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - uint16_t tsdiff, ts, sample; - uint8_t samples[2048]; + uint16_t tsdiff, ts, sample, item16; + uint8_t samples[SAMPLES_BUFFER_SIZE]; + uint8_t *send_ptr; + size_t send_count, trig_count; unsigned int i; + int j; ts = sigma_dram_cluster_ts(dram_cluster); tsdiff = ts - ss->lastts; @@ -786,22 +846,45 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster, /* * If we have 1024 samples ready or we're at the * end of submitting the padding samples, submit - * the packet to Sigrok. + * the packet to Sigrok. Since constant data is + * sent, duplication of data for rates above 50MHz + * is simple. */ if ((i == 1023) || (ts == tsdiff - 1)) { logic.length = (i + 1) * logic.unitsize; - sr_session_send(sdi, &packet); + for (j = 0; j < devc->samples_per_event; j++) + sr_session_send(sdi, &packet); } } /* * Parse the samples in current cluster and prepare them - * to be submitted to Sigrok. + * to be submitted to Sigrok. Cope with memory layouts that + * vary with the samplerate. */ + send_ptr = &samples[0]; + send_count = 0; sample = 0; for (i = 0; i < events_in_cluster; i++) { - sample = sigma_dram_cluster_data(dram_cluster, i); - store_sr_sample(samples, i, sample); + item16 = sigma_dram_cluster_data(dram_cluster, i); + if (devc->cur_samplerate == SR_MHZ(200)) { + sample = sigma_deinterlace_200mhz_data(item16, 0); + store_sr_sample(samples, send_count++, sample); + sample = sigma_deinterlace_200mhz_data(item16, 1); + store_sr_sample(samples, send_count++, sample); + sample = sigma_deinterlace_200mhz_data(item16, 2); + store_sr_sample(samples, send_count++, sample); + sample = sigma_deinterlace_200mhz_data(item16, 3); + store_sr_sample(samples, send_count++, sample); + } else if (devc->cur_samplerate == SR_MHZ(100)) { + sample = sigma_deinterlace_100mhz_data(item16, 0); + store_sr_sample(samples, send_count++, sample); + sample = sigma_deinterlace_100mhz_data(item16, 1); + store_sr_sample(samples, send_count++, sample); + } else { + sample = item16; + store_sr_sample(samples, send_count++, sample); + } } /* @@ -821,10 +904,12 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster, ss->lastsample, &devc->trigger); if (trigger_offset > 0) { + trig_count = trigger_offset * devc->samples_per_event; packet.type = SR_DF_LOGIC; - logic.length = trigger_offset * logic.unitsize; + logic.length = trig_count * logic.unitsize; sr_session_send(sdi, &packet); - events_in_cluster -= trigger_offset; + send_ptr += trig_count * logic.unitsize; + send_count -= trig_count; } /* Only send trigger if explicitly enabled. */ @@ -838,10 +923,10 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster, * Send the data after the trigger, or all of the received data * if no trigger position applies. */ - if (events_in_cluster > 0) { + if (send_count) { packet.type = SR_DF_LOGIC; - logic.length = events_in_cluster * logic.unitsize; - logic.data = samples + (trigger_offset * logic.unitsize); + logic.length = send_count * logic.unitsize; + logic.data = send_ptr; sr_session_send(sdi, &packet); } @@ -863,12 +948,18 @@ static int decode_chunk_ts(struct sigma_dram_line *dram_line, struct sr_dev_inst *sdi) { struct sigma_dram_cluster *dram_cluster; - struct dev_context *devc = sdi->priv; - unsigned int clusters_in_line = - (events_in_line + (EVENTS_PER_CLUSTER - 1)) / EVENTS_PER_CLUSTER; + struct dev_context *devc; + unsigned int clusters_in_line; unsigned int events_in_cluster; unsigned int i; - uint32_t trigger_cluster = ~0, triggered = 0; + uint32_t trigger_cluster, triggered; + + devc = sdi->priv; + clusters_in_line = events_in_line; + clusters_in_line += EVENTS_PER_CLUSTER - 1; + clusters_in_line /= EVENTS_PER_CLUSTER; + trigger_cluster = ~0; + triggered = 0; /* Check if trigger is in this chunk. */ if (trigger_event < (64 * 7)) { @@ -903,17 +994,22 @@ static int decode_chunk_ts(struct sigma_dram_line *dram_line, static int download_capture(struct sr_dev_inst *sdi) { - struct dev_context *devc = sdi->priv; const uint32_t chunks_per_read = 32; + + struct dev_context *devc; struct sigma_dram_line *dram_line; int bufsz; uint32_t stoppos, triggerpos; uint8_t modestatus; - uint32_t i; uint32_t dl_lines_total, dl_lines_curr, dl_lines_done; - uint32_t dl_events_in_line = 64 * 7; - uint32_t trg_line = ~0, trg_event = ~0; + uint32_t dl_events_in_line; + uint32_t trg_line, trg_event; + + devc = sdi->priv; + dl_events_in_line = 64 * 7; + trg_line = ~0; + trg_event = ~0; dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line)); if (!dram_line) @@ -997,13 +1093,13 @@ static int download_capture(struct sr_dev_inst *sdi) */ static int sigma_capture_mode(struct sr_dev_inst *sdi) { - struct dev_context *devc = sdi->priv; - + struct dev_context *devc; uint64_t running_msec; struct timeval tv; - uint32_t stoppos, triggerpos; + devc = sdi->priv; + /* Check if the selected sampling duration passed. */ gettimeofday(&tv, 0); running_msec = (tv.tv_sec - devc->start_tv.tv_sec) * 1000 +