Changeset 291b8bc in mainline for uspace/drv/usbkbd/kbddev.h

Timestamp:

2011-03-26T13:28:43Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f62468c

Parents:

889e8e3 (diff), c9f5e238 (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/usbkbd/kbddev.h (moved) (moved from uspace/drv/usbhid/kbddev.h ) (5 diffs)

uspace/drv/usbkbd/kbddev.h

@@ -34 +34 @@
  */
 
-#ifndef USBHID_KBDDEV_H_
-#define USBHID_KBDDEV_H_
+#ifndef USB_KBDDEV_H_
+#define USB_KBDDEV_H_
 
 #include <stdint.h>
@@ -45 +45 @@
 #include <ddf/driver.h>
 #include <usb/pipes.h>
+#include <usb/devdrv.h>
 
-#include "hiddev.h"
+#include "kbdrepeat.h"
 
 /*----------------------------------------------------------------------------*/
-/**
- * Structure for keeping information needed for auto-repeat of keys.
- */
-typedef struct {
-        /** Last pressed key. */
-        unsigned int key_new;
-        /** Key to be repeated. */
-        unsigned int key_repeated;
-        /** Delay before first repeat in microseconds. */
-        unsigned int delay_before;
-        /** Delay between repeats in microseconds. */
-        unsigned int delay_between;
-} usbhid_kbd_repeat_t;
-
 /**
  * USB/HID keyboard device type.
@@ -75 +62 @@
  *       being device-specific.
  */
-typedef struct {
-        /** Structure holding generic USB/HID device information. */
-        usbhid_dev_t *hid_dev;
+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). */
@@ -96 +84 @@
         
         /** Information for auto-repeat of keys. */
-        usbhid_kbd_repeat_t repeat;
+        usb_kbd_repeat_t repeat;
         
         /** Mutex for accessing the information about auto-repeat. */
         fibril_mutex_t *repeat_mtx;
+        
+        /** Report descriptor. */
+        uint8_t *report_desc;
+
+        /** Report descriptor size. */
+        size_t report_desc_size;
+
+        /** HID Report parser. */
+        usb_hid_report_parser_t *parser;
         
         /** State of the structure (for checking before use). 
@@ -108 +105 @@
          */
         int initialized;
-} usbhid_kbd_t;
+} usb_kbd_t;
 
 /*----------------------------------------------------------------------------*/
 
-int usbhid_kbd_try_add_device(ddf_dev_t *dev);
+enum {
+        USB_KBD_POLL_EP_NO = 0,
+        USB_KBD_POLL_EP_COUNT = 1
+};
 
-int usbhid_kbd_is_usable(const usbhid_kbd_t *kbd_dev);
+usb_endpoint_description_t *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1];
 
-void usbhid_kbd_free(usbhid_kbd_t **kbd_dev);
+ddf_dev_ops_t keyboard_ops;
 
-void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type, unsigned int key);
+/*----------------------------------------------------------------------------*/
 
-#endif /* USBHID_KBDDEV_H_ */
+usb_kbd_t *usb_kbd_new(void);
+
+int usb_kbd_init(usb_kbd_t *kbd_dev, usb_device_t *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);
+
+int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
+
+int usb_kbd_is_ready_to_destroy(const usb_kbd_t *kbd_dev);
+
+void usb_kbd_free(usb_kbd_t **kbd_dev);
+
+void usb_kbd_push_ev(usb_kbd_t *kbd_dev, int type, unsigned int key);
+
+#endif /* USB_KBDDEV_H_ */
 
 /**