diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-01-04 23:28:30 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-01-04 23:28:30 +0000 |
commit | a4a5624492bb5006536987cad5dd23eefec2b7a0 (patch) | |
tree | 9e2e1e1e52b3d34d45ab7ac11f93973468047819 | |
parent | 2005-01-04 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-a4a5624492bb5006536987cad5dd23eefec2b7a0.tar.bz2 |
2005-01-04 Joel Sherrill <joel@OARcorp.com>
* console/keyboard.c, console/ps2_mouse.c, console/vt.c: Remove
warnings.
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/keyboard.c | 29 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c | 47 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/vt.c | 2 |
4 files changed, 31 insertions, 52 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 9346a34805..4b2a142112 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,8 @@ +2005-01-04 Joel Sherrill <joel@OARcorp.com> + + * console/keyboard.c, console/ps2_mouse.c, console/vt.c: Remove + warnings. + 2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> * Makefile.am: Remove build-variant support. diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.c b/c/src/lib/libbsp/i386/pc386/console/keyboard.c index 8327334ebb..b7cb3df19a 100644 --- a/c/src/lib/libbsp/i386/pc386/console/keyboard.c +++ b/c/src/lib/libbsp/i386/pc386/console/keyboard.c @@ -1,32 +1,7 @@ /* - * linux/drivers/char/keyboard.c - * - * Written for linux by Johan Myreen as a translation from - * the assembly version by Linus (with diacriticals added) - * - * Some additional features added by Christoph Niemann (ChN), March 1993 - * - * Loadable keymaps by Risto Kankkunen, May 1993 - * - * Diacriticals redone & other small changes, aeb@cwi.nl, June 1993 - * Added decr/incr_console, dynamic keymaps, Unicode support, - * dynamic function/string keys, led setting, Sept 1994 - * `Sticky' modifier keys, 951006. - * - * 11-11-96: SAK should now work in the raw mode (Martin Mares) - * - * Modified to provide 'generic' keyboard support by Hamish Macdonald - * Merge with the m68k keyboard driver and split-off of the PC low-level - * parts by Geert Uytterhoeven, May 1997 - * - * 27-05-97: Added support for the Magic SysRq Key (Martin Mares) - * 30-07-98: Dead keys redone, aeb@cwi.nl. - * ------------------------------------------------------------------- - * End of Linux - Copyright notes... - * - * Ported to RTEMS to provide the basic fuctionality to the console driver. - * by: Rosimildo da Silva: rdasilva@connecttel.com + * $Id$ * + * Rosimildo da Silva: rdasilva@connecttel.com */ #include <sys/types.h> diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c index 2cd69e4f42..d0e4f11ca8 100644 --- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c +++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c @@ -33,7 +33,9 @@ #include "mouse_parser.h" static void kbd_write_command_w(int data); +#if 0 static void kbd_write_output_w(int data); +#endif static unsigned char handle_kbd_event(void); @@ -236,6 +238,7 @@ static void ps2_mouse_interrupt() * * Don't use 'jiffies', so that we don't depend on interrupts */ +#if 0 static int send_data(unsigned char data) { int retries = 3; @@ -266,7 +269,9 @@ static int send_data(unsigned char data) #endif return 0; } +#endif +#if 0 #define KBD_NO_DATA (-1) /* No data */ #define KBD_BAD_DATA (-2) /* Parity or other error */ @@ -308,6 +313,7 @@ static int kbd_wait_for_input(void) } while (--timeout); return -1; } +#endif static void kbd_write_command_w(int data) { @@ -315,11 +321,13 @@ static void kbd_write_command_w(int data) kbd_write_command(data); } +#if 0 static void kbd_write_output_w(int data) { kb_wait(); kbd_write_output(data); } +#endif static void kbd_write_cmd(int cmd) { @@ -496,12 +504,14 @@ static int write_aux( int minor, const char * buffer, int count ) return retval; } +#if 0 static unsigned int aux_poll() { if( !queue_empty() ) return 1; return 0; } +#endif static int psaux_init( void ) { @@ -588,17 +598,6 @@ static int write_aux_echo( int minor, const char * buffer, int count ) } /* - * Some initialization if necessary - */ -static rtems_device_driver -paux_first_open( rtems_device_minor_number major, - rtems_device_minor_number minor, - void *arg) -{ - return RTEMS_SUCCESSFUL; -} - -/* * paux device driver OPEN entry point */ rtems_device_driver @@ -609,14 +608,14 @@ paux_open(rtems_device_major_number major, rtems_status_code status; static rtems_termios_callbacks cb = { - NULL, /* firstOpen */ + NULL, /* firstOpen */ paux_last_close, /* lastClose */ NULL, /* poll read */ write_aux_echo, /* write */ - NULL, /* setAttributes */ - NULL, /* stopRemoteTx */ - NULL, /* startRemoteTx */ - 0 /* outputUsesInterrupts */ + NULL, /* setAttributes */ + NULL, /* stopRemoteTx */ + NULL, /* startRemoteTx */ + 0 /* outputUsesInterrupts */ }; status = rtems_termios_open (major, minor, arg, &cb ); @@ -629,8 +628,8 @@ paux_open(rtems_device_major_number major, */ rtems_device_driver paux_close(rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg) + rtems_device_minor_number minor, + void *arg) { return (rtems_termios_close (arg)); } @@ -641,8 +640,8 @@ paux_close(rtems_device_major_number major, */ rtems_device_driver paux_read(rtems_device_major_number major, - rtems_device_minor_number minor, - void *arg) + rtems_device_minor_number minor, + void *arg) { return rtems_termios_read (arg); } /* tty_read */ @@ -653,8 +652,8 @@ paux_read(rtems_device_major_number major, */ rtems_device_driver paux_write(rtems_device_major_number major, - rtems_device_minor_number minor, - void * arg) + rtems_device_minor_number minor, + void * arg) { rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *)arg; char *buffer = rw_args->buffer; @@ -668,8 +667,8 @@ paux_write(rtems_device_major_number major, */ rtems_device_driver paux_control(rtems_device_major_number major, - rtems_device_minor_number minor, - void * arg + rtems_device_minor_number minor, + void * arg ) { rtems_libio_ioctl_args_t *args = arg; diff --git a/c/src/lib/libbsp/i386/pc386/console/vt.c b/c/src/lib/libbsp/i386/pc386/console/vt.c index fdca7c8619..61c693ef05 100644 --- a/c/src/lib/libbsp/i386/pc386/console/vt.c +++ b/c/src/lib/libbsp/i386/pc386/console/vt.c @@ -119,7 +119,7 @@ do_kdsk_ioctl(int cmd, struct kbentry *user_kbe, int perm, struct kbd_struct *kb ushort *key_map, val; tmp = *user_kbe; - if (i >= NR_KEYS || s >= MAX_NR_KEYMAPS) + if (i >= NR_KEYS) /* s cannot be >= MAX_NR_KEYMAPS */ return -EINVAL; switch (cmd) { |