Changeset 485 for GPL/trunk/lib32/memory.cpp

Timestamp:

May 23, 2010, 10:17:06 PM (15 years ago)

Author:

David Azarewicz

Message:

Added quirk for Gateway 2000 ICH2/AD1885

File:

• GPL/trunk/lib32/memory.cpp (modified) (12 diffs)

GPL/trunk/lib32/memory.cpp

@@ -106 +106 @@
     pCur = pBaseAddrHead;
 
-    if(pCur->retaddr == addr) 
+    if(pCur->retaddr == addr)
     {
         addr = pCur->base;
@@ -160 +160 @@
     APIRET rc = 0;
     ULONG addr = 0;
-    
+
 #ifdef KEE
     SHORT sel;
@@ -176 +176 @@
 extern "C" int fStrategyInit;
 //******************************************************************************
-APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr) 
+APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr)
 {
     APIRET rc;
@@ -211 +211 @@
 //******************************************************************************
 //******************************************************************************
-APIRET VMFree(LINEAR addr) 
+APIRET VMFree(LINEAR addr)
 {
     APIRET rc;
@@ -302 +302 @@
     size = order * PAGE_SIZE;
 
-    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM)) 
+    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM))
     {//below 16 mb for legacy DMA?
         if(gfp_mask & GFP_DMA)
@@ -326 +326 @@
     }
     else allocsize = size;
-    
+
     if(VMAlloc(allocsize, flags, (LINEAR *)&addr)) {
                 DebugInt3();
                 return 0;
         }
-////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));    
-    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM)) 
+////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));
+    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM))
     {//must be aligned at 64kb boundary
         ULONG physaddr = virt_to_phys((void *)addr);
@@ -377 +377 @@
     //check if it really is the base of the allocation (see above)
     addr = GetBaseAddress(addr, (ULONG NEAR *)__Stack32ToFlat(&size));
-    
+
     if(VMFree((LINEAR)addr)) {
         DebugInt3();
@@ -410 +410 @@
     if(addr) {
 #ifdef DEBUG
-        dprintf(("vmalloc %d -> %x (phys %x)", size, addr, virt_to_phys((void *)addr)));
+        //dprintf(("vmalloc %d -> %x (phys %x)", size, addr, virt_to_phys((void *)addr)));
 #endif
         //only done to save size of memory block
@@ -416 +416 @@
         ulget_free_pagesMemUsed += size;
 #ifdef DEBUG
-        dprintf(("vmalloc: total alloc size %d", ulget_free_pagesMemUsed));
+        //dprintf(("vmalloc: total alloc size %d", ulget_free_pagesMemUsed));
 #endif
     }
@@ -429 +429 @@
 
     GetBaseAddress((ULONG)ptr, (ULONG NEAR *)__Stack32ToFlat(&size));
-    
+
     if(VMFree((LINEAR)ptr)) {
         DebugInt3();
@@ -435 +435 @@
     else {
 #ifdef DEBUG
-        dprintf(("vfree %x size %d", (ULONG)ptr, size));
+        //dprintf(("vfree %x size %d", (ULONG)ptr, size));
 #endif
         ulget_free_pagesMemUsed -= size;
 #ifdef DEBUG
-        dprintf(("vfree: total alloc size %d", ulget_free_pagesMemUsed));
+        //dprintf(("vfree: total alloc size %d", ulget_free_pagesMemUsed));
 #endif
     }
@@ -635 +635 @@
     }
 ////  dprintf(("kfree %x", addr));
-    if(IsHeapAddr(addr)) {  
+    if(IsHeapAddr(addr)) {
 #ifdef DEBUGHEAP
-        free((void *)addr, filename, lineno);  
-#else
-            free((void *)addr);  
+        free((void *)addr, filename, lineno);
+#else
+            free((void *)addr);
 #endif
     }