Changeset b0f00a9 in mainline for uspace/lib/usbdev/include/usb/dev/recognise.h

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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 mainline changes.

File:

• uspace/lib/usbdev/include/usb/dev/recognise.h (moved) (moved from uspace/srv/hid/console/keybuffer.h ) (2 diffs)

uspace/lib/usbdev/include/usb/dev/recognise.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+/** @addtogroup libusbdev
  * @{
  */
 /** @file
+ * USB device recognition.
  */
-
-#ifndef __KEYBUFFER_H__
-#define __KEYBUFFER_H__
+#ifndef LIBUSBDEV_RECOGNISE_H_
+#define LIBUSBDEV_RECOGNISE_H_
 
 #include <sys/types.h>
-#include <io/console.h>
-#include <bool.h>
+#include <usb/usb.h>
+#include <usb/dev/pipes.h>
+#include <ipc/devman.h>
 
-/** Size of buffer for pressed keys */
-#define KEYBUFFER_SIZE  128
+int usb_device_create_match_ids_from_device_descriptor(
+    const usb_standard_device_descriptor_t *, match_id_list_t *);
 
-typedef struct {
-        console_event_t fifo[KEYBUFFER_SIZE];
-        size_t head;
-        size_t tail;
-        size_t items;
-} keybuffer_t;
+int usb_device_create_match_ids_from_interface(
+    const usb_standard_device_descriptor_t *,
+    const usb_standard_interface_descriptor_t *, match_id_list_t *);
 
-extern void keybuffer_free(keybuffer_t *);
-extern void keybuffer_init(keybuffer_t *);
-extern size_t keybuffer_available(keybuffer_t *);
-extern bool keybuffer_empty(keybuffer_t *);
-extern void keybuffer_push(keybuffer_t *, const console_event_t *);
-extern bool keybuffer_pop(keybuffer_t *, console_event_t *);
+int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
+
+int usb_device_register_child_in_devman(usb_address_t, devman_handle_t,
+    ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 
 #endif
-
 /**
  * @}