Changeset 64247 in vbox for trunk/src

Timestamp:

Oct 13, 2016 1:09:21 PM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage/DrvHost*: Move determining the medai size to the host specific sources

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostDVD.cpp (modified) (2 diffs)
• DrvHostFloppy.cpp (modified) (3 diffs)

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

@@ -306 +306 @@
 
 
-
-#ifdef RT_OS_LINUX
-/**
- * Get the media size.
- *
- * @returns VBox status code.
- * @param   pThis   The instance data.
- * @param   pcb     Where to store the size.
- */
-static DECLCALLBACK(int) drvHostDvdGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
-{
-    /*
-     * Query the media size.
-     */
-    /* Clear the media-changed-since-last-call-thingy just to be on the safe side. */
-    ioctl(RTFileToNative(pThis->hFileDevice), CDROM_MEDIA_CHANGED, CDSL_CURRENT);
-    return RTFileSeek(pThis->hFileDevice, 0, RTFILE_SEEK_END, pcb);
-
-}
-#endif /* RT_OS_LINUX */
-
-
 #ifdef USE_MEDIA_POLLING
 /**
@@ -532 +510 @@
             else
                 pThis->pfnPoll       = NULL;
-#endif
-#ifdef RT_OS_LINUX
-            pThis->pfnGetMediaSize   = drvHostDvdGetMediaSize;
 #endif
 

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

@@ -28 +28 @@
 # include <sys/fcntl.h>
 # include <errno.h>
-
-# elif defined(RT_OS_WINDOWS)
-# include <iprt/win/windows.h>
-# include <dbt.h>
-
-#elif defined(RT_OS_L4)
-
-#else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
-# error "Unsupported Platform."
-#endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
+#endif
 
 #include <VBox/vmm/pdmdrv.h>
@@ -66 +57 @@
 
 
-
-#ifdef RT_OS_WINDOWS
-/**
- * Get media size - needs a special IOCTL.
- *
- * @param   pThis   The instance data.
- */
-static DECLCALLBACK(int) drvHostFloppyGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
-{
-    DISK_GEOMETRY   geom;
-    DWORD           cbBytesReturned;
-    int             rc;
-    int             cbSectors;
-
-    memset(&geom, 0, sizeof(geom));
-    rc = DeviceIoControl((HANDLE)RTFileToNative(pThis->hFileDevice), IOCTL_DISK_GET_DRIVE_GEOMETRY,
-                         NULL, 0, &geom, sizeof(geom), &cbBytesReturned,  NULL);
-    if (rc) {
-        cbSectors = geom.Cylinders.QuadPart * geom.TracksPerCylinder * geom.SectorsPerTrack;
-        *pcb = cbSectors * geom.BytesPerSector;
-        rc = VINF_SUCCESS;
-    }
-    else
-    {
-        DWORD   dwLastError;
-
-        dwLastError = GetLastError();
-        rc = RTErrConvertFromWin32(dwLastError);
-        Log(("DrvHostFloppy: IOCTL_DISK_GET_DRIVE_GEOMETRY(%s) failed, LastError=%d rc=%Rrc\n",
-             pThis->pszDevice, dwLastError, rc));
-        return rc;
-    }
-
-    return rc;
-}
-#endif /* RT_OS_WINDOWS */
-
-#ifdef RT_OS_LINUX
-/**
- * Get media size and do change processing.
- *
- * @param   pThis   The instance data.
- */
-static DECLCALLBACK(int) drvHostFloppyGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
-{
-    int rc = ioctl(RTFileToNative(pThis->hFileDevice), FDFLUSH);
-    if (rc)
-    {
-        rc = RTErrConvertFromErrno (errno);
-        Log(("DrvHostFloppy: FDFLUSH ioctl(%s) failed, errno=%d rc=%Rrc\n", pThis->pszDevice, errno, rc));
-        return rc;
-    }
-
-    floppy_drive_struct DrvStat;
-    rc = ioctl(RTFileToNative(pThis->hFileDevice), FDGETDRVSTAT, &DrvStat);
-    if (rc)
-    {
-        rc = RTErrConvertFromErrno(errno);
-        Log(("DrvHostFloppy: FDGETDRVSTAT ioctl(%s) failed, errno=%d rc=%Rrc\n", pThis->pszDevice, errno, rc));
-        return rc;
-    }
-    pThis->fReadOnly = !(DrvStat.flags & FD_DISK_WRITABLE);
-
-    return RTFileSeek(pThis->hFileDevice, 0, RTFILE_SEEK_END, pcb);
-}
-#endif /* RT_OS_LINUX */
-
-
 #ifdef RT_OS_LINUX
 /**
@@ -201 +124 @@
              * Override stuff.
              */
-#ifdef RT_OS_WINDOWS
-            pThis->Base.pfnGetMediaSize = drvHostFloppyGetMediaSize;
-#endif
 #ifdef RT_OS_LINUX
             pThis->Base.pfnPoll         = drvHostFloppyPoll;
-            pThis->Base.pfnGetMediaSize = drvHostFloppyGetMediaSize;
 #endif