From 3d76654d68ad02584aa2ceb68b718af0b4dbf8fc Mon Sep 17 00:00:00 2001
From: Andreas Schulz <ats@FreeBSD.org>
Date: Fri, 2 Sep 1994 22:13:34 +0000
Subject: [PATCH] Reviewed by: Submitted by: 1) if_ie.c: 	Changed a
 printf and put a space in it. Formerly the "<3C507>" 	confused the syslog.
 He tried to see that as the priority to 	log that message.

2) isa_device.h:
	Changed the iobase variable from short to u_short. EISA
	Adresses can go up to 0xf000 and the sign extension doesn't
	look good in the probe output. Example:
	ep1 at 0xffff8000-0xffff8000f is not good :-), i like more a
	ep1 at 0x8000-0x8000f.

3) isa.c:
	Changed a string constant from "probe" to "prob", it gets
	later already an "ed" tagged on the end.
---
 sys/amd64/isa/isa.c       | 4 ++--
 sys/dev/ie/if_ie.c        | 4 ++--
 sys/i386/isa/if_ie.c      | 4 ++--
 sys/i386/isa/isa.c        | 4 ++--
 sys/i386/isa/isa_device.h | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 5b5878efd639..60e76b39842d 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.20 1994/08/13 03:50:07 wollman Exp $
+ *	$Id: isa.c,v 1.21 1994/08/18 05:09:30 davidg Exp $
  */
 
 /*
@@ -170,7 +170,7 @@ haveseen(dvp, tmpdvp, checkbits)
 	if (tmpdvp->id_alive) {
 		char const *whatnot;
 
-		whatnot = checkbits & CC_ATTACH ? "attach" : "probe";
+		whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
 		/*
 		 * Check for I/O address conflict.  We can only check the
 		 * starting address of the device against the range of the
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 969380406d36..7c1dbd153756 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.10 1994/08/24 22:32:43 ats Exp $
+ *	$Id: if_ie.c,v 1.11 1994/08/25 20:16:59 wollman Exp $
  */
 
 /*
@@ -485,7 +485,7 @@ ieattach(dvp)
   ifp->if_unit = unit;
   ifp->if_name = iedriver.name;
   ifp->if_mtu = ETHERMTU;
-  printf("<%s R%d> ethernet address %s\n", 
+  printf(" <%s R%d> ethernet address %s\n", 
 	 ie_hardware_names[ie_softc[unit].hard_type],
 	 ie_softc[unit].hard_vers + 1,
 	 ether_sprintf(ie->arpcom.ac_enaddr));
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 969380406d36..7c1dbd153756 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.10 1994/08/24 22:32:43 ats Exp $
+ *	$Id: if_ie.c,v 1.11 1994/08/25 20:16:59 wollman Exp $
  */
 
 /*
@@ -485,7 +485,7 @@ ieattach(dvp)
   ifp->if_unit = unit;
   ifp->if_name = iedriver.name;
   ifp->if_mtu = ETHERMTU;
-  printf("<%s R%d> ethernet address %s\n", 
+  printf(" <%s R%d> ethernet address %s\n", 
 	 ie_hardware_names[ie_softc[unit].hard_type],
 	 ie_softc[unit].hard_vers + 1,
 	 ether_sprintf(ie->arpcom.ac_enaddr));
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 5b5878efd639..60e76b39842d 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.20 1994/08/13 03:50:07 wollman Exp $
+ *	$Id: isa.c,v 1.21 1994/08/18 05:09:30 davidg Exp $
  */
 
 /*
@@ -170,7 +170,7 @@ haveseen(dvp, tmpdvp, checkbits)
 	if (tmpdvp->id_alive) {
 		char const *whatnot;
 
-		whatnot = checkbits & CC_ATTACH ? "attach" : "probe";
+		whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
 		/*
 		 * Check for I/O address conflict.  We can only check the
 		 * starting address of the device against the range of the
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 3cd86ef5c106..4b66870b54ae 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.7 1994/08/20 03:48:41 davidg Exp $
+ *	$Id: isa_device.h,v 1.8 1994/08/22 15:58:40 bde Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -61,7 +61,7 @@ typedef void inthand2_t __P((int unit));
 struct isa_device {
 	int	id_id;		/* device id */
 	struct	isa_driver *id_driver;
-	short	id_iobase;	/* base i/o address */
+	u_short	id_iobase;	/* base i/o address */
 	u_short	id_irq;		/* interrupt request */
 	short	id_drq;		/* DMA request */
 	caddr_t id_maddr;	/* physical i/o memory address on bus (if any)*/