aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/fx2/b100
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-10-11 18:09:45 -0700
committerJosh Blum <josh@joshknows.com>2011-10-12 10:16:48 -0700
commit1a695f94849644773deda18f84a07ef1a206481b (patch)
tree5fa3699ec69792bf01251fac3ef670a771bed915 /firmware/fx2/b100
parent08b23bf3c6fcd0aaa84be74b4890687491e561bb (diff)
downloaduhd-1a695f94849644773deda18f84a07ef1a206481b.tar.gz
uhd-1a695f94849644773deda18f84a07ef1a206481b.tar.bz2
uhd-1a695f94849644773deda18f84a07ef1a206481b.zip
b100: new eeprom map for special 9 byte serial
Diffstat (limited to 'firmware/fx2/b100')
-rw-r--r--firmware/fx2/b100/usb_descriptors.a513
-rw-r--r--firmware/fx2/b100/usrp_main.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/firmware/fx2/b100/usb_descriptors.a51 b/firmware/fx2/b100/usb_descriptors.a51
index 169aea4fd..5365de840 100644
--- a/firmware/fx2/b100/usb_descriptors.a51
+++ b/firmware/fx2/b100/usb_descriptors.a51
@@ -452,7 +452,8 @@ _usb_desc_serial_number_ascii::
.db '1, 0
.db '5, 0
.db '9, 0
- .db '3, 0
+ .db '2, 0
+ .db '7, 0
str6_end:
SI_FPGA_COMMAND_OUT_PATH = 7
diff --git a/firmware/fx2/b100/usrp_main.c b/firmware/fx2/b100/usrp_main.c
index 7558fadb8..391a6d94f 100644
--- a/firmware/fx2/b100/usrp_main.c
+++ b/firmware/fx2/b100/usrp_main.c
@@ -37,8 +37,8 @@
* offsets into boot eeprom for configuration values
*/
#define HW_REV_OFFSET 5
-#define SERIAL_NO_OFFSET 248
-#define SERIAL_NO_LEN 8
+#define SERIAL_NO_OFFSET 247
+#define SERIAL_NO_LEN 9
#define bRequestType SETUPDAT[0]
@@ -342,7 +342,7 @@ void
patch_usb_descriptors(void)
{
static xdata unsigned char hw_rev;
- static xdata unsigned char serial_no[8];
+ static xdata unsigned char serial_no[SERIAL_NO_LEN];
unsigned char i;
eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1); // LSB of device id