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

[eb]

Author: eb
Date: 2008-01-05 12:03:18 -0700 (Sat, 05 Jan 2008)
New Revision: 7360

Modified:
   usrp2/trunk/firmware/apps/rx_only.c
   usrp2/trunk/firmware/apps/tx_only.c
   usrp2/trunk/firmware/apps/tx_standalone.c
Log:
replace incorrect 255 magic number w/ BP_LAST_LINE

Modified: usrp2/trunk/firmware/apps/rx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/rx_only.c 2008-01-05 18:47:17 UTC (rev 7359)
+++ usrp2/trunk/firmware/apps/rx_only.c 2008-01-05 19:03:18 UTC (rev 7360)
@@ -185,12 +185,6 @@
 {
   uint32_t  status = buffer_pool_status->status;
 
-  if (0){
-    putstr("irq: ");
-    puthex32(status);
-    putchar('\n');
-  }
-
   if (status & BPS_ERROR_ALL){
     // FIXME rare path, handle error conditions
   }
@@ -200,7 +194,7 @@
   if (status & BPS_DONE(CPU_RX_BUF)){  // we've rcvd a frame from ethernet
     bp_clear_buf(CPU_RX_BUF);
     eth_pkt_inspector(0, CPU_RX_BUF);
-    bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, 255);
+    bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
   }
 
   if (status & BPS_DONE(CPU_TX_BUF)){
@@ -244,7 +238,7 @@
 
 
   // setup receive from ETH
-  bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, 255);
+  bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
 
   if (hwconfig_simulation_p()){
     // If we're simulating, pretend that we got a start command from the host

Modified: usrp2/trunk/firmware/apps/tx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_only.c 2008-01-05 18:47:17 UTC (rev 7359)
+++ usrp2/trunk/firmware/apps/tx_only.c 2008-01-05 19:03:18 UTC (rev 7360)
@@ -102,7 +102,7 @@
 buf_cmd_args_t dsp_tx_recv_args = {
   PORT_ETH,
   0,
-  BP_NLINES - 1                // last line
+  BP_LAST_LINE
 };
 
 // send to DSP Tx
@@ -197,7 +197,7 @@
 void
 buffer_irq_handler(unsigned irq)
 {
-  hal_toggle_leds(0x2);
+  //hal_toggle_leds(0x2);
 
   uint32_t  status = buffer_pool_status->status;
 
@@ -205,11 +205,11 @@
     // FIXME rare path, handle error conditions
   }
 
-  dbsm_process_status(&dsp_tx_sm, status);
-
   if (status & BPS_DONE(CPU_TX_BUF)){
     bp_clear_buf(CPU_TX_BUF);
   }
+
+  dbsm_process_status(&dsp_tx_sm, status);
 }
 
 int

Modified: usrp2/trunk/firmware/apps/tx_standalone.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_standalone.c   2008-01-05 18:47:17 UTC (rev 
7359)
+++ usrp2/trunk/firmware/apps/tx_standalone.c   2008-01-05 19:03:18 UTC (rev 
7360)
@@ -65,9 +65,7 @@
  * ================================================================
  */
 
-#define LAST_LINE      255     // last line in buffer
 
-
 // 4 lines of ethernet hdr + 1 line (word0)
 // DSP Rx writes timestamp followed by nlines_per_frame of samples
 #define DSP_RX_FIRST_LINE                5
@@ -78,7 +76,7 @@
 buf_cmd_args_t dsp_rx_recv_args = {
   PORT_DSP,
   DSP_RX_FIRST_LINE,
-  LAST_LINE
+  BP_LAST_LINE
 };
 
 // send to ethernet
@@ -107,7 +105,7 @@
 buf_cmd_args_t dsp_tx_recv_args = {
   PORT_ETH,
   0,
-  LAST_LINE
+  BP_LAST_LINE
 };
 
 // send to DSP Tx
@@ -277,7 +275,7 @@
            dbsm_nop_inspector);
 
   // setup receive from ETH
-  // bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, 255);
+  // bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
 
 #if 0
   if (hwconfig_simulation_p()){