diff options
author | Josh Blum <josh@joshknows.com> | 2011-06-17 11:04:11 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-06-17 11:04:11 -0700 |
commit | a852b6011c11e32e000ccd18c2009edfe81500ee (patch) | |
tree | 17f7647a5ed5cb4dc610b50116bd920c3958356d /firmware/zpu/lib | |
parent | a984d9059a9cd405b18815f5e7669fbd0b0fa555 (diff) | |
parent | bc87971891df7f47c8240a24d2a602c6ae63bbc2 (diff) | |
download | uhd-a852b6011c11e32e000ccd18c2009edfe81500ee.tar.gz uhd-a852b6011c11e32e000ccd18c2009edfe81500ee.tar.bz2 uhd-a852b6011c11e32e000ccd18c2009edfe81500ee.zip |
Merge branch 'master' into frontend_work
Conflicts:
host/lib/usrp/usrp_e100/io_impl.cpp
Diffstat (limited to 'firmware/zpu/lib')
-rw-r--r-- | firmware/zpu/lib/udp_fw_update.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/firmware/zpu/lib/udp_fw_update.h b/firmware/zpu/lib/udp_fw_update.h index d25525bd2..d98447aef 100644 --- a/firmware/zpu/lib/udp_fw_update.h +++ b/firmware/zpu/lib/udp_fw_update.h @@ -45,6 +45,9 @@ typedef enum { USRP2_FW_UPDATE_ID_RESET_MAH_COMPUTORZ_LOL = 's', USRP2_FW_UPDATE_ID_RESETTIN_TEH_COMPUTORZ_OMG = 'S', + USRP2_FW_UPDATE_ID_I_CAN_HAS_HW_REV_LOL = 'v', + USRP2_FW_UPDATE_ID_HERES_TEH_HW_REV_OMG = 'V', + USRP2_FW_UPDATE_ID_KTHXBAI = '~' } usrp2_fw_update_id_t; @@ -54,7 +57,8 @@ typedef struct { uint32_t id; uint32_t seq; union { - uint32_t ip_addr; + uint32_t ip_addr; + uint32_t hw_rev; struct { uint32_t flash_addr; uint32_t length; |