Changeset 72af8da in mainline for uspace/drv/usbmouse/main.c

Timestamp:

2011-03-16T18:50:17Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

42a3a57

Parents:

3e7b7cd (diff), fcf07e6 (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:

merge from usb/development

File:

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

uspace/drv/usbmouse/main.c

@@ -39 +39 @@
 #include <str_error.h>
 
-static int usbmouse_add_device(ddf_dev_t *dev)
+/** Callback when new mouse device is attached and recognised by DDF.
+ *
+ * @param dev Representation of a generic DDF device.
+ * @return Error code.
+ */
+static int usbmouse_add_device(usb_device_t *dev)
 {
         int rc = usb_mouse_create(dev);
@@ -48 +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;
 }
 
-static driver_ops_t mouse_driver_ops = {
+/** USB mouse driver ops. */
+static usb_driver_ops_t mouse_driver_ops = {
         .add_device = usbmouse_add_device,
 };
 
-static driver_t mouse_driver = {
+static usb_endpoint_description_t *endpoints[] = {
+        &poll_endpoint_description,
+        NULL
+};
+
+/** USB mouse driver. */
+static usb_driver_t mouse_driver = {
         .name = NAME,
-        .driver_ops = &mouse_driver_ops
+        .ops = &mouse_driver_ops,
+        .endpoints = endpoints
 };
 
@@ -76 +92 @@
         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
-        return ddf_driver_main(&mouse_driver);
+        return usb_driver_main(&mouse_driver);
 }