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

saleae-logic16: Recognize FPGA FIFO overflow status

This commit is contained in:
Marcus Comstedt 2014-08-17 14:20:01 +02:00
parent 0e1a7fe91a
commit 7754fb4d93
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hardware/saleae-logic16/protocol.c
View File

@ -464,6 +464,9 @@ SR_PRIV int logic16_setup_acquisition(const struct sr_dev_inst *sdi,
if ((ret = read_fpga_register(sdi, 1, &reg1)) != SR_OK) if ((ret = read_fpga_register(sdi, 1, &reg1)) != SR_OK)
return ret; return ret;
/* Ignore FIFO overflow on previous capture */
reg1 &= ~0x20;
if (reg1 != 0x08) { if (reg1 != 0x08) {
sr_dbg("Invalid state at acquisition setup: 0x%02x != 0x08.", reg1); sr_dbg("Invalid state at acquisition setup: 0x%02x != 0x08.", reg1);
return SR_ERR; return SR_ERR;
@ -540,8 +543,8 @@ SR_PRIV int logic16_abort_acquisition(const struct sr_dev_inst *sdi)
if ((ret = read_fpga_register(sdi, 1, &reg1)) != SR_OK) if ((ret = read_fpga_register(sdi, 1, &reg1)) != SR_OK)
return ret; return ret;
if (reg1 != 0x08) { if ((reg1 & ~0x20) != 0x08) {
sr_dbg("Invalid state at acquisition stop: 0x%02x != 0x08.", reg1); sr_dbg("Invalid state at acquisition stop: 0x%02x != 0x08.", reg1 & ~0x20);
return SR_ERR; return SR_ERR;
} }
@ -551,6 +554,11 @@ SR_PRIV int logic16_abort_acquisition(const struct sr_dev_inst *sdi)
if ((ret = read_fpga_register(sdi, 9, &reg9)) != SR_OK) if ((ret = read_fpga_register(sdi, 9, &reg9)) != SR_OK)
return ret; return ret;
if (reg1 & 0x20) {
sr_warn("FIFO overflow, capture data may be truncated.");
return SR_ERR;
}
return SR_OK; return SR_OK;
} }