Changeset 1c6c4092 in mainline

Timestamp:

2011-03-01T16:39:31Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

0f31e2b, 494eaf7

Parents:

27270db

Message:

Properly destroying HID and KBD device structures.

+ Do not send LOCK keys to console.

Location:

uspace/drv/usbhid

Files:

• hiddev.c (modified) (1 diff)
• hiddev.h (modified) (1 diff)
• kbddev.c (modified) (10 diffs)
• main.c (modified) (2 diffs)

uspace/drv/usbhid/hiddev.c

@@ -270 +270 @@
 /*----------------------------------------------------------------------------*/
 
+void usbhid_dev_free(usbhid_dev_t **hid_dev)
+{
+        if (hid_dev == NULL || *hid_dev == NULL) {
+                return;
+        }
+        
+        // free the report descriptor
+        if ((*hid_dev)->report_desc != NULL) {
+                free((*hid_dev)->report_desc);
+        }
+        // destroy the parser
+        if ((*hid_dev)->parser != NULL) {
+                usb_hid_free_report_parser((*hid_dev)->parser);
+        }
+        
+        // TODO: cleanup pipes
+        
+        free(*hid_dev);
+        *hid_dev = NULL;
+}
+
+/*----------------------------------------------------------------------------*/
+
 int usbhid_dev_init(usbhid_dev_t *hid_dev, ddf_dev_t *dev, 
     usb_endpoint_description_t *poll_ep_desc)

uspace/drv/usbhid/hiddev.h

@@ -69 +69 @@
 usbhid_dev_t *usbhid_dev_new(void);
 
+void usbhid_dev_free(usbhid_dev_t **hid_dev);
+
 int usbhid_dev_init(usbhid_dev_t *hid_dev, ddf_dev_t *dev,
     usb_endpoint_description_t *poll_ep_desc);

uspace/drv/usbhid/kbddev.c

@@ -41 +41 @@
 #include <io/keycode.h>
 #include <ipc/kbd.h>
+#include <async.h>
 
 #include <usb/usb.h>
@@ -253 +254 @@
         usb_log_debug2("\n\nmods after: 0x%x\n", kbd_dev->mods);
         usb_log_debug2("\nLock keys after: 0x%x\n\n", kbd_dev->lock_keys);
+        
+        if (key = KC_CAPS_LOCK || key == KC_NUM_LOCK || key == KC_SCROLL_LOCK) {
+                // do not send anything to the console, this is our business
+                return;
+        }
         
         if (type == KEY_PRESS && (kbd_dev->mods & KM_LCTRL) && key == KC_F1) {
@@ -453 +459 @@
 /*----------------------------------------------------------------------------*/
 
-static usbhid_kbd_t *usbhid_kbd_new()
+static usbhid_kbd_t *usbhid_kbd_new(void)
 {
         usbhid_kbd_t *kbd_dev = 
@@ -475 +481 @@
         
         return kbd_dev;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static void usbhid_kbd_free(usbhid_kbd_t **kbd_dev)
+{
+        if (kbd_dev == NULL || *kbd_dev == NULL) {
+                return;
+        }
+        
+        // hangup phone to the console
+        async_hangup((*kbd_dev)->console_phone);
+        
+        if ((*kbd_dev)->hid_dev != NULL) {
+                usbhid_dev_free(&(*kbd_dev)->hid_dev);
+                assert((*kbd_dev)->hid_dev == NULL);
+        }
+        
+        free(*kbd_dev);
+        *kbd_dev = NULL;
 }
 
@@ -623 +649 @@
 
         usbhid_kbd_poll(kbd_dev);
+        
+        // at the end, properly destroy the KBD structure
+        usbhid_kbd_free(&kbd_dev);
+        assert(kbd_dev == NULL);
 
         return EOK;
@@ -645 +675 @@
          * Initialize device (get and process descriptors, get address, etc.)
          */
-        usb_log_info("Initializing USB HID/KBD device...\n");
+        usb_log_info("Initializing USB/HID KBD device...\n");
         
         usbhid_kbd_t *kbd_dev = usbhid_kbd_new();
         if (kbd_dev == NULL) {
-                usb_log_error("Error while creating USB HID/KBD device "
+                usb_log_error("Error while creating USB/HID KBD device "
                     "structure.\n");
                 ddf_fun_destroy(kbd_fun);
@@ -658 +688 @@
         
         if (rc != EOK) {
-                usb_log_error("Failed to initialize USB HID/KBD device.\n");
+                usb_log_error("Failed to initialize USB/HID KBD device.\n");
                 ddf_fun_destroy(kbd_fun);
+                usbhid_kbd_free(&kbd_dev);
                 return rc;
         }       
         
-        usb_log_info("USB/KBD device structure initialized.\n");
+        usb_log_info("USB/HID KBD device structure initialized.\n");
         
         /*
@@ -675 +706 @@
         if (rc != EOK) {
                 usb_log_error("Could not bind DDF function.\n");
+                // TODO: Can / should I destroy the DDF function?
+                ddf_fun_destroy(kbd_fun);
+                usbhid_kbd_free(&kbd_dev);
                 return rc;
         }
@@ -682 +716 @@
                 usb_log_error("Could not add DDF function to class 'keyboard'"
                     "\n");
+                // TODO: Can / should I destroy the DDF function?
+                ddf_fun_destroy(kbd_fun);
+                usbhid_kbd_free(&kbd_dev);
                 return rc;
         }
@@ -690 +727 @@
         fid_t fid = fibril_create(usbhid_kbd_fibril, kbd_dev);
         if (fid == 0) {
-                usb_log_error("Failed to start fibril for HID device\n");
+                usb_log_error("Failed to start fibril for KBD device\n");
                 return ENOMEM;
         }

uspace/drv/usbhid/main.c

@@ -40 +40 @@
 #include <errno.h>
 
-//#include <ipc/driver.h>
-//#include <ipc/kbd.h>
-//#include <io/keycode.h>
-//#include <io/console.h>
-//#include <str_error.h>
-
-//#include <usb/classes/classes.h>
-//#include <usb/classes/hid.h>
-//#include <usb/classes/hidparser.h>
-//#include <usb/request.h>
-//#include <usb/descriptor.h>
-//#include <io/console.h>
-//#include <stdint.h>
-//#include <usb/dp.h>
-
 #include "kbddev.h"
 
@@ -65 +50 @@
 static int usbhid_add_device(ddf_dev_t *dev)
 {
+        usb_log_debug("usbhid_add_device()\n");
+        
         int rc = usbhid_kbd_try_add_device(dev);