[Commit-gnuradio] r10765 - in gnuradio/branches/developers/jcorgan/gpio2/usrp2: firmware/apps fpga/sdr_lib

[jcorgan]

Author: jcorgan
Date: 2009-04-03 23:23:22 -0600 (Fri, 03 Apr 2009)
New Revision: 10765

Modified:
   
gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/apps/app_common_v2.c
   gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v
Log:
Cleanup

Modified: 
gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- 
gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/apps/app_common_v2.c  
    2009-04-04 02:48:37 UTC (rev 10764)
+++ 
gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/apps/app_common_v2.c  
    2009-04-04 05:23:22 UTC (rev 10765)
@@ -555,7 +555,6 @@
 
     case OP_GPIO_STREAM:
       ok = true;
-      printf("OP_GPIO_STREAM: value=%d\n", ((op_gpio_t *)payload)->value);
       dsp_rx_regs->gpio_stream_enable = (uint32_t)((op_gpio_t 
*)payload)->value;
       goto generic_reply;
 

Modified: 
gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v
===================================================================
--- gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v 
2009-04-04 02:48:37 UTC (rev 10764)
+++ gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v 
2009-04-04 05:23:22 UTC (rev 10765)
@@ -162,20 +162,17 @@
    //
    // io_rx[15] => I channel LSB if gpio_ena[0] high
    // io_rx[14] => Q channel LSB if gpio_ena[1] high
-   reg [14:0] i_out_d1, q_out_d1;
-   reg               i_lsb, q_lsb;
-   
+
+   reg [31:0] sample_reg;
    always @(posedge clk)
      begin
-
-       i_out_d1 <= i_out[15:1];
-       i_lsb    <= gpio_ena[0] ? io_rx[15] : i_out[0];
-       q_out_d1 <= q_out[15:1];
-       q_lsb    <= gpio_ena[1] ? io_rx[14] : q_out[0];
-
+       sample_reg[31:17] <= i_out[15:1];
+       sample_reg[15:1]  <= q_out[15:1];
+       sample_reg[16]    <= gpio_ena[0] ? io_rx[15] : i_out[0]; 
+       sample_reg[0]     <= gpio_ena[1] ? io_rx[14] : q_out[0];
      end
    
-   assign      sample = {i_out_d1,i_lsb,q_out_d1,q_lsb};
+   assign      sample = sample_reg;
    assign      strobe = strobe_hb2;
    assign      debug = {enable_hb1, enable_hb2, run, strobe, strobe_cic, 
strobe_cic_d1, strobe_hb1, strobe_hb2};