VirtualBox

Changeset 3666 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
Jul 17, 2007 6:33:02 AM (18 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
22942
Message:

replace underscore symbols in Devices/

Location:
trunk/src/VBox/Devices
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

    r3214 r3666  
    285285    PDMDevHlpPhysRead (pDevIns, r->bdbar + r->civ * 8, b, sizeof(b));
    286286    r->bd_valid   = 1;
    287 #if !defined(__X86__) && !defined(__AMD64__)
     287#if !defined(RT_ARCH_X86) && !defined(RT_ARCH_AMD64)
    288288#error Please adapt the code (audio buffers are little endian)!
    289289#else
    … …  
    16801680    ac97Reset(pDevIns);
    16811681
    1682 #ifndef __DARWIN__ /* coreaudio doesn't supply these. */
     1682#ifndef RT_OS_DARWIN /* coreaudio doesn't supply these. */
    16831683    if (!s->voice_pi)
    16841684        LogRel(("AC97: WARNING: Unable to open PCM IN!\n"));
    … …  
    17051705                "with the consequence that no sound is audible."));
    17061706    }
    1707 #ifndef __DARWIN__
     1707#ifndef RT_OS_DARWIN
    17081708    else if (!s->voice_pi || !s->voice_po || !s->voice_mc)
    17091709    {

  • trunk/src/VBox/Devices/Audio/audio.c

    r3214 r3666  
    4343#include "audio_int.h"
    4444
    45 #ifdef __WIN__
     45#ifdef RT_OS_WINDOWS
    4646#define strcasecmp stricmp
    4747#endif
    … …  
    6363
    6464static struct audio_driver *drvtab[] = {
    65 #ifdef __LINUX__
     65#ifdef RT_OS_LINUX
    6666    &oss_audio_driver,
    6767#ifdef VBOX_WITH_ALSA
    … …  
    6969#endif
    7070#endif
    71 #ifdef __DARWIN__
     71#ifdef RT_OS_DARWIN
    7272    &coreaudio_audio_driver,
    7373#endif
    74 #ifdef __WIN__
     74#ifdef RT_OS_WINDOWS
    7575    &dsound_audio_driver,
    7676#endif

  • trunk/src/VBox/Devices/Builtins.cpp

    r3648 r3666  
    161161        return rc;
    162162#endif
    163 #if defined(__DARWIN__) || defined(__LINUX__) || defined(__WIN__)
     163#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
    164164    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostDVD);
    165165    if (VBOX_FAILURE(rc))
    166166        return rc;
    167167#endif
    168 #if defined(__LINUX__) || defined(__WIN__)
     168#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
    169169    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostFloppy);
    170170    if (VBOX_FAILURE(rc))
    … …  
    177177    if (VBOX_FAILURE(rc))
    178178        return rc;
    179 #if defined(__WIN__) || defined(__LINUX__)
     179#if defined(RT_OS_WINDOWS) || defined(RT_OS_LINUX)
    180180    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostHDD);
    181181    if (VBOX_FAILURE(rc))
    … …  
    195195        return rc;
    196196#endif
    197 #if defined(__L4ENV__) || defined(__LINUX__) || defined(__WIN__)
     197#if defined(__L4ENV__) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
    198198    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
    199199    if (VBOX_FAILURE(rc))
    … …  
    228228#endif
    229229
    230 #if defined(__LINUX__)
     230#if defined(RT_OS_LINUX)
    231231    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostParallel);
    232232    if (VBOX_FAILURE(rc))

  • trunk/src/VBox/Devices/Network/DevPCNet.cpp

    r3654 r3666  
    365365#define CSR_PROM(S)      !!((S)->aCSR[15] & 0x8000) /**< Promiscuous Mode */
    366366
    367 #if !defined(__X86__) && !defined(__AMD64__)
     367#if !defined(RT_ARCH_X86) && !defined(RT_ARCH_AMD64)
    368368#error fix macros (and more in this file) for big-endian machines
    369369#endif
    … …  
    895895    struct ether_header *hdr = (struct ether_header *)buf;
    896896    int     result;
    897 #if (defined(__X86__) || defined(__AMD64__)) && !defined(PCNET_DEBUG_MATCH)
     897#if (defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)) && !defined(PCNET_DEBUG_MATCH)
    898898    result = !CSR_DRCVPA(pData) && !memcmp(hdr->ether_dhost, pData->aCSR + 12, 6);
    899899#else
    … …  
    937937    {
    938938        int index;
    939 #if defined(__X86__) || defined(__AMD64__)
     939#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
    940940        index = lnc_mchash(hdr->ether_dhost) >> 26;
    941941        return ((uint8_t*)(pData->aCSR + 8))[index >> 3] & (1 << (index & 7));
    … …  
    42444244        if (rc == VINF_NAT_DNS)
    42454245        {
    4246 #ifdef __LINUX__
     4246#ifdef RT_OS_LINUX
    42474247            VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), false, "NoDNSforNAT",
    42484248                              N_("A Domain Name Server (DNS) for NAT networking could not be determined. Please check your /etc/resolv.conf for <tt>nameserver</tt> entries. Either add one manually (<i>man resolv.conf</i>) or ensure that your host is correctly connected to an ISP. If you ignore this warning the guest will not be able to perform nameserver lookups and it will probably observe delays if trying so"));

  • trunk/src/VBox/Devices/Network/slirp/slirp.h

    r1824 r3666  
    22#define __COMMON_H__
    33
    4 #ifdef __WIN__
     4#ifdef RT_OS_WINDOWS
    55# include <winsock2.h>
    66typedef int socklen_t;
    … …  
    2626#include <VBox/log.h>
    2727#include <iprt/mem.h>
    28 #ifdef __WIN__
     28#ifdef RT_OS_WINDOWS
    2929# include <windows.h>
    3030# include <io.h>

  • trunk/src/VBox/Devices/Network/slirp/socket.c

    r3226 r3666  
    592592            (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) ||
    593593            (listen(s,1) < 0)) {
    594 #ifdef __WIN__
     594#ifdef RT_OS_WINDOWS
    595595                int tmperrno = WSAGetLastError(); /* Don't clobber the real reason we failed */
    596596                closesocket(s);

  • trunk/src/VBox/Devices/PC/DevRTC.cpp

    r3477 r3666  
    114114    struct tm current_tm;
    115115#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && IN_GC
    116 # if !defined(__WIN__)
     116# if !defined(RT_OS_WINDOWS)
    117117    uint32_t Alignment1[3];
    118118# endif

  • trunk/src/VBox/Devices/PC/DrvACPI.cpp

    r2981 r3666  
    2525#define LOG_GROUP LOG_GROUP_DRV_ACPI
    2626
    27 #ifdef __WIN__
     27#ifdef RT_OS_WINDOWS
    2828#include <windows.h>
    2929#endif
    … …  
    3838#include <iprt/string.h>
    3939
    40 #ifdef __LINUX__
     40#ifdef RT_OS_LINUX
    4141#include <iprt/string.h>
    4242#include <sys/types.h>
    … …  
    9999                                                 PDMACPIPOWERSOURCE *pPowerSource)
    100100{
    101 #if defined(__WIN__)
     101#if defined(RT_OS_WINDOWS)
    102102    SYSTEM_POWER_STATUS powerStatus;
    103103    if (GetSystemPowerStatus(&powerStatus))
    … …  
    127127        *pPowerSource = PDM_ACPI_POWER_SOURCE_UNKNOWN;
    128128    }
    129 #elif defined (__LINUX__) /* !__WIN__ */
     129#elif defined (RT_OS_LINUX) /* !RT_OS_WINDOWS */
    130130    DIR *dfd;
    131131    struct dirent *dp;
    … …  
    183183        fclose(statusFile);
    184184    }
    185 #else /* !__LINUX__ either - what could this be? */
     185#else /* !RT_OS_LINUX either - what could this be? */
    186186    *pPowerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
    187 #endif /* !__WIN__ */
     187#endif /* !RT_OS_WINDOWS */
    188188    return VINF_SUCCESS;
    189189}
    … …  
    203203    *pu32PresentRate        = ~0;      /* present rate is unknown */
    204204
    205 #if defined(__WIN__)
     205#if defined(RT_OS_WINDOWS)
    206206    SYSTEM_POWER_STATUS powerStatus;
    207207    if (GetSystemPowerStatus(&powerStatus))
    … …  
    228228                        GetLastError()));
    229229    }
    230 #elif defined(__LINUX__)
     230#elif defined(RT_OS_LINUX)
    231231    DIR *dfd;
    232232    struct dirent *dp;
    … …  
    417417        *pu32PresentRate = (uint32_t)(((float)presentRateTotal / (float)maxCapacityTotal) * 1000);
    418418    }
    419 #endif /* __LINUX__ */
     419#endif /* RT_OS_LINUX */
    420420    return VINF_SUCCESS;
    421421}

  • trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

    r3649 r3666  
    3333#include <iprt/semaphore.h>
    3434
    35 #ifdef __LINUX__
     35#ifdef RT_OS_LINUX
    3636#include <sys/ioctl.h>
    3737#include <sys/types.h>

  • trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

    r2981 r3666  
    4141#include "Builtins.h"
    4242
    43 #ifdef __WIN__
     43#ifdef RT_OS_WINDOWS
    4444#include <windows.h>
    45 #else /* !__WIN__ */
     45#else /* !RT_OS_WINDOWS */
    4646#include <errno.h>
    4747#include <unistd.h>
    … …  
    4949#include <sys/socket.h>
    5050#include <sys/un.h>
    51 #endif /* !__WIN__ */
     51#endif /* !RT_OS_WINDOWS */
    5252
    5353/*******************************************************************************
    … …  
    7777    /** Flag whether VirtualBox represents the server or client side. */
    7878    bool                fIsServer;
    79 #ifdef __WIN__
     79#ifdef RT_OS_WINDOWS
    8080    /* File handle of the named pipe. */
    8181    RTFILE              NamedPipe;
    … …  
    8686    /* Listen thread wakeup semaphore */
    8787    RTSEMEVENT          ListenSem;
    88 #else /* !__WIN__ */
     88#else /* !RT_OS_WINDOWS */
    8989    /** Socket handle of the local socket for server. */
    9090    RTSOCKET            LocalSocketServer;
    9191    /** Socket handle of the local socket. */
    9292    RTSOCKET            LocalSocket;
    93 #endif /* !__WIN__ */
     93#endif /* !RT_OS_WINDOWS */
    9494    /** Thread for listening for new connections. */
    9595    RTTHREAD            ListenThread;
    … …  
    112112
    113113    Assert(pvBuf);
    114 #ifdef __WIN__
     114#ifdef RT_OS_WINDOWS
    115115    if (pData->NamedPipe != NIL_RTFILE)
    116116    {
    … …  
    172172        *cbRead = (size_t)cbReallyRead;
    173173    }
    174 #else /* !__WIN__ */
     174#else /* !RT_OS_WINDOWS */
    175175    if (pData->LocalSocket != NIL_RTSOCKET)
    176176    {
    … …  
    190190        *cbRead = cbReallyRead;
    191191    }
    192 #endif /* !__WIN__ */
     192#endif /* !RT_OS_WINDOWS */
    193193    else
    194194    {
    … …  
    210210
    211211    Assert(pvBuf);
    212 #ifdef __WIN__
     212#ifdef RT_OS_WINDOWS
    213213    if (pData->NamedPipe != NIL_RTFILE)
    214214    {
    … …  
    262262        *cbWrite = cbWritten;
    263263    }
    264 #else /* !__WIN__ */
     264#else /* !RT_OS_WINDOWS */
    265265    if (pData->LocalSocket != NIL_RTSOCKET)
    266266    {
    … …  
    280280        *cbWrite = cbWritten;
    281281    }
    282 #endif /* !__WIN__ */
     282#endif /* !RT_OS_WINDOWS */
    283283
    284284    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
    … …  
    325325    PDRVNAMEDPIPE   pData = (PDRVNAMEDPIPE)pvUser;
    326326    int             rc = VINF_SUCCESS;
    327 #ifdef __WIN__
     327#ifdef RT_OS_WINDOWS
    328328    RTFILE          NamedPipe = pData->NamedPipe;
    329329    HANDLE          hEvent = CreateEvent(NULL, TRUE, FALSE, 0);
    … …  
    332332    while (RT_LIKELY(!pData->fShutdown))
    333333    {
    334 #ifdef __WIN__
     334#ifdef RT_OS_WINDOWS
    335335        OVERLAPPED overlapped;
    336336
    … …  
    369369            }
    370370        }
    371 #else /* !__WIN__ */
     371#else /* !RT_OS_WINDOWS */
    372372        if (listen(pData->LocalSocketServer, 0) == -1)
    373373        {
    … …  
    393393                pData->LocalSocket = s;
    394394        }
    395 #endif /* !__WIN__ */
    396     }
    397 
    398 #ifdef __WIN__
     395#endif /* !RT_OS_WINDOWS */
     396    }
     397
     398#ifdef RT_OS_WINDOWS
    399399    CloseHandle(hEvent);
    400400#endif
    … …  
    425425    pData->pszLocation                  = NULL;
    426426    pData->fIsServer                    = false;
    427 #ifdef __WIN__
     427#ifdef RT_OS_WINDOWS
    428428    pData->NamedPipe                    = NIL_RTFILE;
    429 #else /* !__WIN__ */
     429#else /* !RT_OS_WINDOWS */
    430430    pData->LocalSocketServer            = NIL_RTSOCKET;
    431431    pData->LocalSocket                  = NIL_RTSOCKET;
    432 #endif /* !__WIN__ */
     432#endif /* !RT_OS_WINDOWS */
    433433    pData->ListenThread                 = NIL_RTTHREAD;
    434434    pData->fShutdown                    = false;
    … …  
    463463    pData->fIsServer = fIsServer;
    464464
    465 #ifdef __WIN__
     465#ifdef RT_OS_WINDOWS
    466466    if (fIsServer)
    467467    {
    … …  
    494494    pData->OverlappedWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
    495495    pData->OverlappedRead.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
    496 #else /* !__WIN__ */
     496#else /* !RT_OS_WINDOWS */
    497497    int s;
    498498    struct sockaddr_un addr;
    … …  
    523523        pData->LocalSocket = s;
    524524    }
    525 #endif /* !__WIN__ */
     525#endif /* !RT_OS_WINDOWS */
    526526
    527527out:
    … …  
    579579    pData->fShutdown = true;
    580580
    581 #ifdef __WIN__
     581#ifdef RT_OS_WINDOWS
    582582    if (pData->NamedPipe != NIL_RTFILE)
    583583    {
    … …  
    594594    RTSemEventSignal(pData->ListenSem);
    595595    RTSemEventDestroy(pData->ListenSem);
    596 #else /* !__WIN__ */
     596#else /* !RT_OS_WINDOWS */
    597597    if (pData->fIsServer)
    598598    {
    … …  
    607607            close(pData->LocalSocket);
    608608    }
    609 #endif /* !__WIN__ */
     609#endif /* !RT_OS_WINDOWS */
    610610}
    611611

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

    r3538 r3666  
    2626*******************************************************************************/
    2727#define LOG_GROUP LOG_GROUP_DRV_HOST_BASE
    28 #ifdef __DARWIN__
     28#ifdef RT_OS_DARWIN
    2929# include <mach/mach.h>
    3030# include <Carbon/Carbon.h>
    … …  
    4141  /* Nothing special requires... yeah, right. */
    4242
    43 #elif defined(__LINUX__)
     43#elif defined(RT_OS_LINUX)
    4444# include <sys/ioctl.h>
    4545# include <sys/fcntl.h>
    4646# include <errno.h>
    4747
    48 #elif defined(__WIN__)
     48#elif defined(RT_OS_WINDOWS)
    4949# define WIN32_NO_STATUS
    5050# include <Windows.h>
    … …  
    134134     */
    135135    int rc;
    136 #ifdef __DARWIN__
     136#ifdef RT_OS_DARWIN
    137137    if (    pThis->fMediaPresent
    138138        &&  pThis->ppScsiTaskDI
    … …  
    142142#endif
    143143    {
    144 #ifdef __DARWIN__
     144#ifdef RT_OS_DARWIN
    145145        /*
    146146         * Issue a READ(12) request.
    … …  
    211211        if (pThis->fMediaPresent)
    212212        {
    213 #ifdef __DARWIN__
     213#ifdef RT_OS_DARWIN
    214214            /** @todo write support... */
    215215            rc = VERR_WRITE_PROTECT;
    … …  
    256256    if (pThis->fMediaPresent)
    257257    {
    258 #ifdef __DARWIN__
     258#ifdef RT_OS_DARWIN
    259259        rc = VINF_SUCCESS;
    260260        /** @todo scsi device buffer flush... */
    … …  
    561561/* -=-=-=-=- poller thread -=-=-=-=- */
    562562
    563 #ifdef __DARWIN__
     563#ifdef RT_OS_DARWIN
    564564/** The runloop input source name for the disk arbitration events. */
    565565#define MY_RUN_LOOP_MODE    CFSTR("drvHostBaseDA")
    … …  
    734734    }
    735735}
    736 #endif /* __DARWIN__ */
     736#endif /* RT_OS_DARWIN */
    737737
    738738
    … …  
    745745static int drvHostBaseOpen(PDRVHOSTBASE pThis, PRTFILE pFileDevice, bool fReadOnly)
    746746{
    747 #ifdef __DARWIN__
     747#ifdef RT_OS_DARWIN
    748748    /* Darwin is kind of special... */
    749749    Assert(!pFileDevice); NOREF(pFileDevice);
    … …  
    923923    return rc;
    924924
    925 #elif defined(__LINUX__)
     925#elif defined(RT_OS_LINUX)
    926926    /** @todo we've got RTFILE_O_NON_BLOCK now. Change the code to use RTFileOpen. */
    927927    int FileDevice = open(pThis->pszDeviceOpen, (pThis->fReadOnlyConfig ? O_RDONLY : O_RDWR) | O_NONBLOCK);
    … …  
    950950static int drvHostBaseReopen(PDRVHOSTBASE pThis)
    951951{
    952 #ifndef __DARWIN__ /* Only *one* open for darwin. */
     952#ifndef RT_OS_DARWIN /* Only *one* open for darwin. */
    953953    LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
    954954
    … …  
    976976        RTFileClose(pThis->FileDevice);
    977977    pThis->FileDevice = FileDevice;
    978 #endif /* !__DARWIN__ */
     978#endif /* !RT_OS_DARWIN */
    979979    return VINF_SUCCESS;
    980980}
    … …  
    990990static int drvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
    991991{
    992 #ifdef __DARWIN__
     992#ifdef RT_OS_DARWIN
    993993    /*
    994994     * Try a READ_CAPACITY command...
    … …  
    10191019    return rc;
    10201020
    1021 #elif defined(__WIN__)
     1021#elif defined(RT_OS_WINDOWS)
    10221022    /* use NT api, retry a few times if the media is being verified. */
    10231023    IO_STATUS_BLOCK             IoStatusBlock = {0};
    … …  
    10541054
    10551055
    1056 #ifdef __DARWIN__
     1056#ifdef RT_OS_DARWIN
    10571057/**
    10581058 * Execute a SCSI command.
    … …  
    10901090        *pcbBuf = 0;
    10911091
    1092 # ifdef __DARWIN__
     1092# ifdef RT_OS_DARWIN
    10931093    Assert(pThis->ppScsiTaskDI);
    10941094
    … …  
    12271227
    12281228
    1229 #ifdef __WIN__
     1229#ifdef RT_OS_WINDOWS
    12301230
    12311231/**
    … …  
    12841284}
    12851285
    1286 #endif /* __WIN__ */
     1286#endif /* RT_OS_WINDOWS */
    12871287
    12881288
    … …  
    12991299    LogFlow(("%s-%d: drvHostBaseMediaThread: ThreadSelf=%p pvUser=%p\n",
    13001300             pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));
    1301 #ifdef __WIN__
     1301#ifdef RT_OS_WINDOWS
    13021302    static WNDCLASS s_classDeviceChange = {0};
    13031303    static ATOM     s_hAtomDeviceChange = 0;
    … …  
    13521352    Assert(!pThis->hwndDeviceChange);
    13531353
    1354 #else /* !__WIN__ */
     1354#else /* !RT_OS_WINDOWS */
    13551355    bool        fFirst = true;
    13561356    int         cRetries = 10;
    … …  
    13961396    }
    13971397
    1398 #endif /* !__WIN__ */
     1398#endif /* !RT_OS_WINDOWS */
    13991399
    14001400    /* (Don't clear the thread handle here, the destructor thread is using it to wait.) */
    … …  
    14501450        do
    14511451        {
    1452 #ifdef __WIN__
     1452#ifdef RT_OS_WINDOWS
    14531453            if (pThis->hwndDeviceChange)
    14541454                PostMessage(pThis->hwndDeviceChange, WM_CLOSE, 0, 0); /* default win proc will destroy the window */
    … …  
    14661466     * Unlock the drive if we've locked it or we're in passthru mode.
    14671467     */
    1468 #ifdef __DARWIN__
     1468#ifdef RT_OS_DARWIN
    14691469    if (    (   pThis->fLocked
    14701470             || pThis->IBlock.pfnSendCmd)
    … …  
    14851485     * Cleanup the other resources.
    14861486     */
    1487 #ifdef __WIN__
     1487#ifdef RT_OS_WINDOWS
    14881488    if (pThis->hwndDeviceChange)
    14891489    {
    … …  
    15001500#endif
    15011501
    1502 #ifdef __DARWIN__
     1502#ifdef RT_OS_DARWIN
    15031503    /*
    15041504     * The unclaiming doesn't seem to mean much, the DVD is actaully
    … …  
    15981598    pThis->fKeepInstance                    = false;
    15991599    pThis->ThreadPoller                     = NIL_RTTHREAD;
    1600 #ifdef __DARWIN__
     1600#ifdef RT_OS_DARWIN
    16011601    pThis->MasterPort                       = NULL;
    16021602    pThis->ppMMCDI                          = NULL;
    … …  
    17361736
    17371737    /* name to open & watch for */
    1738 #ifdef __WIN__
     1738#ifdef RT_OS_WINDOWS
    17391739    int iBit = toupper(pThis->pszDevice[0]) - 'A';
    17401740    if (    iBit > 'Z' - 'A'
    … …  
    17981798     * Verify type.
    17991799     */
    1800 #ifdef __WIN__
     1800#ifdef RT_OS_WINDOWS
    18011801    UINT uDriveType = GetDriveType(pThis->pszDevice);
    18021802    switch (pThis->enmType)
    … …  
    18331833     * Open the device.
    18341834     */
    1835 #ifdef __DARWIN__
     1835#ifdef RT_OS_DARWIN
    18361836    rc = drvHostBaseOpen(pThis, NULL, pThis->fReadOnlyConfig);
    18371837#else
    … …  
    18411841    {
    18421842        char *pszDevice = pThis->pszDevice;
    1843 #ifndef __DARWIN__
     1843#ifndef RT_OS_DARWIN
    18441844        char szPathReal[256];
    18451845        if (   RTPathExists(pszDevice)
    … …  
    18591859            case VERR_ACCESS_DENIED:
    18601860                return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    1861 #ifdef __LINUX__
     1861#ifdef RT_OS_LINUX
    18621862                        N_("Cannot open host device '%s' for %s access. Check the permissions "
    18631863                           "of that device ('/bin/ls -l %s'): Most probably you need to be member "
    … …  
    18821882        }
    18831883    }
    1884 #ifdef __WIN__
     1884#ifdef RT_OS_WINDOWS
    18851885    if (VBOX_SUCCESS(src))
    18861886        DRVHostBaseMediaPresent(pThis);
    … …  
    19011901    }
    19021902
    1903 #ifndef __WIN__
     1903#ifndef RT_OS_WINDOWS
    19041904    if (VBOX_SUCCESS(src))
    19051905    {
    … …  
    19381938        rc = RTThreadUserWait(pThis->ThreadPoller, 10000);
    19391939        AssertRC(rc);
    1940 #ifdef __WIN__
     1940#ifdef RT_OS_WINDOWS
    19411941        if (!pThis->hwndDeviceChange)
    19421942            return VERR_GENERAL_FAILURE;

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

    r3113 r3666  
    7878     * This is invalid if no drive is in the drive. */
    7979    uint64_t volatile       cbSize;
    80 #ifndef __DARWIN__
     80#ifndef RT_OS_DARWIN
    8181    /** The filehandle of the device. */
    8282    RTFILE                  FileDevice;
    … …  
    8585    /** Handle of the poller thread. */
    8686    RTTHREAD                ThreadPoller;
    87 #ifndef __WIN__
     87#ifndef RT_OS_WINDOWS
    8888    /** Event semaphore the thread will wait on. */
    8989    RTSEMEVENT              EventPoller;
    … …  
    108108    uint32_t                cLogRelErrors;
    109109
    110 #ifdef __DARWIN__
     110#ifdef RT_OS_DARWIN
    111111    /** The master port. */
    112112    mach_port_t             MasterPort;
    … …  
    123123#endif
    124124
    125 #ifdef __WIN__
     125#ifdef RT_OS_WINDOWS
    126126    /** Handle to the window we use to catch the device change broadcast messages. */
    127127    volatile HWND           hwndDeviceChange;
    … …  
    169169void DRVHostBaseMediaNotPresent(PDRVHOSTBASE pThis);
    170170DECLCALLBACK(void) DRVHostBaseDestruct(PPDMDRVINS pDrvIns);
    171 #ifdef __DARWIN__
     171#ifdef RT_OS_DARWIN
    172172DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
    173173                                     void *pvBuf, size_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);

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

    r3113 r3666  
    2626*******************************************************************************/
    2727#define LOG_GROUP LOG_GROUP_DRV_HOST_DVD
    28 #ifdef __DARWIN__
     28#ifdef RT_OS_DARWIN
    2929# include <mach/mach.h>
    3030# include <Carbon/Carbon.h>
    … …  
    4040/* nothing (yet). */
    4141
    42 #elif defined __LINUX__
     42#elif defined RT_OS_LINUX
    4343# include <sys/ioctl.h>
    4444/* This is a hack to work around conflicts between these linux kernel headers
    … …  
    5555# define USE_MEDIA_POLLING
    5656
    57 #elif defined(__WIN__)
     57#elif defined(RT_OS_WINDOWS)
    5858# include <Windows.h>
    5959# include <winioctl.h>
    … …  
    105105          * Eject the disc.
    106106          */
    107 #ifdef __DARWIN__
     107#ifdef RT_OS_DARWIN
    108108         uint8_t abCmd[16] =
    109109         {
    … …  
    113113         rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, NULL, 0, 0);
    114114
    115 #elif defined(__LINUX__)
     115#elif defined(RT_OS_LINUX)
    116116         rc = ioctl(pThis->FileDevice, CDROMEJECT, 0);
    117117         if (rc < 0)
    … …  
    125125         }
    126126
    127 #elif defined(__WIN__)
     127#elif defined(RT_OS_WINDOWS)
    128128         RTFILE FileDevice = pThis->FileDevice;
    129129         if (FileDevice == NIL_RTFILE) /* obsolete crap */
    … …  
    180180static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock)
    181181{
    182 #ifdef __DARWIN__
     182#ifdef RT_OS_DARWIN
    183183    uint8_t abCmd[16] =
    184184    {
    … …  
    188188    int rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, NULL, 0, 0);
    189189
    190 #elif defined(__LINUX__)
     190#elif defined(RT_OS_LINUX)
    191191    int rc = ioctl(pThis->FileDevice, CDROM_LOCKDOOR, (int)fLock);
    192192    if (rc < 0)
    … …  
    200200    }
    201201
    202 #elif defined(__WIN__)
     202#elif defined(RT_OS_WINDOWS)
    203203
    204204    PREVENT_MEDIA_REMOVAL PreventMediaRemoval = {fLock};
    … …  
    226226
    227227
    228 #ifdef __LINUX__
     228#ifdef RT_OS_LINUX
    229229/**
    230230 * Get the media size.
    … …  
    244244
    245245}
    246 #endif /* __LINUX__ */
     246#endif /* RT_OS_LINUX */
    247247
    248248
    … …  
    256256     * Poll for media change.
    257257     */
    258 #ifdef __DARWIN__
     258#ifdef RT_OS_DARWIN
    259259    AssertReturn(pThis->ppScsiTaskDI, VERR_INTERNAL_ERROR);
    260260
    … …  
    285285    }
    286286
    287 #elif defined(__LINUX__)
     287#elif defined(RT_OS_LINUX)
    288288    bool fMediaPresent = ioctl(pThis->FileDevice, CDROM_DRIVE_STATUS, CDSL_CURRENT) == CDS_DISC_OK;
    289289
    … …  
    309309         * Poll for media change.
    310310         */
    311 #ifdef __DARWIN__
     311#ifdef RT_OS_DARWIN
    312312        /* taken care of above. */
    313 #elif defined(__LINUX__)
     313#elif defined(RT_OS_LINUX)
    314314        bool fMediaChanged = ioctl(pThis->FileDevice, CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
    315315#else
    … …  
    338338    LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCmd[0], enmTxDir, *pcbBuf, cTimeoutMillies));
    339339
    340 #ifdef __DARWIN__
     340#ifdef RT_OS_DARWIN
    341341    /*
    342342     * Pass the request on to the internal scsi command interface.
    … …  
    357357    rc = VERR_INTERNAL_ERROR;
    358358
    359 #elif defined(__LINUX__)
     359#elif defined(RT_OS_LINUX)
    360360    int direction;
    361361    struct cdrom_generic_command cgc;
    … …  
    418418     * it's 0). So just assume that everything worked ok. */
    419419
    420 #elif defined(__WIN__)
     420#elif defined(RT_OS_WINDOWS)
    421421    int direction;
    422422    struct _REQ
    … …  
    538538            pThis->pfnPoll       = NULL;
    539539#endif
    540 #ifdef __LINUX__
     540#ifdef RT_OS_LINUX
    541541        pThis->pfnGetMediaSize   = drvHostDvdGetMediaSize;
    542542#endif

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

    r3113 r3666  
    2626*******************************************************************************/
    2727#define LOG_GROUP LOG_GROUP_DRV_HOST_FLOPPY
    28 #ifdef __LINUX__
     28#ifdef RT_OS_LINUX
    2929# include <sys/ioctl.h>
    3030# include <linux/fd.h>
    … …  
    3232# include <errno.h>
    3333
    34 # elif defined(__WIN__)
     34# elif defined(RT_OS_WINDOWS)
    3535# include <windows.h>
    3636# include <dbt.h>
    … …  
    3838#elif defined(__L4ENV__)
    3939
    40 #else /* !__WIN__ nor __LINUX__ nor __L4ENV__ */
     40#else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor __L4ENV__ */
    4141# error "Unsupported Platform."
    42 #endif /* !__WIN__ nor __LINUX__ nor __L4ENV__ */
     42#endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor __L4ENV__ */
    4343
    4444#include <VBox/pdm.h>
    … …  
    7474
    7575
    76 #ifdef __LINUX__
     76#ifdef RT_OS_LINUX
    7777/**
    7878 * Get media size and do change processing.
    … …  
    102102    return RTFileSeek(pThis->FileDevice, 0, RTFILE_SEEK_END, pcb);
    103103}
    104 #endif /* __LINUX__ */
    105 
    106 
    107 #ifdef __LINUX__
     104#endif /* RT_OS_LINUX */
     105
     106
     107#ifdef RT_OS_LINUX
    108108/**
    109109 * This thread will periodically poll the Floppy for media presence.
    … …  
    146146    return VINF_SUCCESS;
    147147}
    148 #endif /* __LINUX__ */
     148#endif /* RT_OS_LINUX */
    149149
    150150
    … …  
    172172         * Override stuff.
    173173         */
    174 #ifdef __LINUX__
     174#ifdef RT_OS_LINUX
    175175        pThis->Base.pfnPoll         = drvHostFloppyPoll;
    176176        pThis->Base.pfnGetMediaSize = drvHostFloppyGetMediaSize;

  • trunk/src/VBox/Devices/Storage/DrvHostRawDisk.cpp

    r3081 r3666  
    3737#include <iprt/string.h>
    3838
    39 #ifdef __WIN__
     39#ifdef RT_OS_WINDOWS
    4040#include <windows.h>
    4141#include <winioctl.h>
    42 #elif __LINUX__
     42#elif RT_OS_LINUX
    4343#include <errno.h>
    4444#include <sys/ioctl.h>
    … …  
    4848#include <linux/hdreg.h>
    4949#include <linux/fs.h>
    50 #endif /* !__WIN__ && !__LINUX__ */
     50#endif /* !RT_OS_WINDOWS && !RT_OS_LINUX */
    5151
    5252#include "Builtins.h"
    … …  
    339339        pThis->cSectors = 0;
    340340        pThis->enmTranslation = PDMBIOSTRANSLATION_AUTO;
    341 #ifdef __WIN__
     341#ifdef RT_OS_WINDOWS
    342342        DISK_GEOMETRY DriveGeo;
    343343        DWORD cbDriveGeo;
    … …  
    367367        else
    368368            rc = RTErrConvertFromWin32(GetLastError());
    369 #elif defined(__LINUX__)
     369#elif defined(RT_OS_LINUX)
    370370        struct stat DevStat;
    371371        if (!fstat(pThis->HostDiskFile, &DevStat) && S_ISBLK(DevStat.st_mode))
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette