Changeset 2391aaf in mainline for uspace/drv/usbhid/conv.c

Timestamp:

2011-02-27T19:22:53Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

5d4d98b

Parents:

c2fa801

Message:

Huge refactoring of USB HID driver.

• Created generic USB HID device structure and API (hiddev.h/c).
  • The structure holds data common for all HID devices.
  • Functions for creating the structure, and initializing based on given endpoint description.
  • Processing of descriptors, initializing of pipes moved here.

• Modified USB HID keyboard device structure (kbddev.h/c).
  • This structure now holds only keyboard-specific data.
  • API provides function for adding device of type keyboard.
  • All keyboard-related functions moved here. These include:
    • IPC handler
    • Key and modifier processing functions
    • Polling
    • Creating new fibril for polling.

• Separated USB HID class-specific request functions (hidreq.h/c)

• Removed unused code from scancode parser (conv.c)

WARNING: not compileable due to a strange error.

File:

• uspace/drv/usbhid/conv.c (modified) (2 diffs)

uspace/drv/usbhid/conv.c

@@ -163 +163 @@
 };
 
-unsigned int usbkbd_parse_scancode(int scancode)
+unsigned int usbhid_parse_scancode(int scancode)
 {
-//      console_ev_type_t type;
         unsigned int key;
         int *map = scanmap_simple;
         size_t map_length = sizeof(scanmap_simple) / sizeof(int);
-
-        /*
-         * ACK/NAK are returned as response to us sending a command.
-         * We are not interested in them.
-         */
-//      if (scancode == SC_ACK || scancode == SC_NAK)
-//              return;
-
-//      if (scancode == 0xe0) {
-//              ds = ds_e;
-//              return;
-//      }
-
-//      switch (ds) {
-//      case ds_s:
-//              map = scanmap_simple;
-//              map_length = sizeof(scanmap_simple) / sizeof(int);
-//              break;
-//      case ds_e:
-//              map = scanmap_e0;
-//              map_length = sizeof(scanmap_e0) / sizeof(int);
-//              break;
-//      default:
-//              map = NULL;
-//              map_length = 0;
-//      }
-
-//      ds = ds_s;
-
-//      if (scancode & 0x80) {
-//              scancode &= ~0x80;
-//              type = KEY_RELEASE;
-//      } else {
-//              type = KEY_PRESS;
-//      }
 
         if ((scancode < 0) || ((size_t) scancode >= map_length))
@@ -210 +174 @@
         key = map[scancode];
         
-        if (scancode == 0x53) {
-                usb_log_debug("\n\nWe have a NUM LOCK!, sending key %u\n\n", key);
-        }
-        
-        if (scancode == 0x47) {
-                usb_log_debug("\n\nWe have a SCROLL LOCK!, sending key %u\n\n", key);
-        }
-        
-        if (scancode == 0x39) {
-                usb_log_debug("\n\nWe have a CAPS LOCK!, sending key %u\n\n", key);
-        }
-        
-//      if (key != 0)
-//              kbd_push_ev(type, key);
         return key;
 }