From: aoyama <aoyama@openbsd.org>
Date: Thu, 8 May 2014 13:31:00 +0000 (+0000)
Subject: The pcexmem(4) and pcexio(4) should be attached on LUNA-88K2 only.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b161af434ca3777585a4f506c91a7da3eb03d3db;p=openbsd

The pcexmem(4) and pcexio(4) should be attached on LUNA-88K2 only.

Actually, there seems to be no PC-9801 extension board slot on
'original' LUNA-88K.

ok miod@
---

diff --git a/share/man/man4/man4.luna88k/pcexmem.4 b/share/man/man4/man4.luna88k/pcexmem.4
index e3fb1b2a577..d6feeb68882 100644
--- a/share/man/man4/man4.luna88k/pcexmem.4
+++ b/share/man/man4/man4.luna88k/pcexmem.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcexmem.4,v 1.2 2014/04/22 22:58:02 aoyama Exp $
+.\"	$OpenBSD: pcexmem.4,v 1.3 2014/05/08 13:31:00 aoyama Exp $
 .\"
 .\" Copyright (c) 2014 Kenji Aoyama.
 .\"
@@ -13,7 +13,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: April 22 2014 $
+.Dd $Mdocdate: May 8 2014 $
 .Dt PCEXMEM 4 luna88k
 .Os
 .Sh NAME
@@ -28,7 +28,7 @@ The file
 is an
 .Xr mmap 2
 capable interface to the memory area of the installed board at "NEC PC-9801
-extension board slot" on LUNA-88K.
+extension board slot" on LUNA-88K2.
 Byte offsets in this file are interpreted as relative memory addresses
 of the installed board.
 The range should be between 0x0 and 0xffffff.
diff --git a/sys/arch/luna88k/dev/pcex.c b/sys/arch/luna88k/dev/pcex.c
index c6552b3fe4c..14dbfd94554 100644
--- a/sys/arch/luna88k/dev/pcex.c
+++ b/sys/arch/luna88k/dev/pcex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcex.c,v 1.1 2014/04/16 12:01:33 aoyama Exp $	*/
+/*	$OpenBSD: pcex.c,v 1.2 2014/05/08 13:31:00 aoyama Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
@@ -17,7 +17,7 @@
  */
 
 /*
- * PC-9801 extension board slot direct access driver for LUNA-88K{,2}
+ * PC-9801 extension board slot direct access driver for LUNA-88K2.
  */
 
 #include <sys/param.h>
@@ -227,7 +227,7 @@ pcex_wait_int(struct pcex_softc *sc, u_int level)
  * Note about interrupt on PC-9801 extension board slot
  *
  * PC-9801 extension board slot bus (so-called 'C-bus' in Japan) use 8 own
- * interrupt levels, INT0-INT6, and NMI.  On LUNA-88K{,2}, they all trigger
+ * interrupt levels, INT0-INT6, and NMI.  On LUNA-88K2, they all trigger
  * level 4 interrupt, so we need to check the dedicated interrupt status
  * register to know which C-bus interrupt is occurred.
  *
@@ -258,7 +258,7 @@ pcex_intr(void *arg)
 	int n;
 
 	/*
-	 * LUNA-88K{,2}'s interrupt level 4 is shared with other devices,
+	 * LUNA-88K2's interrupt level 4 is shared with other devices,
 	 * such as le(4), for example.  So we check:
 	 * - the value of our C-bus interrupt status register, and
 	 * - if the INT level is what we are looking for.
diff --git a/sys/arch/luna88k/luna88k/mainbus.c b/sys/arch/luna88k/luna88k/mainbus.c
index eb3009acb9a..da163a051e1 100644
--- a/sys/arch/luna88k/luna88k/mainbus.c
+++ b/sys/arch/luna88k/luna88k/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.10 2014/04/16 12:01:33 aoyama Exp $ */
+/* $OpenBSD: mainbus.c,v 1.11 2014/05/08 13:31:00 aoyama Exp $ */
 /* $NetBSD: mainbus.c,v 1.2 2000/01/07 05:13:08 nisimura Exp $ */
 
 /*-
@@ -55,10 +55,10 @@ static const struct mainbus_attach_args devs[] = {
 	{ "spc",   0xe1000000, 3,  LUNA_88K|LUNA_88K2 }, /* MB89352 */
 	{ "spc",   0xe1000040, 3,  LUNA_88K2 },          /* ditto, LUNA-88K2 only */
 #if NPCM > 0
-	{ "pcm",   0x91000000, 4,  LUNA_88K|LUNA_88K2 }, /* NEC-9801-86 Sound board (under testing) */
+	{ "pcm",   0x91000000, 4,  LUNA_88K2 }, 	 /* NEC-9801-86 Sound board (under testing) */
 #endif
 #if NPCEX > 0
-	{ "pcex",  0x91000000, 4,  LUNA_88K|LUNA_88K2 }, /* PC-9801 extension slot */
+	{ "pcex",  0x91000000, 4,  LUNA_88K2 },		 /* PC-9801 extension slot */
 #endif
 };