Changeset deb4ba7 in mainline for uspace/drv/usbmouse/main.c

Timestamp:

2011-03-13T21:39:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1b0b86e6, 92b41f33

Parents:

335382d (diff), adfe5ec (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:

Initial work on USB device driver framework

See messages in individual commits and discussion on
​https://sourceforge.net/apps/trac/helenos-usb/ticket/85
for more details.

Only the mouse driver uses this framework.

File:

• uspace/drv/usbmouse/main.c (modified) (4 diffs)

uspace/drv/usbmouse/main.c

@@ -44 +44 @@
  * @return Error code.
  */
-static int usbmouse_add_device(ddf_dev_t *dev)
+static int usbmouse_add_device(usb_device_t *dev)
 {
         int rc = usb_mouse_create(dev);
@@ -53 +53 @@
         }
 
-        fid_t poll_fibril = fibril_create(usb_mouse_polling_fibril, dev);
-        if (poll_fibril == 0) {
-                usb_log_error("Failed to initialize polling fibril.\n");
-                /* FIXME: free allocated resources. */
-                return ENOMEM;
+        usb_log_debug("Polling pipe at endpoint %d.\n", dev->pipes[0].pipe->endpoint_no);
+
+        rc = usb_device_auto_poll(dev, 0,
+            usb_mouse_polling_callback, dev->pipes[0].pipe->max_packet_size,
+            usb_mouse_polling_ended_callback, dev->driver_data);
+
+        if (rc != EOK) {
+                usb_log_error("Failed to start polling fibril: %s.\n",
+                    str_error(rc));
+                return rc;
         }
 
-        fibril_add_ready(poll_fibril);
-
         usb_log_info("controlling new mouse (handle %llu).\n",
-            dev->handle);
+            dev->ddf_dev->handle);
 
         return EOK;
@@ -69 +72 @@
 
 /** USB mouse driver ops. */
-static driver_ops_t mouse_driver_ops = {
+static usb_driver_ops_t mouse_driver_ops = {
         .add_device = usbmouse_add_device,
 };
 
+static usb_endpoint_description_t *endpoints[] = {
+        &poll_endpoint_description,
+        NULL
+};
+
 /** USB mouse driver. */
-static driver_t mouse_driver = {
+static usb_driver_t mouse_driver = {
         .name = NAME,
-        .driver_ops = &mouse_driver_ops
+        .ops = &mouse_driver_ops,
+        .endpoints = endpoints
 };
 
@@ -83 +92 @@
         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
-        return ddf_driver_main(&mouse_driver);
+        return usb_driver_main(&mouse_driver);
 }