BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sigma: Support 50 and 200 MHz modes

This commit is contained in:
Håvard Espeland 2010-04-28 21:21:19 +02:00
parent a8116d764b
commit f78898e947
1 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
hardware/asix-sigma/asix-sigma.c
View File

@ -40,10 +40,12 @@ static GSList *device_instances = NULL;
// XXX These should be per device // XXX These should be per device
static struct ftdi_context ftdic; 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 uint32_t limit_msec = 0;
static struct timeval start_tv; static struct timeval start_tv;
static int cur_firmware = -1; static int cur_firmware = -1;
static int num_probes = 0;
static int samples_per_event = 0;
static uint64_t supported_samplerates[] = { static uint64_t supported_samplerates[] = {
MHZ(50), MHZ(50),
@ -467,14 +469,20 @@ static int set_samplerate(struct sigrok_device_instance *sdi, uint64_t samplerat
if (samplerate <= MHZ(50)) { if (samplerate <= MHZ(50)) {
ret = upload_firmware(0); ret = upload_firmware(0);
num_probes = 16;
// XXX: Setup divider // XXX: Setup divider
} }
if (samplerate == MHZ(100)) if (samplerate == MHZ(100)) {
ret = upload_firmware(1); ret = upload_firmware(1);
else if (samplerate == MHZ(200)) num_probes = 8;
}
else if (samplerate == MHZ(200)) {
ret = upload_firmware(2); ret = upload_firmware(2);
num_probes = 4;
}
cur_samplerate = samplerate; cur_samplerate = samplerate;
samples_per_event = 16 / num_probes;
g_message("Firmware uploaded"); g_message("Firmware uploaded");
@ -564,20 +572,23 @@ static int hw_set_configuration(int device_index, int capability, void *value)
/* /*
* Decode chunk of 1024 bytes, 64 clusters, 7 events per cluster. * Decode chunk of 1024 bytes, 64 clusters, 7 events per cluster.
* Each event is 20ns apart, and can contain multiple samples. * 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, 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; uint16_t tsdiff, ts;
uint8_t samples[65536 * samples_per_event]; uint16_t samples[65536 * samples_per_event];
struct datafeed_packet packet; struct datafeed_packet packet;
int i, j, k, numpad, tosend; int i, j, k, l, numpad, tosend;
size_t n = 0, sent = 0; 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 *event;
uint16_t cur_sample;
/* For each ts */ /* For each ts */
for (i = 0; i < 64; ++i) { for (i = 0; i < 64; ++i) {
@ -588,25 +599,29 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
/* Pad last sample up to current point. */ /* Pad last sample up to current point. */
numpad = tsdiff * samples_per_event - clustersize; numpad = tsdiff * samples_per_event - clustersize;
if (numpad > 0) { if (numpad > 0) {
memset(samples, *lastsample, for (j = 0; j < numpad; ++j)
tsdiff * samples_per_event - clustersize); samples[j] = *lastsample;
n = tsdiff * samples_per_event - clustersize;
n = numpad;
} }
event = (uint16_t *) &buf[i * 16 + 2]; 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 (j = 0; j < 7; ++j) {
/* For each sample in event. */
for (k = 0; k < samples_per_event; ++k) { for (k = 0; k < samples_per_event; ++k) {
/* cur_sample = 0;
* Extract samples from bytestream.
* Samples are packed together in a short. /* For each probe. */
*/ for (l = 0; l < num_probes; ++l)
samples[n++] = cur_sample |= (!!(event[j] &
((!!(event[j] & (1 << (k + 0x0)))) << 0) | (1 << (l * 2 + k)))) << l;
((!!(event[j] & (1 << (k + 0x4)))) << 1) |
((!!(event[j] & (1 << (k + 0x8)))) << 2) | samples[n++] = cur_sample;
((!!(event[j] & (1 << (k + 0xc)))) << 3);
} }
} }
@ -615,10 +630,10 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
/* Send to sigrok. */ /* Send to sigrok. */
sent = 0; sent = 0;
while (sent < n) { while (sent < n) {
tosend = MIN(4096, n - sent); tosend = MIN(2048, n - sent);
packet.type = DF_LOGIC8; packet.type = DF_LOGIC16;
packet.length = tosend; packet.length = tosend * sizeof(uint16_t);
packet.payload = samples + sent; packet.payload = samples + sent;
session_bus(user_data, &packet); session_bus(user_data, &packet);
@ -626,7 +641,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) static int receive_data(int fd, int revents, void *user_data)
@ -638,7 +653,7 @@ static int receive_data(int fd, int revents, void *user_data)
uint32_t triggerpos, stoppos, running_msec; uint32_t triggerpos, stoppos, running_msec;
struct timeval tv; struct timeval tv;
uint16_t lastts = 0; uint16_t lastts = 0;
uint8_t lastsample = 0; uint16_t lastsample = 0;
fd = fd; fd = fd;
revents = revents; revents = revents;
@ -664,6 +679,9 @@ static int receive_data(int fd, int revents, void *user_data)
/* Get the current position. */ /* Get the current position. */
sigma_read_pos(&stoppos, &triggerpos); sigma_read_pos(&stoppos, &triggerpos);
/* Read mode status. We will care for this later. */
sigma_get_register(READ_MODE);
/* Download sample data. */ /* Download sample data. */
for (curchunk = 0; curchunk < numchunks;) { for (curchunk = 0; curchunk < numchunks;) {
newchunks = MIN(chunks_per_read, numchunks - curchunk); newchunks = MIN(chunks_per_read, numchunks - curchunk);