Changeset 9097c16a in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-02-04T13:14:14Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

9e7cdf8

Parents:

11797d5 (diff), ff244e6 (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:

Merged development

File:

• uspace/drv/usbhid/main.c (moved) (moved from uspace/drv/usbkbd/main.c ) (13 diffs)

uspace/drv/usbhid/main.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/** @addtogroup drvusbhid
+ * @{
+ */
+/**
+ * @file
+ * Main routines of USB HID driver.
+ */
+
 #include <usb/usbdrv.h>
 #include <driver.h>
@@ -33 +43 @@
 #include <io/console.h>
 #include <errno.h>
+#include <str_error.h>
 #include <fibril.h>
 #include <usb/classes/hid.h>
@@ -39 +50 @@
 #include <usb/descriptor.h>
 #include <io/console.h>
+#include "hid.h"
 #include "descparser.h"
 #include "descdump.h"
@@ -45 +57 @@
 
 #define BUFFER_SIZE 32
-#define NAME "usbkbd"
+#define NAME "usbhid"
 
 #define GUESSED_POLL_ENDPOINT 1
@@ -369 +381 @@
         if (rc < 0) {
                 printf("Problem setting phone to HC.\n");
-                free(kbd_dev);
-                return NULL;
+                goto error_leave;
         }
 
@@ -376 +387 @@
         if (rc < 0) {
                 printf("Problem getting address of the device.\n");
-                free(kbd_dev);
-                return NULL;
+                goto error_leave;
         }
 
@@ -387 +397 @@
 //      }
 
-        // default endpoint
-        kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
-        
         /*
          * will need all descriptors:
@@ -400 +407 @@
         usbkbd_process_descriptors(kbd_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(&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;
 }
 
@@ -413 +448 @@
         //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
         //    NULL);
-        printf("Calling usb_hid_boot_keyboard_input_report() with size %d\n",
+        printf("Calling usb_hid_boot_keyboard_input_report() with size %zu\n",
             actual_size);
         //dump_buffer("bufffer: ", buffer, actual_size);
@@ -425 +460 @@
 static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
 {
-        int rc;
-        usb_handle_t handle;
+        int rc, sess_rc;
         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");
@@ -446 +468 @@
         while (true) {
                 async_usleep(1000 * 1000 * 2);
-                rc = usb_drv_async_interrupt_in(kbd_dev->device->parent_phone,
-                    poll_target, buffer, BUFFER_SIZE, &actual_size, &handle);
+
+                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));
+                        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);
 
                 if (rc != EOK) {
-                        printf("Error in usb_drv_async_interrupt_in(): %d\n", rc);
+                        printf("Error polling the keyboard: %s.\n",
+                            str_error(rc));
                         continue;
                 }
 
-                rc = usb_drv_async_wait_for(handle);
-                if (rc != EOK) {
-                        printf("Error in usb_drv_async_wait_for(): %d\n", rc);
+                if (sess_rc != EOK) {
+                        printf("Error closing session: %s.\n",
+                            str_error(sess_rc));
                         continue;
                 }
@@ -557 +589 @@
         return driver_main(&kbd_driver);
 }
+
+/**
+ * @}
+ */