[Commit-gnuradio] r7208 - in usrp2/trunk/firmware: . apps

[eb]

Author: eb
Date: 2007-12-16 19:12:03 -0700 (Sun, 16 Dec 2007)
New Revision: 7208

Modified:
   usrp2/trunk/firmware/Makefile.common
   usrp2/trunk/firmware/apps/rx_only.c
Log:
turned uart output back on

Modified: usrp2/trunk/firmware/Makefile.common
===================================================================
--- usrp2/trunk/firmware/Makefile.common        2007-12-17 01:35:41 UTC (rev 
7207)
+++ usrp2/trunk/firmware/Makefile.common        2007-12-17 02:12:03 UTC (rev 
7208)
@@ -19,7 +19,7 @@
 STD_INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 #HAL_IO = -DHAL_IO_USES_DBOARD_PINS 
-#HAL_IO = -DHAL_IO_USES_UART 
+HAL_IO = -DHAL_IO_USES_UART 
 
 AM_CPPFLAGS = $(HAL_IO) $(STD_INCLUDES)
 

Modified: usrp2/trunk/firmware/apps/rx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/rx_only.c 2007-12-17 01:35:41 UTC (rev 7207)
+++ usrp2/trunk/firmware/apps/rx_only.c 2007-12-17 02:12:03 UTC (rev 7208)
@@ -66,7 +66,7 @@
 // 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
-#define DSP_RX_SAMPLES_PER_FRAME       119
+#define DSP_RX_SAMPLES_PER_FRAME       250
 #define        DSP_RX_EXTRA_LINES                1     // writes timestamp
 
 // receive from DSP
@@ -161,7 +161,7 @@
   dsp_rx_regs->scale_iq = (1 << 16) | 1;
   dsp_rx_regs->decim_rate = 63;        // register gets N - 1
 
-  uint32_t cmd = MK_RX_CMD(10000 * DSP_RX_SAMPLES_PER_FRAME + 2, 
DSP_RX_SAMPLES_PER_FRAME);
+  uint32_t cmd = MK_RX_CMD(10000 * DSP_RX_SAMPLES_PER_FRAME, 
DSP_RX_SAMPLES_PER_FRAME);
   // printf("rx_command = "); puthex32_nl(cmd);
   dsp_rx_regs->rx_command = cmd;