Adjust console stuff now that makedev is no longer a macro.

5 files changed, 14 insertions, 9 deletions

diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index 7e3f8a0cbe66..4724eb4ea077 100644
--- a/sys/alpha/alpha/prom.c
+++ b/sys/alpha/alpha/prom.c
@@ -51,7 +51,7 @@
 
 /* XXX this is to fake out the console routines, while booting. */
 struct consdev promcons = { NULL, NULL, promcngetc, promcncheckc, promcnputc,
-			    NULL, makedev(97,0), CN_NORMAL };
+			    NULL, 0 /* makedev(97,0) */, CN_NORMAL };
 
 struct rpb	*hwrpb;
 int		alpha_console;
@@ -117,6 +117,7 @@ init_bootstrap_console()
 #endif
 
 	/* XXX fake out the console routines, for now */
+	promcons.cn_dev = makedev(97, 0);
 	cn_tab = &promcons;
 }
 
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 9bb40e96fa1f..0c1d97ee2628 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zs_tlsb.c,v 1.10 1999/05/08 21:58:54 dfr Exp $
+ *	$Id: zs_tlsb.c,v 1.11 1999/05/09 13:00:30 phk Exp $
  */
 /*
  * This driver is a hopeless hack to get the SimOS console working.  A real
@@ -91,7 +91,7 @@ static void	zs_cnpollc __P((dev_t, int));
 
 struct consdev zs_cons = {
 	NULL, NULL, zs_cngetc, NULL, zs_cnputc,
-	NULL, makedev(CDEV_MAJOR, 0), CN_NORMAL,
+	NULL, 0, CN_NORMAL,
 };
 
 static caddr_t zs_console_addr;
@@ -213,6 +213,7 @@ zs_cnattach(vm_offset_t base, vm_offset_t offset)
     zs_console_addr = (caddr_t) ALPHA_PHYS_TO_K0SEG(base + offset);
     zs_console = 1;
 
+    zs_cons.cn_dev = makedev(CDEV_MAJOR, 0);
     cn_tab = &zs_cons;
     return 0;
 }
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 8b3630baf1b4..20354d394e54 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.239 1999/05/09 16:56:38 peter Exp $
+ *	$Id: sio.c,v 1.240 1999/05/09 20:35:02 peter Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2862,7 +2862,7 @@ siocnprobe(cp)
 
 struct consdev siocons = {
 	NULL, NULL, siocngetc, siocncheckc, siocnputc,
-	NULL, makedev(CDEV_MAJOR, 0), CN_NORMAL,
+	NULL, 0, CN_NORMAL,
 };
 
 extern struct consdev *cn_tab;
@@ -2901,6 +2901,7 @@ siocnattach(port, speed)
 	siocnopen(&sp, siocniobase, comdefaultrate);
 	splx(s);
 
+	siocons.cn_dev = makedev(CDEV_MAJOR, 0);
 	cn_tab = &siocons;
 	return 0;
 }
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 1f8377e66fb5..24e3d10cfbd6 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.300 1999/04/16 21:21:56 peter Exp $
+ *	$Id: syscons.c,v 1.301 1999/04/27 11:14:04 phk Exp $
  */
 
 #include "sc.h"
@@ -354,7 +354,7 @@ static cn_putc_t	sccnputc;
 
 struct consdev sc_cons = {
     NULL, NULL, sccngetc, sccncheckc, sccnputc,
-    NULL, makedev(CDEV_MAJOR, 0), CN_NORMAL,
+    NULL, 0, CN_NORMAL,
 };
 
 #endif /* __i386__ */
@@ -1917,6 +1917,7 @@ sccnattach(void)
     }
 
     scinit();
+    sc_cons.cn_dev = makedev(CDEV_MAJOR, 0);
     cn_tab = &sc_cons;
 }
 
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 8b3630baf1b4..20354d394e54 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.239 1999/05/09 16:56:38 peter Exp $
+ *	$Id: sio.c,v 1.240 1999/05/09 20:35:02 peter Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2862,7 +2862,7 @@ siocnprobe(cp)
 
 struct consdev siocons = {
 	NULL, NULL, siocngetc, siocncheckc, siocnputc,
-	NULL, makedev(CDEV_MAJOR, 0), CN_NORMAL,
+	NULL, 0, CN_NORMAL,
 };
 
 extern struct consdev *cn_tab;
@@ -2901,6 +2901,7 @@ siocnattach(port, speed)
 	siocnopen(&sp, siocniobase, comdefaultrate);
 	splx(s);
 
+	siocons.cn_dev = makedev(CDEV_MAJOR, 0);
 	cn_tab = &siocons;
 	return 0;
 }