Changeset fa8d346 in mainline for uspace/app/mkbd/main.c

Timestamp:

2011-05-24T22:19:26Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d3f198

Parents:

9dddb3d

Message:

Fixes in mkbd and libusbhid.

• Fixed initialization of report parser in mkbd.
• Fixed usb_hid_process_report_descriptor() - added some parameters.

File:

• uspace/app/mkbd/main.c (modified) (6 diffs)

uspace/app/mkbd/main.c

@@ -60 +60 @@
 static int dev_phone = -1;
 
-static int initialize_report_parser(int dev_phone, usb_hid_report_t *report)
-{
-        report = (usb_hid_report_t *)malloc(sizeof(usb_hid_report_t));
-        if (report == NULL) {
-                return ENOMEM;
-        }
-        
-        int rc = usb_hid_report_init(report);
-        if (rc != EOK) {
-                usb_hid_free_report(report);
+static int initialize_report_parser(int dev_phone, usb_hid_report_t **report)
+{
+        *report = (usb_hid_report_t *)malloc(sizeof(usb_hid_report_t));
+        if (*report == NULL) {
+                return ENOMEM;
+        }
+        
+        int rc = usb_hid_report_init(*report);
+        if (rc != EOK) {
+                usb_hid_free_report(*report);
+                *report = NULL;
+                printf("usb_hid_report_init() failed.\n");
                 return rc;
         }
@@ -78 +80 @@
             dev_phone, &report_desc_size);
         if (rc != EOK) {
-                usb_hid_free_report(report);
+                usb_hid_free_report(*report);
+                *report = NULL;
+                printf("usbhid_dev_get_report_descriptor_length() failed.\n");
                 return rc;
         }
         
         if (report_desc_size == 0) {
-                usb_hid_free_report(report);
+                usb_hid_free_report(*report);
+                *report = NULL;
+                printf("usbhid_dev_get_report_descriptor_length() returned 0.\n");
                 return EINVAL;  // TODO: other error code?
         }
@@ -89 +95 @@
         uint8_t *desc = (uint8_t *)malloc(report_desc_size);
         if (desc == NULL) {
-                usb_hid_free_report(report);
+                usb_hid_free_report(*report);
+                *report = NULL;
                 return ENOMEM;
         }
@@ -98 +105 @@
             &actual_size);
         if (rc != EOK) {
-                usb_hid_free_report(report);
+                usb_hid_free_report(*report);
+                *report = NULL;
                 free(desc);
+                printf("usbhid_dev_get_report_descriptor() failed.\n");
                 return rc;
         }
         
         if (actual_size != report_desc_size) {
-                usb_hid_free_report(report);
+                usb_hid_free_report(*report);
+                *report = NULL;
                 free(desc);
+                printf("usbhid_dev_get_report_descriptor() returned wrong size:"
+                    " %zu, expected: %zu.\n", actual_size, report_desc_size);
                 return EINVAL;  // TODO: other error code?
         }
@@ -111 +123 @@
         // initialize the report parser
         
-        rc = usb_hid_parse_report_descriptor(report, desc, report_desc_size);
+        rc = usb_hid_parse_report_descriptor(*report, desc, report_desc_size);
         free(desc);
         
         if (rc != EOK) {
                 free(desc);
+                printf("usb_hid_parse_report_descriptor() failed.\n");
                 return rc;
         }
@@ -215 +228 @@
         
         usb_hid_report_t *report = NULL;
-        rc = initialize_report_parser(dev_phone, report);
+        rc = initialize_report_parser(dev_phone, &report);
         if (rc != EOK) {
                 printf("Failed to initialize report parser: %s\n",