From 9751c913835477b752d06672afbab33e7a5ee710 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Dec 2000 16:37:38 +0000 Subject: 2000-12-01 Joel Sherrill * pc386/console/console.c, pc386/console/serial_mouse.c, pc386/console/vgainit.c, shared/comm/tty_drv.c: Remove warnings. --- c/src/lib/libbsp/i386/ChangeLog | 5 + c/src/lib/libbsp/i386/pc386/console/console.c | 1 + c/src/lib/libbsp/i386/pc386/console/serial_mouse.c | 6 + c/src/lib/libbsp/i386/pc386/console/vgainit.c | 276 ++++++++++----------- c/src/lib/libbsp/i386/shared/comm/tty_drv.c | 8 + 5 files changed, 158 insertions(+), 138 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/i386/ChangeLog b/c/src/lib/libbsp/i386/ChangeLog index b7c8ab45be..502d3893ab 100644 --- a/c/src/lib/libbsp/i386/ChangeLog +++ b/c/src/lib/libbsp/i386/ChangeLog @@ -1,3 +1,8 @@ +2000-12-01 Joel Sherrill + + * pc386/console/console.c, pc386/console/serial_mouse.c, + pc386/console/vgainit.c, shared/comm/tty_drv.c: Remove warnings. + 2000-11-09 Ralf Corsepius * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index b93e0cc284..264eda12f0 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -534,6 +534,7 @@ conSetAttr(int minor, const struct termios *t) case CS5: databits = CHR_5_BITS; break; case CS6: databits = CHR_6_BITS; break; case CS7: databits = CHR_7_BITS; break; + default: /* just to avoid warnings -- all cases are covered. */ case CS8: databits = CHR_8_BITS; break; } diff --git a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c index bc81ee78f7..184911c58f 100644 --- a/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c +++ b/c/src/lib/libbsp/i386/pc386/console/serial_mouse.c @@ -18,6 +18,11 @@ * MODIFICATION/HISTORY: * * $Log$ + * Revision 1.4 2000/10/23 14:10:25 joel + * 2000-10-23 Joel Sherrill + * + * * console/serial_mouse.c: Fixed typos introduced by removal of CR/LF. + * * Revision 1.3 2000/10/20 16:01:13 joel * 2000-10-20 Rosimildo da Silva * @@ -360,6 +365,7 @@ conSetAttr(int port, int minor, const struct termios *t) case CS5: databits = CHR_5_BITS; break; case CS6: databits = CHR_6_BITS; break; case CS7: databits = CHR_7_BITS; break; + default: /* just to avoid warnings -- all cases are covered. */ case CS8: databits = CHR_8_BITS; break; } diff --git a/c/src/lib/libbsp/i386/pc386/console/vgainit.c b/c/src/lib/libbsp/i386/pc386/console/vgainit.c index c91421f807..124689f327 100644 --- a/c/src/lib/libbsp/i386/pc386/console/vgainit.c +++ b/c/src/lib/libbsp/i386/pc386/console/vgainit.c @@ -375,97 +375,97 @@ static REGIO graph_off[] = { */ static REGIO graphics_on[] = { /* Reset attr F/F */ - IN, ATTRREG, 0, 0, 0, + { IN, ATTRREG, 0, 0, 0 }, /* Disable palette */ - OUT, PALREG, 0, 0, 0, + { OUT, PALREG, 0, 0, 0 }, /* Reset sequencer regs */ - OUT, SEQREG, 0, SEQVAL, 0, - OUT, SEQREG, 1, SEQVAL, 1, - OUT, SEQREG, 2, SEQVAL, 0x0f, - OUT, SEQREG, 3, SEQVAL, 0, - OUT, SEQREG, 4, SEQVAL, 6, + { OUT, SEQREG, 0, SEQVAL, 0 }, + { OUT, SEQREG, 1, SEQVAL, 1 }, + { OUT, SEQREG, 2, SEQVAL, 0x0f }, + { OUT, SEQREG, 3, SEQVAL, 0 }, + { OUT, SEQREG, 4, SEQVAL, 6 }, /* Misc out reg */ - OUT, GENREG1, 0xe3, 0, 0, + { OUT, GENREG1, 0xe3, 0, 0 }, /* Sequencer enable */ - OUT, SEQREG, 0, SEQVAL, 0x03, + { OUT, SEQREG, 0, SEQVAL, 0x03 }, /* Unprotect crtc regs 0-7 */ - OUT, CRTCREG, 0x11, CRTCVAL, 0, + { OUT, CRTCREG, 0x11, CRTCVAL, 0 }, /* Crtc */ - OUT, CRTCREG, 0, CRTCVAL, 0x5f, - OUT, CRTCREG, 1, CRTCVAL, 0x4f, - OUT, CRTCREG, 2, CRTCVAL, 0x50, - OUT, CRTCREG, 3, CRTCVAL, 0x82, - OUT, CRTCREG, 4, CRTCVAL, 0x54, - OUT, CRTCREG, 5, CRTCVAL, 0x80, - OUT, CRTCREG, 6, CRTCVAL, 0x0b, - OUT, CRTCREG, 7, CRTCVAL, 0x3e, - OUT, CRTCREG, 8, CRTCVAL, 0x00, - OUT, CRTCREG, 9, CRTCVAL, 0x40, - OUT, CRTCREG, 10, CRTCVAL, 0x00, - OUT, CRTCREG, 11, CRTCVAL, 0x00, - OUT, CRTCREG, 12, CRTCVAL, 0x00, - OUT, CRTCREG, 13, CRTCVAL, 0x00, - OUT, CRTCREG, 14, CRTCVAL, 0x00, - OUT, CRTCREG, 15, CRTCVAL, 0x59, - OUT, CRTCREG, 16, CRTCVAL, 0xea, - OUT, CRTCREG, 17, CRTCVAL, 0x8c, - OUT, CRTCREG, 18, CRTCVAL, 0xdf, - OUT, CRTCREG, 19, CRTCVAL, 0x28, - OUT, CRTCREG, 20, CRTCVAL, 0x00, - OUT, CRTCREG, 21, CRTCVAL, 0xe7, - OUT, CRTCREG, 22, CRTCVAL, 0x04, - OUT, CRTCREG, 23, CRTCVAL, 0xe3, - OUT, CRTCREG, 24, CRTCVAL, 0xff, + { OUT, CRTCREG, 0, CRTCVAL, 0x5f }, + { OUT, CRTCREG, 1, CRTCVAL, 0x4f }, + { OUT, CRTCREG, 2, CRTCVAL, 0x50 }, + { OUT, CRTCREG, 3, CRTCVAL, 0x82 }, + { OUT, CRTCREG, 4, CRTCVAL, 0x54 }, + { OUT, CRTCREG, 5, CRTCVAL, 0x80 }, + { OUT, CRTCREG, 6, CRTCVAL, 0x0b }, + { OUT, CRTCREG, 7, CRTCVAL, 0x3e }, + { OUT, CRTCREG, 8, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 9, CRTCVAL, 0x40 }, + { OUT, CRTCREG, 10, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 11, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 12, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 13, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 14, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 15, CRTCVAL, 0x59 }, + { OUT, CRTCREG, 16, CRTCVAL, 0xea }, + { OUT, CRTCREG, 17, CRTCVAL, 0x8c }, + { OUT, CRTCREG, 18, CRTCVAL, 0xdf }, + { OUT, CRTCREG, 19, CRTCVAL, 0x28 }, + { OUT, CRTCREG, 20, CRTCVAL, 0x00 }, + { OUT, CRTCREG, 21, CRTCVAL, 0xe7 }, + { OUT, CRTCREG, 22, CRTCVAL, 0x04 }, + { OUT, CRTCREG, 23, CRTCVAL, 0xe3 }, + { OUT, CRTCREG, 24, CRTCVAL, 0xff }, /* Graphics controller */ - OUT, GENREG2, 0x00, 0, 0, - OUT, GENREG3, 0x01, 0, 0, - OUT, GRREG, 0, GRVAL, 0x00, - OUT, GRREG, 1, GRVAL, 0x00, - OUT, GRREG, 2, GRVAL, 0x00, - OUT, GRREG, 3, GRVAL, 0x00, - OUT, GRREG, 4, GRVAL, 0x00, - OUT, GRREG, 5, GRVAL, 0x00, - OUT, GRREG, 6, GRVAL, 0x05, - OUT, GRREG, 7, GRVAL, 0x0f, - OUT, GRREG, 8, GRVAL, 0xff, + { OUT, GENREG2, 0x00, 0, 0 }, + { OUT, GENREG3, 0x01, 0, 0 }, + { OUT, GRREG, 0, GRVAL, 0x00 }, + { OUT, GRREG, 1, GRVAL, 0x00 }, + { OUT, GRREG, 2, GRVAL, 0x00 }, + { OUT, GRREG, 3, GRVAL, 0x00 }, + { OUT, GRREG, 4, GRVAL, 0x00 }, + { OUT, GRREG, 5, GRVAL, 0x00 }, + { OUT, GRREG, 6, GRVAL, 0x05 }, + { OUT, GRREG, 7, GRVAL, 0x0f }, + { OUT, GRREG, 8, GRVAL, 0xff }, /* Reset attribute flip/flop */ - IN, ATTRREG, 0, 0, 0, + { IN, ATTRREG, 0, 0, 0 }, /* Palette */ - OUT, PALREG, 0, PALREG, 0x00, - OUT, PALREG, 1, PALREG, 0x01, - OUT, PALREG, 2, PALREG, 0x02, - OUT, PALREG, 3, PALREG, 0x03, - OUT, PALREG, 4, PALREG, 0x04, - OUT, PALREG, 5, PALREG, 0x05, - OUT, PALREG, 6, PALREG, 0x06, - OUT, PALREG, 7, PALREG, 0x07, - OUT, PALREG, 8, PALREG, 0x38, - OUT, PALREG, 9, PALREG, 0x39, - OUT, PALREG, 10, PALREG, 0x3a, - OUT, PALREG, 11, PALREG, 0x3b, - OUT, PALREG, 12, PALREG, 0x3c, - OUT, PALREG, 13, PALREG, 0x3d, - OUT, PALREG, 14, PALREG, 0x3e, - OUT, PALREG, 15, PALREG, 0x3f, - OUT, PALREG, 16, PALREG, 0x01, - OUT, PALREG, 17, PALREG, 0x00, - OUT, PALREG, 18, PALREG, 0x0f, - OUT, PALREG, 19, PALREG, 0x00, + { OUT, PALREG, 0, PALREG, 0x00 }, + { OUT, PALREG, 1, PALREG, 0x01 }, + { OUT, PALREG, 2, PALREG, 0x02 }, + { OUT, PALREG, 3, PALREG, 0x03 }, + { OUT, PALREG, 4, PALREG, 0x04 }, + { OUT, PALREG, 5, PALREG, 0x05 }, + { OUT, PALREG, 6, PALREG, 0x06 }, + { OUT, PALREG, 7, PALREG, 0x07 }, + { OUT, PALREG, 8, PALREG, 0x38 }, + { OUT, PALREG, 9, PALREG, 0x39 }, + { OUT, PALREG, 10, PALREG, 0x3a }, + { OUT, PALREG, 11, PALREG, 0x3b }, + { OUT, PALREG, 12, PALREG, 0x3c }, + { OUT, PALREG, 13, PALREG, 0x3d }, + { OUT, PALREG, 14, PALREG, 0x3e }, + { OUT, PALREG, 15, PALREG, 0x3f }, + { OUT, PALREG, 16, PALREG, 0x01 }, + { OUT, PALREG, 17, PALREG, 0x00 }, + { OUT, PALREG, 18, PALREG, 0x0f }, + { OUT, PALREG, 19, PALREG, 0x00 }, /* Enable palette */ - OUT, PALREG, 0x20, 0, 0, + { OUT, PALREG, 0x20, 0, 0 }, /* End of table */ - DONE, 0, 0, 0, 0 + { DONE, 0, 0, 0, 0 } }; @@ -473,97 +473,97 @@ static REGIO graphics_on[] = { */ static REGIO graph_off[] = { /* Reset attr F/F */ - IN, ATTRREG, 0, 0, 0, + { IN, ATTRREG, 0, 0, 0 }, /* Disable palette */ - OUT, PALREG, 0, 0, 0, + { OUT, PALREG, 0, 0, 0 }, /* Reset sequencer regs */ - OUT, SEQREG, 0, SEQVAL, 1, - OUT, SEQREG, 1, SEQVAL, 1, - OUT, SEQREG, 2, SEQVAL, 3, - OUT, SEQREG, 3, SEQVAL, 0, - OUT, SEQREG, 4, SEQVAL, 2, + { OUT, SEQREG, 0, SEQVAL, 1 }, + { OUT, SEQREG, 1, SEQVAL, 1 }, + { OUT, SEQREG, 2, SEQVAL, 3 }, + { OUT, SEQREG, 3, SEQVAL, 0 }, + { OUT, SEQREG, 4, SEQVAL, 2 }, /* Misc out reg */ - OUT, GENREG1, 0x63, 0, 0, + { OUT, GENREG1, 0x63, 0, 0 }, /* Sequencer enable */ - OUT, SEQREG, 0, SEQVAL, 3, + { OUT, SEQREG, 0, SEQVAL, 3 }, /* Unprotect crtc regs 0-7 */ - OUT, CRTCREG, 0x11, CRTCVAL, 0, + { OUT, CRTCREG, 0x11, CRTCVAL, 0 }, /* Crtc */ - OUT, CRTCREG, 0, CRTCVAL, 0x5f, /* horiz total */ - OUT, CRTCREG, 1, CRTCVAL, 0x4f, /* horiz end */ - OUT, CRTCREG, 2, CRTCVAL, 0x50, /* horiz blank */ - OUT, CRTCREG, 3, CRTCVAL, 0x82, /* end blank */ - OUT, CRTCREG, 4, CRTCVAL, 0x55, /* horiz retrace */ - OUT, CRTCREG, 5, CRTCVAL, 0x81, /* end retrace */ - OUT, CRTCREG, 6, CRTCVAL, 0xbf, /* vert total */ - OUT, CRTCREG, 7, CRTCVAL, 0x1f, /* overflows */ - OUT, CRTCREG, 8, CRTCVAL, 0x00, /* row scan */ - OUT, CRTCREG, 9, CRTCVAL, 0x4f, /* max scan line */ - OUT, CRTCREG, 10, CRTCVAL, 0x00, /* cursor start */ - OUT, CRTCREG, 11, CRTCVAL, 0x0f, /* cursor end */ - OUT, CRTCREG, 12, CRTCVAL, 0x0e, /* start high addr */ - OUT, CRTCREG, 13, CRTCVAL, 0xb0, /* low addr */ - OUT, CRTCREG, 14, CRTCVAL, 0x16, /* cursor high */ - OUT, CRTCREG, 15, CRTCVAL, 0x30, /* cursor low */ - OUT, CRTCREG, 16, CRTCVAL, 0x9c, /* vert retrace */ - OUT, CRTCREG, 17, CRTCVAL, 0x8e, /* retrace end */ - OUT, CRTCREG, 18, CRTCVAL, 0x8f, /* vert end */ - OUT, CRTCREG, 19, CRTCVAL, 0x28, /* offset */ - OUT, CRTCREG, 20, CRTCVAL, 0x1f, /* underline */ - OUT, CRTCREG, 21, CRTCVAL, 0x96, /* vert blank */ - OUT, CRTCREG, 22, CRTCVAL, 0xb9, /* end blank */ - OUT, CRTCREG, 23, CRTCVAL, 0xa3, /* crt mode */ - OUT, CRTCREG, 24, CRTCVAL, 0xff, /* line compare */ + { OUT, CRTCREG, 0, CRTCVAL, 0x5f }, /* horiz total */ + { OUT, CRTCREG, 1, CRTCVAL, 0x4f }, /* horiz end */ + { OUT, CRTCREG, 2, CRTCVAL, 0x50 }, /* horiz blank */ + { OUT, CRTCREG, 3, CRTCVAL, 0x82 }, /* end blank */ + { OUT, CRTCREG, 4, CRTCVAL, 0x55 }, /* horiz retrace */ + { OUT, CRTCREG, 5, CRTCVAL, 0x81 }, /* end retrace */ + { OUT, CRTCREG, 6, CRTCVAL, 0xbf }, /* vert total */ + { OUT, CRTCREG, 7, CRTCVAL, 0x1f }, /* overflows */ + { OUT, CRTCREG, 8, CRTCVAL, 0x00 }, /* row scan */ + { OUT, CRTCREG, 9, CRTCVAL, 0x4f }, /* max scan line */ + { OUT, CRTCREG, 10, CRTCVAL, 0x00 }, /* cursor start */ + { OUT, CRTCREG, 11, CRTCVAL, 0x0f }, /* cursor end */ + { OUT, CRTCREG, 12, CRTCVAL, 0x0e }, /* start high addr */ + { OUT, CRTCREG, 13, CRTCVAL, 0xb0 }, /* low addr */ + { OUT, CRTCREG, 14, CRTCVAL, 0x16 }, /* cursor high */ + { OUT, CRTCREG, 15, CRTCVAL, 0x30 }, /* cursor low */ + { OUT, CRTCREG, 16, CRTCVAL, 0x9c }, /* vert retrace */ + { OUT, CRTCREG, 17, CRTCVAL, 0x8e }, /* retrace end */ + { OUT, CRTCREG, 18, CRTCVAL, 0x8f }, /* vert end */ + { OUT, CRTCREG, 19, CRTCVAL, 0x28 }, /* offset */ + { OUT, CRTCREG, 20, CRTCVAL, 0x1f }, /* underline */ + { OUT, CRTCREG, 21, CRTCVAL, 0x96 }, /* vert blank */ + { OUT, CRTCREG, 22, CRTCVAL, 0xb9 }, /* end blank */ + { OUT, CRTCREG, 23, CRTCVAL, 0xa3 }, /* crt mode */ + { OUT, CRTCREG, 24, CRTCVAL, 0xff }, /* line compare */ /* Graphics controller */ - OUT, GENREG2, 0x00, 0, 0, - OUT, GENREG3, 0x01, 0, 0, - OUT, GRREG, 0, GRVAL, 0x00, - OUT, GRREG, 1, GRVAL, 0x00, - OUT, GRREG, 2, GRVAL, 0x00, - OUT, GRREG, 3, GRVAL, 0x00, - OUT, GRREG, 4, GRVAL, 0x00, - OUT, GRREG, 5, GRVAL, 0x10, - OUT, GRREG, 6, GRVAL, 0x0e, - OUT, GRREG, 7, GRVAL, 0x00, - OUT, GRREG, 8, GRVAL, 0xff, + { OUT, GENREG2, 0x00, 0, 0 }, + { OUT, GENREG3, 0x01, 0, 0 }, + { OUT, GRREG, 0, GRVAL, 0x00 }, + { OUT, GRREG, 1, GRVAL, 0x00 }, + { OUT, GRREG, 2, GRVAL, 0x00 }, + { OUT, GRREG, 3, GRVAL, 0x00 }, + { OUT, GRREG, 4, GRVAL, 0x00 }, + { OUT, GRREG, 5, GRVAL, 0x10 }, + { OUT, GRREG, 6, GRVAL, 0x0e }, + { OUT, GRREG, 7, GRVAL, 0x00 }, + { OUT, GRREG, 8, GRVAL, 0xff }, /* Reset attribute flip/flop */ - IN, ATTRREG, 0, 0, 0, + { IN, ATTRREG, 0, 0, 0 }, /* Palette */ - OUT, PALREG, 0, PALREG, 0x00, - OUT, PALREG, 1, PALREG, 0x01, - OUT, PALREG, 2, PALREG, 0x02, - OUT, PALREG, 3, PALREG, 0x03, - OUT, PALREG, 4, PALREG, 0x04, - OUT, PALREG, 5, PALREG, 0x05, - OUT, PALREG, 6, PALREG, 0x06, - OUT, PALREG, 7, PALREG, 0x07, - OUT, PALREG, 8, PALREG, 0x10, - OUT, PALREG, 9, PALREG, 0x11, - OUT, PALREG, 10, PALREG, 0x12, - OUT, PALREG, 11, PALREG, 0x13, - OUT, PALREG, 12, PALREG, 0x14, - OUT, PALREG, 13, PALREG, 0x15, - OUT, PALREG, 14, PALREG, 0x16, - OUT, PALREG, 15, PALREG, 0x17, - OUT, PALREG, 16, PALREG, 0x08, - OUT, PALREG, 17, PALREG, 0x00, - OUT, PALREG, 18, PALREG, 0x0f, - OUT, PALREG, 19, PALREG, 0x00, + { OUT, PALREG, 0, PALREG, 0x00 }, + { OUT, PALREG, 1, PALREG, 0x01 }, + { OUT, PALREG, 2, PALREG, 0x02 }, + { OUT, PALREG, 3, PALREG, 0x03 }, + { OUT, PALREG, 4, PALREG, 0x04 }, + { OUT, PALREG, 5, PALREG, 0x05 }, + { OUT, PALREG, 6, PALREG, 0x06 }, + { OUT, PALREG, 7, PALREG, 0x07 }, + { OUT, PALREG, 8, PALREG, 0x10 }, + { OUT, PALREG, 9, PALREG, 0x11 }, + { OUT, PALREG, 10, PALREG, 0x12 }, + { OUT, PALREG, 11, PALREG, 0x13 }, + { OUT, PALREG, 12, PALREG, 0x14 }, + { OUT, PALREG, 13, PALREG, 0x15 }, + { OUT, PALREG, 14, PALREG, 0x16 }, + { OUT, PALREG, 15, PALREG, 0x17 }, + { OUT, PALREG, 16, PALREG, 0x08 }, + { OUT, PALREG, 17, PALREG, 0x00 }, + { OUT, PALREG, 18, PALREG, 0x0f }, + { OUT, PALREG, 19, PALREG, 0x00 }, /* Enable palette */ - OUT, PALREG, 0x20, 0, 0, + { OUT, PALREG, 0x20, 0, 0 }, /* End of table */ - DONE, 0, 0, 0, 0 + { DONE, 0, 0, 0, 0 } }; #endif diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c index 98c60ff1c1..490260675f 100644 --- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c +++ b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c @@ -18,6 +18,13 @@ * MODIFICATION/HISTORY: * * $Log$ + * Revision 1.2 2000/10/18 16:10:50 joel + * 2000-10-18 Charles-Antoine Gauthier + * + * * comm/i386-stub-glue.c, comm/tty_drv.c, comm/uart.c, comm/uart.h: + * Add the ability to set parity, number of data bits and + * number of stop bits to the existing i386 serial drivers. + * * Revision 1.1 2000/08/30 08:18:56 joel * 2000-08-26 Rosimildo da Silva * @@ -352,6 +359,7 @@ conSetAttr(int port, int minor, const struct termios *t) case CS5: databits = CHR_5_BITS; break; case CS6: databits = CHR_6_BITS; break; case CS7: databits = CHR_7_BITS; break; + default: /* just to avoid warnings -- all cases are covered */ case CS8: databits = CHR_8_BITS; break; } -- cgit v1.2.3