diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/m68k/atari/atakeyb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/m68k/atari/atakeyb.c')
| -rw-r--r-- | arch/m68k/atari/atakeyb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 4add96d13b19..5890897d28bf 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
| @@ -121,7 +121,7 @@ KEYBOARD_STATE kb_state; | |||
| 121 | * bytes have been lost and in which state of the packet structure we are now. | 121 | * bytes have been lost and in which state of the packet structure we are now. |
| 122 | * This usually causes keyboards bytes to be interpreted as mouse movements | 122 | * This usually causes keyboards bytes to be interpreted as mouse movements |
| 123 | * and vice versa, which is very annoying. It seems better to throw away some | 123 | * and vice versa, which is very annoying. It seems better to throw away some |
| 124 | * bytes (that are usually mouse bytes) than to misinterpret them. Therefor I | 124 | * bytes (that are usually mouse bytes) than to misinterpret them. Therefore I |
| 125 | * introduced the RESYNC state for IKBD data. In this state, the bytes up to | 125 | * introduced the RESYNC state for IKBD data. In this state, the bytes up to |
| 126 | * one that really looks like a key event (0x04..0xf2) or the start of a mouse | 126 | * one that really looks like a key event (0x04..0xf2) or the start of a mouse |
| 127 | * packet (0xf8..0xfb) are thrown away, but at most 2 bytes. This at least | 127 | * packet (0xf8..0xfb) are thrown away, but at most 2 bytes. This at least |