PERFORCE change 40882 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=40882

Change 40882 by peter at peter_daintree on 2003/10/30 15:01:53

	I am more evil that jhb

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#6 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/madt.c#6 (text+ko) ====

@@ -48,6 +48,8 @@
 #include <dev/acpica/madt.h>
 #include <dev/pci/pcivar.h>
 
+#define	bootverbose		1	/* XXX debugging */
+
 #define	NIOAPICS		16	/* Max number of I/O APICs */
 #define	NLAPICS			16	/* Max number of local APICs */
 
@@ -201,9 +203,7 @@
 	KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high"));
 	rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR));
 	if (rsdp == NULL) {
-#if 0
 		if (bootverbose)
-#endif
 			printf("MADT: Failed to map RSDP\n");
 		return (ENXIO);
 	}
@@ -218,9 +218,7 @@
 		printf("XSDT PA = 0x%jx\n", (uintmax_t)rsdp->XsdtPhysicalAddress);
 		xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG);
 		if (xsdt == NULL) {
-#if 0
 			if (bootverbose)
-#endif
 				printf("MADT: Failed to map XSDT\n");
 			return (ENXIO);
 		}
@@ -235,9 +233,7 @@
 		printf("RSDT PA = 0x%jx\n", (uintmax_t)rsdp->RsdtPhysicalAddress);
 		rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG);
 		if (rsdt == NULL) {
-#if 0
 			if (bootverbose)
-#endif
 				printf("MADT: Failed to map RSDT\n");
 			return (ENXIO);
 		}
@@ -250,15 +246,11 @@
 	}
 	pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR));
 	if (madt_physaddr == 0) {
-#if 0
 		if (bootverbose)
-#endif
 			printf("MADT: No MADT table found\n");
 		return (ENXIO);
 	} else
-#if 0
 	if (bootverbose)
-#endif
 		printf("MADT: Found table at %p\n", (void *)madt_physaddr);
 
 	return (0);
@@ -274,16 +266,12 @@
 
 	table = madt_map(address, 0, sizeof(ACPI_TABLE_HEADER));
 	if (table == NULL) {
-#if 0
 		if (bootverbose)
-#endif
 			printf("MADT: Failed to map table at %p\n",
 			    (void *)address);
 		return (0);
 	}
-#if 0
 	if (bootverbose)
-#endif
 		printf("Table '%.4s' at %p\n", table->Signature,
 		    (void *)address);
 
@@ -398,9 +386,7 @@
 		 * its own.
 		 */
 		proc = (PROCESSOR_APIC *)entry;
-#if 0
 		if (bootverbose)
-#endif
 			printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n",
 			    proc->LocalApicId, proc->ProcessorApicId,
 			    proc->ProcessorEnabled ? "enabled" : "disabled");
@@ -433,9 +419,7 @@
 	switch (entry->Type) {
 	case APIC_IO:
 		apic = (IO_APIC *)entry;
-#if 0
 		if (bootverbose)
-#endif
 			printf("MADT: Found IO APIC ID %d, Vector %d at %p\n",
 			    apic->IoApicId, apic->Vector,
 			    (void *)apic->IoApicAddress);
@@ -597,9 +581,7 @@
 	if (nmi->ProcessorApicId == 0xff)
 		apic_id = APIC_ID_ALL;
 	else if (madt_find_cpu(nmi->ProcessorApicId, &apic_id) != 0) {
-#if 0
 		if (bootverbose)
-#endif
 			printf("MADT: Ignoring local NMI routed to ACPI CPU %u\n",
 			    nmi->ProcessorApicId);
 		return;