Module Name: src
Committed By: tsutsui
Date: Wed Apr 30 15:53:09 UTC 2014
Modified Files:
src/sys/arch/hp300/dev: frodo.c
Log Message:
Probe mcclock only on 425e to avoid an extra "not configured" message.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hp300/dev/frodo.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/hp300/dev/frodo.c
diff -u src/sys/arch/hp300/dev/frodo.c:1.31 src/sys/arch/hp300/dev/frodo.c:1.32
--- src/sys/arch/hp300/dev/frodo.c:1.31 Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/dev/frodo.c Wed Apr 30 15:53:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: frodo.c,v 1.31 2014/04/19 05:37:54 tsutsui Exp $ */
+/* $NetBSD: frodo.c,v 1.32 2014/04/30 15:53:09 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.31 2014/04/19 05:37:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.32 2014/04/30 15:53:09 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@@ -197,6 +197,11 @@ frodoattach(device_t parent, device_t se
if (fd->fd_offset == FRODO_APCI_OFFSET(1) &&
mmuid != MMUID_425_E)
continue;
+ /*
+ * The mcclock is available only on a 425e.
+ */
+ if (fd->fd_offset == FRODO_CALENDAR && mmuid != MMUID_425_E)
+ continue;
fa.fa_name = fd->fd_name;
fa.fa_bst = bst;
fa.fa_base = ia->ia_iobase;
