Changeset 489c3e7 in mainline for uspace/drv/usbmouse/main.c

Timestamp:

2011-03-12T11:59:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

69334af

Parents:

6105fc0

Message:

USB mouse driver uses the new framework

The implementation was adjusted very roughly, but it looks that it
still works.

File:

• uspace/drv/usbmouse/main.c (modified) (5 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);
@@ -52 +52 @@
                 return rc;
         }
+
+        usb_log_debug("Polling pipe at endpoint %d.\n", dev->pipes[0].pipe->endpoint_no);
 
         fid_t poll_fibril = fibril_create(usb_mouse_polling_fibril, dev);
@@ -63 +65 @@
 
         usb_log_info("controlling new mouse (handle %llu).\n",
-            dev->handle);
+            dev->ddf_dev->handle);
 
         return EOK;
@@ -69 +71 @@
 
 /** 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 +91 @@
         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
-        return ddf_driver_main(&mouse_driver);
+        return usb_driver_main(&mouse_driver);
 }