Changeset 2586860 in mainline for uspace/lib/usbhid/include
- Timestamp:
- 2011-05-17T12:47:11Z (15 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 88be3a0b, ef90ffb3
- Parents:
- 3375bd4 (diff), 160b75e (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. - Location:
- uspace/lib/usbhid/include/usb/hid
- Files:
-
- 12 moved
-
hid.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hid.h ) (2 diffs)
-
hid_report_items.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hid_report_items.h ) (2 diffs)
-
hiddescriptor.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hiddescriptor.h ) (2 diffs)
-
hidparser.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidparser.h ) (2 diffs)
-
hidpath.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidpath.h ) (2 diffs)
-
hidreport.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidreport.h ) (2 diffs)
-
hidtypes.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidtypes.h ) (2 diffs)
-
iface.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hid/iface.h ) (2 diffs)
-
request.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidreq.h ) (2 diffs)
-
usages/core.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidut.h ) (2 diffs)
-
usages/kbdgen.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hidutkbd.h ) (1 diff)
-
usages/led.h (moved) (moved from uspace/lib/usbhid/include/usb/classes/hid/utled.h ) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbhid/include/usb/hid/hid.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * @brief USB HID device related types. 34 34 */ 35 #ifndef LIBUSB _HID_H_36 #define LIBUSB _HID_H_35 #ifndef LIBUSBHID_HID_H_ 36 #define LIBUSBHID_HID_H_ 37 37 38 38 #include <usb/usb.h> 39 #include <usb/ classes/hidparser.h>39 #include <usb/hid/hidparser.h> 40 40 #include <usb/descriptor.h> 41 41 -
uspace/lib/usbhid/include/usb/hid/hid_report_items.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * @brief USB HID parser. 34 34 */ 35 #ifndef LIBUSB _HID_REPORT_ITEMS_H_36 #define LIBUSB _HID_REPORT_ITEMS_H_35 #ifndef LIBUSBHID_HID_REPORT_ITEMS_H_ 36 #define LIBUSBHID_HID_REPORT_ITEMS_H_ 37 37 38 38 #include <stdint.h> -
uspace/lib/usbhid/include/usb/hid/hiddescriptor.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * USB HID report descriptor and report data parser 34 34 */ 35 #ifndef LIBUSB _HIDDESCRIPTOR_H_36 #define LIBUSB _HIDDESCRIPTOR_H_35 #ifndef LIBUSBHID_HIDDESCRIPTOR_H_ 36 #define LIBUSBHID_HIDDESCRIPTOR_H_ 37 37 38 38 #include <stdint.h> 39 39 #include <adt/list.h> 40 #include <usb/ classes/hid_report_items.h>41 #include <usb/ classes/hidpath.h>42 #include <usb/ classes/hidtypes.h>40 #include <usb/hid/hid_report_items.h> 41 #include <usb/hid/hidpath.h> 42 #include <usb/hid/hidtypes.h> 43 43 44 44 -
uspace/lib/usbhid/include/usb/hid/hidparser.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * USB HID report descriptor and report data parser 34 34 */ 35 #ifndef LIBUSB _HIDPARSER_H_36 #define LIBUSB _HIDPARSER_H_35 #ifndef LIBUSBHID_HIDPARSER_H_ 36 #define LIBUSBHID_HIDPARSER_H_ 37 37 38 38 #include <stdint.h> 39 39 #include <adt/list.h> 40 #include <usb/ classes/hid_report_items.h>41 #include <usb/ classes/hidpath.h>42 #include <usb/ classes/hidtypes.h>43 #include <usb/ classes/hiddescriptor.h>40 #include <usb/hid/hid_report_items.h> 41 #include <usb/hid/hidpath.h> 42 #include <usb/hid/hidtypes.h> 43 #include <usb/hid/hiddescriptor.h> 44 44 45 45 -
uspace/lib/usbhid/include/usb/hid/hidpath.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * USB HID report descriptor and report data parser 34 34 */ 35 #ifndef LIBUSB _HIDPATH_H_36 #define LIBUSB _HIDPATH_H_35 #ifndef LIBUSBHID_HIDPATH_H_ 36 #define LIBUSBHID_HIDPATH_H_ 37 37 38 #include <usb/ classes/hidparser.h>38 #include <usb/hid/hidparser.h> 39 39 #include <stdint.h> 40 40 #include <adt/list.h> -
uspace/lib/usbhid/include/usb/hid/hidreport.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 34 34 */ 35 35 36 #ifndef LIBUSB _HIDREPORT_H_37 #define LIBUSB _HIDREPORT_H_36 #ifndef LIBUSBHID_HIDREPORT_H_ 37 #define LIBUSBHID_HIDREPORT_H_ 38 38 39 #include <usb/dev drv.h>40 #include <usb/ classes/hidparser.h>39 #include <usb/dev/driver.h> 40 #include <usb/hid/hidparser.h> 41 41 42 42 /** -
uspace/lib/usbhid/include/usb/hid/hidtypes.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * USB HID report descriptor and report data parser 34 34 */ 35 #ifndef LIBUSB _HIDTYPES_H_36 #define LIBUSB _HIDTYPES_H_35 #ifndef LIBUSBHID_HIDTYPES_H_ 36 #define LIBUSBHID_HIDTYPES_H_ 37 37 38 38 #include <stdint.h> -
uspace/lib/usbhid/include/usb/hid/iface.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * Client functions for accessing USB HID interface. 34 34 */ 35 #ifndef LIBUSB _CLASSES_HID_IFACE_H_36 #define LIBUSB _CLASSES_HID_IFACE_H_35 #ifndef LIBUSBHID_CLASSES_HID_IFACE_H_ 36 #define LIBUSBHID_CLASSES_HID_IFACE_H_ 37 37 38 38 #include <sys/types.h> -
uspace/lib/usbhid/include/usb/hid/request.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 39 39 #include <stdint.h> 40 40 41 #include <usb/ classes/hid.h>42 #include <usb/ pipes.h>41 #include <usb/hid/hid.h> 42 #include <usb/dev/pipes.h> 43 43 44 44 /*----------------------------------------------------------------------------*/ -
uspace/lib/usbhid/include/usb/hid/usages/core.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * @brief USB HID Usage Tables. 34 34 */ 35 #ifndef LIBUSB _HIDUT_H_36 #define LIBUSB _HIDUT_H_35 #ifndef LIBUSBHID_HIDUT_H_ 36 #define LIBUSBHID_HIDUT_H_ 37 37 38 38 /** USB/HID Usage Pages. */ -
uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ -
uspace/lib/usbhid/include/usb/hid/usages/led.h
r3375bd4 r2586860 27 27 */ 28 28 29 /** @addtogroup libusb 29 /** @addtogroup libusbhid 30 30 * @{ 31 31 */ … … 33 33 * @brief USB HID Usage Tables - LED page. 34 34 */ 35 #ifndef LIBUSB _UTLED_H_36 #define LIBUSB _UTLED_H_35 #ifndef LIBUSBHID_UTLED_H_ 36 #define LIBUSBHID_UTLED_H_ 37 37 38 38 typedef enum {
Note:
See TracChangeset
for help on using the changeset viewer.
