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

saleae-logic-pro: Random minor cosmetics/consistency fixes.

This commit is contained in:
Uwe Hermann 2017-06-28 08:29:04 +02:00
parent b6189f7c8a
commit bb0c52719e
3 changed files with 73 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/hardware/saleae-logic-pro/api.c
View File

@ -22,9 +22,9 @@
#include <string.h> #include <string.h>
#include "protocol.h" #include "protocol.h"
#define BUF_COUNT (8) #define BUF_COUNT 8
#define BUF_SIZE (16*1024) #define BUF_SIZE (16 * 1024)
#define BUF_TIMEOUT (1000*1000) #define BUF_TIMEOUT (1000 * 1000)
SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info; SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
@ -201,7 +201,7 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
} }
/* configure default samplerate */ /* Configure default samplerate. */
if (devc->dig_samplerate == 0) if (devc->dig_samplerate == 0)
devc->dig_samplerate = samplerates[3]; devc->dig_samplerate = samplerates[3];
@ -289,21 +289,15 @@ static int config_list(uint32_t key, GVariant **data,
switch (key) { switch (key) {
case SR_CONF_SCAN_OPTIONS: case SR_CONF_SCAN_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
scanopts, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
ARRAY_SIZE(scanopts),
sizeof(uint32_t));
break; break;
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (!sdi) { if (!sdi) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
drvopts, drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
ARRAY_SIZE(drvopts),
sizeof(uint32_t));
} else { } else {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
ARRAY_SIZE(devopts),
sizeof(uint32_t));
} }
break; break;
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
@ -375,8 +369,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
buf = g_malloc(BUF_SIZE); buf = g_malloc(BUF_SIZE);
transfer = libusb_alloc_transfer(0); transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl, libusb_fill_bulk_transfer(transfer, usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE, 2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT); saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
if ((ret = libusb_submit_transfer(transfer)) != 0) { if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.", sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret)); libusb_error_name(ret));

129
src/hardware/saleae-logic-pro/protocol.c
View File

@ -63,7 +63,7 @@ static void encrypt(const struct sr_dev_inst *sdi, const uint8_t *in, uint8_t *o
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
value = in[i]; value = in[i];
mask = lfsr >> (i%4*8); mask = lfsr >> (i % 4 * 8);
if (i == 0) if (i == 0)
value = (value & 0x28) | ((value ^ mask) & ~0x28); value = (value & 0x28) | ((value ^ mask) & ~0x28);
else else
@ -79,9 +79,8 @@ static void decrypt(const struct sr_dev_inst *sdi, uint8_t *data, uint8_t len)
uint32_t lfsr = devc->lfsr; uint32_t lfsr = devc->lfsr;
int i; int i;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++)
data[i] ^= (lfsr >> (i%4*8)); data[i] ^= (lfsr >> (i % 4 * 8));
}
iterate_lfsr(sdi); iterate_lfsr(sdi);
} }
@ -113,7 +112,7 @@ static int transact(const struct sr_dev_inst *sdi,
return SR_ERR; return SR_ERR;
} }
if (req[0] == 0x20) { // reseed if (req[0] == 0x20) { /* Reseed. */
return SR_OK; return SR_OK;
} else if (rsp_len == 0) { } else if (rsp_len == 0) {
rsp = rsp_dummy; rsp = rsp_dummy;
@ -164,7 +163,7 @@ static int write_regs(const struct sr_dev_inst *sdi, uint8_t (*regs)[2], uint8_t
req[4 + 2 * i] = regs[i][1]; req[4 + 2 * i] = regs[i][1];
} }
return transact(sdi, req, 3 + 2*cnt, NULL, 0); return transact(sdi, req, 3 + (2 * cnt), NULL, 0);
} }
static int write_reg(const struct sr_dev_inst *sdi, static int write_reg(const struct sr_dev_inst *sdi,
@ -193,7 +192,7 @@ static int get_firmware_version(const struct sr_dev_inst *sdi)
static int read_i2c(const struct sr_dev_inst *sdi, uint8_t *data, uint8_t len) static int read_i2c(const struct sr_dev_inst *sdi, uint8_t *data, uint8_t len)
{ {
uint8_t req[5]; uint8_t req[5];
uint8_t rsp[1+128]; uint8_t rsp[1 + 128];
int ret; int ret;
if (len < 1 || len > 128 || !data) if (len < 1 || len > 128 || !data)
@ -201,20 +200,19 @@ static int read_i2c(const struct sr_dev_inst *sdi, uint8_t *data, uint8_t len)
req[0] = 0x00; req[0] = 0x00;
req[1] = COMMAND_READ_I2C; req[1] = COMMAND_READ_I2C;
req[2] = 0xc0; // fixed address req[2] = 0xc0; /* Fixed address */
req[3] = len; req[3] = len;
req[4] = 0; // len msb? req[4] = 0; /* Len MSB? */
ret = transact(sdi, req, sizeof(req), rsp, 1 + len); ret = transact(sdi, req, sizeof(req), rsp, 1 + len);
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
if (rsp[0] != 0x02) { if (rsp[0] != 0x02) {
sr_dbg("Failed to do I2C read (0x%02x).", rsp[0]); sr_dbg("Failed to do I2C read (0x%02x).", rsp[0]);
return SR_ERR; return SR_ERR;
} }
memcpy(data, rsp+1, len); memcpy(data, rsp + 1, len);
return SR_OK; return SR_OK;
} }
@ -229,15 +227,14 @@ static int write_i2c(const struct sr_dev_inst *sdi, const uint8_t *data, uint8_t
req[0] = 0x00; req[0] = 0x00;
req[1] = COMMAND_WRITE_I2C; req[1] = COMMAND_WRITE_I2C;
req[2] = 0xc0; // fixed address req[2] = 0xc0; /* Fixed address */
req[3] = len; req[3] = len;
req[4] = 0; // len msb? req[4] = 0; /* Len MSB? */
memcpy(req + 5, data, len); memcpy(req + 5, data, len);
ret = transact(sdi, req, 5 + len, rsp, sizeof(rsp)); ret = transact(sdi, req, 5 + len, rsp, sizeof(rsp));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
if (rsp[0] != 0x02) { if (rsp[0] != 0x02) {
sr_dbg("Failed to do I2C write (0x%02x).", rsp[0]); sr_dbg("Failed to do I2C write (0x%02x).", rsp[0]);
return SR_ERR; return SR_ERR;
@ -250,13 +247,12 @@ static int wake_i2c(const struct sr_dev_inst *sdi)
{ {
uint8_t req[] = {0x00, COMMAND_WAKE_I2C}; uint8_t req[] = {0x00, COMMAND_WAKE_I2C};
uint8_t rsp[1] = {}; uint8_t rsp[1] = {};
uint8_t i2c_rsp[1+1+2] = {}; uint8_t i2c_rsp[1 + 1 + 2] = {};
int ret; int ret;
ret = transact(sdi, req, sizeof(req), rsp, sizeof(rsp)); ret = transact(sdi, req, sizeof(req), rsp, sizeof(rsp));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
if (rsp[0] != 0x00) { if (rsp[0] != 0x00) {
sr_dbg("Failed to do I2C wake trigger (0x%02x).", rsp[0]); sr_dbg("Failed to do I2C wake trigger (0x%02x).", rsp[0]);
return SR_ERR; return SR_ERR;
@ -277,53 +273,47 @@ static int wake_i2c(const struct sr_dev_inst *sdi)
static int crypto_random(const struct sr_dev_inst *sdi, uint8_t *data) static int crypto_random(const struct sr_dev_inst *sdi, uint8_t *data)
{ {
uint8_t i2c_req[8] = {0x03, 0x07, 0x1b, 0x00, 0x00, 0x00, 0x24, 0xcd}; uint8_t i2c_req[8] = {0x03, 0x07, 0x1b, 0x00, 0x00, 0x00, 0x24, 0xcd};
uint8_t i2c_rsp[1+32+2] = {}; uint8_t i2c_rsp[1 + 32 + 2] = {};
int ret; int ret;
ret = write_i2c(sdi, i2c_req, sizeof(i2c_req)); ret = write_i2c(sdi, i2c_req, sizeof(i2c_req));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
g_usleep(100000); // TODO: poll instead g_usleep(100000); /* TODO: Poll instead. */
ret = read_i2c(sdi, i2c_rsp, sizeof(i2c_rsp)); ret = read_i2c(sdi, i2c_rsp, sizeof(i2c_rsp));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
if (data) { if (data)
memcpy(data, i2c_rsp+1, 32); memcpy(data, i2c_rsp + 1, 32);
}
return SR_OK; return SR_OK;
} }
static int crypto_nonce(const struct sr_dev_inst *sdi, uint8_t *data) static int crypto_nonce(const struct sr_dev_inst *sdi, uint8_t *data)
{ {
uint8_t i2c_req[6+20+2] = {0x03, 0x1b, 0x16, 0x00, 0x00, 0x00}; uint8_t i2c_req[6 + 20 + 2] = {0x03, 0x1b, 0x16, 0x00, 0x00, 0x00};
uint8_t i2c_rsp[1+32+2] = {}; uint8_t i2c_rsp[1 + 32 + 2] = {};
int ret; int ret;
// CRC /* CRC */
i2c_req[26] = 0x7d; i2c_req[26] = 0x7d;
i2c_req[27] = 0xe0; i2c_req[27] = 0xe0;
ret = write_i2c(sdi, i2c_req, sizeof(i2c_req)); ret = write_i2c(sdi, i2c_req, sizeof(i2c_req));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
g_usleep(100000); // TODO: poll instead g_usleep(100000); /* TODO: Poll instead. */
ret = read_i2c(sdi, i2c_rsp, sizeof(i2c_rsp)); ret = read_i2c(sdi, i2c_rsp, sizeof(i2c_rsp));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
if (data) { if (data)
memcpy(data, i2c_rsp+1, 32); memcpy(data, i2c_rsp + 1, 32);
}
return SR_OK; return SR_OK;
} }
@ -331,23 +321,21 @@ static int crypto_nonce(const struct sr_dev_inst *sdi, uint8_t *data)
static int crypto_sign(const struct sr_dev_inst *sdi, uint8_t *data, uint8_t *crc) static int crypto_sign(const struct sr_dev_inst *sdi, uint8_t *data, uint8_t *crc)
{ {
uint8_t i2c_req[8] = {0x03, 0x07, 0x41, 0x80, 0x00, 0x00, 0x28, 0x05}; uint8_t i2c_req[8] = {0x03, 0x07, 0x41, 0x80, 0x00, 0x00, 0x28, 0x05};
uint8_t i2c_rsp[1+64+2] = {}; uint8_t i2c_rsp[1 + 64 + 2] = {};
int ret; int ret;
ret = write_i2c(sdi, i2c_req, sizeof(i2c_req)); ret = write_i2c(sdi, i2c_req, sizeof(i2c_req));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
g_usleep(100000); // TODO: poll instead g_usleep(100000); /* TODO: Poll instead. */
ret = read_i2c(sdi, i2c_rsp, sizeof(i2c_rsp)); ret = read_i2c(sdi, i2c_rsp, sizeof(i2c_rsp));
if (ret != SR_OK) { if (ret != SR_OK)
return ret; return ret;
}
memcpy(data, i2c_rsp+1, 64); memcpy(data, i2c_rsp + 1, 64);
memcpy(crc, i2c_rsp+1+64, 2); memcpy(crc, i2c_rsp + 1 + 64, 2);
return SR_OK; return SR_OK;
} }
@ -389,7 +377,7 @@ static int authenticate(const struct sr_dev_inst *sdi)
lfsr = 0; lfsr = 0;
for (i = 0; i < 28; i++) for (i = 0; i < 28; i++)
lfsr ^= nonce[i] << (8*(i%4)); lfsr ^= nonce[i] << (8 * (i % 4));
lfsr ^= sig_crc[0] | sig_crc[1] << 8; lfsr ^= sig_crc[0] | sig_crc[1] << 8;
sr_dbg("Authenticate 0x%08x -> 0x%08x", devc->lfsr, lfsr); sr_dbg("Authenticate 0x%08x -> 0x%08x", devc->lfsr, lfsr);
@ -431,8 +419,7 @@ static int configure_channels(const struct sr_dev_inst *sdi)
} }
sr_dbg("%d channels enabled (0x%04x)", sr_dbg("%d channels enabled (0x%04x)",
devc->dig_channel_cnt, devc->dig_channel_cnt, devc->dig_channel_mask);
devc->dig_channel_mask);
return SR_OK; return SR_OK;
} }
@ -441,7 +428,7 @@ SR_PRIV int saleae_logic_pro_init(const struct sr_dev_inst *sdi)
{ {
reseed(sdi); reseed(sdi);
get_firmware_version(sdi); get_firmware_version(sdi);
/* setting the LED doesn't work yet */ /* Setting the LED doesn't work yet. */
/* set_led(sdi, 0x00, 0x00, 0xff); */ /* set_led(sdi, 0x00, 0x00, 0xff); */
return SR_OK; return SR_OK;
@ -457,30 +444,30 @@ SR_PRIV int saleae_logic_pro_prepare(const struct sr_dev_inst *sdi)
}; };
uint8_t regs_config[][2] = { uint8_t regs_config[][2] = {
{0x00, 0x00}, {0x00, 0x00},
{0x08, 0x00}, /* analog channel mask (LSB) */ {0x08, 0x00}, /* Analog channel mask (LSB) */
{0x09, 0x00}, /* analog channel mask (MSB) */ {0x09, 0x00}, /* Analog channel mask (MSB) */
{0x06, 0x01}, /* digital channel mask (LSB) */ {0x06, 0x01}, /* Digital channel mask (LSB) */
{0x07, 0x00}, /* digital channel mask (MSB) */ {0x07, 0x00}, /* Digital channel mask (MSB) */
{0x0a, 0x00}, /* analog sample rate? */ {0x0a, 0x00}, /* Analog sample rate? */
{0x0b, 0x64}, /* digital sample rate? */ {0x0b, 0x64}, /* Digital sample rate? */
{0x0c, 0x00}, {0x0c, 0x00},
{0x0d, 0x00}, /* analog mux rate? */ {0x0d, 0x00}, /* Analog mux rate? */
{0x0e, 0x01}, /* digital mux rate? */ {0x0e, 0x01}, /* Digital mux rate? */
{0x12, 0x04}, {0x12, 0x04},
{0x13, 0x00}, {0x13, 0x00},
{0x14, 0xff}, /* pre-divider? */ {0x14, 0xff}, /* Pre-divider? */
}; };
uint8_t start_req[] = {0x00, 0x01}; uint8_t start_req[] = {0x00, 0x01};
uint8_t start_rsp[2] = {}; uint8_t start_rsp[2] = {};
configure_channels(sdi); configure_channels(sdi);
/* digital channel mask and muxing */ /* Digital channel mask and muxing */
regs_config[3][1] = devc->dig_channel_mask; regs_config[3][1] = devc->dig_channel_mask;
regs_config[4][1] = devc->dig_channel_mask >> 8; regs_config[4][1] = devc->dig_channel_mask >> 8;
regs_config[9][1] = devc->dig_channel_cnt; regs_config[9][1] = devc->dig_channel_cnt;
/* samplerate */ /* Samplerate */
switch (devc->dig_samplerate) { switch (devc->dig_samplerate) {
case SR_MHZ(1): case SR_MHZ(1):
regs_config[6][1] = 0x64; regs_config[6][1] = 0x64;
@ -571,9 +558,9 @@ static void saleae_logic_pro_convert_data(const struct sr_dev_inst *sdi,
unsigned int sample_index, batch_index; unsigned int sample_index, batch_index;
uint16_t *dst_batch; uint16_t *dst_batch;
/* copy partial batch to the beginning */ /* Copy partial batch to the beginning. */
memcpy(dst, dst+devc->conv_size, CONV_BATCH_SIZE); memcpy(dst, dst + devc->conv_size, CONV_BATCH_SIZE);
/* reset converted size */ /* Reset converted size. */
devc->conv_size = 0; devc->conv_size = 0;
batch_index = devc->batch_index; batch_index = devc->batch_index;
@ -581,17 +568,17 @@ static void saleae_logic_pro_convert_data(const struct sr_dev_inst *sdi,
samples = *src++; samples = *src++;
dst_batch = (uint16_t*)dst; dst_batch = (uint16_t*)dst;
/* first index of the batch */ /* First index of the batch. */
if (batch_index == 0) if (batch_index == 0)
memset(dst, 0, CONV_BATCH_SIZE); memset(dst, 0, CONV_BATCH_SIZE);
/* convert one channel */ /* Convert one channel. */
channel_mask = devc->dig_channel_masks[batch_index]; channel_mask = devc->dig_channel_masks[batch_index];
for (sample_index = 0; sample_index <= 31; sample_index++) for (sample_index = 0; sample_index <= 31; sample_index++)
if ((samples >> (31-sample_index)) & 1) if ((samples >> (31 - sample_index)) & 1)
dst_batch[sample_index] |= channel_mask; dst_batch[sample_index] |= channel_mask;
/* last index of the batch */ /* Last index of the batch. */
if (++batch_index == devc->dig_channel_cnt) { if (++batch_index == devc->dig_channel_cnt) {
devc->conv_size += CONV_BATCH_SIZE; devc->conv_size += CONV_BATCH_SIZE;
batch_index = 0; batch_index = 0;
@ -615,11 +602,11 @@ SR_PRIV void LIBUSB_CALL saleae_logic_pro_receive_data(struct libusb_transfer *t
case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though. */ case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though. */
break; break;
default: default:
// FIXME /* FIXME */
return; return;
} }
saleae_logic_pro_convert_data(sdi, (uint32_t*)transfer->buffer, 16*1024/4); saleae_logic_pro_convert_data(sdi, (uint32_t*)transfer->buffer, 16 * 1024 / 4);
saleae_logic_pro_send_data(sdi, devc->conv_buffer, devc->conv_size, 2); saleae_logic_pro_send_data(sdi, devc->conv_buffer, devc->conv_size, 2);
if ((ret = libusb_submit_transfer(transfer)) != LIBUSB_SUCCESS) if ((ret = libusb_submit_transfer(transfer)) != LIBUSB_SUCCESS)

11
src/hardware/saleae-logic-pro/protocol.h
View File

@ -28,12 +28,13 @@
#define LOG_PREFIX "saleae-logic-pro" #define LOG_PREFIX "saleae-logic-pro"
/* 16 channels * 32 samples */ /* 16 channels * 32 samples */
#define CONV_BATCH_SIZE (2*32) #define CONV_BATCH_SIZE (2 * 32)
/* one packet + one partial conversion:
* worst case is only one active channel converted to 2 bytes per sample, with /*
* 8*16384 samples per packet * One packet + one partial conversion: Worst case is only one active
* channel converted to 2 bytes per sample, with 8 * 16384 samples per packet.
*/ */
#define CONV_BUFFER_SIZE (2*8*16384 + CONV_BATCH_SIZE) #define CONV_BUFFER_SIZE (2 * 8 * 16384 + CONV_BATCH_SIZE)
/** Private, per-device-instance driver context. */ /** Private, per-device-instance driver context. */
struct dev_context { struct dev_context {