RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* console/ps2_mouse.c: Fix ps2 mouse interrupt.
This commit is contained in:
Joel Sherrill
2008-08-19 19:57:46 +00:00
parent f75767b00c
commit 14afc13ade
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,7 @@
2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>
* console/ps2_mouse.c: Fix ps2 mouse interrupt.
2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, console/serial_mouse.c, ne2000/ne2000.c, * clock/ckinit.c, console/serial_mouse.c, ne2000/ne2000.c,

10
c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
View File

@@ -58,15 +58,15 @@ static unsigned char mouse_reply_expected = 0;
#define AUX_INTS_ON (KBD_MODE_KCC | KBD_MODE_SYS | KBD_MODE_MOUSE_INT | KBD_MODE_KBD_INT) #define AUX_INTS_ON (KBD_MODE_KCC | KBD_MODE_SYS | KBD_MODE_MOUSE_INT | KBD_MODE_KBD_INT)
#define MAX_RETRIES 60 /* some aux operations take long time*/ #define MAX_RETRIES 60 /* some aux operations take long time*/
static void ps2_mouse_interrupt(void); static void ps2_mouse_interrupt(rtems_irq_hdl_param);
static void ( *driver_input_handler_ps2 )( void *, char *, int ) = 0; static void ( *driver_input_handler_ps2 )( void *, unsigned char *, int ) = 0;
/* /*
* This routine sets the handler to handle the characters received * This routine sets the handler to handle the characters received
* from the serial port. * from the serial port.
*/ */
void ps2_set_driver_handler( int port, void ( *handler )( void *, char *, int ) ) void ps2_set_driver_handler( int port, void ( *handler )( void *, unsigned char *, int ) )
{ {
driver_input_handler_ps2 = handler; driver_input_handler_ps2 = handler;
} }
@@ -190,7 +190,7 @@ static inline void handle_mouse_event(unsigned char scancode)
else else
{ {
/* post this byte to termios */ /* post this byte to termios */
rtems_termios_enqueue_raw_characters( termios_ttyp_paux, &scancode, 1 ); rtems_termios_enqueue_raw_characters( termios_ttyp_paux, (char *)&scancode, 1 );
} }
} }
} }
@@ -230,7 +230,7 @@ static unsigned char handle_kbd_event(void)
return status; return status;
} }
static void ps2_mouse_interrupt(void) static void ps2_mouse_interrupt(rtems_irq_hdl_param ignored)
{ {
handle_kbd_event(); handle_kbd_event();
} }