Changeset 3670 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Jul 17, 2007 9:19:36 AM (17 years ago)

Author:

vboxsync

Message:

RT_OS_L4

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• DisplayImpl.cpp (modified) (2 diffs)
• HostUSBImpl.cpp (modified) (1 diff)
• MouseImpl.h (modified) (1 diff)
• USBProxyService.h (modified) (1 diff)
• VBoxBFE.cpp (modified) (15 diffs)
• VMMDevInterface.cpp (modified) (1 diff)

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

@@ -41 +41 @@
 #include <iprt/asm.h>
 
-#ifdef __L4__
+#ifdef RT_OS_L4
 #include <stdio.h>
 #include <l4/util/util.h>
@@ -396 +396 @@
     while(!mFramebuffer)
     {
-#if __L4__
+#if RT_OS_L4
       asm volatile ("nop":::"memory");
       l4_sleep(5);

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

@@ -91 +91 @@
     mUSBProxyService = new USBProxyServiceWin32 (this);
 */
-#ifdef __L4__
+#ifdef RT_OS_L4
     mUSBProxyService = new USBProxyServiceLinux (this);
 #else

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

@@ -55 +55 @@
     int  setAbsoluteCoordinates(bool fAbsolute);
     int  setNeedsHostCursor(bool fNeedsHostCursor);
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
     // So far L4Con does not support an own mouse pointer.
     bool getAbsoluteCoordinates() { return false; }

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

@@ -178 +178 @@
 
 
-#if defined(RT_OS_LINUX) || defined(__L4__)
+#if defined(RT_OS_LINUX) || defined(RT_OS_L4)
 #include <stdio.h>
 

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

@@ -65 +65 @@
 #include <errno.h>
 
-#if defined(RT_OS_LINUX) || defined(__L4__)
+#if defined(RT_OS_LINUX) || defined(RT_OS_L4)
 #include <fcntl.h>
 #include <net/if.h>
@@ -72 +72 @@
 #endif
 
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
 #include <vector>
 #endif
@@ -88 +88 @@
 #endif
 
-#if defined(USE_SDL) && ! defined(__L4__)
+#if defined(USE_SDL) && ! defined(RT_OS_L4)
 #include "SDLConsole.h"
 #include "SDLFramebuffer.h"
 #endif
 
-#ifdef __L4__
+#ifdef RT_OS_L4
 #include "L4Console.h"
 #include "L4Framebuffer.h"
 #endif
 
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
 # ifndef L4API_l4v2onv4
 #  include <l4/sys/ktrace.h>
@@ -145 +145 @@
 
 /** flag whether keyboard/mouse events are grabbed */
-#ifdef __L4__
+#ifdef RT_OS_L4
 /** see <l4/input/macros.h> for key definitions */
 int gHostKey; /* not used */
@@ -321 +321 @@
              "  -[no]csam          Enable or disable CSAM\n"
 #endif
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
              "  -env <var=value>   Set the given environment variable to \"value\"\n"
 #endif
@@ -331 +331 @@
 int main(int argc, char **argv)
 {
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
 #ifndef L4API_l4v2onv4
     /* clear Fiasco kernel trace buffer */
@@ -347 +347 @@
                 return SyntaxError("Error setting environment string %s.\n", argv[i]);
         }
-#endif /* __L4ENV__ */
+#endif /* RT_OS_L4 */
 
     /*
@@ -632 +632 @@
             g_fCSAM = false;
 #endif /* VBOXSDL_ADVANCED_OPTIONS */
-#ifdef __L4__
+#ifdef RT_OS_L4
         else if (strcmp(pszArg, "-env") == 0)
             ++curArg;
-#endif /* __L4__ */
+#endif /* RT_OS_L4 */
         /* just show the help screen */
         else
@@ -655 +655 @@
     gConsole = new SDLConsole();
     gFramebuffer = new SDLFramebuffer();
-#elif defined(__L4ENV__)
+#elif defined(RT_OS_L4)
     gConsole = new L4Console();
     gFramebuffer = new L4Framebuffer();
@@ -725 +725 @@
     gConsole->updateTitlebar();
 
-#ifdef __L4__
+#ifdef RT_OS_L4
     /* The L4 console provides (currently) a fixed resolution. */
     if (g_u32VRamSizeMB * _1M >=   gFramebuffer->getHostXres() 
@@ -996 +996 @@
 #endif /* VBOXBFE_WITH_USB */
 
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
     /* L4 console cannot draw a host cursor */
     gMouse->setHostCursor(false);
@@ -1343 +1343 @@
     rc = CFGMR3InsertInteger(pCfg,  "VRamSize",       g_u32VRamSizeMB * _1M);       UPDATE_RC();
 
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
     /* XXX hard-coded */
     rc = CFGMR3InsertInteger(pCfg,  "HeightReduction", 18);                         UPDATE_RC();
@@ -1490 +1490 @@
 #endif
                 {
-#if defined (RT_OS_LINUX) || defined (__L4__)
+#if defined (RT_OS_LINUX) || defined (RT_OS_L4)
                     /*
                      * Create/Open the TAP the device.
@@ -1550 +1550 @@
 
 
-#else /* !RT_OS_LINUX && !__L4__ */
+#else /* !RT_OS_LINUX && !RT_OS_L4 */
                     FatalError("Name based HIF devices not implemented yet for this host platform\n");
                     return VERR_NOT_IMPLEMENTED;
@@ -1604 +1604 @@
 #elif defined(RT_OS_LINUX)
         rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
-#elif defined(__L4ENV__)
+#elif defined(RT_OS_L4)
         rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
 #else /* portme */

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

@@ -43 +43 @@
 #include "ConsoleImpl.h"
 
-#ifdef __L4__
+#ifdef RT_OS_L4
 #include <l4/util/util.h> /* for l4_sleep */
 #endif