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

[eb]

Author: eb
Date: 2007-12-13 23:41:08 -0700 (Thu, 13 Dec 2007)
New Revision: 7168

Modified:
   usrp2/trunk/firmware/apps/rx_only.c
   usrp2/trunk/firmware/lib/dbsm.c
Log:
changed to read length from "last_line" register

Modified: usrp2/trunk/firmware/apps/rx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/rx_only.c 2007-12-14 04:30:40 UTC (rev 7167)
+++ usrp2/trunk/firmware/apps/rx_only.c 2007-12-14 06:41:08 UTC (rev 7168)
@@ -70,7 +70,8 @@
 buf_cmd_args_t dsp_rx_recv_args = {
   PORT_DSP,
   DSP_RX_FIRST_LINE,
-  DSP_RX_FIRST_LINE + DSP_RX_SAMPLES_PER_FRAME + DSP_RX_EXTRA_LINES - 1
+  //DSP_RX_FIRST_LINE + DSP_RX_SAMPLES_PER_FRAME + DSP_RX_EXTRA_LINES - 1
+  255
 };
 
 // send to ETH
@@ -146,7 +147,7 @@
   dsp_rx_regs->clear_state = 1;                // reset
   dsp_rx_regs->freq = 0;
   dsp_rx_regs->scale_iq = (1 << 16) | 1;
-  dsp_rx_regs->decim_rate = 127;       // register gets N - 1
+  dsp_rx_regs->decim_rate = 63;        // register gets N - 1
 
   uint32_t cmd = MK_RX_CMD(10000 * DSP_RX_SAMPLES_PER_FRAME, 
DSP_RX_SAMPLES_PER_FRAME);
   printf("rx_command = "); puthex32_nl(cmd);
@@ -333,8 +334,8 @@
   bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, 255);
 
   // FIXME fake that we got a start command
-  u2_mac_addr_t host = {{ 0x00, 0x0A, 0xE4, 0x3E, 0xD2, 0xD5 }};
-  start_rx_cmd(&host);
+  // u2_mac_addr_t host = {{ 0x00, 0x0A, 0xE4, 0x3E, 0xD2, 0xD5 }};
+  // start_rx_cmd(&host);
 
   while(1){
     // FIXME perhaps handle low-pri stuff here

Modified: usrp2/trunk/firmware/lib/dbsm.c
===================================================================
--- usrp2/trunk/firmware/lib/dbsm.c     2007-12-14 04:30:40 UTC (rev 7167)
+++ usrp2/trunk/firmware/lib/dbsm.c     2007-12-14 06:41:08 UTC (rev 7168)
@@ -111,7 +111,8 @@
       if (sm->tx_idle){
        sm->tx_idle = false;
        bp_send_from_buf(buf_this, sm->send_args.port, 1,
-                        sm->send_args.first_line, sm->send_args.last_line);
+                        sm->send_args.first_line,
+                        buffer_pool_status->last_line[buf_this] - 1);
        buffer_state[buf_this] = BS_EMPTYING;
       }
     }
@@ -125,7 +126,8 @@
       }
       if (buffer_state[buf_other] == BS_FULL){
        bp_send_from_buf(buf_other, sm->send_args.port, 1,
-                        sm->send_args.first_line, sm->send_args.last_line);
+                        sm->send_args.first_line,
+                        buffer_pool_status->last_line[buf_other] - 1);
        buffer_state[buf_other] = BS_EMPTYING;
       }
       else