Changeset 582fe388 in mainline

Timestamp:

2011-07-24T16:48:33Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

de3432b

Parents:

45cae6b

Message:

Display sense key in string form.

Location:

uspace

Files:

• drv/bus/usb/usbmast/scsi_ms.c (modified) (1 diff)
• lib/scsi/include/scsi/spc.h (modified) (1 diff)
• lib/scsi/src/spc.c (modified) (2 diffs)

uspace/drv/bus/usb/usbmast/scsi_ms.c

@@ -64 +64 @@
 {
         scsi_sense_data_t sense_buf;
+        unsigned sense_key;
         int rc;
 
         rc = usbmast_request_sense(mfun, &sense_buf, sizeof(sense_buf));
         if (rc == EOK) {
-                printf("Got sense data (sense_key=0x%x, asc=0x%02x, "
-                    "ascq=0x%02x.\n", sense_buf.flags_key & 0x0f,
+                sense_key = sense_buf.flags_key & 0x0f;
+                printf("Got sense data. Sense key: 0x%x (%s), ASC 0x%02x, "
+                    "ASCQ 0x%02x.\n", sense_key,
+                    scsi_get_sense_key_str(sense_key),
                     sense_buf.additional_code,
                     sense_buf.additional_cqual);

uspace/lib/scsi/include/scsi/spc.h

@@ -205 +205 @@
         SCSI_SK_ABORTED_COMMAND = 0xb,
         SCSI_SK_VOLUME_OVERFLOW = 0xd,
-        SCSI_SK_MISCOMPARE      = 0xe
+        SCSI_SK_MISCOMPARE      = 0xe,
+
+        SCSI_SK_LIMIT           = 0x10
 };
 
 extern const char *scsi_dev_type_str[SCSI_DEV_LIMIT];
+extern const char *scsi_sense_key_str[SCSI_SK_LIMIT];
+
 extern const char *scsi_get_dev_type_str(unsigned);
+extern const char *scsi_get_sense_key_str(unsigned);
 
 #endif

uspace/lib/scsi/src/spc.c

@@ -44 +44 @@
 };
 
+const char *scsi_sense_key_str[SCSI_SK_LIMIT] = {
+        [SCSI_SK_NO_SENSE]              = "No Sense",
+        [SCSI_SK_RECOVERED_ERROR]       = "Recovered Error",
+        [SCSI_SK_NOT_READY]             = "Not Ready",
+        [SCSI_SK_MEDIUM_ERROR]          = "Medium Error",
+        [SCSI_SK_HARDWARE_ERROR]        = "Hardware Error",
+        [SCSI_SK_ILLEGAL_REQUEST]       = "Illegal Request",
+        [SCSI_SK_UNIT_ATTENTION]        = "Unit Attention",
+        [SCSI_SK_DATA_PROTECT]          = "Data Protect",
+        [SCSI_SK_BLANK_CHECK]           = "Blank Check",
+        [SCSI_SK_VENDOR_SPECIFIC]       = "Vendor-specific",
+        [SCSI_SK_COPY_ABORTED]          = "Copy Aborted",
+        [SCSI_SK_ABORTED_COMMAND]       = "Aborted Command",
+        [SCSI_SK_VOLUME_OVERFLOW]       = "Volume Overflow",
+        [SCSI_SK_MISCOMPARE]            = "Miscompare"
+};
+
 /** Get peripheral device type string.
  *
@@ -53 +70 @@
 {
         if (dev_type >= SCSI_DEV_LIMIT || scsi_dev_type_str[dev_type] == NULL)
-                return "<unknown>";
+                return "Unknown";
 
         return scsi_dev_type_str[dev_type];
 }
+
+/** Get sense key string.
+ *
+ * Return string description of SCSI sense key.
+ * The returned string is valid indefinitely, the caller should
+ * not attempt to free it.
+ */
+const char *scsi_get_sense_key_str(unsigned sense_key)
+{
+        if (sense_key >= SCSI_SK_LIMIT || scsi_sense_key_str[sense_key] == NULL)
+                return "Unknown";
+
+        return scsi_sense_key_str[sense_key];
+}
+