diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-10-08 13:38:55 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-10-08 13:38:55 -0700 |
| commit | 4a6990c5d3019ca6881464f135a315e3ec022b93 (patch) | |
| tree | 801f6d873b527aae8e9162e70994405a6d6428ed | |
| parent | 7db726e9b45b972c8fcb0c1dc366919e11256cc1 (diff) | |
| download | uhd-4a6990c5d3019ca6881464f135a315e3ec022b93.tar.gz uhd-4a6990c5d3019ca6881464f135a315e3ec022b93.tar.bz2 uhd-4a6990c5d3019ca6881464f135a315e3ec022b93.zip | |
USRP2P: Little bit of commonality in the include files. No functional change.
| -rw-r--r-- | firmware/microblaze/usrp2p/bootloader/init_bootloader.c | 6 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/firmware/microblaze/usrp2p/bootloader/init_bootloader.c b/firmware/microblaze/usrp2p/bootloader/init_bootloader.c index e6c808f37..2bbbd405e 100644 --- a/firmware/microblaze/usrp2p/bootloader/init_bootloader.c +++ b/firmware/microblaze/usrp2p/bootloader/init_bootloader.c @@ -18,8 +18,6 @@ #include <i2c.h> #include "usrp2/fw_common.h" -#define SAFE_FLAG_LOCATION 247 - bool find_safe_booted_flag(void); void set_safe_booted_flag(bool flag); @@ -32,13 +30,13 @@ void pic_interrupt_handler() bool find_safe_booted_flag(void) { unsigned char flag_byte; - eeprom_read(USRP2_I2C_ADDR_MBOARD, SAFE_FLAG_LOCATION, &flag_byte, 1); + eeprom_read(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_BOOTLOADER_FLAGS, &flag_byte, 1); return (flag_byte == 0x5E); } void set_safe_booted_flag(bool flag) { unsigned char flag_byte = flag ? 0x5E : 0xDC; - eeprom_write(USRP2_I2C_ADDR_MBOARD, SAFE_FLAG_LOCATION, &flag_byte, 1); + eeprom_write(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_BOOTLOADER_FLAGS, &flag_byte, 1); } diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index 59e223e75..67955c831 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -59,7 +59,6 @@ extern "C" { #define USRP2_EE_MBOARD_REV_MSB 0x01 //1 byte #define USRP2_EE_MBOARD_MAC_ADDR 0x02 //6 bytes #define USRP2_EE_MBOARD_IP_ADDR 0x0C //uint32, big-endian -#define USRP2_EE_MBOARD_SERIAL_NUM 0xF8 #define USRP2_EE_MBOARD_BOOTLOADER_FLAGS 0xF7 typedef enum{ |