Changes in uspace/app/mkbd/main.c [b7fd2a0:e540424a] in mainline

File:

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

uspace/app/mkbd/main.c

@@ -44 +44 @@
 #include <devman.h>
 #include <loc.h>
+#include <usb/dev/hub.h>
 #include <usbhid_iface.h>
 #include <usb/dev/pipes.h>
@@ -60 +61 @@
 static async_sess_t *dev_sess = NULL;
 
-static errno_t initialize_report_parser(async_sess_t *dev_sess,
+static int initialize_report_parser(async_sess_t *dev_sess,
     usb_hid_report_t **report)
 {
@@ -67 +68 @@
                 return ENOMEM;
         
-        errno_t rc = usb_hid_report_init(*report);
+        int rc = usb_hid_report_init(*report);
         if (rc != EOK) {
                 usb_hid_report_deinit(*report);
@@ -131 +132 @@
         
         uint8_t report_id;
-        errno_t rc = usb_hid_parse_report(report, buffer, size, &report_id);
+        int rc = usb_hid_parse_report(report, buffer, size, &report_id);
         if (rc != EOK)
                 return;
@@ -165 +166 @@
 }
 
-static errno_t wait_for_quit_fibril(void *arg)
+static int wait_for_quit_fibril(void *arg)
 {
         console_ctrl_t *con = console_init(stdin, stdout);
@@ -218 +219 @@
         devman_handle_t dev_handle = 0;
         
-        errno_t rc = usb_resolve_device_handle(devpath, &dev_handle);
+        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",
@@ -237 +238 @@
         rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
         if (rc != EOK) {
-                printf(NAME ": failed to get path (handle %"
-                       PRIun "): %s.\n", dev_handle, str_error(errno));
                 return ENOMEM;
         }
@@ -264 +263 @@
         uint8_t *event = (uint8_t *)malloc(size);
         if (event == NULL) {
-                printf("Out of memory.\n");
                 // TODO: hangup phone?
                 return ENOMEM;