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

[matt]

Author: matt
Date: 2008-03-07 12:37:30 -0700 (Fri, 07 Mar 2008)
New Revision: 7956

Modified:
   usrp2/trunk/firmware/apps/app_common.c
   usrp2/trunk/firmware/apps/eth_to_serdes.c
   usrp2/trunk/firmware/apps/serdes_to_dsp.c
   usrp2/trunk/firmware/lib/dbsm.c
Log:
error debugging code, so clock stuff for mimo setup


Modified: usrp2/trunk/firmware/apps/app_common.c
===================================================================
--- usrp2/trunk/firmware/apps/app_common.c      2008-03-07 15:07:07 UTC (rev 
7955)
+++ usrp2/trunk/firmware/apps/app_common.c      2008-03-07 19:37:30 UTC (rev 
7956)
@@ -119,6 +119,7 @@
 bool
 eth_pkt_inspector(dbsm_t *sm, int bufno)
 {
+  static unsigned char exp_seqno = 0;
   u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
   size_t byte_len = (buffer_pool_status->last_line[bufno] - 3) * 4;
 
@@ -139,6 +140,16 @@
 
   case 0:
   default:
+    /*
+    if((pkt->thdr.seqno) == exp_seqno) {
+      exp_seqno++;
+    }
+    else {
+      //putchar('S');
+      printf("S%d %d ",exp_seqno,pkt->thdr.seqno);
+      exp_seqno = pkt->thdr.seqno + 1;
+    }
+    */
     return false;      // pass it on to Tx DSP
     break;
   }

Modified: usrp2/trunk/firmware/apps/eth_to_serdes.c
===================================================================
--- usrp2/trunk/firmware/apps/eth_to_serdes.c   2008-03-07 15:07:07 UTC (rev 
7955)
+++ usrp2/trunk/firmware/apps/eth_to_serdes.c   2008-03-07 19:37:30 UTC (rev 
7956)
@@ -112,6 +112,11 @@
 {
   u2_init();
 
+  // Reg 8, Charge pump on, dig lock det, positive PFD, 47
+  ad9510_write_reg(0x08, 0x47);
+  // turn on ref input and choose the SMA
+  output_regs->clk_ctrl = 0x14; 
+
   // provide a clock for the serdes (THEY_LOCK_TO_ME)
   ad9510_write_reg(0x3E, 0x00); // Turn on output 2 (clk_exp_out), normal 
levels
   ad9510_write_reg(0x4D, 0x00); // Turn on Div2

Modified: usrp2/trunk/firmware/apps/serdes_to_dsp.c
===================================================================
--- usrp2/trunk/firmware/apps/serdes_to_dsp.c   2008-03-07 15:07:07 UTC (rev 
7955)
+++ usrp2/trunk/firmware/apps/serdes_to_dsp.c   2008-03-07 19:37:30 UTC (rev 
7956)
@@ -145,8 +145,11 @@
   ad9510_write_reg(0x08, 0x47);
   ad9510_write_reg(0x5A, 0x01); // Update Regs
   // if (LOCK_TO_MIMO_REF)
+
   // Turn on ref output and choose the MIMO connector
   output_regs->clk_ctrl = 0x15;
+  // Turn on ref output and choose the SMA connector
+  //output_regs->clk_ctrl = 0x14;
 
   // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
   hal_gpio_set_tx_mode(15, 0, GPIOM_FPGA_1);

Modified: usrp2/trunk/firmware/lib/dbsm.c
===================================================================
--- usrp2/trunk/firmware/lib/dbsm.c     2008-03-07 15:07:07 UTC (rev 7955)
+++ usrp2/trunk/firmware/lib/dbsm.c     2008-03-07 19:37:30 UTC (rev 7956)
@@ -156,6 +156,7 @@
     return;
 
   if (status & (BPS_ERROR(sm->buf0) | BPS_ERROR(sm->buf0 ^ 1))){
+    putchar('E');
     // Most likely an ethernet Rx error.  We just restart the transfer.
     if (status & (BPS_ERROR(sm->buf0)))
       dbsm_error_helper(sm, sm->buf0);