- Move lptreg.h into pc98/cbus and rename to olptreg.h.

- Remove ifdef pc98.

3 files changed, 49 insertions, 58 deletions

diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
deleted file mode 100644
index 70906f0..0000000
--- a/sys/i386/isa/lptreg.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- * $FreeBSD$
- */
-
-/*
- * AT Parallel Port (for lineprinter)
- * Interface port and bit definitions
- * Written by William Jolitz 12/18/90
- * Copyright (C) William Jolitz 1990
- */
-
-/*
- * modified for PC9801 by A.Kojima
- *			Kyoto University Microcomputer Club (KMC)
- */
-
-#ifdef PC98
-#define lpt_pstb_ctrl	(-9)	/* PSTB enable control */
-#define	LPC_EN_PSTB	0xc	/* PSTB enable */
-#define	LPC_DIS_PSTB	0xd	/* PSTB disable */
-
-#define lpt_data	0	/* Data to/from printer (R/W) */
-
-#define lpt_status	2	/* Status of printer (R) */
-#define	LPS_NBSY	0x4	/* printer no ack of data */
-
-#define lpt_control	6	/* Control printer (W) */
-#define	LPC_MODE8255	0x82	/* 8255 mode */
-#define	LPC_IRQ8	0x6	/* IRQ8 active */
-#define	LPC_NIRQ8	0x7	/* IRQ8 inactive */
-#define	LPC_PSTB	0xe	/* PSTB active */
-#define	LPC_NPSTB	0xf	/* PSTB inactive */
-
-#else /* IBM-PC */
-#define lpt_data	0	/* Data to/from printer (R/W) */
-
-#define lpt_status	1	/* Status of printer (R) */
-#define	LPS_NERR		0x08	/* printer no error */
-#define	LPS_SEL			0x10	/* printer selected */
-#define	LPS_OUT			0x20	/* printer out of paper */
-#define	LPS_NACK		0x40	/* printer no ack of data */
-#define	LPS_NBSY		0x80	/* printer no ack of data */
-
-#define lpt_control	2	/* Control printer (R/W) */
-#define	LPC_STB			0x01	/* strobe data to printer */
-#define	LPC_AUTOL		0x02	/* automatic linefeed */
-#define	LPC_NINIT		0x04	/* initialize printer */
-#define	LPC_SEL			0x08	/* printer selected */
-#define	LPC_ENA			0x10	/* enable IRQ */
-#endif
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 494eb04..085b692 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -118,7 +118,7 @@
 
 #include <isa/isavar.h>
 
-#include <i386/isa/lptreg.h>
+#include <pc98/cbus/olptreg.h>
 #include <dev/ppbus/lptio.h>
 
 #define	LPINITRDY	4	/* wait up to 4 seconds for a ready */
diff --git a/sys/pc98/cbus/olptreg.h b/sys/pc98/cbus/olptreg.h
new file mode 100644
index 0000000..8168110
--- /dev/null
+++ b/sys/pc98/cbus/olptreg.h
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2005 Yoshihiro TAKAHASHI
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * modified for PC9801 by A.Kojima
+ *			Kyoto University Microcomputer Club (KMC)
+ */
+
+#define lpt_pstb_ctrl	(-9)	/* PSTB enable control */
+#define	LPC_EN_PSTB	0xc	/* PSTB enable */
+#define	LPC_DIS_PSTB	0xd	/* PSTB disable */
+
+#define lpt_data	0	/* Data to/from printer (R/W) */
+
+#define lpt_status	2	/* Status of printer (R) */
+#define	LPS_NBSY	0x4	/* printer no ack of data */
+
+#define lpt_control	6	/* Control printer (W) */
+#define	LPC_MODE8255	0x82	/* 8255 mode */
+#define	LPC_IRQ8	0x6	/* IRQ8 active */
+#define	LPC_NIRQ8	0x7	/* IRQ8 inactive */
+#define	LPC_PSTB	0xe	/* PSTB active */
+#define	LPC_NPSTB	0xf	/* PSTB inactive */