Changes in uspace/drv/usbhid/multimedia/multimedia.c [19e0560e:0d59d0e9] in mainline

File:

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

uspace/drv/usbhid/multimedia/multimedia.c

@@ -143 +143 @@
         assert(multim_dev != NULL);
         
+//      usb_multimedia_t *multim_dev = (usb_multimedia_t *)hid_dev->data;
+        
         console_event_t ev;
         
@@ -171 +173 @@
         // hangup phone to the console
         async_hangup((*multim_dev)->console_phone);
+        
+        // free all buffers
+//      if ((*multim_dev)->keys != NULL) {
+//              free((*multim_dev)->keys);
+//      }
+//      if ((*multim_dev)->keys_old != NULL) {
+//              free((*multim_dev)->keys_old);
+//      }
 
         free(*multim_dev);
@@ -235 +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, 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 */
         
@@ -273 +315 @@
 {
         // TODO: checks
-        if (hid_dev == NULL || data == NULL || buffer == NULL) {
-                return false;
-        }
         
         usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
             hid_dev, buffer, buffer_size);
+        
+        if (data == NULL) {
+                return EINVAL;  // TODO: other error code?
+        }
         
         usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
@@ -305 +348 @@
             | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
             USB_HID_REPORT_TYPE_INPUT);
-
+        
+//      unsigned int key;
+        
         /*! @todo Is this iterating OK if done multiple times? 
          *  @todo The parsing is not OK