From d328b599301058a58dd1541edf7dbee690ff3d96 Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Thu, 5 Jan 2017 13:55:20 +0100
Subject: [PATCH] Moved RMC error constants from RmcProxy.hpp to Constants.hpp
---
mediachanger/Constants.hpp | 19 +++++++++++++++++++
mediachanger/RmcProxy.hpp | 19 -------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/mediachanger/Constants.hpp b/mediachanger/Constants.hpp
index 2280fe87f6..616903d306 100644
--- a/mediachanger/Constants.hpp
+++ b/mediachanger/Constants.hpp
@@ -86,6 +86,25 @@ enum MsgType {
#define MSG_DATA 2
#define RMC_RC 3
+/*
+ *------------------------------------------------------------------------
+ * RMC (Remote SCSI media changer server) errors
+ *------------------------------------------------------------------------
+ */
+#define ERMBASEOFF 2200 /* RMC error base offset */
+#define ERMCNACT ERMBASEOFF+1 /* Remote SCSI media changer server not active or service being drained */
+#define ERMCRBTERR (ERMBASEOFF+2) /* Remote SCSI media changer error */
+#define ERMCUNREC ERMCRBTERR+1 /* Remote SCSI media changer unrec. error */
+#define ERMCSLOWR ERMCRBTERR+2 /* Remote SCSI media changer error (slow retry) */
+#define ERMCFASTR ERMCRBTERR+3 /* Remote SCSI media changer error (fast retry) */
+#define ERMCDFORCE ERMCRBTERR+4 /* Remote SCSI media changer error (demount force) */
+#define ERMCDDOWN ERMCRBTERR+5 /* Remote SCSI media changer error (drive down) */
+#define ERMCOMSGN ERMCRBTERR+6 /* Remote SCSI media changer error (ops message) */
+#define ERMCOMSGS ERMCRBTERR+7 /* Remote SCSI media changer error (ops message + retry) */
+#define ERMCOMSGR ERMCRBTERR+8 /* Remote SCSI media changer error (ops message + wait) */
+#define ERMCUNLOAD ERMCRBTERR+9 /* Remote SCSI media changer error (unload + demount) */
+#define ERMMAXERR ERMBASEOFF+11
+
/**
* The default TCP/IP port on which the CASTOR ACS daemon listens for incoming Zmq
* connections from the tape server.
diff --git a/mediachanger/RmcProxy.hpp b/mediachanger/RmcProxy.hpp
index ff7e40bf4b..e0228cd0a4 100644
--- a/mediachanger/RmcProxy.hpp
+++ b/mediachanger/RmcProxy.hpp
@@ -30,25 +30,6 @@
#include <unistd.h>
#include <sys/types.h>
-/*
- *------------------------------------------------------------------------
- * RMC (Remote SCSI media changer server) errors
- *------------------------------------------------------------------------
- */
-#define ERMBASEOFF 2200 /* RMC error base offset */
-#define ERMCNACT ERMBASEOFF+1 /* Remote SCSI media changer server not active or service being drained */
-#define ERMCRBTERR (ERMBASEOFF+2) /* Remote SCSI media changer error */
-#define ERMCUNREC ERMCRBTERR+1 /* Remote SCSI media changer unrec. error */
-#define ERMCSLOWR ERMCRBTERR+2 /* Remote SCSI media changer error (slow retry) */
-#define ERMCFASTR ERMCRBTERR+3 /* Remote SCSI media changer error (fast retry) */
-#define ERMCDFORCE ERMCRBTERR+4 /* Remote SCSI media changer error (demount force) */
-#define ERMCDDOWN ERMCRBTERR+5 /* Remote SCSI media changer error (drive down) */
-#define ERMCOMSGN ERMCRBTERR+6 /* Remote SCSI media changer error (ops message) */
-#define ERMCOMSGS ERMCRBTERR+7 /* Remote SCSI media changer error (ops message + retry) */
-#define ERMCOMSGR ERMCRBTERR+8 /* Remote SCSI media changer error (ops message + wait) */
-#define ERMCUNLOAD ERMCRBTERR+9 /* Remote SCSI media changer error (unload + demount) */
-#define ERMMAXERR ERMBASEOFF+11
-
namespace cta {
namespace mediachanger {
--
GitLab