儲存庫 vbox 的更動 68573

時間撮記:

2017-8-31 下午12:10:48 (7 年 以前)

作者:

vboxsync

訊息:

merging vbglioc r117745: Working on making VBoxGuest.h usable by openwatcom in 16-bit mode.

檔案:

• trunk/include/VBox/VBoxGuest.h (修改) (26 筆差異)

trunk/include/VBox/VBoxGuest.h

@@ -1 +1 @@
 /** @file
  * VBoxGuest - VirtualBox Guest Additions Driver Interface. (ADD,DEV)
+ *
+ * @note    This file is used by 16-bit compilers too (OpenWatcom).
  *
  * @remarks This is in the process of being split up and usage cleaned up.
@@ -93 +95 @@
  * @internal */
 #define VBGL_IOCTL_FLAG_32BIT                       UINT32_C(0)
+/** 16-bit specific I/O control flag. */
+#define VBGL_IOCTL_FLAG_16BIT                       UINT32_C(64)
 /** Check if the I/O control is a 64-bit one.   */
 #define VBGL_IOCTL_IS_64BIT(a_uIOCtl)               RT_BOOL((a_uIOCtl) & VBGL_IOCTL_FLAG_64BIT)
@@ -103 +107 @@
 #elif ARCH_BITS == 32
 # define VBGL_IOCTL_FLAG_CC                         VBGL_IOCTL_FLAG_32BIT
+#elif ARCH_BITS == 16
+# define VBGL_IOCTL_FLAG_CC                         VBGL_IOCTL_FLAG_16BIT
 #else
 # error "dunno which arch this is!"
@@ -220 +226 @@
 AssertCompileSize(VBGLREQHDR, 24);
 /** Pointer to a IOC header. */
-typedef VBGLREQHDR *PVBGLREQHDR;
+typedef VBGLREQHDR RT_FAR *PVBGLREQHDR;
 
 /** Version of VMMDevRequestHeader structure. */
@@ -317 +323 @@
         } Out;
     } u;
-} VBGLIOCDRIVERVERSIONINFO, *PVBGLIOCDRIVERVERSIONINFO;
+} VBGLIOCDRIVERVERSIONINFO, RT_FAR *PVBGLIOCDRIVERVERSIONINFO;
 AssertCompileSize(VBGLIOCDRIVERVERSIONINFO, 24 + 20);
 #ifndef RT_OS_OS2 /* figure this one out... */
@@ -343 +349 @@
         {
             /** The MMIO mapping.  NULL if no MMIO region. */
-            struct VMMDevMemory volatile   *pvVmmDevMapping;
+            struct VMMDevMemory volatile RT_FAR *pvVmmDevMapping;
             /** The I/O port address. */
             RTIOPORT                        IoPort;
             /** Padding, ignore. */
-            RTIOPORT                        auPadding[HC_ARCH_BITS == 32 ? 1 : 3];
+            RTIOPORT                        auPadding[HC_ARCH_BITS == 64 ? 3 : 1];
         } Out;
     } u;
-} VBGLIOCGETVMMDEVIOINFO, *PVBGLIOCGETVMMDEVIOINFO;
-AssertCompileSize(VBGLIOCGETVMMDEVIOINFO, 24 + (HC_ARCH_BITS == 32 ? 8 : 16));
+} VBGLIOCGETVMMDEVIOINFO, RT_FAR *PVBGLIOCGETVMMDEVIOINFO;
+AssertCompileSize(VBGLIOCGETVMMDEVIOINFO, 24 + (HC_ARCH_BITS == 64 ? 16 : 8));
 /** @} */
 
@@ -394 +400 @@
         } Out;
     } u;
-} VBGLIOCHGCMCONNECT, *PVBGLIOCHGCMCONNECT;
+} VBGLIOCHGCMCONNECT, RT_FAR *PVBGLIOCHGCMCONNECT;
 AssertCompileSize(VBGLIOCHGCMCONNECT, 24 + 132);
 #ifndef RT_OS_OS2 /* figure this one out... */
@@ -421 +427 @@
         } In;
     } u;
-} VBGLIOCHGCMDISCONNECT, *PVBGLIOCHGCMDISCONNECT;
+} VBGLIOCHGCMDISCONNECT, RT_FAR *PVBGLIOCHGCMDISCONNECT;
 AssertCompileSize(VBGLIOCHGCMDISCONNECT, 24 + 4);
 /** @} */
@@ -470 +476 @@
     uint16_t    cParms;
     /* Parameters follow in form HGCMFunctionParameter aParms[cParms] */
-} VBGLIOCHGCMCALL, *PVBGLIOCHGCMCALL;
+} VBGLIOCHGCMCALL, RT_FAR *PVBGLIOCHGCMCALL;
 AssertCompileSize(VBGLIOCHGCMCALL, 24 + 16);
-typedef VBGLIOCHGCMCALL const *PCVBGLIOCHGCMCALL;
+typedef VBGLIOCHGCMCALL const RT_FAR *PCVBGLIOCHGCMCALL;
 
 /**
@@ -567 +573 @@
         } In;
     } u;
-} VBGLIOCLOG, *PVBGLIOCLOG;
+} VBGLIOCLOG, RT_FAR *PVBGLIOCLOG;
 /** @} */
 
@@ -598 +604 @@
         } Out;
     } u;
-} VBGLIOCWAITFOREVENTS, *PVBGLIOCWAITFOREVENTS;
+} VBGLIOCWAITFOREVENTS, RT_FAR *PVBGLIOCWAITFOREVENTS;
 AssertCompileSize(VBGLIOCWAITFOREVENTS, 24 + 8);
 /** @} */
@@ -643 +649 @@
         } In;
     } u;
-} VBGLIOCCHANGEFILTERMASK, *PVBGLIOCCHANGEFILTERMASK;
+} VBGLIOCCHANGEFILTERMASK, RT_FAR *PVBGLIOCCHANGEFILTERMASK;
 AssertCompileSize(VBGLIOCCHANGEFILTERMASK, 24 + 8);
 /** @} */
@@ -698 +704 @@
         } In;
     } u;
-} VBGLIOCACQUIREGUESTCAPS, *PVBGLIOCACQUIREGUESTCAPS;
+} VBGLIOCACQUIREGUESTCAPS, RT_FAR *PVBGLIOCACQUIREGUESTCAPS;
 AssertCompileSize(VBGLIOCACQUIREGUESTCAPS, 24 + 12);
 /** @} */
@@ -731 +737 @@
         } Out;
     } u;
-} VBGLIOCSETGUESTCAPS, *PVBGLIOCSETGUESTCAPS;
+} VBGLIOCSETGUESTCAPS, RT_FAR *PVBGLIOCSETGUESTCAPS;
 AssertCompileSize(VBGLIOCSETGUESTCAPS, 24 + 8);
 typedef VBGLIOCSETGUESTCAPS VBoxGuestSetCapabilitiesInfo;
@@ -756 +762 @@
         } In;
     } u;
-} VBGLIOCSETMOUSESTATUS, *PVBGLIOCSETMOUSESTATUS;
+} VBGLIOCSETMOUSESTATUS, RT_FAR *PVBGLIOCSETMOUSESTATUS;
 /** @} */
 
@@ -790 +796 @@
             PFNVBOXGUESTMOUSENOTIFY     pfnNotify;
             /** The callback argument. */
-            void                       *pvUser;
-        } In;
-    } u;
-} VBGLIOCSETMOUSENOTIFYCALLBACK, *PVBGLIOCSETMOUSENOTIFYCALLBACK;
+            void                RT_FAR *pvUser;
+        } In;
+    } u;
+} VBGLIOCSETMOUSENOTIFYCALLBACK, RT_FAR *PVBGLIOCSETMOUSENOTIFYCALLBACK;
 /** @} */
 
@@ -825 +831 @@
         } Out;
     } u;
-} VBGLIOCCHECKBALLOON, *PVBGLIOCCHECKBALLOON;
+} VBGLIOCCHECKBALLOON, RT_FAR *PVBGLIOCCHECKBALLOON;
 AssertCompileSize(VBGLIOCCHECKBALLOON, 24 + 8);
 typedef VBGLIOCCHECKBALLOON VBoxGuestCheckBalloonInfo;
@@ -854 +860 @@
             RTR3PTR     pvChunk;
             /** Explicit alignment padding, MBZ. */
-            uint8_t     abPadding[ARCH_BITS == 32 ? 4 + 7 : 0 + 7];
+            uint8_t     abPadding[ARCH_BITS == 64 ? 0 + 7 : 4 + 7];
             /** true = inflate, false = deflate. */
             bool        fInflate;
         } In;
     } u;
-} VBGLIOCCHANGEBALLOON, *PVBGLIOCCHANGEBALLOON;
+} VBGLIOCCHANGEBALLOON, RT_FAR *PVBGLIOCCHANGEBALLOON;
 AssertCompileSize(VBGLIOCCHANGEBALLOON, 24+16);
 /** @} */
@@ -883 +889 @@
         } In;
     } u;
-} VBGLIOCWRITECOREDUMP, *PVBGLIOCWRITECOREDUMP;
+} VBGLIOCWRITECOREDUMP, RT_FAR *PVBGLIOCWRITECOREDUMP;
 AssertCompileSize(VBGLIOCWRITECOREDUMP, 24 + 4);
 typedef VBGLIOCWRITECOREDUMP VBoxGuestWriteCoreDump;
@@ -929 +935 @@
      * @param   cbReq               The size of the data buffer.
      */
+# if ARCH_BITS == 32 || defined(DOXYGEN_RUNNING)
     DECLCALLBACKMEMBER(int, pfnServiceEP)(uint32_t u32Session, unsigned iFunction, PVBGLREQHDR pReqHdr, size_t cbReq);
+# else
+    uint32_t pfnServiceEP;
+#endif
 
     /** The 16-bit service entry point for C code (cdecl).
@@ -942 +952 @@
      * @endcode
      */
+# if ARCH_BITS == 16 || defined(DOXYGEN_RUNNING)
+    DECLCALLBACKMEMBER(int, fpfnServiceEP)(uint32_t u32Session, uint16_t iFunction, PVBGLREQHDR fpvData, uint16_t cbData);
+# else
     RTFAR16 fpfnServiceEP;
+# endif
 
     /** The 16-bit service entry point for Assembly code (register).
@@ -959 +973 @@
 } VBOXGUESTOS2IDCCONNECT;
 /** Pointer to VBOXGUESTOS2IDCCONNECT buffer. */
-typedef VBOXGUESTOS2IDCCONNECT *PVBOXGUESTOS2IDCCONNECT;
+typedef VBOXGUESTOS2IDCCONNECT RT_FAR *PVBOXGUESTOS2IDCCONNECT;
 #endif /* RT_OS_OS2 */
 
@@ -996 +1010 @@
         {
             /** The session handle (opaque). */
-            void           *pvSession;
+            void    RT_FAR *pvSession;
             /** The version of the I/O control interface for this session
              * (typically VBGL_IOC_VERSION). */
@@ -1008 +1022 @@
             uint32_t        uReserved1;
             /** Reserved \#2 (will be returned as NULL until defined). */
-            void           *pvReserved2;
+            void    RT_FAR *pvReserved2;
         } Out;
     } u;
-} VBGLIOCIDCCONNECT, *PVBGLIOCIDCCONNECT;
-AssertCompileSize(VBGLIOCIDCCONNECT, 24 + 16 + ARCH_BITS / 8 * 2);
+} VBGLIOCIDCCONNECT, RT_FAR *PVBGLIOCIDCCONNECT;
+AssertCompileSize(VBGLIOCIDCCONNECT, 24 + 16 + (ARCH_BITS == 64 ? 8 : 4) * 2);
 #ifndef RT_OS_OS2 /* figure this one out... */
 AssertCompile(VBGL_IOCTL_IDC_CONNECT_SIZE_IN == 24 + 16);
@@ -1040 +1054 @@
         {
             /** The session handle for platforms where this is needed. */
-            void       *pvSession;
-        } In;
-    } u;
-} VBGLIOCIDCDISCONNECT, *PVBGLIOCIDCDISCONNECT;
-AssertCompileSize(VBGLIOCIDCDISCONNECT, 24 + ARCH_BITS / 8);
+            void RT_FAR *pvSession;
+        } In;
+    } u;
+} VBGLIOCIDCDISCONNECT, RT_FAR *PVBGLIOCIDCDISCONNECT;
+AssertCompileSize(VBGLIOCIDCDISCONNECT, 24 + (ARCH_BITS == 64 ? 8 : 4));
 /** @} */
 
@@ -1059 +1073 @@
  * @param   cbReq       The request size.
  */
-int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t uReq, PVBGLREQHDR pReqHdr, size_t cbReq);
+int VBOXCALL VBoxGuestIDC(void RT_FAR *pvSession, uintptr_t uReq, PVBGLREQHDR pReqHdr, size_t cbReq);
 RT_C_DECLS_END
 #endif