Simplify matching in keyboard scancode decoding

intermezzOS · Oct 2, 2016 · bea1522 · bea1522
1 parent e02ff51
commit bea1522
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/keyboard/src/lib.rs b/keyboard/src/lib.rs
@@ -1,7 +1,5 @@
 #![no_std]
 
-static NULL: char = '\0';
-
 /// Decode a code in the PS/2 scan code set 1 (legacy set).
 ///
 /// Difference between set 1 and sets 2 & 3:
@@ -62,12 +60,8 @@ pub fn from_scancode(code: usize) -> Option<char> {
         0x37 => '*', // Keypad
         0x4a => '-', // Keypad
         0x4e => '+', // Keypad
-        _ => NULL,
+        _ => return None,
     };
 
-    if printable != NULL {
-        Some(printable)
-    } else {
-        None
-    }
+    Some(printable)
 }