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

sr: fx2lafw: Only check for correct major FW version. 

Changes in the minor version number are OK, as those should never
contain any incompatible/API changes.
This commit is contained in:
Uwe Hermann 2012-05-30 23:15:23 +02:00
parent 8fdecced96
commit 0a8c0c324e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hardware/fx2lafw/fx2lafw.c
View File

@ -251,11 +251,15 @@ static int fx2lafw_dev_open(int dev_index)
break; break;
} }
if (vi.major != FX2LAFW_VERSION_MAJOR || /*
vi.minor != FX2LAFW_VERSION_MINOR) { * Changes in major version mean incompatible/API changes, so
sr_err("fx2lafw: Expected firmware version %d.%d " * bail out if we encounter an incompatible version.
"got %d.%d.", FX2LAFW_VERSION_MAJOR, * Different minor versions are OK, they should be compatible.
FX2LAFW_VERSION_MINOR, vi.major, vi.minor); */
if (vi.major != FX2LAFW_REQUIRED_VERSION_MAJOR) {
sr_err("fx2lafw: Expected firmware version %d.x, "
"got %d.%d.", FX2LAFW_REQUIRED_VERSION_MAJOR,
vi.major, vi.minor);
break; break;
} }

3
hardware/fx2lafw/fx2lafw.h
View File

@ -31,8 +31,7 @@
#define NUM_SIMUL_TRANSFERS 32 #define NUM_SIMUL_TRANSFERS 32
#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2) #define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)
#define FX2LAFW_VERSION_MAJOR 1 #define FX2LAFW_REQUIRED_VERSION_MAJOR 1
#define FX2LAFW_VERSION_MINOR 0
/* 6 delay states of up to 256 clock ticks */ /* 6 delay states of up to 256 clock ticks */
#define MAX_SAMPLE_DELAY (6 * 256) #define MAX_SAMPLE_DELAY (6 * 256)