Module Name: src
Committed By: isaki
Date: Sat Jul 24 13:15:13 UTC 2010
Modified Files:
src/sys/arch/x68k/dev: slhci_intio.c
Log Message:
Probe not only Nereid Ctrl port but also SL811HS/T port.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/dev/slhci_intio.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/x68k/dev/slhci_intio.c
diff -u src/sys/arch/x68k/dev/slhci_intio.c:1.13 src/sys/arch/x68k/dev/slhci_intio.c:1.14
--- src/sys/arch/x68k/dev/slhci_intio.c:1.13 Sat May 8 02:48:31 2010
+++ src/sys/arch/x68k/dev/slhci_intio.c Sat Jul 24 13:15:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_intio.c,v 1.13 2010/05/08 02:48:31 isaki Exp $ */
+/* $NetBSD: slhci_intio.c,v 1.14 2010/07/24 13:15:13 isaki Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_intio.c,v 1.13 2010/05/08 02:48:31 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_intio.c,v 1.14 2010/07/24 13:15:13 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,6 +87,10 @@
ia->ia_intr == SLHCI_INTIO_INTR2 ) )
return 0;
+ /* Whether the SL811 port is accessible or not */
+ if (badaddr((void *)IIOV(ia->ia_addr)))
+ return 0;
+
/* Whether the control port is accessible or not */
nc_addr = ia->ia_addr + NEREID_ADDR_OFFSET;
nc_size = 0x02;
