summaryrefslogtreecommitdiffstats
path: root/firmware/microblaze/apps
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-04 19:37:31 -0700
committerJosh Blum <josh@joshknows.com>2010-11-04 19:37:31 -0700
commitd370b4bb3e6ff67027406f71cb6cf7a64d60b016 (patch)
tree884265bd19cfee3526285ac44ac59a7be7488396 /firmware/microblaze/apps
parent4d6caa8a7bf83e6ee78022a109cbc76e075b1ef9 (diff)
parent8a695c06848dfd254d372e661aa00c2c8d6184a1 (diff)
downloaduhd-d370b4bb3e6ff67027406f71cb6cf7a64d60b016.tar.gz
uhd-d370b4bb3e6ff67027406f71cb6cf7a64d60b016.tar.bz2
uhd-d370b4bb3e6ff67027406f71cb6cf7a64d60b016.zip
Merge branch 'garp' into good_stuff
Diffstat (limited to 'firmware/microblaze/apps')
-rw-r--r--firmware/microblaze/apps/txrx_uhd.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c
index 1dd6e80ac..098542bc8 100644
--- a/firmware/microblaze/apps/txrx_uhd.c
+++ b/firmware/microblaze/apps/txrx_uhd.c
@@ -422,6 +422,7 @@ link_changed_callback(int speed)
link_is_up = speed != 0;
hal_set_leds(link_is_up ? LED_RJ45 : 0x0, LED_RJ45);
printf("\neth link changed: speed = %d\n", speed);
+ if (link_is_up) send_gratuitous_arp();
}
static void setup_network(void){
@@ -479,15 +480,18 @@ main(void)
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();
-
+ //1) register the addresses into the network stack
register_mac_addr(ethernet_mac_addr());
register_ip_addr(get_ip_addr());
+ //2) register callbacks for udp ports we service
register_udp_listener(USRP2_UDP_CTRL_PORT, handle_udp_ctrl_packet);
register_udp_listener(USRP2_UDP_DATA_PORT, handle_udp_data_packet);
+ //3) setup ethernet hardware to bring the link up
+ ethernet_register_link_changed_callback(link_changed_callback);
+ ethernet_init();
+
// initialize double buffering state machine for ethernet -> DSP Tx
dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,