diff options
| author | akiyama <akiyama@FreeBSD.org> | 2014-08-31 10:42:52 +0000 |
|---|---|---|
| committer | akiyama <akiyama@FreeBSD.org> | 2014-08-31 10:42:52 +0000 |
| commit | bf3d63ee2830a957c5eaf72958e2e2904161e76c (patch) | |
| tree | fd9ca91122123225b867239da2515297698a4a4d | |
| parent | 541ca9866f407975b301aafb6f75d63241f586b7 (diff) | |
| download | FreeBSD-src-bf3d63ee2830a957c5eaf72958e2e2904161e76c.zip FreeBSD-src-bf3d63ee2830a957c5eaf72958e2e2904161e76c.tar.gz | |
MFC r263859:
Change default logic to CONFORM because this routine is shared
with SCI polarity setting.
Reviewed by: jhb
MFC r269184:
Add missing newline to output dmesg properly.
| -rw-r--r-- | sys/x86/acpica/madt.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index ef36276..f54a358 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -298,6 +298,9 @@ interrupt_polarity(UINT16 IntiFlags, UINT8 Source) { switch (IntiFlags & ACPI_MADT_POLARITY_MASK) { + default: + printf("WARNING: Bogus Interrupt Polarity. Assume CONFORMS\n"); + /* FALLTHROUGH*/ case ACPI_MADT_POLARITY_CONFORMS: if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_POLARITY_LOW); @@ -306,11 +309,8 @@ interrupt_polarity(UINT16 IntiFlags, UINT8 Source) case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); case ACPI_MADT_POLARITY_ACTIVE_LOW: - break; - default: - printf("WARNING: Bogus Interrupt Polarity. Assume POLALITY LOW"); + return (INTR_POLARITY_LOW); } - return (INTR_POLARITY_LOW); } static enum intr_trigger @@ -318,6 +318,9 @@ interrupt_trigger(UINT16 IntiFlags, UINT8 Source) { switch (IntiFlags & ACPI_MADT_TRIGGER_MASK) { + default: + printf("WARNING: Bogus Interrupt Trigger Mode. Assume CONFORMS.\n"); + /*FALLTHROUGH*/ case ACPI_MADT_TRIGGER_CONFORMS: if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_TRIGGER_LEVEL); @@ -326,13 +329,8 @@ interrupt_trigger(UINT16 IntiFlags, UINT8 Source) case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); case ACPI_MADT_TRIGGER_LEVEL: - break; - default: - printf("WARNING: Bogus Interrupt Trigger Mode. Assume Level trigger."); - - break; + return (INTR_TRIGGER_LEVEL); } - return (INTR_TRIGGER_LEVEL); } /* |
