Changeset 4fe3b6d in mainline for uspace/drv/usbhid/multimedia/multimedia.h

Timestamp:

2011-05-20T11:07:00Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 with development

File:

• uspace/drv/usbhid/multimedia/multimedia.h (moved) (moved from uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h ) (2 diffs)

uspace/drv/usbhid/multimedia/multimedia.h

@@ -31 +31 @@
  */
 /** @file
- * USB Logitech UltraX Keyboard sample driver.
+ * USB Keyboard multimedia keys subdriver.
  */
 
-#ifndef USB_HID_LGTCH_ULTRAX_H_
-#define USB_HID_LGTCH_ULTRAX_H_
+#ifndef USB_HID_MULTIMEDIA_H_
+#define USB_HID_MULTIMEDIA_H_
 
-#include <usb/devdrv.h>
+#include <usb/dev/driver.h>
 
 struct usb_hid_dev;
@@ -43 +43 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_lgtch_init(struct usb_hid_dev *hid_dev);
+int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data);
 
-void usb_lgtch_deinit(struct usb_hid_dev *hid_dev);
+void usb_multimedia_deinit(struct usb_hid_dev *hid_dev, void *data);
 
-bool usb_lgtch_polling_callback(struct usb_hid_dev *hid_dev, uint8_t *buffer,
-    size_t buffer_size);
+bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data,
+    uint8_t *buffer, size_t buffer_size);
 
 /*----------------------------------------------------------------------------*/
 
-#endif // USB_HID_LGTCH_ULTRAX_H_
+#endif // USB_HID_MULTIMEDIA_H_
 
 /**