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

Timestamp:

2011-05-30T14:57:37Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

0c07d70

Parents:

b2387c2 (diff), 2176ed6 (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 with usb/development

File:

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

uspace/app/mkbd/main.c

@@ -71 +71 @@
                 usb_hid_free_report(*report);
                 *report = NULL;
-                printf("usb_hid_report_init() failed.\n");
+                //printf("usb_hid_report_init() failed.\n");
                 return rc;
         }
@@ -82 +82 @@
                 usb_hid_free_report(*report);
                 *report = NULL;
-                printf("usbhid_dev_get_report_descriptor_length() failed.\n");
+                //printf("usbhid_dev_get_report_descriptor_length() failed.\n");
                 return rc;
         }
@@ -89 +89 @@
                 usb_hid_free_report(*report);
                 *report = NULL;
-                printf("usbhid_dev_get_report_descriptor_length() returned 0.\n");
+                //printf("usbhid_dev_get_report_descriptor_length() returned 0.\n");
                 return EINVAL;  // TODO: other error code?
         }
@@ -108 +108 @@
                 *report = NULL;
                 free(desc);
-                printf("usbhid_dev_get_report_descriptor() failed.\n");
+                //printf("usbhid_dev_get_report_descriptor() failed.\n");
                 return rc;
         }
@@ -116 +116 @@
                 *report = NULL;
                 free(desc);
-                printf("usbhid_dev_get_report_descriptor() returned wrong size:"
-                    " %zu, expected: %zu.\n", actual_size, report_desc_size);
+//              printf("usbhid_dev_get_report_descriptor() returned wrong size:"
+//                  " %zu, expected: %zu.\n", actual_size, report_desc_size);
                 return EINVAL;  // TODO: other error code?
         }
@@ -128 +128 @@
         if (rc != EOK) {
                 free(desc);
-                printf("usb_hid_parse_report_descriptor() failed.\n");
+//              printf("usb_hid_parse_report_descriptor() failed.\n");
                 return rc;
         }
@@ -213 +213 @@
         
         char *devpath = argv[1];
-        //const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
-        
-        int rc;
         
         devman_handle_t dev_handle = 0;
-        rc = devman_device_get_handle(devpath, &dev_handle, 0);
-        if (rc != EOK) {
-                printf("Failed to get handle from devman: %s.\n",
+        
+        int rc = usb_resolve_device_handle(devpath, NULL, NULL, &dev_handle);
+        if (rc != EOK) {
+                printf("Device not found or not of USB kind: %s.\n",
                     str_error(rc));
                 return rc;