diff options
| author | Johnathan Corgan | 2009-08-31 12:08:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-08-31 12:08:30 -0700 |
| commit | 7eea883c377f64862a4d83f1b33a83fdf3cfc392 (patch) | |
| tree | 2c4b4d32c28e331cea42b16e001e89a74eb3b3e2 /usrp2/firmware/apps | |
| parent | 1aa216df204197b4849581dd4f42b2e7680eb72f (diff) | |
| download | gnuradio-7eea883c377f64862a4d83f1b33a83fdf3cfc392.tar.gz gnuradio-7eea883c377f64862a4d83f1b33a83fdf3cfc392.tar.bz2 gnuradio-7eea883c377f64862a4d83f1b33a83fdf3cfc392.zip | |
Merged SVN matt/new_eth r10782:11633 into new_eth
* svn diff http://gnuradio.org/svn/branches/developers/matt/new_eth
-r10782:11633
* Patch applied with no conflicts or fuzz.
Diffstat (limited to 'usrp2/firmware/apps')
| -rw-r--r-- | usrp2/firmware/apps/gen_eth_packets.c | 3 | ||||
| -rw-r--r-- | usrp2/firmware/apps/txrx.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usrp2/firmware/apps/gen_eth_packets.c b/usrp2/firmware/apps/gen_eth_packets.c index ce1e8160b..b81f60dac 100644 --- a/usrp2/firmware/apps/gen_eth_packets.c +++ b/usrp2/firmware/apps/gen_eth_packets.c @@ -141,11 +141,12 @@ main(void) ethernet_register_link_changed_callback(link_changed_callback); ethernet_init(); + /* if (hwconfig_simulation_p()){ eth_mac->speed = 4; // hardcode mac speed to 1000 link_is_up = true; } - + */ // fire off a receive from the ethernet bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE); diff --git a/usrp2/firmware/apps/txrx.c b/usrp2/firmware/apps/txrx.c index 730ee66c5..935e62a72 100644 --- a/usrp2/firmware/apps/txrx.c +++ b/usrp2/firmware/apps/txrx.c @@ -257,12 +257,14 @@ main(void) { u2_init(); - putstr("\nTxRx\n"); + putstr("\nTxRx-NEWETH\n"); print_mac_addr(ethernet_mac_addr()->addr); newline(); ethernet_register_link_changed_callback(link_changed_callback); + putstr("Before ethernet_init()\n"); ethernet_init(); + putstr("After ethernet_init()\n"); #if 0 |