Changes in uspace/drv/usbhid/main.c [0484d92:66d5062] in mainline

File:

• uspace/drv/usbhid/main.c (modified) (9 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>
 #include <usb/classes/hidparser.h>
-#include <usb/request.h>
+#include <usb/devreq.h>
 #include <usb/descriptor.h>
 #include <io/console.h>
-#include "hid.h"
 #include "descparser.h"
 #include "descdump.h"
@@ -280 +278 @@
                 
                 // get the descriptor from the device
-                int rc = usb_request_get_descriptor(&kbd_dev->ctrl_pipe,
-                    USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT,
-                    i, 0,
-                    kbd_dev->conf->interfaces[i].report_desc, length,
+                int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone,
+                    kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 
+                    0, i, kbd_dev->conf->interfaces[i].report_desc, length, 
                     &actual_size);
 
@@ -304 +301 @@
         usb_standard_configuration_descriptor_t config_desc;
         
-        int rc;
-        rc = usb_request_get_bare_configuration_descriptor(&kbd_dev->ctrl_pipe,
-            0, &config_desc);
+        int rc = usb_drv_req_get_bare_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, &config_desc);
         
         if (rc != EOK) {
@@ -320 +316 @@
         size_t transferred = 0;
         // get full configuration descriptor
-        rc = usb_request_get_full_configuration_descriptor(&kbd_dev->ctrl_pipe,
-            0, descriptors,
+        rc = usb_drv_req_get_full_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, descriptors,
             config_desc.total_length, &transferred);
         
@@ -368 +364 @@
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        int rc;
-
         usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
             sizeof(usb_hid_dev_kbd_t));
@@ -380 +374 @@
         kbd_dev->device = dev;
 
-        /*
-         * Initialize the backing connection to the host controller.
-         */
-        rc = usb_device_connection_initialize_from_device(&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_default_control(&kbd_dev->ctrl_pipe,
-            &kbd_dev->wire);
-        if (rc != EOK) {
-                printf("Failed to initialize default control pipe: %s.\n",
-                    str_error(rc));
-                goto error_leave;
-        }
-
-        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;
-        }
-
+        // get phone to my HC and save it as my parent's phone
+        // TODO: maybe not a good idea if DDF will use parent_phone
+        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+        if (rc < 0) {
+                printf("Problem setting phone to HC.\n");
+                free(kbd_dev);
+                return NULL;
+        }
+
+        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
+        if (rc < 0) {
+                printf("Problem getting address of the device.\n");
+                free(kbd_dev);
+                return NULL;
+        }
+
+        // doesn't matter now that we have no address
+//      if (kbd_dev->address < 0) {
+//              fprintf(stderr, NAME ": No device address!\n");
+//              free(kbd_dev);
+//              return NULL;
+//      }
+
+        // default endpoint
+        kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
+        
         /*
          * will need all descriptors:
-         * 1) choose one configuration from configuration descriptors
+         * 1) choose one configuration from configuration descriptors 
          *    (set it to the device)
          * 2) set endpoints from endpoint descriptors
@@ -417 +408 @@
 
         // TODO: get descriptors, parse descriptors and save endpoints
-        usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
         usbkbd_process_descriptors(kbd_dev);
-        usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
 
         return kbd_dev;
-
-error_leave:
-        free(kbd_dev);
-        return NULL;
 }
 
@@ -450 +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");
@@ -458 +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;
                 }