From 910ee34995bf569957a41fd124ced80dd33bf582 Mon Sep 17 00:00:00 2001
From: mark <mark@NetBSD.org>
Date: Thu, 28 Mar 1996 21:52:32 +0000
Subject: [PATCH] Remove definitions of the inb() and outb() macros as they are
 now defined in a header file.

---
 sys/arch/arm32/dev/com.c     | 5 +----
 sys/arch/arm32/dev/lpt.c     | 7 ++-----
 sys/arch/arm32/dev/wd.c      | 4 +---
 sys/arch/arm32/mainbus/com.c | 5 +----
 sys/arch/arm32/mainbus/fd.c  | 5 +----
 sys/arch/arm32/mainbus/lpt.c | 7 ++-----
 sys/arch/arm32/mainbus/wd.c  | 4 +---
 7 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/sys/arch/arm32/dev/com.c b/sys/arch/arm32/dev/com.c
index d972a5fc5615..ee9b812f7968 100644
--- a/sys/arch/arm32/dev/com.c
+++ b/sys/arch/arm32/dev/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.4 1996/03/27 22:08:31 mark Exp $	*/
+/*	$NetBSD: com.c,v 1.5 1996/03/28 21:52:32 mark Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -62,9 +62,6 @@
 #include <arm32/mainbus/comreg.h>
 #include <arm32/mainbus/mainbus.h>
 
-#define inb ReadByte
-#define outb WriteByte 
-
 #define	com_lcr	com_cfcr
 
 #define	COM_IBUFSIZE	(2 * 256)
diff --git a/sys/arch/arm32/dev/lpt.c b/sys/arch/arm32/dev/lpt.c
index 0b22fb49c72f..35ff77c3f0d3 100644
--- a/sys/arch/arm32/dev/lpt.c
+++ b/sys/arch/arm32/dev/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.5 1996/03/27 22:08:28 mark Exp $ */
+/* $NetBSD: lpt.c,v 1.6 1996/03/28 21:52:47 mark Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
@@ -49,7 +49,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from:$NetBSD: lpt.c,v 1.5 1996/03/27 22:08:28 mark Exp $
+ *	from:$NetBSD: lpt.c,v 1.6 1996/03/28 21:52:47 mark Exp $
  */
 
 /*
@@ -96,9 +96,6 @@
 #include <arm32/mainbus/lptreg.h>
 #include <arm32/mainbus/mainbus.h>
 
-#define inb ReadByte
-#define outb WriteByte 
-
 #define	TIMEOUT		hz*16	/* wait up to 16 seconds for a ready */
 #define	STEP		hz/4
 
diff --git a/sys/arch/arm32/dev/wd.c b/sys/arch/arm32/dev/wd.c
index 5b91838e35de..e54e2e2a127f 100644
--- a/sys/arch/arm32/dev/wd.c
+++ b/sys/arch/arm32/dev/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.5 1996/03/27 22:08:25 mark Exp $	*/
+/*	$NetBSD: wd.c,v 1.6 1996/03/28 21:52:52 mark Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -57,8 +57,6 @@
 #include <machine/io.h>
 #include <machine/katelib.h>
 
-#define inb ReadByte
-#define outb WriteByte
 extern int wdresethack;
 
 #define	WAITTIME	(4 * hz)	/* time to wait for a completion */
diff --git a/sys/arch/arm32/mainbus/com.c b/sys/arch/arm32/mainbus/com.c
index d972a5fc5615..ee9b812f7968 100644
--- a/sys/arch/arm32/mainbus/com.c
+++ b/sys/arch/arm32/mainbus/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.4 1996/03/27 22:08:31 mark Exp $	*/
+/*	$NetBSD: com.c,v 1.5 1996/03/28 21:52:32 mark Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -62,9 +62,6 @@
 #include <arm32/mainbus/comreg.h>
 #include <arm32/mainbus/mainbus.h>
 
-#define inb ReadByte
-#define outb WriteByte 
-
 #define	com_lcr	com_cfcr
 
 #define	COM_IBUFSIZE	(2 * 256)
diff --git a/sys/arch/arm32/mainbus/fd.c b/sys/arch/arm32/mainbus/fd.c
index 000b3792d609..d12e73d46b95 100644
--- a/sys/arch/arm32/mainbus/fd.c
+++ b/sys/arch/arm32/mainbus/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.4 1996/03/27 22:18:44 mark Exp $	*/
+/*	$NetBSD: fd.c,v 1.5 1996/03/28 21:52:41 mark Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -68,9 +68,6 @@
 #include <arm32/mainbus/mainbus.h>
 #include <arm32/mainbus/fdreg.h>
 
-#define inb ReadByte
-#define outb WriteByte
-
 #define FDUNIT(dev)	(minor(dev) / 8)
 #define FDTYPE(dev)	(minor(dev) % 8)
 
diff --git a/sys/arch/arm32/mainbus/lpt.c b/sys/arch/arm32/mainbus/lpt.c
index 0b22fb49c72f..35ff77c3f0d3 100644
--- a/sys/arch/arm32/mainbus/lpt.c
+++ b/sys/arch/arm32/mainbus/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.5 1996/03/27 22:08:28 mark Exp $ */
+/* $NetBSD: lpt.c,v 1.6 1996/03/28 21:52:47 mark Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
@@ -49,7 +49,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from:$NetBSD: lpt.c,v 1.5 1996/03/27 22:08:28 mark Exp $
+ *	from:$NetBSD: lpt.c,v 1.6 1996/03/28 21:52:47 mark Exp $
  */
 
 /*
@@ -96,9 +96,6 @@
 #include <arm32/mainbus/lptreg.h>
 #include <arm32/mainbus/mainbus.h>
 
-#define inb ReadByte
-#define outb WriteByte 
-
 #define	TIMEOUT		hz*16	/* wait up to 16 seconds for a ready */
 #define	STEP		hz/4
 
diff --git a/sys/arch/arm32/mainbus/wd.c b/sys/arch/arm32/mainbus/wd.c
index 5b91838e35de..e54e2e2a127f 100644
--- a/sys/arch/arm32/mainbus/wd.c
+++ b/sys/arch/arm32/mainbus/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.5 1996/03/27 22:08:25 mark Exp $	*/
+/*	$NetBSD: wd.c,v 1.6 1996/03/28 21:52:52 mark Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -57,8 +57,6 @@
 #include <machine/io.h>
 #include <machine/katelib.h>
 
-#define inb ReadByte
-#define outb WriteByte
 extern int wdresethack;
 
 #define	WAITTIME	(4 * hz)	/* time to wait for a completion */