Changeset 667 for GPL/branches/uniaud32-next/lib32/memory.c

Timestamp:

Jan 27, 2021, 9:35:47 AM (5 years ago)

Author:

Paul Smedley

Message:

Remove remaining support for non-KEE builds

File:

• GPL/branches/uniaud32-next/lib32/memory.c (modified) (7 diffs)

GPL/branches/uniaud32-next/lib32/memory.c

@@ -32 +32 @@
 #include <stacktoflat.h>
 #include <limits.h>
-#ifdef KEE
 #include <kee.h>
-#endif
 #include "malloc.h"
 #define _I386_PAGE_H
@@ -178 +176 @@
 unsigned long virt_to_phys(void * address)
 {
-#ifdef KEE
     KEEVMPageList pagelist;
     ULONG         nrpages;
@@ -187 +184 @@
         }
         return pagelist.addr;
-#else
-    LINEAR addr = (LINEAR)address;
-    PAGELIST pagelist;
-
-        if(DevLinToPageList(addr, PAGE_SIZE, (PAGELIST NEAR *)&pagelist)) {
-                DebugInt3();
-                return 0;
-        }
-        return pagelist.physaddr;
-#endif
 }
 //******************************************************************************
@@ -205 +192 @@
     ULONG addr = 0;
 
-#ifdef KEE
     SHORT sel;
     rc = KernVMAlloc(PAGE_SIZE, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&address, &sel);
-#else
-    rc = DevVMAlloc(VMDHA_PHYS, PAGE_SIZE, (LINEAR)&address, (ULONG)&addr);
-#endif
     if (rc != 0) {
         DebugInt3();
@@ -232 +215 @@
 __again:
 
-#ifdef KEE
-
     rc = KernVMAlloc(size, flags, (PVOID*)&addr, (PVOID*)-1, &sel);
-#else
-    rc = DevVMAlloc(flags, size, (LINEAR)-1, (ULONG)&addr);
-#endif
     if (rc == 0) {
         *pAddr = (LINEAR)addr;
@@ -257 +235 @@
 {
     APIRET rc;
-
-#ifdef KEE
-        rc = KernVMFree((PVOID)addr);
-#else
-        rc = DevVMFree((LINEAR)addr);
-#endif
+    rc = KernVMFree((PVOID)addr);
     if(rc) {
         DebugInt3();
@@ -531 +504 @@
         //size &= 0xFFFFF000;
 
-#ifdef KEE
     SHORT sel;
-
-        //rc = KernVMAlloc(size, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&physaddr, &sel);
+    //rc = KernVMAlloc(size, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&physaddr, &sel);
     rc = KernVMAlloc(Length, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&PhysicalAddress, &sel);
-#else
-    //rc = DevVMAlloc(VMDHA_PHYS, size, (LINEAR)&physaddr, (ULONG)&addr);
-    rc = DevVMAlloc(VMDHA_PHYS, Length, (LINEAR)&PhysicalAddress, (ULONG)&addr);
-#endif
     if (rc != 0) {
         dprintf(("ioremap error: %x", rc));