diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-09 18:29:13 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-09 18:29:13 -0700 |
| commit | f6c3178c7ce7b255c3bcf9ade6d9d61b5de79ae1 (patch) | |
| tree | 0635d82780e6870cb0a2fd90640a31349368df9d /firmware | |
| parent | b99c2c0417a453b1d9ed3c9d77989ce32db4fd88 (diff) | |
| download | uhd-f6c3178c7ce7b255c3bcf9ade6d9d61b5de79ae1.tar.gz uhd-f6c3178c7ce7b255c3bcf9ade6d9d61b5de79ae1.tar.bz2 uhd-f6c3178c7ce7b255c3bcf9ade6d9d61b5de79ae1.zip | |
usrp2: added fpga compat number, renamed firmware proto version to compat
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/microblaze/apps/txrx_uhd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c index 092d216aa..f0a9702be 100644 --- a/firmware/microblaze/apps/txrx_uhd.c +++ b/firmware/microblaze/apps/txrx_uhd.c @@ -181,9 +181,9 @@ void handle_udp_ctrl_packet( uint32_t ctrl_data_in_id = ctrl_data_in->id; //ensure that the protocol versions match - if (payload_len >= sizeof(uint32_t) && ctrl_data_in->proto_ver != USRP2_PROTO_VERSION){ - printf("!Error in control packet handler: Expected protocol version %d, but got %d\n", - USRP2_PROTO_VERSION, ctrl_data_in->proto_ver + if (payload_len >= sizeof(uint32_t) && ctrl_data_in->proto_ver != USRP2_FW_COMPAT_NUM){ + printf("!Error in control packet handler: Expected compatibility number %d, but got %d\n", + USRP2_FW_COMPAT_NUM, ctrl_data_in->proto_ver ); ctrl_data_in_id = USRP2_CTRL_ID_WAZZUP_BRO; } @@ -198,7 +198,7 @@ void handle_udp_ctrl_packet( //setup the output data usrp2_ctrl_data_t ctrl_data_out = { - .proto_ver = USRP2_PROTO_VERSION, + .proto_ver = USRP2_FW_COMPAT_NUM, .id=USRP2_CTRL_ID_HUH_WHAT, .seq=ctrl_data_in->seq }; @@ -441,7 +441,8 @@ main(void) print_mac_addr(ethernet_mac_addr()->addr); newline(); print_ip_addr(get_ip_addr()); newline(); - printf("Control protocol version: %d\n", USRP2_PROTO_VERSION); + printf("FPGA compatibility number: %d\n", USRP2_FPGA_COMPAT_NUM); + printf("Firmware compatibility number: %d\n", USRP2_FW_COMPAT_NUM); ethernet_register_link_changed_callback(link_changed_callback); ethernet_init(); |