diff --git a/sm5/VERSION b/sm5/VERSION
index 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644
--- a/sm5/VERSION
+++ b/sm5/VERSION
@@ -1 +1 @@
-6
+7
diff --git a/sm5/scsicmds.c b/sm5/scsicmds.c
index 8c392fe09f9fd40f85a7f3db4d07ae9b0ce9f182..05bcf8655fa6d9c7a36bbc777fd0bb40623f984f 100644
--- a/sm5/scsicmds.c
+++ b/sm5/scsicmds.c
@@ -32,7 +32,7 @@
 /* #include <scsi/scsi_ioctl.h> bypass for now */
 #include "scsicmds.h"
 
-const char *scsicmds_c_cvsid="$Id: scsicmds.c,v 1.18 2003/01/16 15:28:57 ballen4705 Exp $" SCSICMDS_H_CVSID;
+const char *scsicmds_c_cvsid="$Id: scsicmds.c,v 1.19 2003/02/17 16:03:38 ballen4705 Exp $" SCSICMDS_H_CVSID;
 
 static int send_scsi_cmd(int device, int cmnd_len, void * io_hdr)
 {
@@ -662,7 +662,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 {
 
  char *smartsensetable [] =   {
-	"FAILURE PREDICTION THRESHOLD EXCEEDED",
+   /* 0x00 */	"FAILURE PREDICTION THRESHOLD EXCEEDED",
 	"MEDIA FAILURE PREDICTION THRESHOLD EXCEEDED",
 	"LOGICAL UNIT FAILURE PREDICTION THRESHOLD EXCEEDED",
 	"Unknown Failure",
@@ -678,7 +678,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"HARDWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x10 */	"HARDWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"HARDWARE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"HARDWARE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"HARDWARE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -694,7 +694,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"CONTROLLER IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x20 */	"CONTROLLER IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"CONTROLLER IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"CONTROLLER IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"CONTROLLER IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -710,7 +710,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"DATA CHANNEL IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x30 */	"DATA CHANNEL IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"DATA CHANNEL IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"DATA CHANNEL IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"DATA CHANNEL IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -726,7 +726,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"SERVO IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x40 */	"SERVO IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"SERVO IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"SERVO IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"SERVO IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -742,7 +742,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"SPINDLE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x50 */	"SPINDLE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"SPINDLE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"SPINDLE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"SPINDLE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -758,7 +758,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"FIRMWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x60 */	"FIRMWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"FIRMWARE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"FIRMWARE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"FIRMWARE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -770,7 +770,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"FIRMWARE IMPENDING FAILURE THROUGHPUT PERFORMANCE",
 	"FIRMWARE IMPENDING FAILURE SEEK TIME PERFORMANCE",
 	"FIRMWARE IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"FIRMWARE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT"};
+   /* 0x6c */	"FIRMWARE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT"};
 
 	if ( ascq == 0xff)
 		return "SMART Sense: False Alarm";
diff --git a/sm5/scsicmds.cpp b/sm5/scsicmds.cpp
index bdd389f7936c6ddbf18b691d0b9e97295485a9eb..85eb2b8e7f039e1662fc096b676e27fef6faa951 100644
--- a/sm5/scsicmds.cpp
+++ b/sm5/scsicmds.cpp
@@ -32,7 +32,7 @@
 /* #include <scsi/scsi_ioctl.h> bypass for now */
 #include "scsicmds.h"
 
-const char *scsicmds_c_cvsid="$Id: scsicmds.cpp,v 1.18 2003/01/16 15:28:57 ballen4705 Exp $" SCSICMDS_H_CVSID;
+const char *scsicmds_c_cvsid="$Id: scsicmds.cpp,v 1.19 2003/02/17 16:03:38 ballen4705 Exp $" SCSICMDS_H_CVSID;
 
 static int send_scsi_cmd(int device, int cmnd_len, void * io_hdr)
 {
@@ -662,7 +662,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 {
 
  char *smartsensetable [] =   {
-	"FAILURE PREDICTION THRESHOLD EXCEEDED",
+   /* 0x00 */	"FAILURE PREDICTION THRESHOLD EXCEEDED",
 	"MEDIA FAILURE PREDICTION THRESHOLD EXCEEDED",
 	"LOGICAL UNIT FAILURE PREDICTION THRESHOLD EXCEEDED",
 	"Unknown Failure",
@@ -678,7 +678,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"HARDWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x10 */	"HARDWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"HARDWARE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"HARDWARE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"HARDWARE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -694,7 +694,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"CONTROLLER IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x20 */	"CONTROLLER IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"CONTROLLER IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"CONTROLLER IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"CONTROLLER IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -710,7 +710,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"DATA CHANNEL IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x30 */	"DATA CHANNEL IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"DATA CHANNEL IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"DATA CHANNEL IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"DATA CHANNEL IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -726,7 +726,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"SERVO IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x40 */	"SERVO IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"SERVO IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"SERVO IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"SERVO IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -742,7 +742,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"SPINDLE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x50 */	"SPINDLE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"SPINDLE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"SPINDLE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"SPINDLE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -758,7 +758,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"Unknown Failure",
 	"Unknown Failure",
 	"Unknown Failure",
-	"FIRMWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
+   /* 0x60 */	"FIRMWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
 	"FIRMWARE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
 	"FIRMWARE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
 	"FIRMWARE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
@@ -770,7 +770,7 @@ char* scsiSmartGetSenseCode ( UINT8 ascq)
 	"FIRMWARE IMPENDING FAILURE THROUGHPUT PERFORMANCE",
 	"FIRMWARE IMPENDING FAILURE SEEK TIME PERFORMANCE",
 	"FIRMWARE IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"FIRMWARE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT"};
+   /* 0x6c */	"FIRMWARE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT"};
 
 	if ( ascq == 0xff)
 		return "SMART Sense: False Alarm";