[Commit-gnuradio] r6972 - usrp2/trunk/firmware/apps

[eb]

Author: eb
Date: 2007-11-16 17:21:37 -0700 (Fri, 16 Nov 2007)
New Revision: 6972

Modified:
   usrp2/trunk/firmware/apps/gen_eth_packets.c
Log:
tick at 1kHz, send 1024 byte packets, fixed xor mask

Modified: usrp2/trunk/firmware/apps/gen_eth_packets.c
===================================================================
--- usrp2/trunk/firmware/apps/gen_eth_packets.c 2007-11-16 22:46:10 UTC (rev 
6971)
+++ usrp2/trunk/firmware/apps/gen_eth_packets.c 2007-11-17 00:21:37 UTC (rev 
6972)
@@ -58,13 +58,13 @@
 
 // ----------------------------------------------------------------
 
-#define        PACKET_SIZE 1500                // bytes
-#define ETH_DATA_RATE 1000000          // 1MB/s
-#define        ETH_PACKET_RATE (ETH_DATA_RATE/PACKET_SIZE)     // 13,3333 
pkts/s
+// #define     PACKET_SIZE 1500                // bytes
+// #define ETH_DATA_RATE 1000000               // 1MB/s
+// #define     ETH_PACKET_RATE (ETH_DATA_RATE/PACKET_SIZE)     // 13,3333 
pkts/s
 
-#define TIMER_RATE 100000000           // 100 MHz clock
+// static int timer_delta = MASTER_CLK_RATE/ETH_PACKET_RATE;   // ticks 
between interrupts
 
-static int timer_delta = TIMER_RATE/ETH_PACKET_RATE;   // ticks between 
interrupts
+static int timer_delta = MASTER_CLK_RATE/1000; // tick at 1kHz
 
 static volatile bool send_packet_now = false;   // timer handler sets this
 static volatile bool link_is_up = false;       // eth handler sets this
@@ -159,7 +159,7 @@
 
   for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++){
     buf[i] = mark | i;
-    mark ^= 0x00FF00000;
+    mark ^= 0x00FF0000;
   }
 
   // copy header into buffer
@@ -220,13 +220,13 @@
       // kick off the next packet
       // FIXME set packet number in packet
 
-      bp_send_from_buf(0, PORT_ETH, 1, 0, 15);
+      bp_send_from_buf(0, PORT_ETH, 1, 0, 255);        // 1KB total
 
       while ((buffer_pool_status->status & (BPS_DONE_0|BPS_ERROR_0)) == 0)
        ;
       bp_clear_buf(0);
 
-      output_regs->leds = ((led_counter++) & 0x1) | (link_is_up ? 0x2 : 0x0);
+      output_regs->leds = ((++led_counter) & 0x1) | (link_is_up ? 0x2 : 0x0);
     }
   }