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

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/Devices

Files:

• Audio/audio.c (modified) (1 diff)
• Audio/ossaudio.c (modified) (15 diffs)
• Builtins.cpp (modified) (3 diffs)
• Storage/DrvHostBase.cpp (modified) (1 diff)
• Storage/DrvHostDVD.cpp (modified) (4 diffs)
• Storage/DrvHostFloppy.cpp (modified) (1 diff)

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

@@ -75 +75 @@
     &dsound_audio_driver,
 #endif
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
     &oss_audio_driver,
 #endif

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

@@ -45 +45 @@
     int nfrags;
     int fragsize;
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     int mmapped;
 #endif
@@ -61 +61 @@
 
 static struct {
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     int try_mmap;
 #endif
@@ -70 +70 @@
     int debug;
 } conf = {
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     INIT_FIELD (try_mmap    =) 0,
 #endif
@@ -341 +341 @@
     st_sample_t *src;
     struct audio_buf_info abinfo;
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     struct count_info cntinfo;
 #endif
@@ -353 +353 @@
     bufsize = hw->samples << hw->info.shift;
 
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     if (oss->mmapped) {
         int bytes;
@@ -408 +408 @@
             return 0;
         }
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     }
 #endif
@@ -422 +422 @@
 
         hw->clip (dst, src, convert_samples);
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
         {
 #else
@@ -466 +466 @@
     }
 
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     if (oss->mmapped) {
         oss->old_optr = cntinfo.ptr;
@@ -478 +478 @@
 static void oss_fini_out (HWVoiceOut *hw)
 {
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     int err;
 #endif
@@ -490 +490 @@
 
     if (oss->pcm_buf) {
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
         qemu_free (oss->pcm_buf);
 #else
@@ -555 +555 @@
     hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift;
 
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     oss->mmapped = 0;
     if (conf.try_mmap) {
@@ -599 +599 @@
 #endif
 
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     if (!oss->mmapped) {
 #endif
@@ -619 +619 @@
             return -1;
         }
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     }
 #endif
@@ -632 +632 @@
     OSSVoiceOut *oss = (OSSVoiceOut *) hw;
 
-#ifdef __L4ENV__
+#ifdef RT_OS_L4
     return 0;
 #else
@@ -847 +847 @@
     {"NFRAGS", AUD_OPT_INT, &conf.nfrags,
      "Number of fragments", NULL, 0},
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     {"MMAP", AUD_OPT_BOOL, &conf.try_mmap,
      "Try using memory mapped access", NULL, 0},

trunk/src/VBox/Devices/Builtins.cpp

@@ -156 +156 @@
     if (VBOX_FAILURE(rc))
         return rc;
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVmdkHDD);
     if (VBOX_FAILURE(rc))
@@ -190 +190 @@
         return rc;
 #endif
-#ifndef __L4ENV__
+#ifndef RT_OS_L4
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNAT);
     if (VBOX_FAILURE(rc))
         return rc;
 #endif
-#if defined(__L4ENV__) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_L4) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (VBOX_FAILURE(rc))
@@ -219 +219 @@
 #endif
 
-#if !defined(__L4ENV__)
+#if !defined(RT_OS_L4)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNamedPipe);
     if (VBOX_FAILURE(rc))

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

@@ -38 +38 @@
 # include <VBox/scsi.h>
 
-#elif defined(__L4ENV__)
+#elif defined(RT_OS_L4)
   /* Nothing special requires... yeah, right. */
 

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

@@ -37 +37 @@
 # define USE_MEDIA_POLLING
 
-#elif defined(__L4ENV__)
+#elif defined(RT_OS_L4)
 /* nothing (yet). */
 
@@ -353 +353 @@
     }
 
-#elif defined(__L4ENV__)
+#elif defined(RT_OS_L4)
     /* Not really ported to L4 yet. */
     rc = VERR_INTERNAL_ERROR;
@@ -519 +519 @@
          */
 
-#ifndef __L4ENV__ /* Passthrough is not supported on L4 yet */
+#ifndef RT_OS_L4 /* Passthrough is not supported on L4 yet */
         bool fPassthrough;
         rc = CFGMR3QueryBool(pCfgHandle, "Passthrough", &fPassthrough);
@@ -528 +528 @@
             pThis->fReadOnlyConfig = false;
         }
-#endif /* !__L4ENV__ */
+#endif /* !RT_OS_L4 */
 
         pThis->IMount.pfnUnmount = drvHostDvdUnmount;

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

@@ -36 +36 @@
 # include <dbt.h>
 
-#elif defined(__L4ENV__)
-
-#else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor __L4ENV__ */
+#elif defined(RT_OS_L4)
+
+#else /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
 # error "Unsupported Platform."
-#endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor __L4ENV__ */
+#endif /* !RT_OS_WINDOWS nor RT_OS_LINUX nor RT_OS_L4 */
 
 #include <VBox/pdm.h>