Changeset 1480 in vbox for trunk/src/VBox/HostDrivers/Support/linux

Timestamp:

Mar 14, 2007 6:27:47 PM (18 years ago)

Author:

vboxsync

Message:

No longer require contiguous memory for the VM structure.
Did long overdue IOCtl cleanup wrt R3/R0 pointers.

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (8 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -246 +246 @@
 static int      VBoxSupDrvDeviceControl(struct inode *pInode, struct file *pFilp,
                                         unsigned int IOCmd, unsigned long IOArg);
-static void    *VBoxSupDrvMapUser(struct page **papPages, unsigned cPages, unsigned fProt, pgprot_t pgFlags);
+static RTR3PTR  VBoxSupDrvMapUser(struct page **papPages, unsigned cPages, unsigned fProt, pgprot_t pgFlags);
 static int      VBoxSupDrvInitGip(PSUPDRVDEVEXT pDevExt);
 static int      VBoxSupDrvTermGip(PSUPDRVDEVEXT pDevExt);
 static void     VBoxSupGipTimer(unsigned long ulUser);
+#ifdef CONFIG_SMP
 static void     VBoxSupDrvGipPerCpu(void *pvUser);
+#endif
 static int      VBoxSupDrvOrder(unsigned long size);
 static int      VBoxSupDrvErr2LinuxErr(int);
@@ -827 +829 @@
  * @param   pHCPhys     Where to store the physical address.
  */
-int VBOXCALL supdrvOSContAllocOne(PSUPDRVMEMREF pMem, void **ppvR0, void **ppvR3, PRTHCPHYS pHCPhys)
+int VBOXCALL supdrvOSContAllocOne(PSUPDRVMEMREF pMem, PRTR0PTR ppvR0, PRTR3PTR ppvR3, PRTHCPHYS pHCPhys)
 {
     struct page *paPages;
@@ -916 +918 @@
     {
         *pHCPhys = HCPhys;
-        *ppvR3 = (void *)ulAddr;
+        *ppvR3 = ulAddr;
         if (ppvR0)
             *ppvR0 = (void *)ulAddr;
-        pMem->pvR3              = (void *)ulAddr;
+        pMem->pvR3              = ulAddr;
         pMem->pvR0              = NULL;
         pMem->u.cont.paPages    = paPages;
@@ -1000 +1002 @@
  * @param   ppvR3       Where to store the address of the Ring-3 mapping.
  */
-int  VBOXCALL   supdrvOSMemAllocOne(PSUPDRVMEMREF pMem, void **ppvR0, void **ppvR3)
+int  VBOXCALL   supdrvOSMemAllocOne(PSUPDRVMEMREF pMem, PRTR0PTR ppvR0, PRTR3PTR ppvR3)
 {
     const unsigned  cbAligned = RT_ALIGN(pMem->cb, PAGE_SIZE);
@@ -1132 +1134 @@
         up_write(&current->mm->mmap_sem);   /* check when we can leave this. */
     }
-    pMem->pvR3 = NULL;
+    pMem->pvR3 = NIL_RTR3PTR;
 
     /*
@@ -1190 +1192 @@
  * @param   pgFlags     The page level protection.
  */
-static void *VBoxSupDrvMapUser(struct page **papPages, unsigned cPages, unsigned fProt, pgprot_t pgFlags)
+static RTR3PTR VBoxSupDrvMapUser(struct page **papPages, unsigned cPages, unsigned fProt, pgprot_t pgFlags)
 {
     int             rc = SUPDRV_ERR_NO_MEMORY;
@@ -1234 +1236 @@
         {
             up_write(&current->mm->mmap_sem);
-            return (void *)ulAddr;
+            return ulAddr;
         }
 
@@ -1252 +1254 @@
     up_write(&current->mm->mmap_sem);
 
-    return NULL;
+    return NIL_RTR3PTR;
 }