Changes in uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c [31cfee16:b20de1d] in mainline

File:

• uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c (modified) (8 diffs)

uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

@@ -58 +58 @@
 } usb_lgtch_flags;
 
-/*----------------------------------------------------------------------------*/
-/**
- * Logitech UltraX device type.
- */
-typedef struct usb_lgtch_ultrax_t {
-        /** Previously pressed keys (not translated to key codes). */
-        int32_t *keys_old;
-        /** Currently pressed keys (not translated to key codes). */
-        int32_t *keys;
-        /** Count of stored keys (i.e. number of keys in the report). */
-        size_t key_count;
-        
-        /** IPC phone to the console device (for sending key events). */
-        int console_phone;
-
-        /** Information for auto-repeat of keys. */
-//      usb_kbd_repeat_t repeat;
-        
-        /** Mutex for accessing the information about auto-repeat. */
-//      fibril_mutex_t *repeat_mtx;
-
-        /** State of the structure (for checking before use). 
-         * 
-         * 0 - not initialized
-         * 1 - initialized
-         * -1 - ready for destroying
-         */
-        int initialized;
-} usb_lgtch_ultrax_t;
-
 
 /*----------------------------------------------------------------------------*/
@@ -238 +208 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_lgtch_create_function(usb_hid_dev_t *hid_dev)
-{
+int usb_lgtch_init(struct usb_hid_dev *hid_dev)
+{
+        if (hid_dev == NULL || hid_dev->usb_dev == NULL) {
+                return EINVAL; /*! @todo Other return code? */
+        }
+        
+        usb_log_debug(NAME " Initializing HID/lgtch_ultrax structure...\n");
+        
+        usb_lgtch_ultrax_t *lgtch_dev = (usb_lgtch_ultrax_t *)malloc(
+            sizeof(usb_lgtch_ultrax_t));
+        if (lgtch_dev == NULL) {
+                return ENOMEM;
+        }
+        
+        lgtch_dev->console_phone = -1;
+        
+        usb_hid_report_path_t *path = usb_hid_report_path();
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
+        
+        usb_hid_report_path_set_report_id(path, 1);
+        
+        lgtch_dev->key_count = usb_hid_report_input_length(
+            hid_dev->report, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+        usb_hid_report_path_free(path);
+        
+        usb_log_debug(NAME " Size of the input report: %zu\n", 
+            lgtch_dev->key_count);
+        
+        lgtch_dev->keys = (int32_t *)calloc(lgtch_dev->key_count, 
+            sizeof(int32_t));
+        
+        if (lgtch_dev->keys == NULL) {
+                usb_log_fatal("No memory!\n");
+                free(lgtch_dev);
+                return ENOMEM;
+        }
+        
+        lgtch_dev->keys_old = 
+                (int32_t *)calloc(lgtch_dev->key_count, sizeof(int32_t));
+        
+        if (lgtch_dev->keys_old == NULL) {
+                usb_log_fatal("No memory!\n");
+                free(lgtch_dev->keys);
+                free(lgtch_dev);
+                return ENOMEM;
+        }
+        
+        /*! @todo Autorepeat */
+        
+        // save the KBD device structure into the HID device structure
+        hid_dev->data = lgtch_dev;
+        
         /* Create the function exposed under /dev/devices. */
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
@@ -248 +269 @@
         }
         
+        lgtch_dev->initialized = USB_LGTCH_STATUS_INITIALIZED;
+        usb_log_debug(NAME " HID/lgtch_ultrax device structure initialized.\n");
+        
         /*
          * Store the initialized HID device and HID ops
@@ -255 +279 @@
         fun->driver_data = hid_dev;   // TODO: maybe change to hid_dev->data
         
+        /*
+         * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
+         *    do nej.
+         * 2) do tych ops do .interfaces[DEV_IFACE_USBHID (asi)] priradi 
+         *    vyplnenu strukturu usbhid_iface_t.
+         * 3) klientska aplikacia - musi si rucne vytvorit telefon
+         *    (devman_device_connect() - cesta k zariadeniu (/hw/pci0/...) az 
+         *    k tej fcii.
+         *    pouzit usb/classes/hid/iface.h - prvy int je telefon
+         */
+
         int rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -261 +296 @@
                 // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(fun);
+                usb_lgtch_free(&lgtch_dev);
                 return rc;
         }
@@ -271 +307 @@
                 // TODO: Can / should I destroy the DDF function?
                 ddf_fun_destroy(fun);
-                return rc;
-        }
-        
-        return EOK;
-}
-
-/*----------------------------------------------------------------------------*/
-
-int usb_lgtch_init(struct usb_hid_dev *hid_dev)
-{
-        if (hid_dev == NULL || hid_dev->usb_dev == NULL) {
-                return EINVAL; /*! @todo Other return code? */
-        }
-        
-        usb_log_debug(NAME " Initializing HID/lgtch_ultrax structure...\n");
-        
-        usb_lgtch_ultrax_t *lgtch_dev = (usb_lgtch_ultrax_t *)malloc(
-            sizeof(usb_lgtch_ultrax_t));
-        if (lgtch_dev == NULL) {
-                return ENOMEM;
-        }
-        
-        lgtch_dev->console_phone = -1;
-        
-        usb_hid_report_path_t *path = usb_hid_report_path();
-        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
-        
-        usb_hid_report_path_set_report_id(path, 1);
-        
-        lgtch_dev->key_count = usb_hid_report_input_length(
-            hid_dev->report, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
-        usb_hid_report_path_free(path);
-        
-        usb_log_debug(NAME " Size of the input report: %zu\n", 
-            lgtch_dev->key_count);
-        
-        lgtch_dev->keys = (int32_t *)calloc(lgtch_dev->key_count, 
-            sizeof(int32_t));
-        
-        if (lgtch_dev->keys == NULL) {
-                usb_log_fatal("No memory!\n");
-                free(lgtch_dev);
-                return ENOMEM;
-        }
-        
-        lgtch_dev->keys_old = 
-                (int32_t *)calloc(lgtch_dev->key_count, sizeof(int32_t));
-        
-        if (lgtch_dev->keys_old == NULL) {
-                usb_log_fatal("No memory!\n");
-                free(lgtch_dev->keys);
-                free(lgtch_dev);
-                return ENOMEM;
-        }
-        
-        /*! @todo Autorepeat */
-        
-        // save the KBD device structure into the HID device structure
-        hid_dev->data = lgtch_dev;
-        
-        lgtch_dev->initialized = USB_LGTCH_STATUS_INITIALIZED;
-        usb_log_debug(NAME " HID/lgtch_ultrax device structure initialized.\n");
-        
-        int rc = usb_lgtch_create_function(hid_dev);
-        if (rc != EOK) {
                 usb_lgtch_free(&lgtch_dev);
                 return rc;
@@ -386 +356 @@
         int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
             &report_id);
-        
-        if (rc != EOK) {
-                usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
-                    str_error(rc));
-                return true;
-        }
-        
         usb_hid_report_path_set_report_id(path, report_id);
 
@@ -420 +383 @@
         usb_hid_report_path_free(path);
         
+        if (rc != EOK) {
+                usb_log_warning(NAME "Error in usb_hid_boot_keyboard_input_report():"
+                    "%s\n", str_error(rc));
+        }
+        
         return true;
 }