Changeset 40b965d in mainline

Timestamp:

2010-10-14T09:05:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cbc00a4d

Parents:

1880c65

Message:

Add USB keycodes for base keys

Now, all keys of the typewriter part of keyboard are added together
with cursor movement keys. Still missing is keypad and special keys
(multimedia etc.).

File:

• uspace/lib/usb/hidutkbd.h (modified) (3 diffs)

uspace/lib/usb/hidutkbd.h

@@ -68 +68 @@
 #endif
 
+#define __NONPRINT(name, usage_id) \
+        USB_HIDUT_KBD_KEY(name, usage_id, 0, 0, 0, 0)
+
 /* US alphabet letters */
 USB_HIDUT_KBD_KEY(A, 0x04, 'a', 'A', 0, 0)
@@ -115 +118 @@
 USB_HIDUT_KBD_KEY(SPACE, 0x2C, ' ', 0, 0, 0)
 
+/* Special (printable) characters */
+USB_HIDUT_KBD_KEY(DASH, 0x2D, '-', '_', 0, 0)
+USB_HIDUT_KBD_KEY(EQUALS, 0x2E, '=', '+', 0, 0)
+USB_HIDUT_KBD_KEY(LEFT_BRACKET, 0x2F, '[', '{', 0, 0)
+USB_HIDUT_KBD_KEY(RIGHT_BRACKET, 0x30, ']', '}', 0, 0)
+USB_HIDUT_KBD_KEY(BACKSLASH, 0x31, '\\', '|', 0, 0)
+USB_HIDUT_KBD_KEY(HASH, 0x, '#', '~', 0, 0)
+USB_HIDUT_KBD_KEY(SEMICOLON, 0x33, ';', ':', 0, 0)
+USB_HIDUT_KBD_KEY(APOSTROPHE, 0x34, '\'', '"', 0, 0)
+USB_HIDUT_KBD_KEY(GRAVE_ACCENT, 0x35, '`', '~', 0, 0)
+USB_HIDUT_KBD_KEY(COMMA, 0x36, ',', '<', 0, 0)
+USB_HIDUT_KBD_KEY(PERIOD, 0x37, '.', '>', 0, 0)
+USB_HIDUT_KBD_KEY(SLASH, 0x38, '/', '?', 0, 0)
+
+USB_HIDUT_KBD_KEY(CAPS_LOCK, 0x39, 0, 0, 0, 0)
+
 /* Function keys */
-USB_HIDUT_KBD_KEY( F1, 0x3A, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F2, 0x3B, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F3, 0x3C, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F4, 0x3D, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F5, 0x3E, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F6, 0x3F, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F7, 0x40, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F8, 0x41, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY( F9, 0x42, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY(F10, 0x43, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY(F11, 0x44, 0, 0, 0, 0)
-USB_HIDUT_KBD_KEY(F12, 0x45, 0, 0, 0, 0)
+__NONPRINT( F1, 0x3A)
+__NONPRINT( F2, 0x3B)
+__NONPRINT( F3, 0x3C)
+__NONPRINT( F4, 0x3D)
+__NONPRINT( F5, 0x3E)
+__NONPRINT( F6, 0x3F)
+__NONPRINT( F7, 0x40)
+__NONPRINT( F8, 0x41)
+__NONPRINT( F9, 0x42)
+__NONPRINT(F10, 0x43)
+__NONPRINT(F11, 0x44)
+__NONPRINT(F12, 0x45)
+
+/* Cursor movement keys & co. */
+__NONPRINT(PRINT_SCREEN, 0x46)
+__NONPRINT(SCROLL_LOCK, 0x47)
+__NONPRINT(PAUSE, 0x48)
+__NONPRINT(INSERT, 0x49)
+__NONPRINT(HOME, 0x4A)
+__NONPRINT(PAGE_UP, 0x4B)
+__NONPRINT(DELETE, 0x4C)
+__NONPRINT(END, 0x4D)
+__NONPRINT(PAGE_DOWN, 0x4E)
+__NONPRINT(RIGHT_ARROW, 0x4F)
+__NONPRINT(LEFT_ARROW, 0x50)
+__NONPRINT(DOWN_ARROW, 0x51)
+__NONPRINT(UP_ARROW, 0x52)
+
 
 
@@ -133 +168 @@
 /* USB_HIDUT_KBD_KEY(, 0x, '', '', 0, 0) */
 
+#undef __NONPRINT
+
 /**
  * @}