[Commit-gnuradio] r7398 - in usrp2/trunk/firmware: apps lib

[eb]

Author: eb
Date: 2008-01-11 00:01:29 -0700 (Fri, 11 Jan 2008)
New Revision: 7398

Modified:
   usrp2/trunk/firmware/apps/gen_eth_packets.c
   usrp2/trunk/firmware/lib/ethernet.c
Log:
mods for simulation

Modified: usrp2/trunk/firmware/apps/gen_eth_packets.c
===================================================================
--- usrp2/trunk/firmware/apps/gen_eth_packets.c 2008-01-11 06:20:02 UTC (rev 
7397)
+++ usrp2/trunk/firmware/apps/gen_eth_packets.c 2008-01-11 07:01:29 UTC (rev 
7398)
@@ -145,9 +145,8 @@
   pkt.fixed.word0 = 0x01234567;
   pkt.fixed.timestamp = 0xffffffff;
 
-  // fill ALL buffers for debugging
-  for (i = 0; i < 8; i++)
-    init_packet((void *)buffer_ram(i), &pkt, i);
+  // init just the one we're using
+  init_packet((void *)buffer_ram(0), &pkt, i);
 }
 
 int

Modified: usrp2/trunk/firmware/lib/ethernet.c
===================================================================
--- usrp2/trunk/firmware/lib/ethernet.c 2008-01-11 06:20:02 UTC (rev 7397)
+++ usrp2/trunk/firmware/lib/ethernet.c 2008-01-11 07:01:29 UTC (rev 7398)
@@ -225,6 +225,11 @@
 {
   if (!src_addr_initialized){    // fetch from eeprom
     src_addr_initialized = true;
+
+    // if we're simulating, don't read the EEPROM model, it's REALLY slow
+    if (hwconfig_simulation_p())       
+      return &src_addr;
+    
     u2_mac_addr_t tmp;
     bool ok = eeprom_read(I2C_ADDR_MBOARD, MBOARD_MAC_ADDR, &tmp.addr[0], 6);
     if (!ok || unprogrammed(&tmp)){