Changeset 24287 in vbox for trunk/src/VBox

Timestamp:

Nov 3, 2009 12:34:11 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

54273

Message:

Made the common parts of the OS/2 additions build again.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• Additions/common/VBoxGuest/VBoxGuest-os2.cpp (modified) (1 diff)
• Additions/common/VBoxGuestLib/SysHlp.cpp (modified) (1 diff)
• Additions/common/VBoxService/Makefile.kmk (modified) (2 diffs)
• Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (2 diffs)
• Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp (modified) (3 diffs)
• Runtime/r0drv/os2/thread-r0drv-os2.cpp (modified) (1 diff)
• Runtime/r3/fs.cpp (modified) (1 diff)
• Runtime/r3/init.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -24 +24 @@
 
 
-if1of ($(KBUILD_TARGET), \
-        freebsd \
-        $(if $(defined VBOX_WITH_OS2_ADDITIONS),os2,) \
-        $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) \
-        solaris)
+if1of ($(KBUILD_TARGET), freebsd $(if $(defined VBOX_WITH_ADDITION_DRIVERS),linux,) os2 solaris)
  #
  # VBoxGuest - The Guest Additions Driver (mixed case).

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

@@ -651 +651 @@
 
 
+void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt)
+{
+    /* No polling on OS/2 */
+    NOREF(pDevExt);
+}
+
+
 #ifdef DEBUG_READ /** @todo figure out this one once and for all... */
 

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -143 +143 @@
 
 # ifdef RT_OS_OS2
+#  include <VBox/VBoxGuest.h> /* for VBOXGUESTOS2IDCCONNECT */
 RT_C_DECLS_BEGIN
 /*

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -22 +22 @@
 SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
-if "$(KBUILD_HOST)" != "os2" || defined(VBOX_WITH_OS2_ADDITIONS)
 
 #
@@ -99 +98 @@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
 
-endif # os2 || with os2 additions
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -237 +237 @@
  #endif /* TARGET_NT4 */
 #elif defined(RT_OS_FREEBSD)
-        /* TODO: Port me */
+        /** @todo FreeBSD: Port logged on user info retrival. */
+#elif defined(RT_OS_OS2)
+        /** @todo OS/2: Port logged on (LAN/local/whatever) user info retrival. */
 #else
         utmp* ut_user;
@@ -383 +385 @@
                 return -1;
             }
- #if defined(RT_OS_SOLARIS)  || defined(RT_OS_FREEBSD)
+ #if defined(RT_OS_FREEBSD) || defined(RT_OS_OS2) || defined(RT_OS_SOLARIS)
             pAddress = (sockaddr_in *)&ifrequest[i].ifr_addr;
  #else

trunk/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp

@@ -41 +41 @@
 RTR0DECL(int) RTR0MemUserCopyFrom(void *pvDst, RTR3PTR R3PtrSrc, size_t cb)
 {
-    int rc = KernCopyIn(pvDst, (const user_addr_t)R3PtrSrc, cb);
+    int rc = KernCopyIn(pvDst, (void *)R3PtrSrc, cb);
     if (RT_LIKELY(rc == 0))
         return VINF_SUCCESS;
@@ -50 +50 @@
 RTR0DECL(int) RTR0MemUserCopyTo(RTR3PTR R3PtrDst, void const *pvSrc, size_t cb)
 {
-    int rc = KernCopyOut(R3PtrDst, pvSrc, cb);
+    int rc = KernCopyOut((void *)R3PtrDst, pvSrc, cb);
     if (RT_LIKELY(rc == 0))
         return VINF_SUCCESS;
@@ -68 +68 @@
 
 RTR0DECL(bool) RTR0MemKernelIsValidAddr(void *pv)
-{
+{                                   
     /** @todo this is all wrong, see RTR0MemUserIsValidAddr. */
-    return R3Ptr >= UINT32_C(0x20000000); /* 512MB */
+    return (uintptr_t)pv >= UINT32_C(0x20000000); /* 512MB */
 }
 

trunk/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp

@@ -173 +173 @@
     AssertReturn(rc == 0, true);
 
-    return cInterruptLevel > 0;
+    return u.cInterruptLevel > 0;
 }
 

trunk/src/VBox/Runtime/r3/fs.cpp

@@ -37 +37 @@
 # include <sys/time.h>
 # include <sys/param.h>
+# ifndef DEV_BSIZE
+#  include <sys/stat.h>
+#  define DEV_BSIZE S_BLKSIZE /** @todo bird: add DEV_BSIZE to sys/param.h on OS/2. */
+# endif
 #endif
 

trunk/src/VBox/Runtime/r3/init.cpp

@@ -159 +159 @@
 
 #ifdef RT_OS_OS2
+/** Fork completion callback for OS/2.  Only called in the child. */
+static void rtR3ForkOs2ChildCompletionCallback(void *pvArg, int rc, __LIBC_FORKCTX enmCtx)
+{
+    Assert(enmCtx == __LIBC_FORK_CTX_CHILD); NOREF(enmCtx);
+    NOREF(pvArg);
+
+    if (!rc)
+        rtR3ForkChildCallback();
+}
+
 /** Low-level fork callback for OS/2.  */
 int rtR3ForkOs2Child(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation)
 {
-    if (enmOperation == __LIBC_FORK_STAGE_COMPLETION_CHILD)
-        rtR3ForkChildCallback();
+    if (enmOperation == __LIBC_FORK_OP_EXEC_CHILD)
+        return pForkHandle->pfnCompletionCallback(pForkHandle, rtR3ForkOs2ChildCompletionCallback, NULL, __LIBC_FORK_CTX_CHILD);
     return 0;
 }