Force success of the probe (after doing it as before except in one

miscconfigured case) if the port is the console.  This fixes several
bugs:
- if all sioprobe()s failed, then the console driver followed null
  pointers in cdevsw[].
- if the sioprobe() for the console failed but another sioprobe()
  succeeded, then init hung early when the console couldn't be
  opened.
- it was silly for the console to not be there after printing boot
  messages on it.
Bugs introduced by this are hopefully no worse than old ones caused
by forcing the success of the `cn' level probe.

1 files changed, 5 insertions, 4 deletions

diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 63c4248..898f080 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.203 1998/05/31 10:53:55 bde Exp $
+ *	$Id: sio.c,v 1.204 1998/06/03 09:43:38 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -616,7 +616,8 @@ sioprobe(dev)
 		if (idev == NULL) {
 			printf("sio%d: master device %d not configured\n",
 			       dev->id_unit, COM_MPMASTER(dev));
-			return (0);
+			dev->id_irq = 0;
+			idev = dev;
 		}
 		if (!COM_NOTAST4(dev)) {
 			outb(idev->id_iobase + com_scr,
@@ -735,7 +736,7 @@ sioprobe(dev)
 		}
 		outb(iobase + com_cfcr, CFCR_8BITS);
 		enable_intr();
-		return( result );
+		return (iobase == siocniobase ? IO_COMSIZE : result);
 	}
 
 	/*
@@ -799,7 +800,7 @@ sioprobe(dev)
 			}
 			break;
 		}
-	return (result);
+	return (iobase == siocniobase ? IO_COMSIZE : result);
 }
 
 #ifdef COM_ESP