Changeset 52713 in vbox for trunk/src/VBox/Devices/Storage/VSCSI

Timestamp:

Sep 12, 2014 9:34:39 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96052

Message:

BusLogic: Slightly enhanced debug info.

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSIInternal.h (modified) (3 diffs)
• VSCSILun.cpp (modified) (2 diffs)
• VSCSISense.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h

@@ -245 +245 @@
 
 /**
- * Sets a error sense code.
+ * Sets an error sense code.
  *
  * @returns SCSI status code.
@@ -258 +258 @@
 
 /**
+ * Sets an error sense code with additional information.
+ *
+ * @returns SCSI status code.
+ * @param   pVScsiSense   The SCSI sense state to use.
+ * @param   pVScsiReq     The SCSI request.
+ * @param   uSCSISenseKey The SCSI sense key to set.
+ * @param   uSCSIASC      The ASC value.
+ * @param   uSCSIASC      The ASCQ value. 
+ * @param   uInfo         The 32-bit sense information.
+ */
+int vscsiReqSenseErrorInfoSet(PVSCSISENSE pVScsiSense, PVSCSIREQINT pVScsiReq, uint8_t uSCSISenseKey,
+                              uint8_t uSCSIASC, uint8_t uSCSIASCQ, uint32_t uInfo);
+
+/**
  * Process a request sense command.
  *
@@ -435 +449 @@
 }
 
+/**
+ * Wrapper around vscsiReqSenseErrorInfoSet()
+ */
+DECLINLINE(int) vscsiLunReqSenseErrorInfoSet(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq, uint8_t uSCSISenseKey, uint8_t uSCSIASC, uint8_t uSCSIASCQ, uint32_t uInfo)
+{
+    return vscsiReqSenseErrorInfoSet(&pVScsiLun->pVScsiDevice->VScsiSense, pVScsiReq, uSCSISenseKey, uSCSIASC, uSCSIASCQ, uInfo);
+}
 
 #endif /* ___VSCSIInternal_h */

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp

@@ -29 +29 @@
 /** MMC descriptor */
 extern VSCSILUNDESC g_VScsiLunTypeMmc;
+/** SSC descriptor */
+extern VSCSILUNDESC g_VScsiLunTypeSsc;
 
 /**
@@ -37 +39 @@
     &g_VScsiLunTypeSbc,
     &g_VScsiLunTypeMmc,
+    &g_VScsiLunTypeSsc,
 };
 

trunk/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp

@@ -64 +64 @@
 }
 
+int vscsiReqSenseErrorInfoSet(PVSCSISENSE pVScsiSense, PVSCSIREQINT pVScsiReq, uint8_t uSCSISenseKey, uint8_t uSCSIASC, uint8_t uSCSIASCQ, uint32_t uInfo)
+{
+    memset(pVScsiSense->abSenseBuf, 0, sizeof(pVScsiSense->abSenseBuf));
+    pVScsiSense->abSenseBuf[0] = RT_BIT(7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED; /* Fixed format */
+    pVScsiSense->abSenseBuf[2] = uSCSISenseKey;
+    vscsiH2BEU32(&pVScsiSense->abSenseBuf[3], uInfo);
+    pVScsiSense->abSenseBuf[7]  = 10;
+    pVScsiSense->abSenseBuf[12] = uSCSIASC;
+    pVScsiSense->abSenseBuf[13] = uSCSIASCQ;
+
+    if (pVScsiReq->pbSense && pVScsiReq->cbSense)
+        memcpy(pVScsiReq->pbSense, pVScsiSense->abSenseBuf, RT_MIN(sizeof(pVScsiSense->abSenseBuf), pVScsiReq->cbSense));
+
+    return SCSI_STATUS_CHECK_CONDITION;
+}
+
 int vscsiReqSenseCmd(PVSCSISENSE pVScsiSense, PVSCSIREQINT pVScsiReq)
 {