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

[eb]

Author: eb
Date: 2008-07-30 19:21:47 -0600 (Wed, 30 Jul 2008)
New Revision: 9069

Modified:
   usrp2/trunk/firmware/apps/txrx.c
   usrp2/trunk/firmware/lib/hal_io.c
Log:
Tx gpio bit 15 for f/w timing measurement

Modified: usrp2/trunk/firmware/apps/txrx.c
===================================================================
--- usrp2/trunk/firmware/apps/txrx.c    2008-07-31 00:56:44 UTC (rev 9068)
+++ usrp2/trunk/firmware/apps/txrx.c    2008-07-31 01:21:47 UTC (rev 9069)
@@ -260,6 +260,12 @@
   ethernet_register_link_changed_callback(link_changed_callback);
   ethernet_init();
 
+
+  // make bit 15 of Tx gpio's be a s/w output
+  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
+  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
+
+
   // initialize double buffering state machine for ethernet -> DSP Tx
 
   dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
@@ -290,7 +296,12 @@
   // kick off the state machine
   dbsm_start(&dsp_tx_sm);
 
+  int which = 0;
+
   while(1){
+    hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
+    which ^= 0x8000;
+
     buffer_irq_handler(0);
 
     int pending = pic_regs->pending;           // poll for under or overrun

Modified: usrp2/trunk/firmware/lib/hal_io.c
===================================================================
--- usrp2/trunk/firmware/lib/hal_io.c   2008-07-31 00:56:44 UTC (rev 9068)
+++ usrp2/trunk/firmware/lib/hal_io.c   2008-07-31 01:21:47 UTC (rev 9069)
@@ -132,10 +132,10 @@
     mask &= 0xffff;
   }
 
-  int ei = hal_disable_ints();
+  //int ei = hal_disable_ints();
   _gpio_io_shadow = (_gpio_io_shadow & ~mask) | (value & mask);
   gpio_base->io = _gpio_io_shadow;
-  hal_restore_ints(ei);
+  //hal_restore_ints(ei);
 }