Changeset 293de44 in mainline for uspace/drv/usbhid/multimedia/keymap.h

Timestamp:

2011-05-20T11:18:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c7c2443

Parents:

160b75e (diff), 7941bd6 (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/multimedia/keymap.h (moved) (moved from uspace/drv/usbhid/lgtch-ultrax/keymap.h ) (1 diff)

uspace/drv/usbhid/multimedia/keymap.h

@@ -34 +34 @@
  */
 
-#ifndef USB_HID_LGTCH_ULTRAX_KEYMAP_H_
-#define USB_HID_LGTCH_ULTRAX_KEYMAP_H_
+#ifndef USB_HID_MULTIMEDIA_KEYMAP_H_
+#define USB_HID_MULTIMEDIA_KEYMAP_H_
 
-unsigned int usb_lgtch_map_usage(int usage);
+unsigned int usb_multimedia_map_usage(int usage);
 
-#endif /* USB_HID_LGTCH_ULTRAX_KEYMAP_H_ */
+const char *usb_multimedia_usage_to_str(int usage);
+
+#endif /* USB_HID_MULTIMEDIA_KEYMAP_H_ */
 
 /**