[Commit-gnuradio] r10489 - in gnuradio/branches/releases/3.2/usrp2/firmware: apps lib

[jcorgan]

Author: jcorgan
Date: 2009-02-23 15:57:51 -0700 (Mon, 23 Feb 2009)
New Revision: 10489

Modified:
   gnuradio/branches/releases/3.2/usrp2/firmware/apps/app_common_v2.c
   gnuradio/branches/releases/3.2/usrp2/firmware/lib/memory_map.h
Log:
Merged r10454, r10456 from trunk into release 3.2 branch

Modified: gnuradio/branches/releases/3.2/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/firmware/apps/app_common_v2.c  
2009-02-23 22:50:47 UTC (rev 10488)
+++ gnuradio/branches/releases/3.2/usrp2/firmware/apps/app_common_v2.c  
2009-02-23 22:57:51 UTC (rev 10489)
@@ -57,11 +57,10 @@
 static bool
 sync_every_pps(const op_generic_t *p)
 {
-  // FIXME use bit fields or defined masks
   if (p->ok)
-    timesync_regs->tick_control |= 16;
+    timesync_regs->tick_control |= TSC_TRIGGER_EVERYPPS;
   else
-    timesync_regs->tick_control &= ~16;
+    timesync_regs->tick_control &= ~TSC_TRIGGER_EVERYPPS;
 
   return true;
 }

Modified: gnuradio/branches/releases/3.2/usrp2/firmware/lib/memory_map.h
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/firmware/lib/memory_map.h      
2009-02-23 22:50:47 UTC (rev 10488)
+++ gnuradio/branches/releases/3.2/usrp2/firmware/lib/memory_map.h      
2009-02-23 22:57:51 UTC (rev 10489)
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2007,2008 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -625,7 +625,6 @@
 
 ///////////////////////////////////////////////////
 // Time Sync Controller, Slave 12
-
 #define TIMESYNC_BASE  0xE800
 
 typedef struct {
@@ -656,6 +655,15 @@
 
 #define timesync_regs ((timesync_regs_t *) TIMESYNC_BASE)
 
+#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
 //   All regs are 8 bits wide, but are accessed as if they are 32 bits