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

[jcorgan]

Author: jcorgan
Date: 2009-02-17 10:19:48 -0700 (Tue, 17 Feb 2009)
New Revision: 10454

Modified:
   gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
   gnuradio/trunk/usrp2/firmware/lib/memory_map.h
Log:
Use defined bit positions

Modified: gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c
===================================================================
--- gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2009-02-17 17:03:56 UTC 
(rev 10453)
+++ gnuradio/trunk/usrp2/firmware/apps/app_common_v2.c  2009-02-17 17:19:48 UTC 
(rev 10454)
@@ -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_EVERYPPS;
   else
-    timesync_regs->tick_control &= ~16;
+    timesync_regs->tick_control &= ~TSC_EVERYPPS;
 
   return true;
 }

Modified: gnuradio/trunk/usrp2/firmware/lib/memory_map.h
===================================================================
--- gnuradio/trunk/usrp2/firmware/lib/memory_map.h      2009-02-17 17:03:56 UTC 
(rev 10453)
+++ gnuradio/trunk/usrp2/firmware/lib/memory_map.h      2009-02-17 17:19:48 UTC 
(rev 10454)
@@ -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,12 @@
 
 #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)
+
 ///////////////////////////////////////////////////
 // SD Card SPI interface, Slave 13
 //   All regs are 8 bits wide, but are accessed as if they are 32 bits