Changeset 24287 in vbox for trunk/src/VBox/Runtime/r0drv/os2

Timestamp:

Nov 3, 2009 12:34:11 PM (16 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/Runtime/r0drv/os2

Files:

• memuserkernel-r0drv-os2.cpp (modified) (3 diffs)
• thread-r0drv-os2.cpp (modified) (1 diff)

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;
 }