Changeset d8b275d in mainline for uspace/drv/usbhid/kbd/kbddev.h

Timestamp:

2011-04-14T08:24:29Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (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/usbhid/kbd/kbddev.h (modified) (8 diffs)

uspace/drv/usbhid/kbd/kbddev.h

@@ -34 +34 @@
  */
 
-#ifndef USB_KBDDEV_H_
-#define USB_KBDDEV_H_
+#ifndef USB_HID_KBDDEV_H_
+#define USB_HID_KBDDEV_H_
 
 #include <stdint.h>
@@ -49 +49 @@
 #include "kbdrepeat.h"
 
-struct usb_hid_dev_t;
+struct usb_hid_dev;
 
 /*----------------------------------------------------------------------------*/
@@ -65 +65 @@
  */
 typedef struct usb_kbd_t {
-        /** Structure holding generic USB device information. */
-        //usbhid_dev_t *hid_dev;
-        //usb_device_t *usb_dev;
-        
         /** Currently pressed keys (not translated to key codes). */
         uint8_t *keys;
@@ -91 +87 @@
         fibril_mutex_t *repeat_mtx;
         
-        /** Report descriptor. */
-        //uint8_t *report_desc;
-
-        /** Report descriptor size. */
-        //size_t report_desc_size;
-        
         uint8_t *output_buffer;
         
@@ -106 +96 @@
         
         int32_t *led_data;
-
-        /** HID Report parser. */
-        //usb_hid_report_parser_t *parser;
         
         /** State of the structure (for checking before use). 
@@ -121 +108 @@
 /*----------------------------------------------------------------------------*/
 
-//enum {
-//      USB_KBD_POLL_EP_NO = 0,
-//      USB_HID_POLL_EP_NO = 1,
-//      USB_KBD_POLL_EP_COUNT = 2
-//};
-
-//usb_endpoint_description_t *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1];
-
-//ddf_dev_ops_t keyboard_ops;
-
 usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
@@ -138 +115 @@
 /*----------------------------------------------------------------------------*/
 
-//usb_kbd_t *usb_kbd_new(void);
+int usb_kbd_init(struct usb_hid_dev *hid_dev);
 
-int usb_kbd_init(struct usb_hid_dev_t *hid_dev);
-
-bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg);
-
-//void usb_kbd_polling_ended_callback(usb_device_t *dev, bool reason, 
-//     void *arg);
+bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, uint8_t *buffer,
+    size_t buffer_size);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -154 +126 @@
 void usb_kbd_free(usb_kbd_t **kbd_dev);
 
-void usb_kbd_push_ev(struct usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev,
+void usb_kbd_push_ev(struct usb_hid_dev *hid_dev, usb_kbd_t *kbd_dev,
     int type, unsigned int key);
 
+void usb_kbd_deinit(struct usb_hid_dev *hid_dev);
 
-void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev);
+int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);
 
-int usb_kbd_set_boot_protocol(struct usb_hid_dev_t *hid_dev);
-
-#endif /* USB_KBDDEV_H_ */
+#endif /* USB_HID_KBDDEV_H_ */
 
 /**