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

[eb]

Author: eb
Date: 2008-01-10 10:58:36 -0700 (Thu, 10 Jan 2008)
New Revision: 7394

Modified:
   usrp2/trunk/firmware/apps/rx_only.c
   usrp2/trunk/firmware/apps/tx_only.c
   usrp2/trunk/firmware/lib/dbsm.c
Log:
Hoisted test for BPS_DONE out of dbsm_process_helper into
dbs_process_status.  Using rx_samples we can now run

{{{
  sudo apps/rx_samples -e eth1 -d 4 -F 169
}}}

w/out overruns.  Previous best was -F 190.


Modified: usrp2/trunk/firmware/apps/rx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/rx_only.c 2008-01-10 17:46:55 UTC (rev 7393)
+++ usrp2/trunk/firmware/apps/rx_only.c 2008-01-10 17:58:36 UTC (rev 7394)
@@ -186,11 +186,11 @@
     bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
   }
 
+  dbsm_process_status(&dsp_rx_sm, status);
+
   if (status & BPS_DONE(CPU_TX_BUF)){
     bp_clear_buf(CPU_TX_BUF);
   }
-
-  dbsm_process_status(&dsp_rx_sm, status);
 }
 
 int

Modified: usrp2/trunk/firmware/apps/tx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_only.c 2008-01-10 17:46:55 UTC (rev 7393)
+++ usrp2/trunk/firmware/apps/tx_only.c 2008-01-10 17:58:36 UTC (rev 7394)
@@ -208,11 +208,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/lib/dbsm.c
===================================================================
--- usrp2/trunk/firmware/lib/dbsm.c     2008-01-10 17:46:55 UTC (rev 7393)
+++ usrp2/trunk/firmware/lib/dbsm.c     2008-01-10 17:58:36 UTC (rev 7394)
@@ -142,7 +142,7 @@
   buffer_state[sm->buf0 ^ 1] = BS_EMPTY;
 }
 
-static void dbsm_process_helper(dbsm_t *sm, uint32_t status, int buf_this);
+static void dbsm_process_helper(dbsm_t *sm, int buf_this);
 
 void
 dbsm_process_status(dbsm_t *sm, uint32_t status)
@@ -150,16 +150,19 @@
   if (!sm->running)
     return;
 
-  dbsm_process_helper(sm, status, sm->buf0);
-  dbsm_process_helper(sm, status, sm->buf0 ^ 1);
+  if (status & BPS_DONE(sm->buf0))
+    dbsm_process_helper(sm, sm->buf0);
+
+  if (status & BPS_DONE(sm->buf0 ^ 1))
+    dbsm_process_helper(sm, sm->buf0 ^ 1);
 }
 
 static void
-dbsm_process_helper(dbsm_t *sm, uint32_t status, int buf_this)
+dbsm_process_helper(dbsm_t *sm, int buf_this)
 {
   int buf_other = buf_this ^ 1;
 
-  if (status & BPS_DONE(buf_this)){
+  if (1){
     bp_clear_buf(buf_this);
 
     if (buffer_state[buf_this] == BS_FILLING){