Fix compiler warnings.

2 files changed, 28 insertions, 29 deletions

diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 2337ea3..05c2d60 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.116 1995/11/04 13:23:43 bde Exp $
+ *	$Id: sio.c,v 1.117 1995/11/04 17:07:50 bde Exp $
  */
 
 #include "sio.h"
@@ -297,7 +297,6 @@ static	int	sio_timeouts_until_log;
 static struct tty	*sio_tty[NSIO];
 #else
 static struct tty	sio_tty[NSIO];
-static	int	nsio_tty = NSIO;
 #endif
 
 #ifdef KGDB
@@ -309,25 +308,25 @@ extern	int	kgdb_debug_init;
 #endif
 
 static	struct speedtab comspeedtab[] = {
-	0,	0,
-	50,	COMBRD(50),
-	75,	COMBRD(75),
-	110,	COMBRD(110),
-	134,	COMBRD(134),
-	150,	COMBRD(150),
-	200,	COMBRD(200),
-	300,	COMBRD(300),
-	600,	COMBRD(600),
-	1200,	COMBRD(1200),
-	1800,	COMBRD(1800),
-	2400,	COMBRD(2400),
-	4800,	COMBRD(4800),
-	9600,	COMBRD(9600),
-	19200,	COMBRD(19200),
-	38400,	COMBRD(38400),
-	57600,	COMBRD(57600),
-	115200,	COMBRD(115200),
-	-1,	-1
+	{ 0,		0 },
+	{ 50,		COMBRD(50) },
+	{ 75,		COMBRD(75) },
+	{ 110,		COMBRD(110) },
+	{ 134,		COMBRD(134) },
+	{ 150,		COMBRD(150) },
+	{ 200,		COMBRD(200) },
+	{ 300,		COMBRD(300) },
+	{ 600,		COMBRD(600) },
+	{ 1200,		COMBRD(1200) },
+	{ 1800,		COMBRD(1800) },
+	{ 2400,		COMBRD(2400) },
+	{ 4800,		COMBRD(4800) },
+	{ 9600,		COMBRD(9600) },
+	{ 19200,	COMBRD(19200) },
+	{ 38400,	COMBRD(38400) },
+	{ 57600,	COMBRD(57600) },
+	{ 115200,	COMBRD(115200) },
+	{ -1,		-1 }
 };
 
 /* XXX - configure this list */
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index ef0251d..a586352 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/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.127 1995/10/28 16:58:04 markm Exp $
+ *  $Id: syscons.c,v 1.128 1995/11/04 16:00:52 markm Exp $
  */
 
 #include "sc.h"
@@ -1105,7 +1105,7 @@ void
 scstart(struct tty *tp)
 {
     struct clist *rbp;
-    int i, s, len;
+    int s, len;
     u_char buf[PCBURST];
     scr_stat *scp = get_scr_stat(tp->t_dev);
 
@@ -1975,7 +1975,7 @@ scinit(void)
 {
     u_short volatile *cp;
     u_short was;
-    unsigned hw_cursor, startaddr;
+    unsigned hw_cursor;
     int i;
 
     if (init_done)
@@ -2671,7 +2671,7 @@ set_mode(scr_stat *scp)
 {
     char *modetable;
     char special_modetable[64];
-    int mode, font_size;
+    int font_size;
 
     if (scp != cur_console)
 	return;
@@ -3038,10 +3038,10 @@ draw_mouse_image(scr_stat *scp)
     }
     scp->mouse_oldpos = crt_pos;
     while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
-    *(crt_pos) = *(scp->mouse_pos)&0xff00|0xd0;
-    *(crt_pos+1) = *(scp->mouse_pos+1)&0xff00|0xd1;
-    *(crt_pos+scp->xsize) = *(scp->mouse_pos+scp->xsize)&0xff00|0xd2;
-    *(crt_pos+scp->xsize+1) = *(scp->mouse_pos+scp->xsize+1)&0xff00|0xd3;
+    *(crt_pos) = (*(scp->mouse_pos)&0xff00)|0xd0;
+    *(crt_pos+1) = (*(scp->mouse_pos+1)&0xff00)|0xd1;
+    *(crt_pos+scp->xsize) = (*(scp->mouse_pos+scp->xsize)&0xff00)|0xd2;
+    *(crt_pos+scp->xsize+1) = (*(scp->mouse_pos+scp->xsize+1)&0xff00)|0xd3;
     set_font_mode();
     bcopy(scp->mouse_cursor, (char *)pa_to_va(address) + 0xd0 * 32, 128);
     set_normal_mode();