Changeset 3638

Timestamp:

07/16/07 15:13:59 (1 year ago)

Author:

vboxsync

Message:

AMD64 -> RT_ARCH_AMD64; X86 -> RT_ARCH_X86; [OS] -> RT_OS_[OS].

Files:

• trunk/include/VBox/VBoxGuest.h (modified) (6 diffs)
• trunk/include/VBox/asmdefs.mac (modified) (6 diffs)
• trunk/include/VBox/com/EventQueue.h (modified) (2 diffs)
• trunk/include/VBox/com/Guid.h (modified) (2 diffs)
• trunk/include/VBox/com/VirtualBox.h (modified) (1 diff)
• trunk/include/VBox/com/defs.h (modified) (5 diffs)
• trunk/include/VBox/com/string.h (modified) (6 diffs)
• trunk/include/VBox/dbggui.h (modified) (1 diff)
• trunk/include/VBox/hwacc_svm.h (modified) (1 diff)
• trunk/include/VBox/stam.mac (modified) (6 diffs)
• trunk/include/VBox/sup.h (modified) (1 diff)
• trunk/include/VBox/usblib.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -39 +39 @@
-typedef uint32_t vmmDevHypPhys;
-
-__LINUX__
+RT_OS_LINUX
-/** The support device name. */
-# define VBOXGUEST_DEVICE_NAME        "/dev/vboxadd"
-
-__OS2__
+RT_OS_OS2
-/** The support device name. */
-# define VBOXGUEST_DEVICE_NAME        "\\Dev\\VBoxGst$"
-
-__WIN__
+RT_OS_WINDOWS
-/** The support service name. */
-# define VBOXGUEST_SERVICE_NAME       "VBoxGuest"
@@ -958 +958 @@
- * @{
- */
-__AMD64__
+RT_OS_AMD64
-# define VBOXGUEST_IOCTL_FLAG     128
-__X86__
+RT_OS_X86
-# define VBOXGUEST_IOCTL_FLAG     0
-#else
@@ -966 +966 @@
-#endif
-
-__WIN__
+RT_OS_WINDOWS
-# define IOCTL_CODE(DeviceType, Function, Method, Access, DataSize_ignored) \
-    ( ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
-
-__OS2__
+RT_OS_OS2
-# define VBOXGUEST_IOCTL_CATEGORY                   0xc2
-# define VBOXGUEST_IOCTL_CODE(Function, Size)       ((unsigned char)(Function))
@@ -976 +976 @@
-# define VBOXGUEST_IOCTL_CODE_FAST(Function)        ((unsigned char)(Function))
-
-__LINUX__
+RT_OS_LINUX
-# define IOCTL_CODE(DeviceType, Function, Method_ignored, Access_ignored, DataSize) \
-    ( (3 << 30) | ((DeviceType) << 8) | (Function) | ((DataSize) << 16) )
@@ -1243 +1243 @@
-
-
-__OS2__
+RT_OS_OS2
-
-/** 
@@ -1311 +1311 @@
-#define VBOXGUEST_IOCTL_OS2_IDC_DISCONNECT  VBOXGUEST_IOCTL_CODE(48, sizeof(uint32_t))
-
-__OS2__
+RT_OS_OS2
-
-/** @} */

trunk/include/VBox/asmdefs.mac

@@ -163 +163 @@
-
-%macro COM_S_PRINT 1+
-__AMD64__
+RT_OS_AMD64
-    COM64_S_PRINT %1
-%else
@@ -252 +252 @@
-
-%macro COM_S_CHAR 1
-__AMD64__
+RT_OS_AMD64
-    COM64_S_CHAR %1
-%else
@@ -371 +371 @@
-
-%macro COM_S_NEWLINE 0
-__AMD64__
+RT_OS_AMD64
-    COM64_S_NEWLINE
-%else
@@ -499 +499 @@
-
-%macro COM_S_DWORD_REG 1
-__AMD64__
+RT_OS_AMD64
-    COM64_S_DWORD_REG %1
-%else
@@ -627 +627 @@
-
-%macro COM_S_BYTE_REG 1
-__AMD64__
+RT_OS_AMD64
-    COM64_S_BYTE_REG %1
-%else
@@ -698 +698 @@
-
-%macro COM_S_DIGIT_REG 1
-__AMD64__
+RT_OS_AMD64
-    COM64_S_DIGIT_REG %1
-%else

trunk/include/VBox/com/EventQueue.h

@@ -23 +23 @@
-#define ___VBox_com_EventQueue_h
-
-__WIN__
+RT_OS_WINDOWS
-#include <windows.h>
-#else
@@ -84 +84 @@
-private:
-
-__WIN__
+RT_OS_WINDOWS
-
-    DWORD mThreadId;

trunk/include/VBox/com/Guid.h

@@ -23 +23 @@
-#define ___VBox_com_Guid_h
-
-__WIN__
+RT_OS_WINDOWS
-#include <nsMemory.h>
-#endif
@@ -99 +99 @@
-    operator const RTUUID * const () const { return &uuid; }
-
-__WIN__
+RT_OS_WINDOWS
-
-    // to assign instances to GUIDPARAMOUT parameters from within the interface method

trunk/include/VBox/com/VirtualBox.h

@@ -37 +37 @@
-// generated VirtualBox COM library definition file
-#if !defined (VBOXCOM_NOINCLUDE)
-__WIN__
+RT_OS_WINDOWS
-#include <VirtualBox.h>
-#else

trunk/include/VBox/com/defs.h

@@ -32 +32 @@
-#if !defined (VBOX_WITH_XPCOM)
-
-__WIN__
+RT_OS_WINDOWS
-
-// Windows COM
@@ -72 +72 @@
-#define COM_IIDOF(I) _ATL_IIDOF (I)
-
-__WIN__
+RT_OS_WINDOWS
-
-#error "VBOX_WITH_XPCOM is not defined!"
-
-__WIN__
+RT_OS_WINDOWS
-
-#else // !defined (VBOX_WITH_XPCOM)
@@ -83 +83 @@
-/////////////////////////////////////////////////////////////////////////////
-
-__OS2__
+RT_OS_OS2
-
-/* Make sure OS/2 Toolkit headers are pulled in to have
@@ -96 +96 @@
-#undef TRUE
-
-__OS2__
-
-__DARWIN__
+RT_OS_OS2
+
+RT_OS_DARWIN
-  /* CFBase.h defines these*/
-# undef FALSE
-# undef TRUE
-__DARWIN__
+RT_OS_DARWIN
-
-#include <nsID.h>
@@ -284 +284 @@
-}
-
-__WIN__
+RT_OS_WINDOWS
-
-/**

trunk/include/VBox/com/string.h

@@ -23 +23 @@
-#define ___VBox_com_string_h
-
-__WIN__
+RT_OS_WINDOWS
-#include <nsMemory.h>
-#endif
@@ -296 +296 @@
-        if (str)
-        {
-__WIN__
+RT_OS_WINDOWS
-            ::RTStrFree (str);
-#else
@@ -310 +310 @@
-        if (str && *str == 0)
-        {
-__WIN__
+RT_OS_WINDOWS
-            ::RTStrFree (str);
-#else
@@ -330 +330 @@
-        if (aSize)
-        {
-__WIN__
+RT_OS_WINDOWS
-            str = (char *) ::RTMemTmpAlloc (aSize);
-#else
@@ -426 +426 @@
-    {
-        if (rs)
-__WIN__
+RT_OS_WINDOWS
-            ::RTStrDupEx (&ls, rs);
-#else
@@ -437 +437 @@
-        if (rs)
-        {
-__WIN__
+RT_OS_WINDOWS
-            ::RTStrUcs2ToUtf8 (&ls, (PRTUCS2) rs);
-#else

trunk/include/VBox/dbggui.h

@@ -22 +22 @@
-#define ___VBox_dbggui_h
-
-__WIN__
+RT_OS_WINDOWS
-# include <VirtualBox.h>
-#else

trunk/include/VBox/hwacc_svm.h

@@ -652 +652 @@
-    __asm
-    {
-__AMD64__
+RT_OS_AMD64
-        mov     rax, pPageGC
-#   else

trunk/include/VBox/stam.mac

@@ -62 +62 @@
-%macro STAM_COUNTER_INC 1
-%ifdef VBOX_WITH_STATISTICS
-__AMD64__
+RT_OS_AMD64
-    STAM64_COUNTER_INC %1
- %else
@@ -107 +107 @@
-%macro STAM_COUNTER_ADD 2
-%ifdef VBOX_WITH_STATISTICS
-__AMD64__
+RT_OS_AMD64
-     STAM64_COUNTER_ADD %1, %2
- %else
@@ -166 +166 @@
-%macro STAM_PROFILE_START 1
-%ifdef VBOX_WITH_STATISTICS
-__AMD64__
+RT_OS_AMD64
-    STAM64_PROFILE_START %1
- %else
@@ -272 +272 @@
-%macro STAM_PROFILE_STOP 2
-%ifdef VBOX_WITH_STATISTICS
-__AMD64__
+RT_OS_AMD64
-    STAM64_PROFILE_STOP %1, %2
- %else
@@ -317 +317 @@
-%macro STAM_PROFILE_ADV_START 1
-%ifdef VBOX_WITH_STATISTICS
-__AMD64__
+RT_OS_AMD64
-    STAM64_PROFILE_ADV_START %1
- %else
@@ -366 +366 @@
-%macro STAM_PROFILE_ADV_STOP 1
-%ifdef VBOX_WITH_STATISTICS
-__AMD64__
+RT_OS_AMD64
-    STAM64_PROFILE_ADV_STOP %1
- %else

trunk/include/VBox/sup.h

@@ -207 +207 @@
-#elif defined(IN_RING0)
-extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
-__DARWIN__) && defined(__AMD64__
+RT_OS_DARWIN) && defined(RT_OS_AMD64
-/** Workaround for ELF+GCC problem on 64-bit hosts.
- * (GCC emits a mov with a R_X86_64_32 reloc, we need R_X86_64_64.) */

trunk/include/VBox/usblib.h

@@ -46 +46 @@
-
-#ifndef CTL_CODE
-__WIN__
+RT_OS_WINDOWS
-#  define CTL_CODE(DeviceType, Function, Method, Access) \
-    ( ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))