Author: takawata
Date: Fri Mar 28 02:38:14 2014
New Revision: 263859
URL: http://svnweb.freebsd.org/changeset/base/263859
Log:
Change default logic to CONFORM because this routine is shared
with SCI polarity setting.
Reviewed by: jhb
Modified:
head/sys/x86/acpica/madt.c
Modified: head/sys/x86/acpica/madt.c
==
--- head/sys/x86/acpica/madt.c Fri Mar 28 02:06:51 2014(r263858)
+++ head/sys/x86/acpica/madt.c Fri Mar 28 02:38:14 2014(r263859)
@@ -298,6 +298,9 @@ interrupt_polarity(UINT16 IntiFlags, UIN
{
switch (IntiFlags ACPI_MADT_POLARITY_MASK) {
+ default:
+ printf(WARNING: Bogus Interrupt Polarity. Assume CONFORMS);
+ /* FALLTHROUGH*/
case ACPI_MADT_POLARITY_CONFORMS:
if (Source == AcpiGbl_FADT.SciInterrupt)
return (INTR_POLARITY_LOW);
@@ -306,11 +309,8 @@ interrupt_polarity(UINT16 IntiFlags, UIN
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, UINT
{
switch (IntiFlags ACPI_MADT_TRIGGER_MASK) {
+ default:
+ printf(WARNING: Bogus Interrupt Trigger Mode. Assume
CONFORMS.);
+ /*FALLTHROUGH*/
case ACPI_MADT_TRIGGER_CONFORMS:
if (Source == AcpiGbl_FADT.SciInterrupt)
return (INTR_TRIGGER_LEVEL);
@@ -326,13 +329,8 @@ interrupt_trigger(UINT16 IntiFlags, UINT
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);
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
