Changeset 39036 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 19, 2011 1:58:52 PM (13 years ago)

Author:

vboxsync

Message:

DevATA: Report actual media type (rather than empty drive) in mode sense header.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -103 +103 @@
 #define ATA_MEDIA_TYPE_DATA                     1    /**< Data CD */
 #define ATA_MEDIA_TYPE_CDDA                     2    /**< CD-DA  (audio) CD type */
+#define ATA_MEDIA_NO_DISC                    0x70    /**< Door closed, no medium */
 
 /*******************************************************************************
@@ -2629 +2630 @@
     Assert(s->cbElementaryTransfer <= 16);
     ataH2BE_U16(&pbBuf[0], 16 + 6);
-    pbBuf[2] = 0x70;
+    pbBuf[2] = (uint8_t)s->MediaTrackType;
     pbBuf[3] = 0;
     pbBuf[4] = 0;
@@ -2638 +2639 @@
     pbBuf[8] = 0x01;
     pbBuf[9] = 0x06;
-    pbBuf[10] = 0x00;
-    pbBuf[11] = 0x05;
+    pbBuf[10] = 0x00;   /* Maximum error recovery */
+    pbBuf[11] = 0x05;   /* 5 retries */
     pbBuf[12] = 0x00;
     pbBuf[13] = 0x00;
@@ -2657 +2658 @@
     Assert(s->cbElementaryTransfer <= 40);
     ataH2BE_U16(&pbBuf[0], 38);
-    pbBuf[2] = 0x70;
+    pbBuf[2] = (uint8_t)s->MediaTrackType;
     pbBuf[3] = 0;
     pbBuf[4] = 0;
@@ -3716 +3717 @@
     pIf->cNotifiedMediaChange = 4;
     ataMediumRemoved(pIf);
-    ataMediumTypeSet(pIf, ATA_MEDIA_TYPE_UNKNOWN);
+    ataMediumTypeSet(pIf, ATA_MEDIA_NO_DISC);
 }
 
@@ -6305 +6306 @@
          */
         ataMediumInserted(pIf);
+        ataMediumTypeSet(pIf, ATA_MEDIA_TYPE_UNKNOWN);
     }
     else