Changeset 400735e in mainline for uspace/lib/usbhid/include/usb/hid/usages/consumer.h

Timestamp:

2011-05-28T14:30:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fb5a3e

Parents:

e8f826b (diff), 48141f0 (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/lib/usbhid/include/usb/hid/usages/consumer.h (moved) (moved from uspace/drv/uhci-hcd/utils/slab.h ) (2 diffs)

uspace/lib/usbhid/include/usb/hid/usages/consumer.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbuhcihc
+
+/** @addtogroup libusbhid
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * USB multimedia key usage to string mapping.
  */
-#ifndef DRV_UHCI_UTILS_SLAB_H
-#define DRV_UHCI_UTILS_SLAB_H
 
-#include <bool.h>
+#ifndef LIBUSBHID_CONSUMER_H_
+#define LIBUSBHID_CONSUMER_H_
 
-#define SLAB_ELEMENT_SIZE 1024
+const char *usbhid_multimedia_usage_to_str(int usage);
 
-void * slab_malloc_g(void);
+#endif /* LIBUSBHID_CONSUMER_H_ */
 
-void slab_free_g(void *addr);
-
-bool slab_in_range_g(void *addr);
-
-#endif
 /**
  * @}