Changeset 400735e in mainline for uspace/drv/usbhid/multimedia/multimedia.c

Timestamp:

2011-05-28T14:30:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fb5a3e

Parents:

e8f826b (diff), 48141f0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/drv/usbhid/multimedia/multimedia.c (modified) (6 diffs)

uspace/drv/usbhid/multimedia/multimedia.c

@@ -43 +43 @@
 #include <usb/debug.h>
 #include <usb/hid/usages/core.h>
+#include <usb/hid/usages/consumer.h>
 
 #include <errno.h>
@@ -58 +59 @@
 typedef struct usb_multimedia_t {
         /** Previously pressed keys (not translated to key codes). */
-        int32_t *keys_old;
+        //int32_t *keys_old;
         /** Currently pressed keys (not translated to key codes). */
-        int32_t *keys;
+        //int32_t *keys;
         /** Count of stored keys (i.e. number of keys in the report). */
-        size_t key_count;       
+        //size_t key_count;     
         /** IPC phone to the console device (for sending key events). */
         int console_phone;
@@ -174 +175 @@
         
         // free all buffers
-        if ((*multim_dev)->keys != NULL) {
-                free((*multim_dev)->keys);
-        }
-        if ((*multim_dev)->keys_old != NULL) {
-                free((*multim_dev)->keys_old);
-        }
+//      if ((*multim_dev)->keys != NULL) {
+//              free((*multim_dev)->keys);
+//      }
+//      if ((*multim_dev)->keys_old != NULL) {
+//              free((*multim_dev)->keys_old);
+//      }
 
         free(*multim_dev);
@@ -209 +210 @@
                 return rc;
         }
+        
+        usb_log_debug("%s function created (jandle: %" PRIun ").\n",
+            NAME, fun->handle);
         
         rc = ddf_fun_add_to_class(fun, "keyboard");
@@ -241 +245 @@
         multim_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);
-        
-        multim_dev->key_count = usb_hid_report_size(
-            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
-
-        usb_hid_report_path_free(path);
-        
-        usb_log_debug(NAME " Size of the input report: %zu\n", 
-            multim_dev->key_count);
-        
-        multim_dev->keys = (int32_t *)calloc(multim_dev->key_count, 
-            sizeof(int32_t));
-        
-        if (multim_dev->keys == NULL) {
-                usb_log_fatal("No memory!\n");
-                free(multim_dev);
-                return ENOMEM;
-        }
-        
-        multim_dev->keys_old = 
-                (int32_t *)calloc(multim_dev->key_count, sizeof(int32_t));
-        
-        if (multim_dev->keys_old == NULL) {
-                usb_log_fatal("No memory!\n");
-                free(multim_dev->keys);
-                free(multim_dev);
-                return ENOMEM;
-        }
+//      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);
+        
+//      multim_dev->key_count = usb_hid_report_size(
+//          hid_dev->report, 1, USB_HID_REPORT_TYPE_INPUT);
+
+//      usb_hid_report_path_free(path);
+        
+//      usb_log_debug(NAME " Size of the input report: %zu\n", 
+//          multim_dev->key_count);
+        
+//      multim_dev->keys = (int32_t *)calloc(multim_dev->key_count, 
+//          sizeof(int32_t));
+        
+//      if (multim_dev->keys == NULL) {
+//              usb_log_fatal("No memory!\n");
+//              free(multim_dev);
+//              return ENOMEM;
+//      }
+        
+//      multim_dev->keys_old = 
+//              (int32_t *)calloc(multim_dev->key_count, sizeof(int32_t));
+        
+//      if (multim_dev->keys_old == NULL) {
+//              usb_log_fatal("No memory!\n");
+//              free(multim_dev->keys);
+//              free(multim_dev);
+//              return ENOMEM;
+//      }
         
         /*! @todo Autorepeat */
@@ -357 +361 @@
                             usb_multimedia_map_usage(field->usage);
                         const char *key_str = 
-                            usb_multimedia_usage_to_str(field->usage);
+                            usbhid_multimedia_usage_to_str(field->usage);
                         usb_log_info("Pressed key: %s\n", key_str);
                         usb_multimedia_push_ev(hid_dev, multim_dev, KEY_PRESS,