Changeset 1965 in vbox for trunk

Timestamp:

Apr 6, 2007 6:14:10 AM (18 years ago)

Author:

vboxsync

Message:

HostDVD support for Darwin.

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (4 diffs)
• Makefile (modified) (5 diffs)
• Storage/DrvHostBase.cpp (modified) (21 diffs)
• Storage/DrvHostBase.h (modified) (3 diffs)
• Storage/DrvHostDVD.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -102 +102 @@
     if (VBOX_FAILURE(rc))
         return rc;
-#if defined(VBOX_WITH_USB) && (defined(__WIN__) || defined(__LINUX__) || defined(__L4ENV__))
+#if defined(VBOX_WITH_USB) && (defined(__L4ENV__) || defined(__LINUX__) || defined(__WIN__))
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceOHCI);
     if (VBOX_FAILURE(rc))
@@ -153 +153 @@
     if (VBOX_FAILURE(rc))
         return rc;
-#if !defined(__L4ENV__) && !defined(__DARWIN__) && !defined(__OS2__)
+#if defined(__DARWIN__) || defined(__LINUX__) || defined(__WIN__)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostDVD);
     if (VBOX_FAILURE(rc))
         return rc;
+#endif
+#if defined(__LINUX__) || defined(__WIN__)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostFloppy);
     if (VBOX_FAILURE(rc))
@@ -185 +187 @@
         return rc;
 #endif
-#if !defined(__DARWIN__) && !defined(__OS2__)
+#if defined(__L4ENV__) || defined(__LINUX__) || defined(__WIN__)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (VBOX_FAILURE(rc))
@@ -203 +205 @@
         return rc;
 
-#if defined(VBOX_WITH_USB) && (defined(__WIN__) || defined(__LINUX__) || defined(__L4ENV__))
+#if defined(VBOX_WITH_USB) && (defined(__L4ENV__) || defined(__LINUX__) || defined(__WIN__))
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVUSBRootHub);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Makefile

@@ -122 +122 @@
 VBoxDD_LIBS.darwin      = \
         $(LIB_REM)
-VBoxDD_LDFLAGS.darwin   = -install_name @executable_path/VBoxDD.dylib -framework CoreAudio
+VBoxDD_LDFLAGS.darwin   = -install_name @executable_path/VBoxDD.dylib -framework CoreAudio -framework IOKit -framework Carbon
 VBoxDD_LDFLAGS.linux    = -Wl,--no-undefined
 VBoxDD_LDFLAGS.l4       = -Wl,--no-undefined
@@ -128 +128 @@
 
 # damn, fix this.
-ifeq ($(BUILD_TARGET),win) 
+ifeq ($(BUILD_TARGET),win)
 $(PATH_LIB)/VBoxDD2.lib: $(PATH_BIN)/VBoxDD2.dll
 $(PATH_LIB)/VBoxDDU.lib: $(PATH_BIN)/VBoxDDU.dll
@@ -336 +336 @@
         Network/slirp
 Drivers_SOURCES    = \
+        Audio/audio.c \
+        Audio/audiosniffer.c \
+        Audio/mixeng.c \
+        Audio/noaudio.c \
+        Input/DrvKeyboardQueue.cpp \
         Input/DrvMouseQueue.cpp \
-        Input/DrvKeyboardQueue.cpp \
-        Storage/VBoxHDD.cpp \
-        Storage/DrvBlock.cpp \
-        Storage/VmdkHDD.cpp \
-        Storage/DrvMediaISO.cpp \
-        Storage/DrvRawImage.cpp \
-        Storage/DrvHostBase.cpp \
-        Storage/DrvHostDVD.cpp \
-        Storage/DrvHostFloppy.cpp \
-        Storage/DrvHostRawDisk.cpp \
-        PC/DrvACPI.cpp \
         Network/DrvIntNet.cpp \
+        Network/DrvNAT.cpp \
         Network/DrvNetSniffer.cpp \
-        Network/DrvNAT.cpp \
+        Network/slirp/bootp.c \
         Network/slirp/cksum.c \
+        Network/slirp/debug.c \
         Network/slirp/if.c \
         Network/slirp/ip_icmp.c \
         Network/slirp/ip_input.c \
         Network/slirp/ip_output.c \
-        Network/slirp/slirp.c \
         Network/slirp/mbuf.c \
         Network/slirp/misc.c \
         Network/slirp/sbuf.c \
+        Network/slirp/slirp.c \
         Network/slirp/socket.c \
         Network/slirp/tcp_input.c \
@@ -367 +363 @@
         Network/slirp/tftp.c \
         Network/slirp/udp.c \
-        Network/slirp/bootp.c \
-        Network/slirp/debug.c \
-        Audio/audio.c \
-        Audio/mixeng.c \
-        Audio/noaudio.c \
-        Audio/audiosniffer.c \
+        PC/DrvACPI.cpp \
         Serial/DrvChar.cpp \
-        Serial/DrvNamedPipe.cpp
+        Serial/DrvNamedPipe.cpp \
+        Storage/DrvBlock.cpp \
+        Storage/DrvHostBase.cpp \
+        Storage/DrvHostDVD.cpp \
+        Storage/DrvHostFloppy.cpp \
+        Storage/DrvHostRawDisk.cpp \
+        Storage/DrvMediaISO.cpp \
+        Storage/DrvRawImage.cpp \
+        Storage/VBoxHDD.cpp \
+        Storage/VmdkHDD.cpp
 
 # -- OS specific --
@@ -380 +380 @@
 ifeq ($(BUILD_TARGET),darwin)
 Drivers_SOURCES      := $(filter-out \
-        Storage/DrvHost% \
+        Storage/DrvHostRaw% \
+        Storage/DrvHostFloppy% \
         , $(Drivers_SOURCES)) \
         Audio/coreaudio.c

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

@@ -26 +26 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_BASE
-#ifdef __LINUX__
+#ifdef __DARWIN__
+# include <mach/mach.h>
+# include <Carbon/Carbon.h>
+# include <IOKit/IOKitLib.h>
+# include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+# include <IOKit/scsi-commands/SCSITaskLib.h>
+# include <IOKit/scsi-commands/SCSICommandOperationCodes.h>
+# include <mach/mach_error.h>
+# include <VBox/scsi.h>
+
+#elif defined(__L4ENV__)
+  /* Nothing special requires... yeah, right. */
+
+#elif defined(__LINUX__)
 # include <sys/ioctl.h>
 # include <sys/fcntl.h>
@@ -79 +92 @@
         /*IN*/ FS_INFORMATION_CLASS FileSystemInformationClass );
 
-#elif defined(__L4ENV__)
-
-#else /* !__WIN__ nor __LINUX__ nor __L4ENV__ */
+#else
 # error "Unsupported Platform."
-#endif /* !__WIN__ nor __LINUX__ nor __L4ENV__ */
+#endif
 
 #include <VBox/pdm.h>
@@ -100 +111 @@
 #include <iprt/asm.h>
 #include <iprt/critsect.h>
+#include <iprt/ctype.h>
 
 #include "DrvHostBase.h"
@@ -120 +132 @@
      */
     int rc;
+#ifdef __DARWIN__
+    if (    pThis->fMediaPresent
+        &&  pThis->ppScsiTaskDI
+        &&  pThis->cbBlock)
+#else
     if (pThis->fMediaPresent)
-    {
+#endif
+    {
+#ifdef __DARWIN__
+        /*
+         * Issue a READ(12) request.
+         */
+        const uint32_t LBA = off / pThis->cbBlock;
+        AssertReturn(!(off % pThis->cbBlock), VERR_INVALID_PARAMETER);
+        const uint32_t cBlocks = cbRead / pThis->cbBlock;
+        AssertReturn(!(cbRead % pThis->cbBlock), VERR_INVALID_PARAMETER);
+        uint8_t abCmd[16] =
+        {
+            SCSI_READ_12, 0,
+            RT_BYTE4(LBA),     RT_BYTE3(LBA),     RT_BYTE2(LBA),     RT_BYTE1(LBA),
+            RT_BYTE4(cBlocks), RT_BYTE3(cBlocks), RT_BYTE2(cBlocks), RT_BYTE1(cBlocks),
+            0, 0, 0, 0, 0
+        };
+        rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, &cbRead, NULL, 0, 0);
+
+#else
         /*
          * Seek and read.
@@ -143 +179 @@
             Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName,
                  pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
+#endif
     }
     else
@@ -172 +209 @@
         if (pThis->fMediaPresent)
         {
+#ifdef __DARWIN__
+            /** @todo write support... */
+            rc = VERR_WRITE_PROTECT;
+
+#else
             /*
              * Seek and write.
@@ -187 +229 @@
                 Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Vrc\n",
                      pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
+#endif
         }
         else
@@ -211 +254 @@
     if (pThis->fMediaPresent)
     {
+#ifdef __DARWIN__
+        rc = VINF_SUCCESS;
+        /** @todo scsi device buffer flush... */
+#else
         rc = RTFileFlush(pThis->FileDevice);
+#endif
     }
     else
@@ -512 +560 @@
 
 /**
- * Wrapper for open / RTFileOpen.
+ * Wrapper for open / RTFileOpen / IOKit.
+ *
+ * @remark  The Darwin code must correspond exactly to the enumeration
+ *          done in Main/darwin/iokit.c.
  */
 static int drvHostBaseOpen(PDRVHOSTBASE pThis, PRTFILE pFileDevice, bool fReadOnly)
 {
-#ifdef __LINUX__
+#ifdef __DARWIN__
+    /* Darwin is kind of special... */
+    Assert(!pFileDevice); NOREF(pFileDevice);
+    Assert(!pThis->cbBlock);
+    Assert(!pThis->MasterPort);
+    Assert(!pThis->ppMMCDI);
+    Assert(!pThis->ppScsiTaskDI);
+
+    /*
+     * Open the master port on the first invocation.
+     */
+    kern_return_t krc = IOMasterPort(MACH_PORT_NULL, &pThis->MasterPort);
+    AssertReturn(krc == KERN_SUCCESS, VERR_GENERAL_FAILURE);
+
+    /*
+     * Create a matching dictionary for searching for DVD services in the IOKit.
+     *
+     * [If I understand this correctly, plain CDROMs doesn't show up as
+     * IODVDServices. Too keep things simple, we will only support DVDs
+     * until somebody complains about it and we get hardware to test it on.
+     * (Unless I'm much mistaken, there aren't any (orignal) intel macs with
+     * plain cdroms.)]
+     */
+    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching("IODVDServices");
+    AssertReturn(RefMatchingDict, NULL);
+
+    /*
+     * do the search and get a collection of keyboards.
+     */
+    io_iterator_t DVDServices = NULL;
+    IOReturn irc = IOServiceGetMatchingServices(pThis->MasterPort, RefMatchingDict, &DVDServices);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), NULL);
+    RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
+
+    /*
+     * Enumerate the DVD drives (services).
+     * (This enumeration must be identical to the one performed in DrvHostBase.cpp.)
+     */
+    int rc = VERR_FILE_NOT_FOUND;
+    unsigned i = 0;
+    io_object_t DVDService;
+    while ((DVDService = IOIteratorNext(DVDServices)) != 0)
+    {
+        /*
+         * Get the properties we use to identify the DVD drive.
+         *
+         * While there is a (weird 12 byte) GUID, it isn't persistent
+         * accross boots. So, we have to use a combination of the
+         * vendor name and product name properties with an optional
+         * sequence number for identification.
+         */
+        CFMutableDictionaryRef PropsRef = 0;
+        kern_return_t krc = IORegistryEntryCreateCFProperties(DVDService, &PropsRef, kCFAllocatorDefault, kNilOptions);
+        if (krc == KERN_SUCCESS)
+        {
+            /* Get the Device Characteristics dictionary. */
+            CFDictionaryRef DevCharRef = (CFDictionaryRef)CFDictionaryGetValue(PropsRef, CFSTR(kIOPropertyDeviceCharacteristicsKey));
+            if (DevCharRef)
+            {
+                /* The vendor name. */
+                char szVendor[128];
+                char *pszVendor = &szVendor[0];
+                CFTypeRef ValueRef = CFDictionaryGetValue(DevCharRef, CFSTR(kIOPropertyVendorNameKey));
+                if (    ValueRef
+                    &&  CFGetTypeID(ValueRef) == CFStringGetTypeID()
+                    &&  CFStringGetCString((CFStringRef)ValueRef, szVendor, sizeof(szVendor), kCFStringEncodingUTF8))
+                    pszVendor = RTStrStrip(szVendor);
+                else
+                    *pszVendor = '\0';
+
+                /* The product name. */
+                char szProduct[128];
+                char *pszProduct = &szProduct[0];
+                ValueRef = CFDictionaryGetValue(DevCharRef, CFSTR(kIOPropertyProductNameKey));
+                if (    ValueRef
+                    &&  CFGetTypeID(ValueRef) == CFStringGetTypeID()
+                    &&  CFStringGetCString((CFStringRef)ValueRef, szProduct, sizeof(szProduct), kCFStringEncodingUTF8))
+                    pszProduct = RTStrStrip(szProduct);
+                else
+                    *pszProduct = '\0';
+
+                /* Construct the two names and compare thwm with the one we're searching for. */
+                char szName1[256 + 32];
+                char szName2[256 + 32];
+                if (*pszVendor || *pszProduct)
+                {
+                    if (*pszVendor && *pszProduct)
+                    {
+                        RTStrPrintf(szName1, sizeof(szName1), "%s %s", pszVendor, pszProduct);
+                        RTStrPrintf(szName2, sizeof(szName2), "%s %s (#%u)", pszVendor, pszProduct, i);
+                    }
+                    else
+                    {
+                        strcpy(szName1, *pszVendor ? pszVendor : pszProduct);
+                        RTStrPrintf(szName2, sizeof(szName2), "%s %s (#%u)", *pszVendor ? pszVendor : pszProduct, i);
+                    }
+                }
+                else
+                {
+                    RTStrPrintf(szName1, sizeof(szName1), "(#%u)", i);
+                    strcpy(szName2, szName1);
+                }
+
+                if (    !strcmp(szName1, pThis->pszDeviceOpen)
+                    ||  !strcmp(szName2, pThis->pszDeviceOpen))
+                {
+                    /*
+                     * Found it! Now, get the client interface and stuff.
+                     * Note that we could also query kIOSCSITaskDeviceUserClientTypeID here if the
+                     * MMC client plugin is missing. For now we assume this won't be necessary.
+                     */
+                    SInt32 Score = 0;
+                    IOCFPlugInInterface **ppPlugInInterface = NULL;
+                    krc = IOCreatePlugInInterfaceForService(DVDService, kIOMMCDeviceUserClientTypeID, kIOCFPlugInInterfaceID,
+                                                            &ppPlugInInterface, &Score);
+                    if (krc == KERN_SUCCESS)
+                    {
+                        HRESULT hrc = (*ppPlugInInterface)->QueryInterface(ppPlugInInterface,
+                                                                           CFUUIDGetUUIDBytes(kIOMMCDeviceInterfaceID),
+                                                                           (LPVOID *)&pThis->ppMMCDI);
+                        (*ppPlugInInterface)->Release(ppPlugInInterface);
+                        ppPlugInInterface = NULL;
+                        if (hrc == S_OK)
+                        {
+                            pThis->ppScsiTaskDI = (*pThis->ppMMCDI)->GetSCSITaskDeviceInterface(pThis->ppMMCDI);
+                            if (pThis->ppScsiTaskDI)
+                                rc = VINF_SUCCESS;
+                            else
+                            {
+                                LogRel(("GetSCSITaskDeviceInterface failed on '%s'\n", pThis->pszDeviceOpen));
+                                rc = VERR_NOT_SUPPORTED;
+                                (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
+                            }
+                        }
+                        else
+                        {
+                            rc = VERR_GENERAL_FAILURE;//RTErrConvertFromDarwinCOM(krc);
+                            pThis->ppMMCDI = NULL;
+                        }
+                    }
+                    else /* Check for kIOSCSITaskDeviceUserClientTypeID? */
+                        rc = VERR_GENERAL_FAILURE;//RTErrConvertFromDarwinKern(krc);
+
+                    /*
+                     * Obtain exclusive access to the device
+                     * (to prevent the host and/or user from interfering).
+                     */
+                    if (VBOX_SUCCESS(rc))
+                    {
+                        irc = (*pThis->ppScsiTaskDI)->ObtainExclusiveAccess(pThis->ppScsiTaskDI);
+                        if (irc == kIOReturnSuccess)
+                            rc = VINF_SUCCESS;
+                        else if (irc == kIOReturnBusy)
+                            rc = VERR_DRIVE_LOCKED;         /* mounted. */
+                        else if (irc == kIOReturnExclusiveAccess)
+                            rc = VERR_SHARING_VIOLATION;    /* already used exclusivly. */
+                        else
+                            rc = VERR_GENERAL_FAILURE;
+                    }
+
+                    /* Cleanup on failure. */
+                    if (VBOX_FAILURE(rc))
+                    {
+                        if (pThis->ppScsiTaskDI)
+                        {
+                            (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI);
+                            pThis->ppScsiTaskDI = NULL;
+                        }
+                        if (pThis->ppMMCDI)
+                        {
+                            (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
+                            pThis->ppMMCDI = NULL;
+                        }
+                    }
+
+                    IOObjectRelease(DVDService);
+                    break;
+                }
+            }
+            CFRelease(PropsRef);
+        }
+        else
+            AssertMsgFailed(("krc=%#x\n", krc));
+
+        IOObjectRelease(DVDService);
+        i++;
+    }
+
+    IOObjectRelease(DVDServices);
+    return rc;
+
+#elif defined(__LINUX__)
+    /** @todo we've got RTFILE_O_NON_BLOCK now. Change the code to use RTFileOpen. */
     int FileDevice = open(pThis->pszDeviceOpen, (pThis->fReadOnlyConfig ? O_RDONLY : O_RDWR) | O_NONBLOCK);
     if (FileDevice < 0)
@@ -522 +765 @@
     *pFileDevice = FileDevice;
     return VINF_SUCCESS;
+
 #else
     return RTFileOpen(pFileDevice, pThis->pszDeviceOpen,
@@ -528 +772 @@
 }
 
+
 /**
  * (Re)opens the device.
+ *
+ * This is used to open the device during construction, but it's also used to re-open
+ * the device when a media is inserted. This re-open will kill off any cached data
+ * that Linux for some peculiar reason thinks should survive a media change...
  *
  * @returns VBOX status code.
@@ -536 +785 @@
 static int drvHostBaseReopen(PDRVHOSTBASE pThis)
 {
+#ifndef __DARWIN__ /* Only *one* open for darwin. */
     LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
 
-    /*
-     * Reopen the device to kill any cached data which for some peculiar reason stays on some OSes (linux)...
-     */
     RTFILE FileDevice;
     int rc = drvHostBaseOpen(pThis, &FileDevice, pThis->fReadOnlyConfig);
@@ -564 +811 @@
         RTFileClose(pThis->FileDevice);
     pThis->FileDevice = FileDevice;
+#endif /* !__DARWIN__ */
     return VINF_SUCCESS;
 }
@@ -577 +825 @@
 static int drvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
 {
-#ifdef __WIN__
+#ifdef __DARWIN__
+    /*
+     * Try a READ_CAPACITY command...
+     */
+    struct
+    {
+        uint32_t cBlocks;
+        uint32_t cbBlock;
+    } Buf = {0, 0};
+    size_t cbBuf = sizeof(Buf);
+    uint8_t abCmd[16] =
+    {
+        SCSI_READ_CAPACITY, 0, 0, 0, 0, 0, 0,
+        0,0,0,0,0,0,0,0,0
+    };
+    int rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_FROM_DEVICE, &Buf, &cbBuf, NULL, 0, 0);
+    if (VBOX_SUCCESS(rc))
+    {
+        Assert(cbBuf == sizeof(Buf));
+        Buf.cBlocks = RT_BE2H_U32(Buf.cBlocks);
+        Buf.cbBlock = RT_BE2H_U32(Buf.cbBlock);
+        //if (Buf.cbBlock > 2048) /* everyone else is doing this... check if it needed/right.*/
+        //    Buf.cbBlock = 2048;
+        pThis->cbBlock = Buf.cbBlock;
+
+        *pcb = (uint64_t)Buf.cBlocks * Buf.cbBlock;
+    }
+    return rc;
+
+#elif defined(__WIN__)
     /* use NT api, retry a few times if the media is being verified. */
     IO_STATUS_BLOCK             IoStatusBlock = {0};
@@ -610 +887 @@
 #endif
 }
+
+
+#ifdef __DARWIN__
+/**
+ * Execute a SCSI command.
+ *
+ * @param pThis             The instance data.
+ * @param pbCmd             Pointer to the SCSI command.
+ * @param cbCmd             The size of the SCSI command.
+ * @param enmTxDir          The transfer direction.
+ * @param pvBuf             The buffer. Can be NULL if enmTxDir is PDMBLOCKTXDIR_NONE.
+ * @param pcbBuf            Where to get the buffer size from and put the actual transfer size. Can be NULL.
+ * @param pbSense           Where to put the sense data. Can be NULL.
+ * @param cbSense           Size of the sense data buffer.
+ * @param cTimeoutMillies   The timeout. 0 mean the default timeout.
+ *
+ * @returns VINF_SUCCESS on success (no sense code).
+ * @returns VERR_UNRESOLVED_ERROR if sense code is present.
+ * @returns Some other VBox status code on failures without sense code.
+ *
+ * @todo Fix VERR_UNRESOLVED_ERROR abuse.
+ */
+DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
+                                     void *pvBuf, size_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies)
+{
+    /*
+     * Minimal input validation.
+     */
+    Assert(enmTxDir == PDMBLOCKTXDIR_NONE || enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE || enmTxDir == PDMBLOCKTXDIR_TO_DEVICE);
+    Assert(!pvBuf || (pcbBuf && *pcbBuf));
+    Assert(pvBuf || enmTxDir == PDMBLOCKTXDIR_NONE);
+    Assert(pbSense || !cbSense);
+    AssertPtr(pbCmd);
+    Assert(cbCmd <= 16 && cbCmd >= 1);
+    const size_t cbBuf = pcbBuf ? *pcbBuf : 0;
+    if (pcbBuf)
+        *pcbBuf = 0;
+
+# ifdef __DARWIN__
+    Assert(pThis->ppScsiTaskDI);
+
+    int rc = VERR_GENERAL_FAILURE;
+    SCSITaskInterface **ppScsiTaskI = (*pThis->ppScsiTaskDI)->CreateSCSITask(pThis->ppScsiTaskDI);
+    if (!ppScsiTaskI)
+        return VERR_NO_MEMORY;
+    do
+    {
+        /* Setup the scsi command. */
+        SCSICommandDescriptorBlock cdb = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+        memcpy(&cdb[0], pbCmd, cbCmd);
+        IOReturn irc = (*ppScsiTaskI)->SetCommandDescriptorBlock(ppScsiTaskI, cdb, cbCmd);
+        AssertBreak(irc == kIOReturnSuccess,);
+
+        /* Setup the buffer. */
+        if (enmTxDir == PDMBLOCKTXDIR_NONE)
+            irc = (*ppScsiTaskI)->SetScatterGatherEntries(ppScsiTaskI, NULL, 0, 0, kSCSIDataTransfer_NoDataTransfer);
+        else
+        {
+            IOVirtualRange Range = { (IOVirtualAddress)pvBuf, cbBuf };
+            irc = (*ppScsiTaskI)->SetScatterGatherEntries(ppScsiTaskI, &Range, 1, cbBuf,
+                                                          enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE
+                                                          ? kSCSIDataTransfer_FromTargetToInitiator
+                                                          : kSCSIDataTransfer_FromInitiatorToTarget);
+        }
+        AssertBreak(irc == kIOReturnSuccess,);
+
+        /* Set the timeout. */
+        irc = (*ppScsiTaskI)->SetTimeoutDuration(ppScsiTaskI, cTimeoutMillies ? cTimeoutMillies : 30000 /*ms*/);
+        AssertBreak(irc == kIOReturnSuccess,);
+
+        /* Execute the command and get the response. */
+        SCSI_Sense_Data SenseData = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+        SCSIServiceResponse     ServiceResponse = kSCSIServiceResponse_Request_In_Process;
+        SCSITaskStatus TaskStatus = kSCSITaskStatus_GOOD;
+        UInt64 cbReturned = 0;
+        irc = (*ppScsiTaskI)->ExecuteTaskSync(ppScsiTaskI, &SenseData, &TaskStatus, &cbReturned);
+        AssertBreak(irc == kIOReturnSuccess,);
+        if (pcbBuf)
+            *pcbBuf = cbReturned;
+
+        irc = (*ppScsiTaskI)->GetSCSIServiceResponse(ppScsiTaskI, &ServiceResponse);
+        AssertBreak(irc == kIOReturnSuccess,);
+        AssertBreak(ServiceResponse == kSCSIServiceResponse_TASK_COMPLETE,);
+
+        if (TaskStatus == kSCSITaskStatus_GOOD)
+            rc = VINF_SUCCESS;
+        else if (   TaskStatus == kSCSITaskStatus_CHECK_CONDITION
+                 && pbSense)
+        {
+            memset(pbSense, 0, cbSense); /* lazy */
+            memcpy(pbSense, &SenseData, RT_MIN(sizeof(SenseData), cbSense));
+            rc = VERR_UNRESOLVED_ERROR;
+        }
+        /** @todo convert sense codes when caller doesn't wish to do this himself. */
+        /*else if (   TaskStatus == kSCSITaskStatus_CHECK_CONDITION
+                 && SenseData.ADDITIONAL_SENSE_CODE == 0x3A)
+            rc = VERR_MEDIA_NOT_PRESENT; */
+        else
+        {
+            rc = enmTxDir == PDMBLOCKTXDIR_NONE
+               ? VERR_DEV_IO_ERROR
+               : enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE
+               ? VERR_READ_ERROR
+               : VERR_WRITE_ERROR;
+            if (pThis->cLogRelErrors++ < 10)
+                LogRel(("DVD scsi error: cmd={%.*Rhxs} TaskStatus=%#x key=%#x ASC=%#x ASCQ=%#x (%Vrc)\n",
+                        cbCmd, pbCmd, TaskStatus, SenseData.SENSE_KEY, SenseData.ADDITIONAL_SENSE_CODE,
+                        SenseData.ADDITIONAL_SENSE_CODE_QUALIFIER, rc));
+        }
+    } while (0);
+
+    (*ppScsiTaskI)->Release(ppScsiTaskI);
+
+# endif
+
+    return rc;
+}
+#endif
 
 
@@ -907 +1302 @@
      */
     if (    pThis->fLocked
+#ifdef __DARWIN__
+        &&  pThis->ppScsiTaskDI
+#else
         &&  pThis->FileDevice != NIL_RTFILE
+#endif
         &&  pThis->pfnDoLock)
     {
@@ -933 +1332 @@
 #endif
 
+#ifdef __DARWIN__
+    if (pThis->ppScsiTaskDI)
+    {
+        (*pThis->ppScsiTaskDI)->ReleaseExclusiveAccess(pThis->ppScsiTaskDI);
+        (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI);
+        pThis->ppScsiTaskDI = NULL;
+    }
+    if (pThis->ppMMCDI)
+    {
+        (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
+        pThis->ppMMCDI = NULL;
+    }
+    if (pThis->MasterPort)
+    {
+        mach_port_deallocate(mach_task_self(), pThis->MasterPort);
+        pThis->MasterPort = NULL;
+    }
+#else
     if (pThis->FileDevice != NIL_RTFILE)
     {
@@ -939 +1356 @@
         pThis->FileDevice = NIL_RTFILE;
     }
+#endif
 
     if (pThis->pszDevice)
@@ -980 +1398 @@
     pThis->pDrvIns                          = pDrvIns;
     pThis->ThreadPoller                     = NIL_RTTHREAD;
+#ifdef __DARWIN__
+    pThis->MasterPort                       = NULL;
+    pThis->ppMMCDI                          = NULL;
+    pThis->ppScsiTaskDI                     = NULL;
+    pThis->cbBlock                          = 0;
+#else
     pThis->FileDevice                       = NIL_RTFILE;
+#endif
     pThis->enmType                          = enmType;
+    //pThis->cErrors                          = 0;
 
     pThis->pfnGetMediaSize                  = drvHostBaseGetMediaSize;
@@ -1197 +1623 @@
      * Open the device.
      */
+#ifdef __DARWIN__
+    rc = drvHostBaseOpen(pThis, NULL, pThis->fReadOnlyConfig);
+#else
     rc = drvHostBaseReopen(pThis);
+#endif
     if (VBOX_FAILURE(rc))
     {
-        char pszPathReal[256];
         char *pszDevice = pThis->pszDevice;
-        if (RT_SUCCESS(RTPathReal(pszDevice, pszPathReal, sizeof(pszPathReal))))
-            pszDevice = pszPathReal;
-        AssertMsgFailed(("Could not open host device %s, rc=%Vrc\n", pThis->pszDevice, rc));
+#ifndef __DARWIN__
+        char szPathReal[256];
+        if (RT_SUCCESS(RTPathReal(pszDevice, szPathReal, sizeof(szPathReal))))
+            pszDevice = szPathReal;
         pThis->FileDevice = NIL_RTFILE;
+#endif
+        AssertMsgFailed(("Could not open host device %s, rc=%Vrc\n", pszDevice, rc));
         switch (rc)
         {
@@ -1219 +1651 @@
                            "of that device"),
 #endif
-                       pszPathReal, pThis->fReadOnlyConfig ? "readonly" : "read/write",
-                       pszPathReal);
+                       pszDevice, pThis->fReadOnlyConfig ? "readonly" : "read/write",
+                       pszDevice);
             default:
                 return rc;

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

@@ -74 +74 @@
      * This is invalid if no drive is in the drive. */
     uint64_t volatile       cbSize;
+#ifndef __DARWIN__
     /** The filehandle of the device. */
     RTFILE                  FileDevice;
+#endif
 
     /** Handle of the poller thread. */
@@ -98 +100 @@
     /** BIOS Geometry: Sectors. */
     uint32_t                cSectors;
+
+    /** The number of errors that could go into the release log. (flood gate) */
+    uint32_t                cLogRelErrors;
+
+#ifdef __DARWIN__
+    /** The master port. */
+    mach_port_t             MasterPort;
+    /** The MMC-2 Device Interface. (This is only used to get the scsi task interface.) */
+    MMCDeviceInterface    **ppMMCDI;
+    /** The SCSI Task Device Interface. */
+    SCSITaskDeviceInterface **ppScsiTaskDI;
+    /** The block size. Set when querying the media size. */
+    uint32_t                cbBlock;
+#endif
 
 #ifdef __WIN__
@@ -145 +161 @@
 void DRVHostBaseMediaNotPresent(PDRVHOSTBASE pThis);
 DECLCALLBACK(void) DRVHostBaseDestruct(PPDMDRVINS pDrvIns);
+#ifdef __DARWIN__
+DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
+                                     void *pvBuf, size_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
+#endif
 
 

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

@@ -26 +26 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_DVD
-#ifdef __LINUX__
+#ifdef __DARWIN__
+# include <mach/mach.h>
+# include <Carbon/Carbon.h>
+# include <IOKit/IOKitLib.h>
+# include <IOKit/IOCFPlugIn.h>
+# include <IOKit/scsi-commands/SCSITaskLib.h>
+# include <IOKit/scsi-commands/SCSICommandOperationCodes.h>
+# include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+# include <mach/mach_error.h>
+# define USE_MEDIA_POLLING
+
+#elif defined(__L4ENV__)
+/* nothing (yet). */
+
+#elif defined __LINUX__
 # include <sys/ioctl.h>
 /* This is a hack to work around conflicts between these linux kernel headers
@@ -39 +53 @@
 # include <sys/fcntl.h>
 # include <errno.h>
+# define USE_MEDIA_POLLING
 
 #elif defined(__WIN__)
@@ -44 +59 @@
 # include <winioctl.h>
 # include <ntddscsi.h>
-
-#elif defined(__L4ENV__)
-
-#else /* !__WIN__ nor __LINUX__ nor __L4ENV__ */
+# undef USE_MEDIA_POLLING
+
+#else
 # error "Unsupported Platform."
-#endif /* !__WIN__ nor __LINUX__ nor __L4ENV__ */
+#endif
 
 #include <VBox/pdm.h>
@@ -84 +98 @@
           * Eject the disc.
           */
-#ifdef __LINUX__
+#ifdef __DARWIN__
+         uint8_t abCmd[16] =
+         {
+             SCSI_START_STOP_UNIT, 0, 0, 0, 2 /*eject+stop*/, 0,
+             0,0,0,0,0,0,0,0,0,0
+         };
+         rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, NULL, 0, 0);
+
+#elif defined(__LINUX__)
          rc = ioctl(pThis->FileDevice, CDROMEJECT, 0);
          if (rc < 0)
@@ -151 +173 @@
 static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock)
 {
-#ifdef __LINUX__
+#ifdef __DARWIN__
+# if 0 /// @todo dig up the specification for this command and implement it. (not important on mac)
+    uint8_t abCmd[16] =
+    {
+        SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0,
+        0,0,0,0,0,0,0,0,0,0
+    };
+    int rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, NULL, 0, 0);
+# else
+    int rc = VINF_SUCCESS;
+# endif
+
+#elif defined(__LINUX__)
     int rc = ioctl(pThis->FileDevice, CDROM_LOCKDOOR, (int)fLock);
     if (rc < 0)
@@ -210 +244 @@
 
 
-#ifdef __LINUX__
+#ifdef USE_MEDIA_POLLING
 /**
  * Do media change polling.
@@ -219 +253 @@
      * Poll for media change.
      */
-#ifdef __LINUX__
+#ifdef __DARWIN__
+    AssertReturn(pThis->ppScsiTaskDI, VERR_INTERNAL_ERROR);
+
+    /*
+     * Issue a TEST UNIT READY request.
+     */
+    bool fMediaChanged = false;
+    bool fMediaPresent = false;
+    uint8_t abCmd[16] = { SCSI_TEST_UNIT_READY, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+    uint8_t abSense[32];
+    int rc2 = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, abSense, sizeof(abSense), 0);
+    if (VBOX_SUCCESS(rc2))
+        fMediaPresent = true;
+    else if (   rc2 == VERR_UNRESOLVED_ERROR
+             && abSense[2] == 6 /* unit attention */
+             && (   (abSense[12] == 0x29 && abSense[13] < 5 /* reset */)
+                 || (abSense[12] == 0x2a && abSense[13] == 0 /* parameters changed */)                        //???
+                 || (abSense[12] == 0x3f && abSense[13] == 0 /* target operating conditions have changed */)  //???
+                 || (abSense[12] == 0x3f && abSense[13] == 2 /* changed operating definition */)              //???
+                 || (abSense[12] == 0x3f && abSense[13] == 3 /* inquery parameters changed */)
+                 || (abSense[12] == 0x3f && abSense[13] == 5 /* device identifier changed */)
+                 )
+            )
+    {
+        fMediaPresent = false;
+        fMediaChanged = true;
+        /** @todo check this media chance stuff on Darwin. */
+    }
+
+#elif defined(__LINUX__)
     bool fMediaPresent = ioctl(pThis->FileDevice, CDROM_DRIVE_STATUS, CDSL_CURRENT) == CDS_DISC_OK;
 
@@ -243 +306 @@
          * Poll for media change.
          */
-        bool fMediaChanged;
-#ifdef __LINUX__
-        fMediaChanged = ioctl(pThis->FileDevice, CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
-
+#ifdef __DARWIN__
+        /* taken care of above. */
+#elif defined(__LINUX__)
+        bool fMediaChanged = ioctl(pThis->FileDevice, CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
 #else
 # error "Unsupported platform."
@@ -252 +315 @@
         if (fMediaChanged)
         {
-            int rc;
             LogFlow(("drvHostDVDMediaThread: Media changed!\n"));
             DRVHostBaseMediaNotPresent(pThis);
@@ -262 +324 @@
     return rc;
 }
-#endif /* __LINUX__ */
+#endif /* USE_MEDIA_POLLING */
 
 
 /** @copydoc PDMIBLOCK::pfnSendCmd */
-static int drvHostDvdSendCmd(PPDMIBLOCK pInterface, const uint8_t *pbCmd, PDMBLOCKTXDIR enmTxDir, void *pvBuf, size_t *pcbBuf, uint8_t *pbStat, uint32_t cTimeoutMillies)
+static int drvHostDvdSendCmd(PPDMIBLOCK pInterface, const uint8_t *pbCmd, PDMBLOCKTXDIR enmTxDir, void *pvBuf, size_t *pcbBuf,
+                             uint8_t *pbStat, uint32_t cTimeoutMillies)
 {
     PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
-    int direction;
     int rc;
     LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCmd[0], enmTxDir, *pcbBuf, cTimeoutMillies));
-#ifdef __LINUX__
+
+#ifdef __DARWIN__
+    /*
+     * Pass the request on to the internal scsi command interface.
+     * The command seems to be 12 bytes long, the docs a bit copy&pasty on the command length point...
+     */
+    if (enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+        memset(pvBuf, '\0', *pcbBuf); /* we got read size, but zero it anyway. */
+    uint8_t abSense[32];
+    rc = DRVHostBaseScsiCmd(pThis, pbCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, pcbBuf, abSense, sizeof(abSense), cTimeoutMillies);
+    if (rc == VERR_UNRESOLVED_ERROR)
+    {
+        *pbStat = abSense[2] & 0x0f;
+        rc = VINF_SUCCESS;
+    }
+
+#elif defined(__L4ENV__)
+    /* Not really ported to L4 yet. */
+    rc = VERR_INTERNAL_ERROR;
+
+#elif defined(__LINUX__)
+    int direction;
     struct cdrom_generic_command cgc;
     request_sense sense;
@@ -331 +414 @@
      * of data transferred (for packet commands with little data transfer
      * it's 0). So just assume that everything worked ok. */
+
 #elif defined(__WIN__)
-    struct _REQ {
+    int direction;
+    struct _REQ
+    {
         SCSI_PASS_THROUGH_DIRECT spt;
         uint8_t aSense[18];
@@ -386 +472 @@
         rc = RTErrConvertFromWin32(GetLastError());
     Log2(("%s: scsistatus=%d bytes returned=%d tlength=%d\n", __FUNCTION__, Req.spt.ScsiStatus, cbReturned, Req.spt.DataTransferLength));
-#elif defined(__L4ENV__)
-    /* L4 is silently unsupported. */
+
 #else
 # error "Unsupported platform."
@@ -444 +529 @@
         pThis->IMount.pfnUnmount = drvHostDvdUnmount;
         pThis->pfnDoLock         = drvHostDvdDoLock;
+#ifdef USE_MEDIA_POLLING
+        if (!fPassthrough)
+            pThis->pfnPoll       = drvHostDvdPoll;
+        else
+            pThis->pfnPoll       = NULL;
+#endif
 #ifdef __LINUX__
-        if (!fPassthrough)
-            pThis->pfnPoll           = drvHostDvdPoll;
-        else
-            pThis->pfnPoll           = NULL;
         pThis->pfnGetMediaSize   = drvHostDvdGetMediaSize;
 #endif