diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:38:50 -0700 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:38:50 -0700 |
commit | 42547a0be8e52758d340fd1eba51a2dd5274a652 (patch) | |
tree | 5233f8799ff73adab77e17840c7604fb3a1aced7 /host/lib/usrp | |
parent | 00ee9dddb649881c715012c48eed13d001ad5318 (diff) | |
download | uhd-42547a0be8e52758d340fd1eba51a2dd5274a652.tar.gz uhd-42547a0be8e52758d340fd1eba51a2dd5274a652.tar.bz2 uhd-42547a0be8e52758d340fd1eba51a2dd5274a652.zip |
Moved UDP firmware update stuff out of fw_common.h into udp_fw_update.h.
This stuff should only go back into fw_common.h if we decide to integrate firmware update into
the UHD code. Right now it's a separate Python script.
Also moved udp_fw_update.h to lib/ because it's the same between USRP2 and USRP2P.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index 320ed7d77..4d3b62d6b 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -43,7 +43,6 @@ extern "C" { // Dynamic and/or private ports: 49152-65535 #define USRP2_UDP_CTRL_PORT 49152 #define USRP2_UDP_DATA_PORT 49153 -#define USRP2_UDP_UPDATE_PORT 49154 //for firmware upgrade commands //////////////////////////////////////////////////////////////////////// // I2C addresses @@ -94,35 +93,6 @@ typedef enum{ } usrp2_ctrl_id_t; -typedef enum { - USRP2_FW_UPDATE_ID_WAT = ' ', - - USRP2_FW_UPDATE_ID_OHAI_LOL = 'a', - USRP2_FW_UPDATE_ID_OHAI_OMG = 'A', - - USRP2_FW_UPDATE_ID_WATS_TEH_FLASH_INFO_LOL = 'f', - USRP2_FW_UPDATE_ID_HERES_TEH_FLASH_INFO_OMG = 'F', - - USRP2_FW_UPDATE_ID_ERASE_TEH_FLASHES_LOL = 'e', - USRP2_FW_UPDATE_ID_ERASING_TEH_FLASHES_OMG = 'E', - - USRP2_FW_UPDATE_ID_R_U_DONE_ERASING_LOL = 'd', - USRP2_FW_UPDATE_ID_IM_DONE_ERASING_OMG = 'D', - USRP2_FW_UPDATE_ID_NOPE_NOT_DONE_ERASING_OMG = 'B', - - USRP2_FW_UPDATE_ID_WRITE_TEH_FLASHES_LOL = 'w', - USRP2_FW_UPDATE_ID_WROTE_TEH_FLASHES_OMG = 'W', - - USRP2_FW_UPDATE_ID_READ_TEH_FLASHES_LOL = 'r', - USRP2_FW_UPDATE_ID_KK_READ_TEH_FLASHES_OMG = 'R', - - USRP2_FW_UPDATE_ID_RESET_MAH_COMPUTORZ_LOL = 's', - USRP2_FW_UPDATE_ID_RESETTIN_TEH_COMPUTORZ_OMG = 'S', - - USRP2_FW_UPDATE_ID_KTHXBAI = '~' - -} usrp2_fw_update_id_t; - typedef enum{ USRP2_DIR_RX = 'r', USRP2_DIR_TX = 't' @@ -167,24 +137,6 @@ typedef struct{ } data; } usrp2_ctrl_data_t; -typedef struct { - __stdint(uint32_t) proto_ver; - __stdint(uint32_t) id; - __stdint(uint32_t) seq; - union { - __stdint(uint32_t) ip_addr; - struct { - __stdint(uint32_t) flash_addr; - __stdint(uint32_t) length; - __stdint(uint8_t) data[256]; - } flash_args; - struct { - __stdint(uint32_t) sector_size_bytes; - __stdint(uint32_t) memory_size_bytes; - } flash_info_args; - } data; -} udp_fw_update_data_t; - #undef __stdint #ifdef __cplusplus } |