Changes in uspace/drv/usbhid/main.c [707ffcf:66d5062] in mainline

File:

• uspace/drv/usbhid/main.c (modified) (8 diffs)

uspace/drv/usbhid/main.c

@@ -43 +43 @@
 #include <io/console.h>
 #include <errno.h>
-#include <str_error.h>
 #include <fibril.h>
 #include <usb/classes/hid.h>
@@ -50 +49 @@
 #include <usb/descriptor.h>
 #include <io/console.h>
-#include "hid.h"
 #include "descparser.h"
 #include "descdump.h"
@@ -381 +379 @@
         if (rc < 0) {
                 printf("Problem setting phone to HC.\n");
-                goto error_leave;
+                free(kbd_dev);
+                return NULL;
         }
 
@@ -387 +386 @@
         if (rc < 0) {
                 printf("Problem getting address of the device.\n");
-                goto error_leave;
+                free(kbd_dev);
+                return NULL;
         }
 
@@ -397 +397 @@
 //      }
 
+        // default endpoint
+        kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
+        
         /*
          * will need all descriptors:
@@ -407 +410 @@
         usbkbd_process_descriptors(kbd_dev);
 
-
-
-        /*
-         * Initialize the backing connection to the host controller.
-         */
-        rc = usb_device_connection_initialize(&kbd_dev->wire, dev);
-        if (rc != EOK) {
-                printf("Problem initializing connection to device: %s.\n",
-                    str_error(rc));
-                goto error_leave;
-        }
-
-        /*
-         * Initialize device pipes.
-         */
-        rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire,
-            GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN);
-        if (rc != EOK) {
-                printf("Failed to initialize interrupt in pipe: %s.\n",
-                    str_error(rc));
-                goto error_leave;
-        }
-
-
         return kbd_dev;
-
-error_leave:
-        free(kbd_dev);
-        return NULL;
 }
 
@@ -460 +435 @@
 static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
 {
-        int rc, sess_rc;
+        int rc;
+        usb_handle_t handle;
         uint8_t buffer[BUFFER_SIZE];
         size_t actual_size;
+        //usb_endpoint_t poll_endpoint = 1;
+
+//      usb_address_t my_address = usb_drv_get_my_address(dev->parent_phone,
+//          dev);
+//      if (my_address < 0) {
+//              return;
+//      }
+
+        usb_target_t poll_target = {
+                .address = kbd_dev->address,
+                .endpoint = kbd_dev->poll_endpoint
+        };
 
         printf("Polling keyboard...\n");
@@ -468 +456 @@
         while (true) {
                 async_usleep(1000 * 1000 * 2);
-
-                sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->poll_pipe);
-                if (sess_rc != EOK) {
-                        printf("Failed to start a session: %s.\n",
-                            str_error(sess_rc));
+                rc = usb_drv_async_interrupt_in(kbd_dev->device->parent_phone,
+                    poll_target, buffer, BUFFER_SIZE, &actual_size, &handle);
+
+                if (rc != EOK) {
+                        printf("Error in usb_drv_async_interrupt_in(): %d\n", rc);
                         continue;
                 }
 
-                rc = usb_endpoint_pipe_read(&kbd_dev->poll_pipe, buffer,
-                    BUFFER_SIZE, &actual_size);
-                sess_rc = usb_endpoint_pipe_end_session(&kbd_dev->poll_pipe);
-
+                rc = usb_drv_async_wait_for(handle);
                 if (rc != EOK) {
-                        printf("Error polling the keyboard: %s.\n",
-                            str_error(rc));
-                        continue;
-                }
-
-                if (sess_rc != EOK) {
-                        printf("Error closing session: %s.\n",
-                            str_error(sess_rc));
+                        printf("Error in usb_drv_async_wait_for(): %d\n", rc);
                         continue;
                 }