Changeset 2586860 in mainline for uspace/lib/usbhid


Ignore:
Timestamp:
2011-05-17T12:47:11Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
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.
Message:

Finish libusb reorganization

Location:
uspace/lib/usbhid
Files:
6 edited
12 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbhid/include/usb/hid/hid.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * @brief USB HID device related types.
    3434 */
    35 #ifndef LIBUSB_HID_H_
    36 #define LIBUSB_HID_H_
     35#ifndef LIBUSBHID_HID_H_
     36#define LIBUSBHID_HID_H_
    3737
    3838#include <usb/usb.h>
    39 #include <usb/classes/hidparser.h>
     39#include <usb/hid/hidparser.h>
    4040#include <usb/descriptor.h>
    4141

  • uspace/lib/usbhid/include/usb/hid/hid_report_items.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * @brief USB HID parser.
    3434 */
    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_
    3737
    3838#include <stdint.h>

  • uspace/lib/usbhid/include/usb/hid/hiddescriptor.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * USB HID report descriptor and report data parser
    3434 */
    35 #ifndef LIBUSB_HIDDESCRIPTOR_H_
    36 #define LIBUSB_HIDDESCRIPTOR_H_
     35#ifndef LIBUSBHID_HIDDESCRIPTOR_H_
     36#define LIBUSBHID_HIDDESCRIPTOR_H_
    3737
    3838#include <stdint.h>
    3939#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>
    4343
    4444

  • uspace/lib/usbhid/include/usb/hid/hidparser.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * USB HID report descriptor and report data parser
    3434 */
    35 #ifndef LIBUSB_HIDPARSER_H_
    36 #define LIBUSB_HIDPARSER_H_
     35#ifndef LIBUSBHID_HIDPARSER_H_
     36#define LIBUSBHID_HIDPARSER_H_
    3737
    3838#include <stdint.h>
    3939#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>
    4444
    4545

  • uspace/lib/usbhid/include/usb/hid/hidpath.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * USB HID report descriptor and report data parser
    3434 */
    35 #ifndef LIBUSB_HIDPATH_H_
    36 #define LIBUSB_HIDPATH_H_
     35#ifndef LIBUSBHID_HIDPATH_H_
     36#define LIBUSBHID_HIDPATH_H_
    3737
    38 #include <usb/classes/hidparser.h>
     38#include <usb/hid/hidparser.h>
    3939#include <stdint.h>
    4040#include <adt/list.h>

  • uspace/lib/usbhid/include/usb/hid/hidreport.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3434 */
    3535
    36 #ifndef LIBUSB_HIDREPORT_H_
    37 #define LIBUSB_HIDREPORT_H_
     36#ifndef LIBUSBHID_HIDREPORT_H_
     37#define LIBUSBHID_HIDREPORT_H_
    3838
    39 #include <usb/devdrv.h>
    40 #include <usb/classes/hidparser.h>
     39#include <usb/dev/driver.h>
     40#include <usb/hid/hidparser.h>
    4141
    4242/**

  • uspace/lib/usbhid/include/usb/hid/hidtypes.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * USB HID report descriptor and report data parser
    3434 */
    35 #ifndef LIBUSB_HIDTYPES_H_
    36 #define LIBUSB_HIDTYPES_H_
     35#ifndef LIBUSBHID_HIDTYPES_H_
     36#define LIBUSBHID_HIDTYPES_H_
    3737
    3838#include <stdint.h>

  • uspace/lib/usbhid/include/usb/hid/iface.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * Client functions for accessing USB HID interface.
    3434 */
    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_
    3737
    3838#include <sys/types.h>

  • uspace/lib/usbhid/include/usb/hid/request.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3939#include <stdint.h>
    4040
    41 #include <usb/classes/hid.h>
    42 #include <usb/pipes.h>
     41#include <usb/hid/hid.h>
     42#include <usb/dev/pipes.h>
    4343
    4444/*----------------------------------------------------------------------------*/

  • uspace/lib/usbhid/include/usb/hid/usages/core.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * @brief USB HID Usage Tables.
    3434 */
    35 #ifndef LIBUSB_HIDUT_H_
    36 #define LIBUSB_HIDUT_H_
     35#ifndef LIBUSBHID_HIDUT_H_
     36#define LIBUSBHID_HIDUT_H_
    3737
    3838/** USB/HID Usage Pages. */

  • uspace/lib/usbhid/include/usb/hid/usages/kbdgen.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */

  • uspace/lib/usbhid/include/usb/hid/usages/led.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * @brief USB HID Usage Tables - LED page.
    3434 */
    35 #ifndef LIBUSB_UTLED_H_
    36 #define LIBUSB_UTLED_H_
     35#ifndef LIBUSBHID_UTLED_H_
     36#define LIBUSBHID_UTLED_H_
    3737
    3838typedef enum {

  • uspace/lib/usbhid/src/hiddescriptor.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * HID report descriptor and report data parser implementation.
    3434 */
    35 #include <usb/classes/hidparser.h>
     35#include <usb/hid/hidparser.h>
    3636#include <errno.h>
    3737#include <stdio.h>

  • uspace/lib/usbhid/src/hidiface.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3535#include <dev_iface.h>
    3636#include <usbhid_iface.h>
    37 #include <usb/classes/hid/iface.h>
     37#include <usb/hid/iface.h>
    3838#include <errno.h>
    3939#include <str_error.h>

  • uspace/lib/usbhid/src/hidparser.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * HID report descriptor and report data parser implementation.
    3434 */
    35 #include <usb/classes/hidparser.h>
     35#include <usb/hid/hidparser.h>
    3636#include <errno.h>
    3737#include <stdio.h>

  • uspace/lib/usbhid/src/hidpath.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    3333 * HID report descriptor and report data parser implementation.
    3434 */
    35 #include <usb/classes/hidparser.h>
     35#include <usb/hid/hidparser.h>
    3636#include <errno.h>
    3737#include <stdio.h>

  • uspace/lib/usbhid/src/hidreport.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhid
    3030 * @{
    3131 */
    … …  
    4040
    4141#include <usb/debug.h>
    42 #include <usb/classes/hidparser.h>
    43 #include <usb/dp.h>
    44 #include <usb/devdrv.h>
    45 #include <usb/pipes.h>
    46 #include <usb/classes/hid.h>
     42#include <usb/hid/hidparser.h>
     43#include <usb/dev/dp.h>
     44#include <usb/dev/driver.h>
     45#include <usb/dev/pipes.h>
     46#include <usb/hid/hid.h>
    4747#include <usb/descriptor.h>
    48 #include <usb/request.h>
    49 
    50 #include <usb/classes/hidreport.h>
     48#include <usb/dev/request.h>
     49
     50#include <usb/hid/hidreport.h>
    5151
    5252static int usb_hid_get_report_descriptor(usb_device_t *dev,

  • uspace/lib/usbhid/src/hidreq.c

    r3375bd4 r2586860  
    3838#include <str_error.h>
    3939
    40 #include <usb/classes/hid.h>
     40#include <usb/hid/hid.h>
    4141#include <usb/debug.h>
    42 #include <usb/request.h>
    43 #include <usb/pipes.h>
    44 
    45 #include <usb/classes/hidreq.h>
     42#include <usb/dev/request.h>
     43#include <usb/dev/pipes.h>
     44
     45#include <usb/hid/request.h>
    4646
    4747/*----------------------------------------------------------------------------*/
Note: See TracChangeset for help on using the changeset viewer.