From 0f3f74dbafbbdcbe34c2ee09c24d4feb4097042f Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@bessy.de>
Date: Mon, 12 Jan 2004 11:29:02 +0000
Subject: [PATCH] Cleaned up alarm status and severity string representation,
 alarmString.h is deprecated now.

---
 src/dbStatic/alarm.h       | 53 +++++++++++++++++++-------------------
 src/dbStatic/alarmString.h |  8 ++++++
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/dbStatic/alarm.h b/src/dbStatic/alarm.h
index 620ea13ec..5ed2e5b0f 100644
--- a/src/dbStatic/alarm.h
+++ b/src/dbStatic/alarm.h
@@ -47,10 +47,10 @@ typedef enum {
 
 #ifdef epicsAlarmGLOBAL
 READONLY char *epicsAlarmSeverityStrings [lastEpicsAlarmSev+1] = {
-		stringOf (epicsSevNone),
-		stringOf (epicsSevMinor),
-		stringOf (epicsSevMajor),
-		stringOf (epicsSevInvalid),
+	"NO_ALARM",
+	"MINOR",
+	"MAJOR",
+	"INVALID",
 };
 #else /*epicsAlarmGLOBAL*/
 epicsShareExtern READONLY char *epicsAlarmSeverityStrings [lastEpicsAlarmSev+1];
@@ -117,28 +117,28 @@ typedef enum {
 
 #ifdef epicsAlarmGLOBAL
 READONLY char *epicsAlarmConditionStrings [lastEpicsAlarmCond+1] = {
-		stringOf (epicsAlarmNone),
-		stringOf (epicsAlarmRead),
-		stringOf (epicsAlarmWrite),
-		stringOf (epicsAlarmHiHi),
-		stringOf (epicsAlarmHigh),
-		stringOf (epicsAlarmLoLo),
-		stringOf (epicsAlarmLow),
-		stringOf (epicsAlarmState),
-		stringOf (epicsAlarmCos),
-		stringOf (epicsAlarmComm),
-		stringOf (epicsAlarmTimeout),
-		stringOf (epicsAlarmHwLimit),
-		stringOf (epicsAlarmCalc),
-		stringOf (epicsAlarmScan),
-		stringOf (epicsAlarmLink),
-		stringOf (epicsAlarmSoft),
-		stringOf (epicsAlarmBadSub),
-		stringOf (epicsAlarmUDF),
-		stringOf (epicsAlarmDisable),
-		stringOf (epicsAlarmSimm),
-		stringOf (epicsAlarmReadAccess),
-		stringOf (epicsAlarmWriteAccess),
+	"NO_ALARM",
+	"READ",
+	"WRITE",
+	"HIHI",
+	"HIGH",
+	"LOLO",
+	"LOW",
+	"STATE",
+	"COS",
+	"COMM",
+	"TIMEOUT",
+	"HWLIMIT",
+	"CALC",
+	"SCAN",
+	"LINK",
+	"SOFT",
+	"BAD_SUB",
+	"UDF",
+	"DISABLE",
+	"SIMM",
+	"READ_ACCESS",
+	"WRITE_ACCESS",
 };
 #else /*epicsAlarmGLOBAL*/
 epicsShareExtern READONLY char *epicsAlarmConditionStrings [lastEpicsAlarmCond+1];
@@ -151,4 +151,3 @@ epicsShareExtern READONLY char *epicsAlarmConditionStrings [lastEpicsAlarmCond+1
 #endif
 
 #endif /* INCalarmh */
-
diff --git a/src/dbStatic/alarmString.h b/src/dbStatic/alarmString.h
index 962c8e17d..b5f63c138 100644
--- a/src/dbStatic/alarmString.h
+++ b/src/dbStatic/alarmString.h
@@ -11,6 +11,14 @@
 
 /* alarmString.h - String values for alarms (Must match alarm.h)!!!!*/
 /* share/epicsH @(#)alarmString.h	1.3     11/6/90 */
+
+/* As of January 2004 (EPICS Base 3.14.5), the use of this file is
+ *
+ *                      D E P R E C A T E D
+ *
+ *         Please use the definitions in alarm.h instead.           */
+
+
 #ifndef INCalarmStringh
 #define INCalarmStringh 1