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

[eb]

Author: eb
Date: 2008-08-03 01:18:40 -0600 (Sun, 03 Aug 2008)
New Revision: 9158

Modified:
   usrp2/trunk/firmware/apps/app_common_v2.c
   usrp2/trunk/firmware/apps/app_passthru_v2.c
   usrp2/trunk/firmware/apps/eth_serdes.c
Log:
mimo working in the Tx direction

Modified: usrp2/trunk/firmware/apps/app_common_v2.c
===================================================================
--- usrp2/trunk/firmware/apps/app_common_v2.c   2008-08-03 06:12:20 UTC (rev 
9157)
+++ usrp2/trunk/firmware/apps/app_common_v2.c   2008-08-03 07:18:40 UTC (rev 
9158)
@@ -87,7 +87,7 @@
     hal_set_leds(0x0, 0x8);
   }
 
-  if (1){
+  if (0){
     printf("sending_reply to port %d, len = %d\n", cpu_tx_buf_dest_port, 
reply_len);
     print_buffer(buffer_ram(CPU_TX_BUF), reply_len/4);
   }

Modified: usrp2/trunk/firmware/apps/app_passthru_v2.c
===================================================================
--- usrp2/trunk/firmware/apps/app_passthru_v2.c 2008-08-03 06:12:20 UTC (rev 
9157)
+++ usrp2/trunk/firmware/apps/app_passthru_v2.c 2008-08-03 07:18:40 UTC (rev 
9158)
@@ -166,13 +166,15 @@
 
  end_of_subpackets:
 
-  // add the EOP marker
-  subpktlen = add_eop(reply_payload, reply_payload_space);
-  subpktlen = (subpktlen + 3) & ~3;    // bump to a multiple of 4
-  reply_payload += subpktlen;
-  reply_payload_space -= subpktlen;
+  if (handled_it){
+    // add the EOP marker
+    subpktlen = add_eop(reply_payload, reply_payload_space);
+    subpktlen = (subpktlen + 3) & ~3;  // bump to a multiple of 4
+    reply_payload += subpktlen;
+    reply_payload_space -= subpktlen;
 
-  send_reply(reply, reply_payload - reply);
+    send_reply(reply, reply_payload - reply);
+  }
 
   return handled_it;
 }

Modified: usrp2/trunk/firmware/apps/eth_serdes.c
===================================================================
--- usrp2/trunk/firmware/apps/eth_serdes.c      2008-08-03 06:12:20 UTC (rev 
9157)
+++ usrp2/trunk/firmware/apps/eth_serdes.c      2008-08-03 07:18:40 UTC (rev 
9158)
@@ -125,12 +125,14 @@
 bool 
 fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)      // returns false
 {
+#if 0
   uint32_t *p = buffer_ram(buf_this);
   uint32_t last_line = buffer_pool_status->last_line[buf_this] - 
sm->last_line_adj;
   printf("fw_sets_seqno_inspector: buf_this = %d, last_line = %d\n",
         buf_this, last_line);
 
   print_buffer(p, (last_line + 1));
+#endif
 
 #if 0
   uint32_t *p = buffer_ram(buf_this);
@@ -152,7 +154,7 @@
 {
   uint32_t  status = buffer_pool_status->status;
 
-  if (status & ~BPS_IDLE_ALL){
+  if (0 && (status & ~BPS_IDLE_ALL)){
     putstr("status = ");
     puthex32_nl(status);
   }
@@ -171,7 +173,8 @@
   ethernet_register_link_changed_callback(link_changed_callback);
   ethernet_init();
 
-  clocks_mimo_config(MC_WE_LOCK_TO_SMA | MC_PROVIDE_CLK_TO_MIMO);
+  // clocks_mimo_config(MC_WE_LOCK_TO_SMA | MC_PROVIDE_CLK_TO_MIMO);
+  clocks_mimo_config(MC_WE_DONT_LOCK | MC_PROVIDE_CLK_TO_MIMO);
 
 #if 0
   // make bit 15 of Tx gpio's be a s/w output
@@ -212,8 +215,9 @@
   ac_could_be_sending_to_eth = &dsp_rx_sm;
 
 
-  // kick off the state machine
+  // kick off the state machines
   dbsm_start(&dsp_tx_sm);
+  dbsm_start(&dsp_rx_sm);
 
   //int which = 0;