Changeset 3666 in vbox for trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

Timestamp:

Jul 17, 2007 6:33:02 AM (17 years ago)

Author:

vboxsync

Message:

replace underscore symbols in Devices/

File:

• trunk/src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (34 diffs)

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

@@ -26 +26 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_BASE
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
 # include <mach/mach.h>
 # include <Carbon/Carbon.h>
@@ -41 +41 @@
   /* Nothing special requires... yeah, right. */
 
-#elif defined(__LINUX__)
+#elif defined(RT_OS_LINUX)
 # include <sys/ioctl.h>
 # include <sys/fcntl.h>
 # include <errno.h>
 
-#elif defined(__WIN__)
+#elif defined(RT_OS_WINDOWS)
 # define WIN32_NO_STATUS
 # include <Windows.h>
@@ -134 +134 @@
      */
     int rc;
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     if (    pThis->fMediaPresent
         &&  pThis->ppScsiTaskDI
@@ -142 +142 @@
 #endif
     {
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
         /*
          * Issue a READ(12) request.
@@ -211 +211 @@
         if (pThis->fMediaPresent)
         {
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
             /** @todo write support... */
             rc = VERR_WRITE_PROTECT;
@@ -256 +256 @@
     if (pThis->fMediaPresent)
     {
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
         rc = VINF_SUCCESS;
         /** @todo scsi device buffer flush... */
@@ -561 +561 @@
 /* -=-=-=-=- poller thread -=-=-=-=- */
 
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
 /** The runloop input source name for the disk arbitration events. */
 #define MY_RUN_LOOP_MODE    CFSTR("drvHostBaseDA")
@@ -734 +734 @@
     }
 }
-#endif /* __DARWIN__ */
+#endif /* RT_OS_DARWIN */
 
 
@@ -745 +745 @@
 static int drvHostBaseOpen(PDRVHOSTBASE pThis, PRTFILE pFileDevice, bool fReadOnly)
 {
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     /* Darwin is kind of special... */
     Assert(!pFileDevice); NOREF(pFileDevice);
@@ -923 +923 @@
     return rc;
 
-#elif defined(__LINUX__)
+#elif defined(RT_OS_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);
@@ -950 +950 @@
 static int drvHostBaseReopen(PDRVHOSTBASE pThis)
 {
-#ifndef __DARWIN__ /* Only *one* open for darwin. */
+#ifndef RT_OS_DARWIN /* Only *one* open for darwin. */
     LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
 
@@ -976 +976 @@
         RTFileClose(pThis->FileDevice);
     pThis->FileDevice = FileDevice;
-#endif /* !__DARWIN__ */
+#endif /* !RT_OS_DARWIN */
     return VINF_SUCCESS;
 }
@@ -990 +990 @@
 static int drvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
 {
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     /*
      * Try a READ_CAPACITY command...
@@ -1019 +1019 @@
     return rc;
 
-#elif defined(__WIN__)
+#elif defined(RT_OS_WINDOWS)
     /* use NT api, retry a few times if the media is being verified. */
     IO_STATUS_BLOCK             IoStatusBlock = {0};
@@ -1054 +1054 @@
 
 
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
 /**
  * Execute a SCSI command.
@@ -1090 +1090 @@
         *pcbBuf = 0;
 
-# ifdef __DARWIN__
+# ifdef RT_OS_DARWIN
     Assert(pThis->ppScsiTaskDI);
 
@@ -1227 +1227 @@
 
 
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
 
 /**
@@ -1284 +1284 @@
 }
 
-#endif /* __WIN__ */
+#endif /* RT_OS_WINDOWS */
 
 
@@ -1299 +1299 @@
     LogFlow(("%s-%d: drvHostBaseMediaThread: ThreadSelf=%p pvUser=%p\n",
              pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
     static WNDCLASS s_classDeviceChange = {0};
     static ATOM     s_hAtomDeviceChange = 0;
@@ -1352 +1352 @@
     Assert(!pThis->hwndDeviceChange);
 
-#else /* !__WIN__ */
+#else /* !RT_OS_WINDOWS */
     bool        fFirst = true;
     int         cRetries = 10;
@@ -1396 +1396 @@
     }
 
-#endif /* !__WIN__ */
+#endif /* !RT_OS_WINDOWS */
 
     /* (Don't clear the thread handle here, the destructor thread is using it to wait.) */
@@ -1450 +1450 @@
         do
         {
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
             if (pThis->hwndDeviceChange)
                 PostMessage(pThis->hwndDeviceChange, WM_CLOSE, 0, 0); /* default win proc will destroy the window */
@@ -1466 +1466 @@
      * Unlock the drive if we've locked it or we're in passthru mode.
      */
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     if (    (   pThis->fLocked
              || pThis->IBlock.pfnSendCmd)
@@ -1485 +1485 @@
      * Cleanup the other resources.
      */
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
     if (pThis->hwndDeviceChange)
     {
@@ -1500 +1500 @@
 #endif
 
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     /*
      * The unclaiming doesn't seem to mean much, the DVD is actaully
@@ -1598 +1598 @@
     pThis->fKeepInstance                    = false;
     pThis->ThreadPoller                     = NIL_RTTHREAD;
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     pThis->MasterPort                       = NULL;
     pThis->ppMMCDI                          = NULL;
@@ -1736 +1736 @@
 
     /* name to open & watch for */
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
     int iBit = toupper(pThis->pszDevice[0]) - 'A';
     if (    iBit > 'Z' - 'A'
@@ -1798 +1798 @@
      * Verify type.
      */
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
     UINT uDriveType = GetDriveType(pThis->pszDevice);
     switch (pThis->enmType)
@@ -1833 +1833 @@
      * Open the device.
      */
-#ifdef __DARWIN__
+#ifdef RT_OS_DARWIN
     rc = drvHostBaseOpen(pThis, NULL, pThis->fReadOnlyConfig);
 #else
@@ -1841 +1841 @@
     {
         char *pszDevice = pThis->pszDevice;
-#ifndef __DARWIN__
+#ifndef RT_OS_DARWIN
         char szPathReal[256];
         if (   RTPathExists(pszDevice)
@@ -1859 +1859 @@
             case VERR_ACCESS_DENIED:
                 return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-#ifdef __LINUX__
+#ifdef RT_OS_LINUX
                         N_("Cannot open host device '%s' for %s access. Check the permissions "
                            "of that device ('/bin/ls -l %s'): Most probably you need to be member "
@@ -1882 +1882 @@
         }
     }
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
     if (VBOX_SUCCESS(src))
         DRVHostBaseMediaPresent(pThis);
@@ -1901 +1901 @@
     }
 
-#ifndef __WIN__
+#ifndef RT_OS_WINDOWS
     if (VBOX_SUCCESS(src))
     {
@@ -1938 +1938 @@
         rc = RTThreadUserWait(pThis->ThreadPoller, 10000);
         AssertRC(rc);
-#ifdef __WIN__
+#ifdef RT_OS_WINDOWS
         if (!pThis->hwndDeviceChange)
             return VERR_GENERAL_FAILURE;