Changeset 87ab18e in avrstuff for libs/ps2_keyboard/ps2_keyboard.c

Timestamp:

Jul 31, 2014, 11:00:37 PM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

0010058

Parents:

ea32107

Message:

Drop hacked "shift" handling from libps2.

• It's up to clients to do that if they wish so (useful if you're converting

to ASCII, for example, but not for a regular keyboard adapter)

Improve callback system to handle release events.

• The callback would only be called for pressed keys, not for releases, leading

to weird results. Things work much better now in XTK.

• Also ignore the E0 byte for extended keys in XTK. This avoids apps going

crazy as the Turbo XT BIOS doesn't handle it right.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@114 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

File:

• libs/ps2_keyboard/ps2_keyboard.c (modified) (2 diffs)

libs/ps2_keyboard/ps2_keyboard.c

@@ -30 +30 @@
 #endif
 
-static volatile uint8_t kbd_data;
 static volatile uint8_t char_waiting;
 static uint8_t started;
 static uint8_t bit_count;
-static uint8_t caps_lock;
 static uint8_t extended;
 
-uint8_t shift;
+volatile uint8_t kbd_data;
 uint8_t release;
 
@@ -79 +77 @@
     kbd_data = 0;
     return;
-  } else if (kbd_data == 0x12) { //hanlde shift key
-    if(release == 0){
-      shift = 1;
-    } else {
-      shift = 0;
-      release = 0;
-    }
-    return;
   } else { //not a special character
-    if(release){ //we were in release mode - exit release mode
-      release = 0;
-      //ignore that character
-    } else {
-      char_waiting = 1;
 #ifdef CALLBACK
           CALLBACK
 #endif
+    if(release){ //we were in release mode - exit release mode
+      release = 0;
+    } else {
+          // Notify callback that there's a new char waiting
+      char_waiting = 1;
     }
   }