From 3664f884499f3c6ad06ee440f467b82e496814ba Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Tue, 6 Apr 2021 19:37:19 -0400
Subject: [PATCH] IC:2021-04-06, Fix merge error from #286

Re-add timebase name definition `CFE_PSP_SOFT_TIMEBASE_NAME` to `cfe_psp.h`
---
 fsw/inc/cfe_psp.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h
index 41d428c2..f98acb2b 100644
--- a/fsw/inc/cfe_psp.h
+++ b/fsw/inc/cfe_psp.h
@@ -146,6 +146,13 @@
 #define CFE_PSP_RST_SUBTYPE_MAX 10
 /** \} */
 
+/**
+ * \brief The name of the software/RTOS timebase for general system timers.
+ *
+ * This name may be referred to by CFE TIME and/or SCH when setting up its own timers.
+ */
+#define CFE_PSP_SOFT_TIMEBASE_NAME "cFS-Master"
+
 /*
 ** Type Definitions
 */