Changeset 27361 in vbox for trunk/src

Timestamp:

Mar 15, 2010 2:24:42 PM (15 years ago)

Author:

vboxsync

Message:

Storate/ATA: implemented ATA_EVENT_STATUS_MEDIA_EJECT_REQUESTED (currently unused)

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (3 diffs)
• ATAController.h (modified) (1 diff)
• DevATA.cpp (modified) (4 diffs)

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

@@ -1685 +1685 @@
         {
             case ATA_EVENT_STATUS_MEDIA_NEW:
-            /* mount */
+                /* mount */
                 ataH2BE_U16(pbBuf + 0, 6);
-                pbBuf[2] = 0x04;
-                pbBuf[3] = 0x5e;
-                pbBuf[4] = 0x02;
-                pbBuf[5] = 0x02;
+                pbBuf[2] = 0x04; /* media */
+                pbBuf[3] = 0x5e; /* suppored = busy|media|external|power|operational */
+                pbBuf[4] = 0x02; /* new medium */
+                pbBuf[5] = 0x02; /* medium present / door closed */
                 pbBuf[6] = 0x00;
                 pbBuf[7] = 0x00;
@@ -1699 +1699 @@
                 /* umount */
                 ataH2BE_U16(pbBuf + 0, 6);
-                pbBuf[2] = 0x04;
-                pbBuf[3] = 0x5e;
-                pbBuf[4] = 0x03;
-                pbBuf[5] = 0x00;
+                pbBuf[2] = 0x04; /* media */
+                pbBuf[3] = 0x5e; /* suppored = busy|media|external|power|operational */
+                pbBuf[4] = 0x03; /* media removal */
+                pbBuf[5] = 0x00; /* medium absent / door closed */
                 pbBuf[6] = 0x00;
                 pbBuf[7] = 0x00;
@@ -1709 +1709 @@
                 break;
 
+            case ATA_EVENT_STATUS_MEDIA_EJECT_REQUESTED: /* currently unused */
+                ataH2BE_U16(pbBuf + 0, 6);
+                pbBuf[2] = 0x04; /* media */
+                pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */
+                pbBuf[4] = 0x01; /* eject requested (eject button pressed) */
+                pbBuf[5] = 0x02; /* medium present / door closed */
+                pbBuf[6] = 0x00;
+                pbBuf[7] = 0x00;
+                break;
+
             case ATA_EVENT_STATUS_UNCHANGED:
             default:
                 ataH2BE_U16(pbBuf + 0, 6);
-                pbBuf[2] = 0x01;
-                pbBuf[3] = 0x5e;
+                pbBuf[2] = 0x01; /* operational change request / notification */
+                pbBuf[3] = 0x5e; /* suppored = busy|media|external|power|operational */
                 pbBuf[4] = 0x00;
                 pbBuf[5] = 0x00;

trunk/src/VBox/Devices/Storage/ATAController.h

@@ -73 +73 @@
 #define ATA_EVENT_STATUS_MEDIA_REMOVED          2    /**< medium removed */
 #define ATA_EVENT_STATUS_MEDIA_CHANGED          3    /**< medium was removed + new medium was inserted */
+#define ATA_EVENT_STATUS_MEDIA_EJECT_REQUESTED  4    /**< medium eject requested (eject button pressed) */
 
 

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

@@ -101 +101 @@
 #define ATA_EVENT_STATUS_MEDIA_REMOVED          2    /**< medium removed */
 #define ATA_EVENT_STATUS_MEDIA_CHANGED          3    /**< medium was removed + new medium was inserted */
+#define ATA_EVENT_STATUS_MEDIA_EJECT_REQUESTED  4    /**< medium eject requested (eject button pressed) */
 
 /**
@@ -2361 +2362 @@
         {
             case ATA_EVENT_STATUS_MEDIA_NEW:
-            /* mount */
+                /* mount */
                 ataH2BE_U16(pbBuf + 0, 6);
-                pbBuf[2] = 0x04;
-                pbBuf[3] = 0x5e;
-                pbBuf[4] = 0x02;
-                pbBuf[5] = 0x02;
+                pbBuf[2] = 0x04; /* media */
+                pbBuf[3] = 0x5e; /* suppored = busy|media|external|power|operational */
+                pbBuf[4] = 0x02; /* new medium */
+                pbBuf[5] = 0x02; /* medium present / door closed */
                 pbBuf[6] = 0x00;
                 pbBuf[7] = 0x00;
@@ -2375 +2376 @@
                 /* umount */
                 ataH2BE_U16(pbBuf + 0, 6);
-                pbBuf[2] = 0x04;
-                pbBuf[3] = 0x5e;
-                pbBuf[4] = 0x03;
-                pbBuf[5] = 0x00;
+                pbBuf[2] = 0x04; /* media */
+                pbBuf[3] = 0x5e; /* suppored = busy|media|external|power|operational */
+                pbBuf[4] = 0x03; /* media removal */
+                pbBuf[5] = 0x00; /* medium absent / door closed */
                 pbBuf[6] = 0x00;
                 pbBuf[7] = 0x00;
@@ -2385 +2386 @@
                 break;
 
+            case ATA_EVENT_STATUS_MEDIA_EJECT_REQUESTED: /* currently unused */
+                ataH2BE_U16(pbBuf + 0, 6);
+                pbBuf[2] = 0x04; /* media */
+                pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */
+                pbBuf[4] = 0x01; /* eject requested (eject button pressed) */
+                pbBuf[5] = 0x02; /* medium present / door closed */
+                pbBuf[6] = 0x00;
+                pbBuf[7] = 0x00;
+                break;
+
             case ATA_EVENT_STATUS_UNCHANGED:
             default:
                 ataH2BE_U16(pbBuf + 0, 6);
-                pbBuf[2] = 0x01;
-                pbBuf[3] = 0x5e;
+                pbBuf[2] = 0x01; /* operational change request / notification */
+                pbBuf[3] = 0x5e; /* suppored = busy|media|external|power|operational */
                 pbBuf[4] = 0x00;
                 pbBuf[5] = 0x00;