Module Name: src
Committed By: nisimura
Date: Thu Jul 30 05:57:28 UTC 2009
Modified Files:
src/sys/arch/sandpoint/pci: pci_machdep.c
src/sys/arch/sandpoint/sandpoint: com_eumb.c
Log Message:
- fix EUMB com console attach case.
- #ifdef out pci_conf_interrupt() for PCI_NETBSD_CONFIGURE option.
Requested and tested by kiyohara.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/pci/pci_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/sandpoint/com_eumb.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.16 src/sys/arch/sandpoint/pci/pci_machdep.c:1.17
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.16 Fri May 30 19:26:35 2008
+++ src/sys/arch/sandpoint/pci/pci_machdep.c Thu Jul 30 05:57:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.16 2008/05/30 19:26:35 ad Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.17 2009/07/30 05:57:27 nisimura Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.16 2008/05/30 19:26:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.17 2009/07/30 05:57:27 nisimura Exp $");
+
+#include "opt_pci.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -393,6 +395,7 @@
intr_disestablish(cookie);
}
+#if defined(PCI_NETBSD_CONFIGURE)
void
pci_conf_interrupt(pci_chipset_tag_t pc, int bus, int dev,
int pin, int swiz, int *iline)
@@ -420,3 +423,4 @@
*iline = 13 + ((swiz + dev + 3) & 3);
}
}
+#endif
Index: src/sys/arch/sandpoint/sandpoint/com_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.4 src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.5
--- src/sys/arch/sandpoint/sandpoint/com_eumb.c:1.4 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/sandpoint/sandpoint/com_eumb.c Thu Jul 30 05:57:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: com_eumb.c,v 1.4 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: com_eumb.c,v 1.5 2009/07/30 05:57:27 nisimura Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.4 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.5 2009/07/30 05:57:27 nisimura Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -89,10 +89,11 @@
found = 1;
comaddr = (eaa->eumb_unit == 1) ? 0x4600 : 0x4500;
- if (comaddr == cnregs.cr_iobase)
+ if (com_is_console(eaa->eumb_bt, comaddr, &ioh)) {
+ cnregs.cr_ioh = ioh;
sc->sc_regs = cnregs;
+ }
else {
- ioh = comaddr;
bus_space_map(eaa->eumb_bt, comaddr, COM_NPORTS, 0, &ioh);
COM_INIT_REGS(sc->sc_regs, eaa->eumb_bt, ioh, comaddr);
}
@@ -116,6 +117,5 @@
cnregs.cr_iot = tag;
cnregs.cr_iobase = conaddr;
cnregs.cr_nports = COM_NPORTS;
- /* cnregs.ioh is initialized by comcnattach */
return comcnattach1(&cnregs, conspeed, confreq, contype, conmode);
}
