aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/x300
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-06-12 14:41:02 -0700
committerBen Hilburn <ben.hilburn@ettus.com>2014-07-17 18:16:04 -0700
commit208d85167838b0bb90d0938c791c1eae4b788e4d (patch)
tree5f0da4eb6cad249c9b6e332676f1ec234b0ed251 /firmware/x300
parent8f6e2ac9972151318bf6883d45ee099a5013ae1e (diff)
downloaduhd-208d85167838b0bb90d0938c791c1eae4b788e4d.tar.gz
uhd-208d85167838b0bb90d0938c791c1eae4b788e4d.tar.bz2
uhd-208d85167838b0bb90d0938c791c1eae4b788e4d.zip
Addressing comments from review.
- Corrected types of some variables to be boost types. - Removed debugging code accidentally left in. - Changed some compiled out error messages to log messages.
Diffstat (limited to 'firmware/x300')
-rw-r--r--firmware/x300/x300/x300_main.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/firmware/x300/x300/x300_main.c b/firmware/x300/x300/x300_main.c
index 8717bf690..d865e1d09 100644
--- a/firmware/x300/x300/x300_main.c
+++ b/firmware/x300/x300/x300_main.c
@@ -1,4 +1,4 @@
-// Copyright 2013 Ettus Research LLC
+// Copyright 2013-2014 Ettus Research LLC
#include "x300_init.h"
#include "x300_defs.h"
@@ -445,24 +445,17 @@ int main(void)
static const uint32_t tick_delta = CPU_CLOCK/1000;
if (ticks_passed > tick_delta)
{
-// handle_link_state(); //deal with router table update
+ handle_link_state(); //deal with router table update
handle_claim(); //deal with the host claim register
-handle_uarts(); //udp_uart_poll();
update_leds(); //run the link and activity leds
-handle_uarts(); //udp_uart_poll();
garp(); //send periodic garps
-handle_uarts(); //udp_uart_poll();
xge_poll_sfpp_status(0); // Every so often poll XGE Phy to look for SFP+ hotplug events.
-handle_uarts(); //udp_uart_poll();
xge_poll_sfpp_status(1); // Every so often poll XGE Phy to look for SFP+ hotplug events.
-handle_uarts(); //udp_uart_poll();
last_cronjob = wb_peek32(SR_ADDR(RB0_BASE, RB_COUNTER));
}
-//handle_uarts(); //udp_uart_poll();
//run the network stack - poll and handle
u3_net_stack_handle_one();
-handle_uarts(); //udp_uart_poll();
//run the PCIe listener - poll and fwd to wishbone
forward_pcie_user_xact_to_wb();