i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pci_acpi.cpp: space cleanup

Browse Source
This commit is contained in:
Jérôme Duval
2013-10-21 22:27:18 +02:00
parent 004a268e04
commit 30794c2d79
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/pci/arch/x86/pci_acpi.cpp
+5 -5
View File
@@ -99,7 +99,7 @@ acpi_check_rsdt(acpi_rsdp* rsdp)
if (rsdp->revision > 0) { if (rsdp->revision > 0) {
length = rsdp->xsdt_length; length = rsdp->xsdt_length;
rsdtArea = map_physical_memory("rsdt acpi", rsdtArea = map_physical_memory("rsdt acpi",
(uint32)rsdp->xsdt_address, rsdp->xsdt_length, B_ANY_KERNEL_ADDRESS, (uint32)rsdp->xsdt_address, rsdp->xsdt_length, B_ANY_KERNEL_ADDRESS,
B_KERNEL_READ_AREA, (void **)&rsdt); B_KERNEL_READ_AREA, (void **)&rsdt);
if (rsdt != NULL if (rsdt != NULL
&& strncmp(rsdt->signature, ACPI_XSDT_SIGNATURE, 4) != 0) { && strncmp(rsdt->signature, ACPI_XSDT_SIGNATURE, 4) != 0) {
@@ -133,7 +133,7 @@ acpi_check_rsdt(acpi_rsdp* rsdp)
TRACE(("acpi: rsdt length: %lu\n", length)); TRACE(("acpi: rsdt length: %lu\n", length));
delete_area(rsdtArea); delete_area(rsdtArea);
rsdtArea = map_physical_memory("rsdt acpi", rsdtArea = map_physical_memory("rsdt acpi",
rsdp->rsdt_address, length, B_ANY_KERNEL_ADDRESS, rsdp->rsdt_address, length, B_ANY_KERNEL_ADDRESS,
B_KERNEL_READ_AREA, (void **)&rsdt); B_KERNEL_READ_AREA, (void **)&rsdt);
} }
@@ -187,7 +187,7 @@ acpi_find_table_generic(const char* signature, acpi_descriptor_header* acpiSdt)
area_id headerArea = -1; area_id headerArea = -1;
for (int32 j = 0; j < sNumEntries; j++, pointer++) { for (int32 j = 0; j < sNumEntries; j++, pointer++) {
headerArea = map_physical_memory("acpi header", (uint32)*pointer, headerArea = map_physical_memory("acpi header", (uint32)*pointer,
sizeof(acpi_descriptor_header), B_ANY_KERNEL_ADDRESS, sizeof(acpi_descriptor_header), B_ANY_KERNEL_ADDRESS,
B_KERNEL_READ_AREA, (void **)&header); B_KERNEL_READ_AREA, (void **)&header);
if (header == NULL if (header == NULL
@@ -217,7 +217,7 @@ acpi_find_table_generic(const char* signature, acpi_descriptor_header* acpiSdt)
delete_area(headerArea); delete_area(headerArea);
headerArea = map_physical_memory("acpi table", headerArea = map_physical_memory("acpi table",
(uint32)*pointer, length, B_ANY_KERNEL_ADDRESS, (uint32)*pointer, length, B_ANY_KERNEL_ADDRESS,
B_KERNEL_READ_AREA, (void **)&header); B_KERNEL_READ_AREA, (void **)&header);
return header; return header;
} }
@@ -262,7 +262,7 @@ acpi_init()
rsdp = (acpi_rsdp*)pointer; rsdp = (acpi_rsdp*)pointer;
} }
} }
if (rsdp != NULL && acpi_check_rsdt(rsdp) == B_OK) { if (rsdp != NULL && acpi_check_rsdt(rsdp) == B_OK) {
delete_area(rsdpArea); delete_area(rsdpArea);
break; break;