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

[matt]

Author: matt
Date: 2008-03-12 11:57:52 -0600 (Wed, 12 Mar 2008)
New Revision: 7998

Modified:
   usrp2/trunk/firmware/apps/
   usrp2/trunk/firmware/apps/sd_bounce.c
Log:
hopefully this will work



Property changes on: usrp2/trunk/firmware/apps
___________________________________________________________________
Name: svn:ignore
   - *-stamp
*.a
*.bin
*.dump
*.log
*.rom
*.map
.deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
blink_leds
blink_leds2
build
compile
config.h
config.h.in
config.log
config.status
configure
depcomp
eth_test
gen_eth_packets
ibs_rx_test
ibs_tx_test
install-sh
libtool
ltmain.sh
missing
py-compile
rcv_eth_packets
run_tests.sh
stamp-h1
test1
test_phy_comm
timer_test
buf_ram_test
buf_ram_zero
hello
test_printf
test_spi
test_i2c
gen_pause_frames
test_serdes
rx_only
tx_only
tx_standalone
tx_drop
tx_drop2
tx_drop_rate_limited
test_lsdac
test_lsadc
read_dbids
test_db_spi
ramp_lsdac
eth_to_serdes
serdes_to_dsp
sd_gentest

   + *-stamp
*.a
*.bin
*.dump
*.log
*.rom
*.map
.deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
blink_leds
blink_leds2
build
compile
config.h
config.h.in
config.log
config.status
configure
depcomp
eth_test
gen_eth_packets
ibs_rx_test
ibs_tx_test
install-sh
libtool
ltmain.sh
missing
py-compile
rcv_eth_packets
run_tests.sh
stamp-h1
test1
test_phy_comm
timer_test
buf_ram_test
buf_ram_zero
hello
test_printf
test_spi
test_i2c
gen_pause_frames
test_serdes
rx_only
tx_only
tx_standalone
tx_drop
tx_drop2
tx_drop_rate_limited
test_lsdac
test_lsadc
read_dbids
test_db_spi
ramp_lsdac
eth_to_serdes
serdes_to_dsp
sd_gentest
sd_bounce


Modified: usrp2/trunk/firmware/apps/sd_bounce.c
===================================================================
--- usrp2/trunk/firmware/apps/sd_bounce.c       2008-03-12 17:52:38 UTC (rev 
7997)
+++ usrp2/trunk/firmware/apps/sd_bounce.c       2008-03-12 17:57:52 UTC (rev 
7998)
@@ -101,7 +101,7 @@
   hal_gpio_set_tx_mode(15, 0, GPIOM_FPGA_0);
   hal_gpio_set_rx_mode(15, 0, GPIOM_FPGA_0);
 
-  putstr("\nsd_gentest\n");
+  putstr("\nsd_bounce\n");
   
   // Set up serdes
   //output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_RXEN | SERDES_LOOPEN);
@@ -119,8 +119,8 @@
   bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
 
   // fire off the first packet
-  bp_send_from_buf(SERDES_TX_BUF, PORT_SERDES, 1, 0, NLINES_PER_PKT);
-  hal_set_timeout(timer_delta);
+  //bp_send_from_buf(SERDES_TX_BUF, PORT_SERDES, 1, 0, NLINES_PER_PKT);
+  //hal_set_timeout(timer_delta);
 
 
   int counter = 0;
@@ -134,26 +134,33 @@
     uint32_t status = buffer_pool_status->status;
 
     if (status & (BPS_DONE(SERDES_RX_BUF))){
-      bp_clear_buf(SERDES_RX_BUF);
-      got_packet = true;
-
-      hal_toggle_leds(0x2);
-
-      // check packet
-      int last_line = buffer_pool_status->last_line[SERDES_RX_BUF]-1;
-      bool ok = check_packet(buffer_ram(SERDES_RX_BUF), last_line);
+      if(EXPECTING_PKT()) {
+       hal_toggle_leds(0x2);
+       
+       // check packet
+       int last_line = buffer_pool_status->last_line[SERDES_RX_BUF]-1;
+       bool ok = check_packet(buffer_ram(SERDES_RX_BUF), last_line);
       
-      if (ok)
-       putchar('r');
-      else
-       putchar('P');
+       if (ok)
+         putchar('r');
+       else
+         putchar('P');
+       
+       bp_clear_buf(SERDES_RX_BUF);
+       got_packet = true;
 
-      // start a receive from sd
-      zero_buffer(SERDES_RX_BUF);
-      bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
+       bp_send_from_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, last_line);
+       counter++;
+      }
+      else {
+       // start a receive from sd
+       bp_clear_buf(SERDES_RX_BUF);
+       zero_buffer(SERDES_RX_BUF);
+       bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
+       counter++;
+      } 
     }
-
-    if (status & (BPS_ERROR(SERDES_RX_BUF))){
+    else if (status & (BPS_ERROR(SERDES_RX_BUF))){
       bp_clear_buf(SERDES_RX_BUF);
       got_packet = true;
 
@@ -162,20 +169,10 @@
       // start a receive from sd
       zero_buffer(SERDES_RX_BUF);
       bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
+      counter = 0;
     }
 
-    if (status & (BPS_DONE(SERDES_TX_BUF))){
-      bp_clear_buf(SERDES_TX_BUF);
-      putchar('t');
-      hal_toggle_leds(0x1);
-    }
-
-    if (status & BPS_ERROR(SERDES_TX_BUF)){
-      bp_clear_buf(SERDES_TX_BUF);
-      putchar('X');
-    }
-
-#if 1
+#if 0
     int pending = pic_regs->pending;
     if (pending & PIC_TIMER_INT){
       hal_set_timeout(timer_delta);