From 89bc97311a50996b19ee00a6eef01ed02ab1ad9f Mon Sep 17 00:00:00 2001
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Sat, 28 Aug 1993 03:02:52 +0000
Subject: [PATCH] xxxprobe now returns the correct number of I/O registers used
 so that the probe output during boot gives the I/O range instead of just the
 starting address

---
 sys/dev/sio/sio.c  | 4 ++--
 sys/i386/isa/sio.c | 4 ++--
 sys/i386/isa/wd.c  | 3 ++-
 sys/isa/sio.c      | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 46e32eb27baa..dd72ce4b09ef 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -41,7 +41,7 @@
  *					into the patch kit.  Added in sioselect
  *					from com.c.  Added port 4 support.
  */
-static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/sio.c,v 1.4 1993/07/20 00:22:30 jkh Exp $";
+static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.5 1993/07/20 02:06:49 jkh Exp $";
 
 #include "sio.h"
 #if NSIO > 0
@@ -352,7 +352,7 @@ sioprobe(dev)
 		already_init = TRUE;
 	}
 	iobase = dev->id_iobase;
-	result = 1;
+	result = IO_COMSIZE;
 
 	/*
 	 * We don't want to get actual interrupts, just masked ones.
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 46e32eb27baa..dd72ce4b09ef 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -41,7 +41,7 @@
  *					into the patch kit.  Added in sioselect
  *					from com.c.  Added port 4 support.
  */
-static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/sio.c,v 1.4 1993/07/20 00:22:30 jkh Exp $";
+static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.5 1993/07/20 02:06:49 jkh Exp $";
 
 #include "sio.h"
 #if NSIO > 0
@@ -352,7 +352,7 @@ sioprobe(dev)
 		already_init = TRUE;
 	}
 	iobase = dev->id_iobase;
-	result = 1;
+	result = IO_COMSIZE;
 
 	/*
 	 * We don't want to get actual interrupts, just masked ones.
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 0eb7abfa8448..79a136ba55d3 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -76,6 +76,7 @@
 #include "uio.h"
 #include "malloc.h"
 #include "machine/cpu.h"
+#include "i386/isa/isa.h"
 #include "i386/isa/isa_device.h"
 #include "i386/isa/icu.h"
 #include "i386/isa/wdreg.h"
@@ -200,7 +201,7 @@ wdprobe(struct isa_device *dvp)
 
 	(void) inb(wdc+wd_error);	/* XXX! */
 	outb(wdc+wd_ctlr, WDCTL_4BIT);
-	return (1);
+	return (IO_WDCSIZE);
 
 nodevice:
 	free(du, M_TEMP);
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 46e32eb27baa..dd72ce4b09ef 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -41,7 +41,7 @@
  *					into the patch kit.  Added in sioselect
  *					from com.c.  Added port 4 support.
  */
-static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys.386bsd/i386/isa/sio.c,v 1.4 1993/07/20 00:22:30 jkh Exp $";
+static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.5 1993/07/20 02:06:49 jkh Exp $";
 
 #include "sio.h"
 #if NSIO > 0
@@ -352,7 +352,7 @@ sioprobe(dev)
 		already_init = TRUE;
 	}
 	iobase = dev->id_iobase;
-	result = 1;
+	result = IO_COMSIZE;
 
 	/*
 	 * We don't want to get actual interrupts, just masked ones.