git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/x86 - Report ACPICA cache name on exhaustion
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
x86
/
acpica.c
diff --git
a/KernelLand/Kernel/arch/x86/acpica.c
b/KernelLand/Kernel/arch/x86/acpica.c
index
43a1854
..
a7a0883
100644
(file)
--- a/
KernelLand/Kernel/arch/x86/acpica.c
+++ b/
KernelLand/Kernel/arch/x86/acpica.c
@@
-5,7
+5,7
@@
* acpica.c
* - ACPICA Interface
*/
* acpica.c
* - ACPICA Interface
*/
-#define ACPI_DEBUG_OUTPUT
1
+#define ACPI_DEBUG_OUTPUT
0
#define DEBUG 0
#define _AcpiModuleName "Shim"
#define _COMPONENT "Acess"
#define DEBUG 0
#define _AcpiModuleName "Shim"
#define _COMPONENT "Acess"
@@
-94,7
+94,7
@@
ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void)
if( ACPI_FAILURE(rv) )
return 0;
if( ACPI_FAILURE(rv) )
return 0;
- LOG("val=%x", val);
+ LOG("val=
0x
%x", val);
return val;
// (Or use EFI)
return val;
// (Or use EFI)
@@
-192,7
+192,7
@@
void *AcpiOsAcquireObject(ACPI_CACHE_T *Cache)
}
}
}
}
- Log_Debug("ACPICA", "AcpiOsAcquireObject: %i objects used
", Cache->nObj);
+ Log_Debug("ACPICA", "AcpiOsAcquireObject: %i objects used
in cache '%s'", Cache->nObj, Cache->Name);
LEAVE('n');
return NULL;
LEAVE('n');
return NULL;
@@
-222,8
+222,13
@@
void *AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length)
Uint ofs = PhysicalAddress & (PAGE_SIZE-1);
int npages = (ofs + Length + (PAGE_SIZE-1)) / PAGE_SIZE;
Uint ofs = PhysicalAddress & (PAGE_SIZE-1);
int npages = (ofs + Length + (PAGE_SIZE-1)) / PAGE_SIZE;
- void *rv = ((char*)MM_MapHWPages(PhysicalAddress, npages)) + ofs;
+ char *maploc = (void*)MM_MapHWPages(PhysicalAddress, npages);
+ if(!maploc) {
+ LOG("Mapping %P+0x%x failed", PhysicalAddress, Length);
+ return NULL;
+ }
// MM_DumpTables(0, -1);
// MM_DumpTables(0, -1);
+ void *rv = maploc + ofs;
LOG("Map (%P+%i pg) to %p", PhysicalAddress, npages, rv);
return rv;
}
LOG("Map (%P+%i pg) to %p", PhysicalAddress, npages, rv);
return rv;
}
UCC
git Repository :: git.ucc.asn.au