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

[eb]

Author: eb
Date: 2009-02-17 12:52:12 -0700 (Tue, 17 Feb 2009)
New Revision: 10456

Modified:
   gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
   gnuradio/trunk/usrp2/firmware/lib/memory_map.h
Log:
minor renaming

Modified: gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2009-02-17 17:24:16 UTC 
(rev 10455)
+++ gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2009-02-17 19:52:12 UTC 
(rev 10456)
@@ -58,9 +58,9 @@
 sync_every_pps(const op_generic_t *p)
 {
   if (p->ok)
-    timesync_regs->tick_control |= TSC_EVERYPPS;
+    timesync_regs->tick_control |= TSC_TRIGGER_EVERYPPS;
   else
-    timesync_regs->tick_control &= ~TSC_EVERYPPS;
+    timesync_regs->tick_control &= ~TSC_TRIGGER_EVERYPPS;
 
   return true;
 }

Modified: gnuradio/trunk/usrp2/firmware/lib/memory_map.h
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/memory_map.h      2009-02-17 17:24:16 UTC 
(rev 10455)
+++ gnuradio/trunk/usrp2/firmware/lib/memory_map.h      2009-02-17 19:52:12 UTC 
(rev 10456)
@@ -655,11 +655,14 @@
 
 #define timesync_regs ((timesync_regs_t *) TIMESYNC_BASE)
 
-#define TSC_SOURCE      (1 << 0)
-#define TSC_IENABLE     (1 << 1)
-#define TSC_EXTSYNC     (1 << 2)
-#define TSC_PPSEDGE     (1 << 3)
-#define TSC_EVERYPPS    (1 << 4)
+#define TSC_SOURCE_PPS        (1 << 0)
+//#define TSC_SOURCE_FREE_RUN (0 << 0)
+#define TSC_IENABLE           (1 << 1)
+#define TSC_EXTSYNC           (1 << 2)
+#define TSC_PPSEDGE_POS       (1 << 3)
+//#define TSC_PPSEDGE_NEG     (0 << 3)
+#define TSC_TRIGGER_EVERYPPS  (1 << 4)
+//#define TSC_TRIGGER_ONCE    (0 << 4)
 
 ///////////////////////////////////////////////////
 // SD Card SPI interface, Slave 13