儲存庫 vbox 的更動 10249

時間撮記:

2008-7-4 下午08:03:45 (16 年 以前)

作者:

vboxsync

訊息:

Removed non-USE_NEW_OS_INTERFACE_FOR_MM code.

檔案:

• trunk/src/VBox/HostDrivers/Support/SUPDRV.h (修改) (3 筆差異)

trunk/src/VBox/HostDrivers/Support/SUPDRV.h

@@ -405 +405 @@
 typedef struct SUPDRVMEMREF
 {
-#ifdef USE_NEW_OS_INTERFACE_FOR_MM
     /** The memory object handle. */
     RTR0MEMOBJ          MemObj;
@@ -412 +411 @@
     /** Type of memory. */
     SUPDRVMEMREFTYPE    eType;
-
-#else /* !USE_NEW_OS_INTERFACE_FOR_MM */
-    /** Pointer to the R0 mapping of the memory.
-     * Set to NULL if N/A. */
-    void               *pvR0;
-    /** Pointer to the R3 mapping of the memory.
-     * Set to NULL if N/A. */
-    RTR3PTR             pvR3;
-    /** Size of the locked memory. */
-    unsigned            cb;
-    /** Type of memory. */
-    SUPDRVMEMREFTYPE    eType;
-
-    /** memory type specific information. */
-    union
-    {
-        struct
-        {
-#if defined(RT_OS_WINDOWS)
-            /** Pointer to memory descriptor list (MDL). */
-            PMDL               *papMdl;
-            unsigned            cMdls;
-#elif defined(RT_OS_LINUX)
-            struct page       **papPages;
-            unsigned            cPages;
-#else
-# error "Either no target was defined or we haven't ported the driver to the target yet."
-#endif
-        } locked;
-        struct
-        {
-#if defined(RT_OS_WINDOWS)
-            /** Pointer to memory descriptor list (MDL). */
-            PMDL                pMdl;
-#elif defined(RT_OS_LINUX)
-            struct page        *paPages;
-            unsigned            cPages;
-#else
-# error "Either no target was defined or we haven't ported the driver to the target yet."
-#endif
-        } cont;
-        struct
-        {
-#if defined(RT_OS_WINDOWS)
-            /** Pointer to memory descriptor list (MDL). */
-            PMDL                pMdl;
-#elif defined(RT_OS_LINUX)
-            /** Pointer to the array of page pointers. */
-            struct page       **papPages;
-            /** Number of pages in papPages. */
-            unsigned            cPages;
-#else
-# error "Either no target was defined or we haven't ported the driver to the target yet."
-#endif
-        } mem;
-#if defined(USE_NEW_OS_INTERFACE_FOR_LOW)
-        struct
-        {
-            /** The memory object handle. */
-            RTR0MEMOBJ          MemObj;
-            /** The ring-3 mapping memory object handle. */
-            RTR0MEMOBJ          MapObjR3;
-        } iprt;
-#endif
-    } u;
-#endif /* !USE_NEW_OS_INTERFACE_FOR_MM */
 } SUPDRVMEMREF, *PSUPDRVMEMREF;
 
@@ -711 +644 @@
 void VBOXCALL   supdrvOSObjInitCreator(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession);
 bool VBOXCALL   supdrvOSObjCanAccess(PSUPDRVOBJ pObj, PSUPDRVSESSION pSession, const char *pszObjName, int *prc);
-#ifndef USE_NEW_OS_INTERFACE_FOR_MM
-int  VBOXCALL   supdrvOSLockMemOne(PSUPDRVMEMREF pMem, PSUPPAGE paPages);
-void VBOXCALL   supdrvOSUnlockMemOne(PSUPDRVMEMREF pMem);
-int  VBOXCALL   supdrvOSContAllocOne(PSUPDRVMEMREF pMem, PRTR0PTR ppvR0, PRTR3PTR ppvR3, PRTHCPHYS pHCPhys);
-void VBOXCALL   supdrvOSContFreeOne(PSUPDRVMEMREF pMem);
-int  VBOXCALL   supdrvOSLowAllocOne(PSUPDRVMEMREF pMem, PRTR0PTR ppvR0, PRTR3PTR ppvR3, PSUPPAGE paPages);
-void VBOXCALL   supdrvOSLowFreeOne(PSUPDRVMEMREF pMem);
-int  VBOXCALL   supdrvOSMemAllocOne(PSUPDRVMEMREF pMem, PRTR0PTR ppvR0, PRTR3PTR ppvR3);
-void VBOXCALL   supdrvOSMemGetPages(PSUPDRVMEMREF pMem, PSUPPAGE paPages);
-void VBOXCALL   supdrvOSMemFreeOne(PSUPDRVMEMREF pMem);
-#endif
 bool VBOXCALL   supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt);