VirtualBox

Changeset 3670 in vbox


Ignore:
Timestamp:
Jul 17, 2007 9:19:36 AM (18 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
22946
Message:

RT_OS_L4

Location:
trunk/src/VBox
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r3666 r3670  
    7575    &dsound_audio_driver,
    7676#endif
    77 #ifdef __L4ENV__
     77#ifdef RT_OS_L4
    7878    &oss_audio_driver,
    7979#endif

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

    r3539 r3670  
    4545    int nfrags;
    4646    int fragsize;
    47 #ifndef __L4ENV__
     47#ifndef RT_OS_L4
    4848    int mmapped;
    4949#endif
    … …  
    6161
    6262static struct {
    63 #ifndef __L4ENV__
     63#ifndef RT_OS_L4
    6464    int try_mmap;
    6565#endif
    … …  
    7070    int debug;
    7171} conf = {
    72 #ifndef __L4ENV__
     72#ifndef RT_OS_L4
    7373    INIT_FIELD (try_mmap    =) 0,
    7474#endif
    … …  
    341341    st_sample_t *src;
    342342    struct audio_buf_info abinfo;
    343 #ifndef __L4ENV__
     343#ifndef RT_OS_L4
    344344    struct count_info cntinfo;
    345345#endif
    … …  
    353353    bufsize = hw->samples << hw->info.shift;
    354354
    355 #ifndef __L4ENV__
     355#ifndef RT_OS_L4
    356356    if (oss->mmapped) {
    357357        int bytes;
    … …  
    408408            return 0;
    409409        }
    410 #ifndef __L4ENV__
     410#ifndef RT_OS_L4
    411411    }
    412412#endif
    … …  
    422422
    423423        hw->clip (dst, src, convert_samples);
    424 #ifdef __L4ENV__
     424#ifdef RT_OS_L4
    425425        {
    426426#else
    … …  
    466466    }
    467467
    468 #ifndef __L4ENV__
     468#ifndef RT_OS_L4
    469469    if (oss->mmapped) {
    470470        oss->old_optr = cntinfo.ptr;
    … …  
    478478static void oss_fini_out (HWVoiceOut *hw)
    479479{
    480 #ifndef __L4ENV__
     480#ifndef RT_OS_L4
    481481    int err;
    482482#endif
    … …  
    490490
    491491    if (oss->pcm_buf) {
    492 #ifdef __L4ENV__
     492#ifdef RT_OS_L4
    493493        qemu_free (oss->pcm_buf);
    494494#else
    … …  
    555555    hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift;
    556556
    557 #ifndef __L4ENV__
     557#ifndef RT_OS_L4
    558558    oss->mmapped = 0;
    559559    if (conf.try_mmap) {
    … …  
    599599#endif
    600600
    601 #ifndef __L4ENV__
     601#ifndef RT_OS_L4
    602602    if (!oss->mmapped) {
    603603#endif
    … …  
    619619            return -1;
    620620        }
    621 #ifndef __L4ENV__
     621#ifndef RT_OS_L4
    622622    }
    623623#endif
    … …  
    632632    OSSVoiceOut *oss = (OSSVoiceOut *) hw;
    633633
    634 #ifdef __L4ENV__
     634#ifdef RT_OS_L4
    635635    return 0;
    636636#else
    … …  
    847847    {"NFRAGS", AUD_OPT_INT, &conf.nfrags,
    848848     "Number of fragments", NULL, 0},
    849 #ifndef __L4ENV__
     849#ifndef RT_OS_L4
    850850    {"MMAP", AUD_OPT_BOOL, &conf.try_mmap,
    851851     "Try using memory mapped access", NULL, 0},

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

    r3666 r3670  
    156156    if (VBOX_FAILURE(rc))
    157157        return rc;
    158 #ifndef __L4ENV__
     158#ifndef RT_OS_L4
    159159    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVmdkHDD);
    160160    if (VBOX_FAILURE(rc))
    … …  
    190190        return rc;
    191191#endif
    192 #ifndef __L4ENV__
     192#ifndef RT_OS_L4
    193193    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNAT);
    194194    if (VBOX_FAILURE(rc))
    195195        return rc;
    196196#endif
    197 #if defined(__L4ENV__) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     197#if defined(RT_OS_L4) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
    198198    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
    199199    if (VBOX_FAILURE(rc))
    … …  
    219219#endif
    220220
    221 #if !defined(__L4ENV__)
     221#if !defined(RT_OS_L4)
    222222    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNamedPipe);
    223223    if (VBOX_FAILURE(rc))

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

    r3666 r3670  
    3838# include <VBox/scsi.h>
    3939
    40 #elif defined(__L4ENV__)
     40#elif defined(RT_OS_L4)
    4141  /* Nothing special requires... yeah, right. */
    4242

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

    r3666 r3670  
    3737# define USE_MEDIA_POLLING
    3838
    39 #elif defined(__L4ENV__)
     39#elif defined(RT_OS_L4)
    4040/* nothing (yet). */
    4141
    … …  
    353353    }
    354354
    355 #elif defined(__L4ENV__)
     355#elif defined(RT_OS_L4)
    356356    /* Not really ported to L4 yet. */
    357357    rc = VERR_INTERNAL_ERROR;
    … …  
    519519         */
    520520
    521 #ifndef __L4ENV__ /* Passthrough is not supported on L4 yet */
     521#ifndef RT_OS_L4 /* Passthrough is not supported on L4 yet */
    522522        bool fPassthrough;
    523523        rc = CFGMR3QueryBool(pCfgHandle, "Passthrough", &fPassthrough);
    … …  
    528528            pThis->fReadOnlyConfig = false;
    529529        }
    530 #endif /* !__L4ENV__ */
     530#endif /* !RT_OS_L4 */
    531531
    532532        pThis->IMount.pfnUnmount = drvHostDvdUnmount;

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

    r3666 r3670  
    3636# include <dbt.h>
    3737
    38 #elif defined(__L4ENV__)
    39 
    40 #else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor __L4ENV__ */
     38#elif defined(RT_OS_L4)
     39
     40#else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
    4141# error "Unsupported Platform."
    42 #endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor __L4ENV__ */
     42#endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
    4343
    4444#include <VBox/pdm.h>

  • trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

    r3110 r3670  
    4141#include <iprt/asm.h>
    4242
    43 #ifdef __L4__
     43#ifdef RT_OS_L4
    4444#include <stdio.h>
    4545#include <l4/util/util.h>
    … …  
    396396    while(!mFramebuffer)
    397397    {
    398 #if __L4__
     398#if RT_OS_L4
    399399      asm volatile ("nop":::"memory");
    400400      l4_sleep(5);

  • trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

    r2981 r3670  
    9191    mUSBProxyService = new USBProxyServiceWin32 (this);
    9292*/
    93 #ifdef __L4__
     93#ifdef RT_OS_L4
    9494    mUSBProxyService = new USBProxyServiceLinux (this);
    9595#else

  • trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.h

    r2981 r3670  
    5555    int  setAbsoluteCoordinates(bool fAbsolute);
    5656    int  setNeedsHostCursor(bool fNeedsHostCursor);
    57 #ifdef __L4ENV__
     57#ifdef RT_OS_L4
    5858    // So far L4Con does not support an own mouse pointer.
    5959    bool getAbsoluteCoordinates() { return false; }

  • trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.h

    r3669 r3670  
    178178
    179179
    180 #if defined(RT_OS_LINUX) || defined(__L4__)
     180#if defined(RT_OS_LINUX) || defined(RT_OS_L4)
    181181#include <stdio.h>
    182182

  • trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

    r3669 r3670  
    6565#include <errno.h>
    6666
    67 #if defined(RT_OS_LINUX) || defined(__L4__)
     67#if defined(RT_OS_LINUX) || defined(RT_OS_L4)
    6868#include <fcntl.h>
    6969#include <net/if.h>
    … …  
    7272#endif
    7373
    74 #ifndef __L4ENV__
     74#ifndef RT_OS_L4
    7575#include <vector>
    7676#endif
    … …  
    8888#endif
    8989
    90 #if defined(USE_SDL) && ! defined(__L4__)
     90#if defined(USE_SDL) && ! defined(RT_OS_L4)
    9191#include "SDLConsole.h"
    9292#include "SDLFramebuffer.h"
    9393#endif
    9494
    95 #ifdef __L4__
     95#ifdef RT_OS_L4
    9696#include "L4Console.h"
    9797#include "L4Framebuffer.h"
    9898#endif
    9999
    100 #ifdef __L4ENV__
     100#ifdef RT_OS_L4
    101101# ifndef L4API_l4v2onv4
    102102#  include <l4/sys/ktrace.h>
    … …  
    145145
    146146/** flag whether keyboard/mouse events are grabbed */
    147 #ifdef __L4__
     147#ifdef RT_OS_L4
    148148/** see <l4/input/macros.h> for key definitions */
    149149int gHostKey; /* not used */
    … …  
    321321             "  -[no]csam          Enable or disable CSAM\n"
    322322#endif
    323 #ifdef __L4ENV__
     323#ifdef RT_OS_L4
    324324             "  -env <var=value>   Set the given environment variable to \"value\"\n"
    325325#endif
    … …  
    331331int main(int argc, char **argv)
    332332{
    333 #ifdef __L4ENV__
     333#ifdef RT_OS_L4
    334334#ifndef L4API_l4v2onv4
    335335    /* clear Fiasco kernel trace buffer */
    … …  
    347347                return SyntaxError("Error setting environment string %s.\n", argv[i]);
    348348        }
    349 #endif /* __L4ENV__ */
     349#endif /* RT_OS_L4 */
    350350
    351351    /*
    … …  
    632632            g_fCSAM = false;
    633633#endif /* VBOXSDL_ADVANCED_OPTIONS */
    634 #ifdef __L4__
     634#ifdef RT_OS_L4
    635635        else if (strcmp(pszArg, "-env") == 0)
    636636            ++curArg;
    637 #endif /* __L4__ */
     637#endif /* RT_OS_L4 */
    638638        /* just show the help screen */
    639639        else
    … …  
    655655    gConsole = new SDLConsole();
    656656    gFramebuffer = new SDLFramebuffer();
    657 #elif defined(__L4ENV__)
     657#elif defined(RT_OS_L4)
    658658    gConsole = new L4Console();
    659659    gFramebuffer = new L4Framebuffer();
    … …  
    725725    gConsole->updateTitlebar();
    726726
    727 #ifdef __L4__
     727#ifdef RT_OS_L4
    728728    /* The L4 console provides (currently) a fixed resolution. */
    729729    if (g_u32VRamSizeMB * _1M >=   gFramebuffer->getHostXres()
    … …  
    996996#endif /* VBOXBFE_WITH_USB */
    997997
    998 #ifdef __L4ENV__
     998#ifdef RT_OS_L4
    999999    /* L4 console cannot draw a host cursor */
    10001000    gMouse->setHostCursor(false);
    … …  
    13431343    rc = CFGMR3InsertInteger(pCfg,  "VRamSize",       g_u32VRamSizeMB * _1M);       UPDATE_RC();
    13441344
    1345 #ifdef __L4ENV__
     1345#ifdef RT_OS_L4
    13461346    /* XXX hard-coded */
    13471347    rc = CFGMR3InsertInteger(pCfg,  "HeightReduction", 18);                         UPDATE_RC();
    … …  
    14901490#endif
    14911491                {
    1492 #if defined (RT_OS_LINUX) || defined (__L4__)
     1492#if defined (RT_OS_LINUX) || defined (RT_OS_L4)
    14931493                    /*
    14941494                     * Create/Open the TAP the device.
    … …  
    15501550
    15511551
    1552 #else /* !RT_OS_LINUX && !__L4__ */
     1552#else /* !RT_OS_LINUX && !RT_OS_L4 */
    15531553                    FatalError("Name based HIF devices not implemented yet for this host platform\n");
    15541554                    return VERR_NOT_IMPLEMENTED;
    … …  
    16041604#elif defined(RT_OS_LINUX)
    16051605        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
    1606 #elif defined(__L4ENV__)
     1606#elif defined(RT_OS_L4)
    16071607        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
    16081608#else /* portme */

  • trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

    r3584 r3670  
    4343#include "ConsoleImpl.h"
    4444
    45 #ifdef __L4__
     45#ifdef RT_OS_L4
    4646#include <l4/util/util.h> /* for l4_sleep */
    4747#endif

  • trunk/src/VBox/Main/MouseImpl.cpp

    r3155 r3670  
    8787    mParent = parent;
    8888
    89 #ifdef __L4ENV__
     89#ifdef RT_OS_L4
    9090    /* L4 console has no own mouse cursor */
    9191    uHostCaps = VMMDEV_MOUSEHOSTCANNOTHWPOINTER;
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