Changeset 3fb0fec in mainline for uspace/lib/scsi/src/spc.c

Timestamp:

2011-07-26T18:29:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7eb0fed8

Parents:

efcebe1 (diff), aa865ee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/scsi/src/spc.c (modified) (2 diffs)

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];
+}
+