Changeset 43366 in vbox for trunk/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c

Timestamp:

Sep 20, 2012 12:31:54 PM (12 years ago)

Author:

vboxsync

Message:

Haiku Additions: cleanup, missed file.

File:

• trunk/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c (modified) (17 diffs)

trunk/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c

@@ -78 +78 @@
         case RTR0MEMOBJTYPE_LOCK:
             return pMem->u.Lock.R0Process == NIL_RTR0PROCESS
-                ? kernel_map
-                : &((struct proc *)pMem->u.Lock.R0Process)->p_vmspace->vm_map;
+            ? kernel_map
+            : &((struct proc *)pMem->u.Lock.R0Process)->p_vmspace->vm_map;
 
         case RTR0MEMOBJTYPE_RES_VIRT:
             return pMem->u.ResVirt.R0Process == NIL_RTR0PROCESS
-                ? kernel_map
-                : &((struct proc *)pMem->u.ResVirt.R0Process)->p_vmspace->vm_map;
+            ? kernel_map
+            : &((struct proc *)pMem->u.ResVirt.R0Process)->p_vmspace->vm_map;
 
         case RTR0MEMOBJTYPE_MAPPING:
             return pMem->u.Mapping.R0Process == NIL_RTR0PROCESS
-                ? kernel_map
-                : &((struct proc *)pMem->u.Mapping.R0Process)->p_vmspace->vm_map;
+            ? kernel_map
+            : &((struct proc *)pMem->u.Mapping.R0Process)->p_vmspace->vm_map;
 
         default:
@@ -150 +150 @@
 
 static int rtR0MemObjNativeAllocArea(PPRTR0MEMOBJINTERNAL ppMem, size_t cb,
-    bool fExecutable, RTR0MEMOBJTYPE type, RTHCPHYS PhysHighest, size_t uAlignment)
+                                     bool fExecutable, RTR0MEMOBJTYPE type, RTHCPHYS PhysHighest, size_t uAlignment)
 {
     NOREF(fExecutable);
@@ -159 +159 @@
     uint32 addressSpec  = B_ANY_KERNEL_ADDRESS;
     uint32 fLock        = ~0U;
-    LogFlowFunc(("ppMem=%p cb=%u, fExecutable=%s, type=%08x, PhysHighest=%RX64 uAlignment=%u\n", ppMem, (unsigned)cb,
-               fExecutable ? "true" : "false", type, PhysHighest, (unsigned)uAlignment));
+    LogFlowFunc(("ppMem=%p cb=%u, fExecutable=%s, type=%08x, PhysHighest=%RX64 uAlignment=%u\n", ppMem,(unsigned)cb,
+                 fExecutable ? "true" : "false", type, PhysHighest,(unsigned)uAlignment));
 
     switch (type)
@@ -194 +194 @@
         case RTR0MEMOBJTYPE_LOCK:
             break;
-#endif        
+#endif
         default:
             return VERR_INTERNAL_ERROR;
@@ -237 +237 @@
         }
 
-           delete_area(pMemHaiku->AreaId);
+        delete_area(pMemHaiku->AreaId);
     }
 
@@ -277 +277 @@
 {
     AssertReturn(uCachePolicy == RTMEM_CACHE_POLICY_DONT_CARE, VERR_NOT_SUPPORTED);
-    LogFlowFunc(("ppMem=%p Phys=%08x cb=%u uCachePolicy=%x\n", ppMem, Phys, (unsigned)cb, uCachePolicy));
+    LogFlowFunc(("ppMem=%p Phys=%08x cb=%u uCachePolicy=%x\n", ppMem, Phys,(unsigned)cb, uCachePolicy));
 
     /* Create the object. */
@@ -315 +315 @@
 
     LogFlowFunc(("ppMem=%p pvStart=%p cb=%u fAccess=%x R0Process=%d fFlags=%x\n", ppMem, pvStart, cb, fAccess, R0Process,
-                fFlags));
+                 fFlags));
 
     /* Create the object. */
@@ -365 +365 @@
 
     if (R0Process != NIL_RTR0PROCESS)
-        team = (team_id)R0Process;
+    team = (team_id)R0Process;
 
     /* Check that the specified alignment is supported. */
     if (uAlignment > PAGE_SIZE)
-        return VERR_NOT_SUPPORTED;
+    return VERR_NOT_SUPPORTED;
 
     /* Create the object. */
     PRTR0MEMOBJHAIKU pMemHaiku = (PRTR0MEMOBJHAIKU)rtR0MemObjNew(sizeof(*pMemHaiku), RTR0MEMOBJTYPE_RES_VIRT, NULL, cb);
     if (!pMemHaiku)
-        return VERR_NO_MEMORY;
+    return VERR_NO_MEMORY;
 
     /* Ask the kernel to reserve the address range. */
@@ -410 +410 @@
     /** @todo r=ramshankar: Wrong format specifiers, fix later! */
     dprintf("%s(%p, %p, %p, %d, %x, %u, %u)\n", __FUNCTION__, ppMem, pMemToMap, pvFixed, uAlignment,
-        fProt, offSub, cbSub);
+            fProt, offSub, cbSub);
 #endif
     /* Check that the specified alignment is supported. */
@@ -436 +436 @@
         rc = area = clone_area("IPRT R0MemObj MapKernel", &pvMap, uAddrSpec, fProtect, pMemToMapHaiku->AreaId);
         LogFlow(("rtR0MemObjNativeMapKernel: clone_area uAddrSpec=%d fProtect=%x AreaId=%d rc=%d\n", uAddrSpec, fProtect,
-                pMemToMapHaiku->AreaId, rc));
+                 pMemToMapHaiku->AreaId, rc));
     }
     else if (pMemToMapHaiku->Core.enmType == RTR0MEMOBJTYPE_PHYS)
@@ -457 +457 @@
                                                     pMemToMapHaiku->Core.cb);
         if (RT_UNLIKELY(!pMemHaiku))
-               return VERR_NO_MEMORY;
+            return VERR_NO_MEMORY;
 
         pMemHaiku->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
@@ -483 +483 @@
     AssertMsgReturn(R3PtrFixed == (RTR3PTR)-1, ("%p\n", R3PtrFixed), VERR_NOT_SUPPORTED);
     if (uAlignment > PAGE_SIZE)
-        return VERR_NOT_SUPPORTED;
+    return VERR_NOT_SUPPORTED;
 
     int                rc;
@@ -493 +493 @@
     vm_prot_t       ProtectionFlags = 0;
     if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
-        ProtectionFlags = VM_PROT_NONE;
+    ProtectionFlags = VM_PROT_NONE;
     if ((fProt & RTMEM_PROT_READ) == RTMEM_PROT_READ)
-        ProtectionFlags |= VM_PROT_READ;
+    ProtectionFlags |= VM_PROT_READ;
     if ((fProt & RTMEM_PROT_WRITE) == RTMEM_PROT_WRITE)
-        ProtectionFlags |= VM_PROT_WRITE;
+    ProtectionFlags |= VM_PROT_WRITE;
     if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)
-        ProtectionFlags |= VM_PROT_EXECUTE;
+    ProtectionFlags |= VM_PROT_EXECUTE;
 
     /* calc mapping address */
@@ -562 +562 @@
          */
         PRTR0MEMOBJHAIKU pMemHaiku = (PRTR0MEMOBJHAIKU)rtR0MemObjNew(sizeof(RTR0MEMOBJHAIKU),
-                                                                           RTR0MEMOBJTYPE_MAPPING,
-                                                                           (void *)AddrR3,
-                                                                           pMemToMap->cb);
+                                                                     RTR0MEMOBJTYPE_MAPPING,
+                                                                     (void *)AddrR3,
+                                                                     pMemToMap->cb);
         if (pMemHaiku)
         {
@@ -591 +591 @@
     PRTR0MEMOBJHAIKU pMemHaiku = (PRTR0MEMOBJHAIKU)pMem;
     status_t rc;
-    
+
     /** @todo r=ramshankar: Validate objects */
- 
-    LogFlow(("rtR0MemObjNativeGetPagePhysAddr: pMem=%p enmType=%x iPage=%u\n", pMem, pMemHaiku->Core.enmType, (unsigned)iPage));
+
+    LogFlow(("rtR0MemObjNativeGetPagePhysAddr: pMem=%p enmType=%x iPage=%u\n", pMem, pMemHaiku->Core.enmType,(unsigned)iPage));
 
     switch (pMemHaiku->Core.enmType)
@@ -602 +602 @@
             team_id        TeamId = B_SYSTEM_TEAM;
             physical_entry aPhysMap[2];
-            int32          cPhysMap = 2;        /** @todo r=ramshankar: why not use RT_ELEMENTS? */
+            int32          cPhysMap = 2;    /** @todo r=ramshankar: why not use RT_ELEMENTS? */
 
             if (pMemHaiku->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
@@ -643 +643 @@
             team_id        TeamId = B_SYSTEM_TEAM;
             physical_entry aPhysMap[2];
-            int32          cPhysMap = 2;        /** @todo r=ramshankar: why not use RT_ELEMENTS? */
+            int32          cPhysMap = 2;    /** @todo r=ramshankar: why not use RT_ELEMENTS? */
 
             void *pb = pMemHaiku->Core.pv + (iPage << PAGE_SHIFT);