Added SCSI qualifier to the appropriate RMC message constants

The current rmcd daemon only does SCSI compatible actions.  The future
rmcd daemon will be able to do both SCSI compatible and ACS
compatible actions.  I have therefore added the SCSI qualifier to the
"old" rmcd message constants to differentiate them from the ACS
message constants.

mediachanger/castorrmc/h/rmc_constants.h

@@ -32,15 +32,15 @@
 
 			/* Request types */
 
-#define	RMC_GETGEOM     1 /* Get robot geometry */
-#define	RMC_FINDCART    2 /* Find cartridge(s) */
-#define RMC_READELEM    3 /* Read element status */
-#define	RMC_MOUNT       4 /* Mount request */
-#define	RMC_UNMOUNT     5 /* Unmount request */
-#define	RMC_EXPORT      6 /* Export tape request */
-#define	RMC_IMPORT      7 /* Import tape request */
-#define	RMC_ACS_MOUNT   8 /* ACS mount request */
-#define	RMC_ACS_UNMOUNT 9 /* ACS unmount request */
+#define	RMC_SCSI_GETGEOM  1 /* Get robot geometry */
+#define	RMC_SCSI_FINDCART 2 /* Find cartridge(s) */
+#define RMC_SCSI_READELEM 3 /* Read element status */
+#define	RMC_SCSI_MOUNT    4 /* Mount request */
+#define	RMC_SCSI_UNMOUNT  5 /* Unmount request */
+#define	RMC_SCSI_EXPORT   6 /* Export tape request */
+#define	RMC_SCSI_IMPORT   7 /* Import tape request */
+#define	RMC_ACS_MOUNT     8 /* ACS mount request */
+#define	RMC_ACS_UNMOUNT   9 /* ACS unmount request */
 
 			/* SCSI media changer server reply types */
 

mediachanger/castorrmc/rmc/rmc_dismount.c

@@ -35,7 +35,7 @@ int rmc_dismount(
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_UNMOUNT);
+	marshall_LONG (sbp, RMC_SCSI_UNMOUNT);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_export.c

@@ -30,7 +30,7 @@ int rmc_export(const char *const server, const char *const vid)
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_EXPORT);
+	marshall_LONG (sbp, RMC_SCSI_EXPORT);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_find_cartridge.c

@@ -40,7 +40,7 @@ int rmc_find_cartridge(
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_FINDCART);
+	marshall_LONG (sbp, RMC_SCSI_FINDCART);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_get_geometry.c

@@ -34,7 +34,7 @@ int rmc_get_geometry(
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_GETGEOM);
+	marshall_LONG (sbp, RMC_SCSI_GETGEOM);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_import.c

@@ -31,7 +31,7 @@ int rmc_import(const char *const server, const char *const vid)
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_IMPORT);
+	marshall_LONG (sbp, RMC_SCSI_IMPORT);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_mount.c

@@ -35,7 +35,7 @@ int rmc_mount(
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_MOUNT);
+	marshall_LONG (sbp, RMC_SCSI_MOUNT);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_read_elem_status.c

@@ -39,7 +39,7 @@ int rmc_read_elem_status(
 
 	sbp = sendbuf;
 	marshall_LONG (sbp, RMC_MAGIC);
-	marshall_LONG (sbp, RMC_READELEM);
+	marshall_LONG (sbp, RMC_SCSI_READELEM);
 	q = sbp;	/* save pointer. The next field will be updated */
 	msglen = 3 * LONGSIZE;
 	marshall_LONG (sbp, msglen);

mediachanger/castorrmc/rmc/rmc_serv.c

@@ -361,25 +361,25 @@ static void procreq(
 	rqst_context.clienthost = clienthost;
 
 	switch (req_type) {
-	case RMC_MOUNT:
+	case RMC_SCSI_MOUNT:
 		c = rmc_srv_mount (&rqst_context);
 		break;
-	case RMC_UNMOUNT:
+	case RMC_SCSI_UNMOUNT:
 		c = rmc_srv_unmount (&rqst_context);
 		break;
-	case RMC_EXPORT:
+	case RMC_SCSI_EXPORT:
 		c = rmc_srv_export (&rqst_context);
 		break;
-	case RMC_IMPORT:
+	case RMC_SCSI_IMPORT:
 		c = rmc_srv_import (&rqst_context);
 		break;
-	case RMC_GETGEOM:
+	case RMC_SCSI_GETGEOM:
 		c = rmc_srv_getgeom (&rqst_context);
 		break;
-	case RMC_READELEM:
+	case RMC_SCSI_READELEM:
 		c = rmc_srv_readelem (&rqst_context);
 		break;
-	case RMC_FINDCART:
+	case RMC_SCSI_FINDCART:
 		c = rmc_srv_findcart (&rqst_context);
 		break;
 	case RMC_ACS_MOUNT: