Changeset 1b0b86e6 in mainline for uspace/drv/usbmouse/mouse.h

Timestamp:

2011-03-13T22:02:44Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b7d8fd9

Parents:

67f54965 (diff), deb4ba7 (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 development/ changes

File:

• uspace/drv/usbmouse/mouse.h (modified) (3 diffs)

uspace/drv/usbmouse/mouse.h

@@ -37 +37 @@
 #define USBMOUSE_MOUSE_H_
 
-#include <ddf/driver.h>
+#include <usb/devdrv.h>
 #include <usb/pipes.h>
 #include <time.h>
@@ -46 +46 @@
 typedef struct {
         /** Generic device container. */
-        ddf_dev_t *device;
+        usb_device_t *dev;
         /** Function representing the device. */
         ddf_fun_t *mouse_fun;
-        /** Representation of connection to the device. */
-        usb_device_connection_t wire;
-        /** Default (zero) control pipe. */
-        usb_endpoint_pipe_t ctrl_pipe;
-        /** Polling (in) pipe. */
-        usb_endpoint_pipe_t poll_pipe;
         /** Polling interval in microseconds. */
         suseconds_t poll_interval_us;
@@ -61 +55 @@
 } usb_mouse_t;
 
-int usb_mouse_create(ddf_dev_t *);
+#define POLL_PIPE(dev) ((dev)->pipes[0].pipe)
 
-int usb_mouse_polling_fibril(void *);
+extern usb_endpoint_description_t poll_endpoint_description;
+
+int usb_mouse_create(usb_device_t *);
+
+bool usb_mouse_polling_callback(usb_device_t *, uint8_t *, size_t, void *);
+void usb_mouse_polling_ended_callback(usb_device_t *, bool, void *);
 
 #endif