Module Name: src
Committed By: phx
Date: Sat Mar 19 19:54:03 UTC 2011
Modified Files:
src/sys/arch/sandpoint/pci: pci_machdep.c
Log Message:
DLink DSM-G600 IDSEL-14 (USB) needs special handling: Pin A is mapped to
EPIC-IRQ 1, but Pin C must be mapped to IRQ 2.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sandpoint/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/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.23 src/sys/arch/sandpoint/pci/pci_machdep.c:1.24
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.23 Mon Feb 14 09:00:04 2011
+++ src/sys/arch/sandpoint/pci/pci_machdep.c Sat Mar 19 19:54:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.23 2011/02/14 09:00:04 nisimura Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.24 2011/03/19 19:54:02 phx Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.23 2011/02/14 09:00:04 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.24 2011/03/19 19:54:02 phx Exp $");
#include "opt_pci.h"
@@ -353,6 +353,8 @@
case BRD_DLINKDSM:
/* map line 13,14,15,16 to EPIC IRQ0,1,3,4 */
*ihp = (line < 15) ? line - 13 : line - 12;
+ if (line == 14 && pin == 3)
+ *ihp += 1; /* USB pin C (EHCI) uses next IRQ */
break;
case BRD_NH230NAS:
/* map line 13,14,15,16 to EPIC IRQ0,3,1,2 */
