Module Name: src
Committed By: kiyohara
Date: Wed Nov 3 05:23:11 UTC 2010
Modified Files:
src/sys/arch/bebox/pci: pci_machdep.c
Log Message:
Calculate IRQ from swiz, if bus != 0.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/bebox/pci/pci_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/bebox/pci/pci_machdep.c
diff -u src/sys/arch/bebox/pci/pci_machdep.c:1.17 src/sys/arch/bebox/pci/pci_machdep.c:1.18
--- src/sys/arch/bebox/pci/pci_machdep.c:1.17 Fri May 30 15:56:32 2008
+++ src/sys/arch/bebox/pci/pci_machdep.c Wed Nov 3 05:23:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.17 2008/05/30 15:56:32 kiyohara Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.18 2010/11/03 05:23:11 kiyohara Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.17 2008/05/30 15:56:32 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.18 2010/11/03 05:23:11 kiyohara Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -114,6 +114,6 @@
*iline = BEBOX_PCIBUS0_DEV2LINE(dev);
}
} else
-#define BEBOX_PCIBUS_DEV2LINE(d, s) ((((d) + (s) + 1) & 0x3) + 26)
- *iline = BEBOX_PCIBUS_DEV2LINE(dev, swiz);
+#define BEBOX_PCIBUS_SWIZ2LINE(s) ((s) + 14)
+ *iline = BEBOX_PCIBUS_SWIZ2LINE(swiz);
}
