Changeset 2586860 in mainline for uspace/lib


Ignore:
Timestamp:
2011-05-17T12:47:11Z (14 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
Files:
2 deleted
29 edited
20 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbdev/include/usb/dev/dp.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB descriptor parser.
    3434 */
    35 #ifndef LIBUSB_DP_H_
    36 #define LIBUSB_DP_H_
     35#ifndef LIBUSBDEV_DP_H_
     36#define LIBUSBDEV_DP_H_
    3737
    3838#include <sys/types.h>

  • uspace/lib/usbdev/include/usb/dev/driver.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB device driver framework.
    3434 */
    35 #ifndef LIBUSB_DEVDRV_H_
    36 #define LIBUSB_DEVDRV_H_
     35#ifndef LIBUSBDEV_DRIVER_H_
     36#define LIBUSBDEV_DRIVER_H_
    3737
    38 #include <usb/pipes.h>
     38#include <usb/dev/pipes.h>
    3939
    4040/** Descriptors for USB device. */

  • uspace/lib/usbdev/include/usb/dev/hc.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * General communication between device drivers and host controller driver.
    3434 */
    35 #ifndef LIBUSB_USBDEVICE_H_
    36 #define LIBUSB_USBDEVICE_H_
     35#ifndef LIBUSBDEV_HC_H_
     36#define LIBUSBDEV_HC_H_
    3737
    3838#include <sys/types.h>

  • uspace/lib/usbdev/include/usb/dev/hub.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3535 * For class specific requests, see usb/classes/hub.h.
    3636 */
    37 #ifndef LIBUSB_HUB_H_
    38 #define LIBUSB_HUB_H_
     37#ifndef LIBUSBDEV_HUB_H_
     38#define LIBUSBDEV_HUB_H_
    3939
    4040#include <sys/types.h>
    41 #include <usb/usbdevice.h>
     41#include <usb/dev/hc.h>
    4242
    4343int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,

  • uspace/lib/usbdev/include/usb/dev/pipes.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB pipes representation.
    3434 */
    35 #ifndef LIBUSB_PIPES_H_
    36 #define LIBUSB_PIPES_H_
     35#ifndef LIBUSBDEV_PIPES_H_
     36#define LIBUSBDEV_PIPES_H_
    3737
    3838#include <sys/types.h>
    3939#include <usb/usb.h>
    40 #include <usb/usbdevice.h>
     40#include <usb/dev/hc.h>
    4141#include <usb/descriptor.h>
    4242#include <ipc/devman.h>

  • uspace/lib/usbdev/include/usb/dev/poll.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB device polling functions.
    3434 */
    35 #ifndef LIBUSB_DEVPOLL_H_
    36 #define LIBUSB_DEVPOLL_H_
     35#ifndef LIBUSBDEV_POLL_H_
     36#define LIBUSBDEV_POLL_H_
    3737
    38 #include <usb/devdrv.h>
     38#include <usb/dev/driver.h>
    3939#include <time.h>
    4040

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

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB device recognition.
    3434 */
    35 #ifndef LIBUSB_RECOGNISE_H_
    36 #define LIBUSB_RECOGNISE_H_
     35#ifndef LIBUSBDEV_RECOGNISE_H_
     36#define LIBUSBDEV_RECOGNISE_H_
    3737
    3838#include <sys/types.h>
    3939#include <usb/usb.h>
    40 #include <usb/pipes.h>
     40#include <usb/dev/pipes.h>
    4141#include <ipc/devman.h>
    4242

  • uspace/lib/usbdev/include/usb/dev/request.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * Standard USB requests.
    3434 */
    35 #ifndef LIBUSB_REQUEST_H_
    36 #define LIBUSB_REQUEST_H_
     35#ifndef LIBUSBDEV_REQUEST_H_
     36#define LIBUSBDEV_REQUEST_H_
    3737
    3838#include <sys/types.h>
    3939#include <l18n/langs.h>
    4040#include <usb/usb.h>
    41 #include <usb/pipes.h>
     41#include <usb/dev/pipes.h>
    4242#include <usb/descriptor.h>
    4343

  • uspace/lib/usbdev/src/altiface.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * Handling alternate interface settings.
    3434 */
    35 #include <usb/devdrv.h>
    36 #include <usb/request.h>
     35#include <usb/dev/driver.h>
     36#include <usb/dev/request.h>
    3737#include <usb/debug.h>
    38 #include <usb/dp.h>
     38#include <usb/dev/dp.h>
    3939#include <errno.h>
    4040#include <str_error.h>

  • uspace/lib/usbdev/src/devdrv.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB device driver framework.
    3434 */
    35 #include <usb/devdrv.h>
    36 #include <usb/request.h>
     35#include <usb/dev/driver.h>
     36#include <usb/dev/request.h>
    3737#include <usb/debug.h>
    38 #include <usb/dp.h>
     38#include <usb/dev/dp.h>
    3939#include <errno.h>
    4040#include <str_error.h>

  • uspace/lib/usbdev/src/devpoll.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * USB device driver framework - automatic interrupt polling.
    3434 */
    35 #include <usb/devpoll.h>
    36 #include <usb/request.h>
     35#include <usb/dev/poll.h>
     36#include <usb/dev/request.h>
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>

  • uspace/lib/usbdev/src/dp.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    4646#include <assert.h>
    4747#include <bool.h>
    48 #include <usb/dp.h>
     48#include <usb/dev/dp.h>
    4949#include <usb/descriptor.h>
    5050

  • uspace/lib/usbdev/src/hub.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * Functions needed by hub drivers.
    3434 */
    35 #include <usb/hub.h>
    36 #include <usb/pipes.h>
    37 #include <usb/request.h>
    38 #include <usb/recognise.h>
     35#include <usb/dev/hub.h>
     36#include <usb/dev/pipes.h>
     37#include <usb/dev/request.h>
     38#include <usb/dev/recognise.h>
    3939#include <usbhc_iface.h>
    4040#include <errno.h>

  • uspace/lib/usbdev/src/pipepriv.c

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

  • uspace/lib/usbdev/src/pipepriv.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * Library internal functions on USB pipes.
    3434 */
    35 #ifndef LIBUSB_PIPEPRIV_H_
    36 #define LIBUSB_PIPEPRIV_H_
     35#ifndef LIBUSBDEV_PIPEPRIV_H_
     36#define LIBUSBDEV_PIPEPRIV_H_
    3737
    38 #include <usb/pipes.h>
     38#include <usb/dev/pipes.h>
    3939#include <bool.h>
    4040

  • uspace/lib/usbdev/src/pipes.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3434 */
    3535#include <usb/usb.h>
    36 #include <usb/pipes.h>
     36#include <usb/dev/pipes.h>
    3737#include <usb/debug.h>
    3838#include <usb/driver.h>

  • uspace/lib/usbdev/src/pipesinit.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3535 */
    3636#include <usb/usb.h>
    37 #include <usb/pipes.h>
    38 #include <usb/dp.h>
    39 #include <usb/request.h>
     37#include <usb/dev/pipes.h>
     38#include <usb/dev/dp.h>
     39#include <usb/dev/request.h>
    4040#include <usbhc_iface.h>
    4141#include <errno.h>

  • uspace/lib/usbdev/src/pipesio.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    4545 */
    4646#include <usb/usb.h>
    47 #include <usb/pipes.h>
     47#include <usb/dev/pipes.h>
    4848#include <errno.h>
    4949#include <assert.h>
    5050#include <usbhc_iface.h>
    51 #include <usb/request.h>
     51#include <usb/dev/request.h>
    5252#include "pipepriv.h"
    5353

  • uspace/lib/usbdev/src/recognise.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3535#include <sys/types.h>
    3636#include <fibril_synch.h>
    37 #include <usb/pipes.h>
    38 #include <usb/recognise.h>
     37#include <usb/dev/pipes.h>
     38#include <usb/dev/recognise.h>
    3939#include <usb/ddfiface.h>
    40 #include <usb/request.h>
     40#include <usb/dev/request.h>
    4141#include <usb/classes/classes.h>
    4242#include <stdio.h>

  • uspace/lib/usbdev/src/request.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3333 * Standard USB requests (implementation).
    3434 */
    35 #include <usb/request.h>
     35#include <usb/dev/request.h>
    3636#include <errno.h>
    3737#include <assert.h>

  • uspace/lib/usbdev/src/usbdevice.c

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */
    … …  
    3636#include <async.h>
    3737#include <usb_iface.h>
    38 #include <usb/usbdevice.h>
     38#include <usb/dev/hc.h>
    3939#include <usb/driver.h>
    4040#include <usb/debug.h>

  • 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/*----------------------------------------------------------------------------*/

  • uspace/lib/usbhost/Makefile

    r3375bd4 r2586860  
    3535
    3636SOURCES = \
    37         src/addrkeep.c \
    3837        src/batch.c \
    3938        src/device_keeper.c \

  • uspace/lib/usbhost/include/usb/host/batch.h

    r3375bd4 r2586860  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 /** @addtogroup libusb
     28/** @addtogroup libusbhost
    2929 * @{
    3030 */
    … …  
    3232 * USB transfer transaction structures.
    3333 */
    34 #ifndef LIBUSB_HOST_BATCH_H
    35 #define LIBUSB_HOST_BATCH_H
     34#ifndef LIBUSBHOST_HOST_BATCH_H
     35#define LIBUSBHOST_HOST_BATCH_H
    3636
    3737#include <adt/list.h>

  • uspace/lib/usbhost/include/usb/host/device_keeper.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhost
    3030 * @{
    3131 */
    … …  
    3838 * This structure shall simplify the management.
    3939 */
    40 #ifndef LIBUSB_HOST_DEVICE_KEEPER_H
    41 #define LIBUSB_HOST_DEVICE_KEEPER_H
     40#ifndef LIBUSBHOST_HOST_DEVICE_KEEPER_H
     41#define LIBUSBHOST_HOST_DEVICE_KEEPER_H
    4242
    4343#include <adt/list.h>

  • uspace/lib/usbhost/include/usb/host/endpoint.h

    r3375bd4 r2586860  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbhost
    3030 * @{
    3131 */
    … …  
    3333 *
    3434 */
    35 #ifndef LIBUSB_HOST_ENDPOINT_H
    36 #define LIBUSB_HOST_ENDPOINT_H
     35#ifndef LIBUSBHOST_HOST_ENDPOINT_H
     36#define LIBUSBHOST_HOST_ENDPOINT_H
    3737
    3838#include <assert.h>

  • uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

    r3375bd4 r2586860  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 /** @addtogroup libusb
     28/** @addtogroup libusbhost
    2929 * @{
    3030 */
    … …  
    3737 * This structure shall simplify the management.
    3838 */
    39 #ifndef LIBUSB_HOST_USB_ENDPOINT_MANAGER_H
    40 #define LIBUSB_HOST_YSB_ENDPOINT_MANAGER_H
     39#ifndef LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
     40#define LIBUSBHOST_HOST_YSB_ENDPOINT_MANAGER_H
    4141
    4242#include <stdlib.h>

  • uspace/lib/usbhost/src/batch.c

    r3375bd4 r2586860  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 /** @addtogroup libusb
     28/** @addtogroup libusbhost
    2929 * @{
    3030 */

  • uspace/lib/usbhost/src/device_keeper.c

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

  • uspace/lib/usbvirt/include/usbvirt/device.h

    r3375bd4 r2586860  
    3737
    3838#include <usb/usb.h>
    39 #include <usb/request.h>
     39#include <usb/dev/request.h>
    4040
    4141/** Maximum number of endpoints supported by virtual USB. */

  • uspace/lib/usbvirt/src/ctrltransfer.c

    r3375bd4 r2586860  
    3434 */
    3535#include "private.h"
    36 #include <usb/request.h>
     36#include <usb/dev/request.h>
    3737#include <usb/debug.h>
    3838#include <assert.h>

  • uspace/lib/usbvirt/src/stdreq.c

    r3375bd4 r2586860  
    3434 */
    3535#include "private.h"
    36 #include <usb/request.h>
     36#include <usb/dev/request.h>
    3737#include <assert.h>
    3838#include <errno.h>
Note: See TracChangeset for help on using the changeset viewer.