[src/trunk]: src/sys/arch/hp300/dev According to the 362/382 Service Handbook...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c661716cea9
branches:  trunk
changeset: 760239:3c661716cea9
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Dec 31 22:41:55 2010 +0000

description:
According to the 362/382 Service Handbook by HP, only 382 has a utility chip
(i.e. frodo and apci) for RS-232C so don't try to attach frodo on HP362.

XXX: HP362 detection code in locore.s and bootloader still doesn't work
XXX: if on-board framebuffer is disabled by a jumper switch, though
XXX: it's still detected as HP360 and just works.

diffstat:

 sys/arch/hp300/dev/intio.c |  31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r d514f436db5b -r 3c661716cea9 sys/arch/hp300/dev/intio.c
--- a/sys/arch/hp300/dev/intio.c        Fri Dec 31 21:50:27 2010 +0000
+++ b/sys/arch/hp300/dev/intio.c        Fri Dec 31 22:41:55 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intio.c,v 1.28 2008/04/28 20:23:19 martin Exp $        */
+/*     $NetBSD: intio.c,v 1.29 2010/12/31 22:41:55 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.28 2008/04/28 20:23:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.29 2010/12/31 22:41:55 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,15 +70,25 @@
 #define nintio_3xx_builtins    __arraycount(intio_3xx_builtins)
 #endif
 
-#if defined(HP362) || defined(HP382)
-static const struct intio_builtins intio_3x2_builtins[] = {
+#if defined(HP362)
+static const struct intio_builtins intio_362_builtins[] = {
+       { "rtc",        RTC_BASE,       -1},
+       { "hil",        HIL_BASE,       1},
+       { "hpib",       HPIB_BASE,      3},
+       { "dma",        DMA_BASE,       1},
+};
+#define nintio_362_builtins    __arraycount(intio_362_builtins)
+#endif
+
+#if defined(HP382)
+static const struct intio_builtins intio_382_builtins[] = {
        { "rtc",        RTC_BASE,       -1},
        { "frodo",      FRODO_BASE,     5},
        { "hil",        HIL_BASE,       1},
        { "hpib",       HPIB_BASE,      3},
        { "dma",        DMA_BASE,       1},
 };
-#define nintio_3x2_builtins    __arraycount(intio_3x2_builtins)
+#define nintio_382_builtins    __arraycount(intio_382_builtins)
 #endif
 
 #if defined(HP400) || defined(HP425) || defined(HP433)
@@ -141,11 +151,16 @@
                ndevs = nintio_3xx_builtins;
                break;
 #endif
-#if defined(HP362) || defined(HP382)
+#if defined(HP362)
        case HP_362:
+               ib = intio_362_builtins;
+               ndevs = nintio_362_builtins;
+               break;
+#endif
+#if defined(HP382)
        case HP_382:
-               ib = intio_3x2_builtins;
-               ndevs = nintio_3x2_builtins;
+               ib = intio_382_builtins;
+               ndevs = nintio_382_builtins;
                break;
 #endif
 #if defined(HP400) || defined(HP425) || defined(HP433)