Changeset 8017 in vbox

Timestamp:

Apr 16, 2008 7:54:25 AM (17 years ago)

Author:

vboxsync

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

29675

Message:

Solaris hostdvd: attempt to better mediachanged detection.

File:

• trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp (modified) (1 diff)

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

@@ -332 +332 @@
 
     /* Need to pass the previous state and DKIO_NONE for the first time. */
-    static dkio_state DeviceState = DKIO_NONE;
-    int rc2 = ioctl(pThis->FileRawDevice, DKIOCSTATE, &DeviceState);
+    static dkio_state s_DeviceState = DKIO_NONE;
+    dkio_state PreviousState = s_DeviceState;
+    int rc2 = ioctl(pThis->FileRawDevice, DKIOCSTATE, &s_DeviceState);
     if (rc2 == 0)
     {
-        fMediaPresent = DeviceState == DKIO_INSERTED;
-        if (pThis->fMediaPresent != fMediaPresent || !fMediaPresent)
-            fMediaChanged = true;   /** @todo find proper way to detect media change. */
-    }
+        fMediaPresent = (s_DeviceState == DKIO_INSERTED);
+        if (PreviousState != s_DeviceState)
+            fMediaChanged = true;
+    }
+    else
+        fMediaChanged = true;
 
 #else