make alpha compile again.

4 files changed, 14 insertions, 35 deletions

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index d6d8fd4..815209b 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.253 1999/08/08 20:25:14 phk Exp $
+ *	$Id: sio.c,v 1.254 1999/08/09 10:34:55 phk Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2639,13 +2639,13 @@ static void siocnclose	__P((struct siocnstate *sp, Port_t iobase));
 static void siocnopen	__P((struct siocnstate *sp, Port_t iobase, int speed));
 static void siocntxwait	__P((Port_t iobase));
 
-#ifdef __i386__
 static cn_probe_t siocnprobe;
 static cn_init_t siocninit;
 static cn_checkc_t siocncheckc;
 static cn_getc_t siocngetc;
 static cn_putc_t siocnputc;
 
+#ifdef __i386__
 CONS_DRIVER(sio, siocnprobe, siocninit, NULL, siocngetc, siocncheckc, siocnputc);
 
 /* To get the GDB related variables */
@@ -2774,10 +2774,7 @@ siocnclose(sp, iobase)
 	outb(iobase + com_ier, sp->ier);
 }
 
-#ifdef __i386__
-static
-#endif
-void
+static void
 siocnprobe(cp)
 	struct consdev	*cp;
 {
@@ -2893,8 +2890,6 @@ siocnprobe(cp)
 
 CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc);
 
-extern struct consdev *cn_tab;
-
 int
 siocnattach(port, speed)
 	int port;
@@ -2974,20 +2969,14 @@ siogdbattach(port, speed)
 
 #endif
 
-#ifdef __i386__
-static
-#endif
-void
+static void
 siocninit(cp)
 	struct consdev	*cp;
 {
 	comconsole = DEV_TO_UNIT(cp->cn_dev);
 }
 
-#ifdef __i386__
-static
-#endif
-int
+static int
 siocncheckc(dev)
 	dev_t	dev;
 {
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index d6d8fd4..815209b 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.253 1999/08/08 20:25:14 phk Exp $
+ *	$Id: sio.c,v 1.254 1999/08/09 10:34:55 phk Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -2639,13 +2639,13 @@ static void siocnclose	__P((struct siocnstate *sp, Port_t iobase));
 static void siocnopen	__P((struct siocnstate *sp, Port_t iobase, int speed));
 static void siocntxwait	__P((Port_t iobase));
 
-#ifdef __i386__
 static cn_probe_t siocnprobe;
 static cn_init_t siocninit;
 static cn_checkc_t siocncheckc;
 static cn_getc_t siocngetc;
 static cn_putc_t siocnputc;
 
+#ifdef __i386__
 CONS_DRIVER(sio, siocnprobe, siocninit, NULL, siocngetc, siocncheckc, siocnputc);
 
 /* To get the GDB related variables */
@@ -2774,10 +2774,7 @@ siocnclose(sp, iobase)
 	outb(iobase + com_ier, sp->ier);
 }
 
-#ifdef __i386__
-static
-#endif
-void
+static void
 siocnprobe(cp)
 	struct consdev	*cp;
 {
@@ -2893,8 +2890,6 @@ siocnprobe(cp)
 
 CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc);
 
-extern struct consdev *cn_tab;
-
 int
 siocnattach(port, speed)
 	int port;
@@ -2974,20 +2969,14 @@ siogdbattach(port, speed)
 
 #endif
 
-#ifdef __i386__
-static
-#endif
-void
+static void
 siocninit(cp)
 	struct consdev	*cp;
 {
 	comconsole = DEV_TO_UNIT(cp->cn_dev);
 }
 
-#ifdef __i386__
-static
-#endif
-int
+static int
 siocncheckc(dev)
 	dev_t	dev;
 {
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 5d57712..4696af8 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: tty_cons.c,v 1.70 1999/07/24 09:41:06 yokota Exp $
+ *	$Id: tty_cons.c,v 1.71 1999/08/09 10:34:58 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -104,7 +104,7 @@ static int openmode, openflag;		/* how /dev/console was openned */
 static u_char cn_phys_is_open;		/* nonzero if physical device is open */
 static d_close_t *cn_phys_close;	/* physical device close function */
 static d_open_t *cn_phys_open;		/* physical device open function */
-static struct consdev *cn_tab;		/* physical console device info */
+struct consdev *cn_tab;		/* physical console device info */
 static struct tty *cn_tp;		/* physical console tty struct */
 #ifdef DEVFS
 static void *cn_devfs_token;		/* represents the devfs entry */
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index ea84d7e..a626091 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.19 1999/01/09 14:07:37 bde Exp $
+ *	$Id: cons.h,v 1.20 1999/06/22 14:12:55 yokota Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
@@ -77,6 +77,7 @@ struct consdev {
 #ifdef KERNEL
 extern	struct linker_set cons_set;
 extern	int cons_unavail;
+extern	struct consdev *cn_tab;
 
 #define CONS_DRIVER(name, probe, init, term, getc, checkc, putc)	\
 	static struct consdev name##_consdev = {			\