Module Name: src
Committed By: yamt
Date: Fri Jun 15 14:02:41 UTC 2012
Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c
Log Message:
assertions. use a macro. no functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/pci/pci_intr_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.23 src/sys/arch/x86/pci/pci_intr_machdep.c:1.24
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.23 Mon Aug 29 22:41:52 2011
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Fri Jun 15 14:02:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.23 2011/08/29 22:41:52 dyoung Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.24 2012/06/15 14:02:41 yamt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.23 2011/08/29 22:41:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.24 2012/06/15 14:02:41 yamt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -140,10 +140,13 @@ pci_intr_map(const struct pci_attach_arg
}
#if NIOAPIC > 0 || NACPICA > 0
+ KASSERT(rawpin >= PCI_INTERRUPT_PIN_A);
+ KASSERT(rawpin <= PCI_INTERRUPT_PIN_D);
pci_decompose_tag(pc, pa->pa_tag, &bus, &dev, &func);
if (mp_busses != NULL) {
- if (intr_find_mpmapping(bus, (dev<<2)|(rawpin-1), ihp) == 0) {
- if ((*ihp & 0xff) == 0)
+ if (intr_find_mpmapping(bus,
+ (dev << 2) | (rawpin - PCI_INTERRUPT_PIN_A), ihp) == 0) {
+ if (APIC_IRQ_LEGACY_IRQ(*ihp) == 0)
*ihp |= line;
return 0;
}
