From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Tue, 17 Feb 2009 17:19:48 +0000 (+0000)
Subject: Use defined bit positions
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=68495fa71f0845671ecd34b9fe69e9573c42456c;p=debian%2Fgnuradio

Use defined bit positions

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10454 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index df943a4e..62e54f9a 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -57,11 +57,10 @@ sync_to_pps(const op_generic_t *p)
 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;
 }
diff --git a/usrp2/firmware/lib/memory_map.h b/usrp2/firmware/lib/memory_map.h
index f4bf4201..f3901978 100644
--- a/usrp2/firmware/lib/memory_map.h
+++ b/usrp2/firmware/lib/memory_map.h
@@ -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 @@ typedef struct {
 
 ///////////////////////////////////////////////////
 // Time Sync Controller, Slave 12
-
 #define TIMESYNC_BASE  0xE800
 
 typedef struct {
@@ -656,6 +655,12 @@ typedef struct {
 
 #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