Changeset dd10e07 in mainline

Timestamp:

2011-04-08T07:04:30Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

73ae3373

Parents:

7f2e33a

Message:

Renamed hidd to hiddev

Location:

uspace/drv/usbhid

Files:

• Makefile (modified) (1 diff)
• generic/hiddev.c (moved) (moved from uspace/drv/usbhid/generic/hidd.c ) (1 diff)
• generic/hiddev.h (moved) (moved from uspace/drv/usbhid/generic/hidd.h )
• usbhid.c (modified) (1 diff)
• usbhid.h (modified) (2 diffs)

uspace/drv/usbhid/Makefile

@@ -43 +43 @@
         kbd/kbddev.c \
         kbd/kbdrepeat.c \
-        generic/hidd.c \
+        generic/hiddev.c \
         $(STOLEN_LAYOUT_SOURCES)
 

uspace/drv/usbhid/generic/hiddev.c

@@ -38 +38 @@
 #include <usb/classes/classes.h>
 
-#include "hidd.h"
+#include "hiddev.h"
 
 /*----------------------------------------------------------------------------*/

uspace/drv/usbhid/usbhid.c

@@ -46 +46 @@
 
 #include "kbd/kbddev.h"
-#include "generic/hidd.h"
-
-/*----------------------------------------------------------------------------*/
-
-/** Generic HID device polling endpoint description. */
-//static usb_endpoint_description_t usb_hid_generic_poll_endpoint_description = {
-//      .transfer_type = USB_TRANSFER_INTERRUPT,
-//      .direction = USB_DIRECTION_IN,
-//      .interface_class = USB_CLASS_HID,
-//      .flags = 0
-//};
-
-///** Keyboard polling endpoint description for boot protocol class. */
-//static usb_endpoint_description_t ush_hid_kbd_poll_endpoint_description = {
-//      .transfer_type = USB_TRANSFER_INTERRUPT,
-//      .direction = USB_DIRECTION_IN,
-//      .interface_class = USB_CLASS_HID,
-//      .interface_subclass = USB_HID_SUBCLASS_BOOT,
-//      .interface_protocol = USB_HID_PROTOCOL_KEYBOARD,
-//      .flags = 0
-//};
+#include "generic/hiddev.h"
+
+/*----------------------------------------------------------------------------*/
 
 /** Mouse polling endpoint description for boot protocol class. */

uspace/drv/usbhid/usbhid.h

@@ -39 +39 @@
 #include <stdint.h>
 
-//#include <fibril_synch.h>
-
-//#include <usb/classes/hid.h>
 #include <usb/classes/hidparser.h>
 #include <ddf/driver.h>
@@ -105 +102 @@
 const char *usb_hid_get_class_name(usb_hid_iface_protocol_t device_type);
 
-/** @todo Maybe not needed in the API. */
 void usb_hid_free(usb_hid_dev_t **hid_dev);