summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usrp2/firmware/apps/app_common_v2.c4
-rw-r--r--usrp2/firmware/lib/memory_map.h13
2 files changed, 10 insertions, 7 deletions
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index 62e54f9a0..60fa63ee3 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -58,9 +58,9 @@ static bool
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;
}
diff --git a/usrp2/firmware/lib/memory_map.h b/usrp2/firmware/lib/memory_map.h
index f3901978e..fb6fc45d7 100644
--- a/usrp2/firmware/lib/memory_map.h
+++ b/usrp2/firmware/lib/memory_map.h
@@ -655,11 +655,14 @@ 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)
+#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