Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7d521e24 in mainline


Ignore:
Timestamp:
2011-05-17T08:54:43Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
9f2de92
Parents:
04c418d
Message:

libusbdev uses include usb/dev

Location:
uspace
Files:
61 edited
8 moved

Legend:

Unmodified
Added
Removed
  • uspace/app/lsusb/main.c

    r04c418d r7d521e24  
    4444#include <devman.h>
    4545#include <devmap.h>
    46 #include <usb/hub.h>
     46#include <usb/dev/hub.h>
    4747#include <usb/host.h>
    4848
  • uspace/app/usbinfo/desctree.c

    r04c418d r7d521e24  
    4747
    4848#include "usbinfo.h"
    49 #include <usb/dp.h>
     49#include <usb/dev/dp.h>
    5050
    5151static void browse_descriptor_tree_internal(usb_dp_parser_t *parser,
  • uspace/app/usbinfo/dev.c

    r04c418d r7d521e24  
    3434 * Representation of queried device.
    3535 */
    36 #include <usb/pipes.h>
     36#include <usb/dev/pipes.h>
    3737#include <errno.h>
    3838#include <str_error.h>
    39 #include <usb/request.h>
     39#include <usb/dev/request.h>
    4040#include "usbinfo.h"
    4141
  • uspace/app/usbinfo/dump.c

    r04c418d r7d521e24  
    4747
    4848#include "usbinfo.h"
    49 #include <usb/dp.h>
     49#include <usb/dev/dp.h>
    5050
    5151#define INDENT "  "
  • uspace/app/usbinfo/info.c

    r04c418d r7d521e24  
    3737#include <str_error.h>
    3838#include <errno.h>
    39 #include <usb/pipes.h>
    40 #include <usb/recognise.h>
    41 #include <usb/request.h>
     39#include <usb/dev/pipes.h>
     40#include <usb/dev/recognise.h>
     41#include <usb/dev/request.h>
    4242#include <usb/classes/classes.h>
    4343#include <usb/classes/hub.h>
  • uspace/app/usbinfo/main.c

    r04c418d r7d521e24  
    4343#include <devman.h>
    4444#include <devmap.h>
    45 #include <usb/usbdevice.h>
    46 #include <usb/pipes.h>
     45#include <usb/dev/hc.h>
     46#include <usb/dev/pipes.h>
    4747#include <usb/host.h>
    4848#include <usb/driver.h>
  • uspace/app/usbinfo/usbinfo.h

    r04c418d r7d521e24  
    3838#include <usb/usb.h>
    3939#include <usb/descriptor.h>
    40 #include <usb/pipes.h>
     40#include <usb/dev/pipes.h>
    4141#include <usb/debug.h>
    42 #include <usb/dp.h>
     42#include <usb/dev/dp.h>
    4343#include <ipc/devman.h>
    4444
  • uspace/drv/ohci/root_hub.c

    r04c418d r7d521e24  
    3939
    4040#include "root_hub.h"
    41 #include "usb/classes/classes.h"
    42 #include "usb/devdrv.h"
     41#include <usb/classes/classes.h>
     42#include <usb/dev/driver.h>
    4343#include "ohci_regs.h"
    4444
    45 #include <usb/request.h>
     45#include <usb/dev/request.h>
    4646#include <usb/classes/hub.h>
    4747
  • uspace/drv/ohci/root_hub.h

    r04c418d r7d521e24  
    3636
    3737#include <usb/usb.h>
    38 #include <usb/devdrv.h>
     38#include <usb/dev/driver.h>
    3939
    4040#include "ohci_regs.h"
  • uspace/drv/uhci-rhd/port.c

    r04c418d r7d521e24  
    4040
    4141#include <usb/usb.h>    /* usb_address_t */
    42 #include <usb/hub.h>    /* usb_hc_new_device_wrapper */
     42#include <usb/dev/hub.h>    /* usb_hc_new_device_wrapper */
    4343#include <usb/debug.h>
    4444
  • uspace/drv/uhci-rhd/port.h

    r04c418d r7d521e24  
    3838#include <fibril.h>
    3939#include <ddf/driver.h>
    40 #include <usb/usbdevice.h> /* usb_hc_connection_t */
     40#include <usb/dev/hc.h> /* usb_hc_connection_t */
    4141
    4242typedef uint16_t port_status_t;
  • uspace/drv/usbflbk/main.c

    r04c418d r7d521e24  
    3434 * Main routines of USB fallback driver.
    3535 */
    36 #include <usb/devdrv.h>
     36#include <usb/dev/driver.h>
    3737#include <usb/debug.h>
    3838#include <errno.h>
  • uspace/drv/usbhid/generic/hiddev.h

    r04c418d r7d521e24  
    3737#define USB_HID_HIDDDEV_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040
    4141struct usb_hid_dev;
  • uspace/drv/usbhid/kbd/kbddev.c

    r04c418d r7d521e24  
    4646
    4747#include <usb/usb.h>
    48 #include <usb/dp.h>
    49 #include <usb/request.h>
     48#include <usb/dev/dp.h>
     49#include <usb/dev/request.h>
    5050#include <usb/classes/hid.h>
    51 #include <usb/pipes.h>
     51#include <usb/dev/pipes.h>
    5252#include <usb/debug.h>
    5353#include <usb/classes/hidparser.h>
     
    5858#include <usb/classes/hid/utled.h>
    5959
    60 #include <usb/devdrv.h>
     60#include <usb/dev/driver.h>
    6161
    6262#include "kbddev.h"
  • uspace/drv/usbhid/kbd/kbddev.h

    r04c418d r7d521e24  
    4444#include <usb/classes/hidparser.h>
    4545#include <ddf/driver.h>
    46 #include <usb/pipes.h>
    47 #include <usb/devdrv.h>
     46#include <usb/dev/pipes.h>
     47#include <usb/dev/driver.h>
    4848
    4949#include "kbdrepeat.h"
  • uspace/drv/usbhid/kbd/main.c

    r04c418d r7d521e24  
    4141#include <str_error.h>
    4242
    43 #include <usb/devdrv.h>
     43#include <usb/dev/driver.h>
    4444
    4545#include "kbddev.h"
  • uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h

    r04c418d r7d521e24  
    3737#define USB_HID_LGTCH_ULTRAX_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040
    4141struct usb_hid_dev;
  • uspace/drv/usbhid/main.c

    r04c418d r7d521e24  
    4141#include <str_error.h>
    4242
    43 #include <usb/devdrv.h>
    44 #include <usb/devpoll.h>
     43#include <usb/dev/driver.h>
     44#include <usb/dev/poll.h>
    4545
    4646#include "usbhid.h"
  • uspace/drv/usbhid/mouse/mousedev.h

    r04c418d r7d521e24  
    3737#define USB_HID_MOUSEDEV_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040
    4141struct usb_hid_dev;
  • uspace/drv/usbhid/usbhid.h

    r04c418d r7d521e24  
    4141#include <usb/classes/hidparser.h>
    4242#include <ddf/driver.h>
    43 #include <usb/pipes.h>
    44 #include <usb/devdrv.h>
     43#include <usb/dev/pipes.h>
     44#include <usb/dev/driver.h>
    4545#include <usb/classes/hid.h>
    4646#include <bool.h>
  • uspace/drv/usbhub/main.c

    r04c418d r7d521e24  
    3636#include <stdio.h>
    3737
    38 #include <usb/devdrv.h>
     38#include <usb/dev/driver.h>
    3939#include <usb/classes/classes.h>
    4040
  • uspace/drv/usbhub/port_status.h

    r04c418d r7d521e24  
    3535#include <bool.h>
    3636#include <sys/types.h>
    37 #include <usb/request.h>
     37#include <usb/dev/request.h>
    3838#include "usbhub_private.h"
    3939
  • uspace/drv/usbhub/ports.h

    r04c418d r7d521e24  
    3636#define DRV_USBHUB_PORTS_H
    3737
    38 #include <usb/devdrv.h>
    39 #include <usb/hub.h>
     38#include <usb/dev/driver.h>
     39#include <usb/dev/hub.h>
    4040
    4141typedef struct usb_hub_info_t usb_hub_info_t;
  • uspace/drv/usbhub/usbhub.c

    r04c418d r7d521e24  
    4242#include <usb/ddfiface.h>
    4343#include <usb/descriptor.h>
    44 #include <usb/recognise.h>
    45 #include <usb/request.h>
     44#include <usb/dev/recognise.h>
     45#include <usb/dev/request.h>
    4646#include <usb/classes/hub.h>
    47 #include <usb/devpoll.h>
     47#include <usb/dev/poll.h>
    4848#include <stdio.h>
    4949
     
    5151#include "usbhub_private.h"
    5252#include "port_status.h"
    53 #include "usb/usb.h"
    54 #include "usb/pipes.h"
    55 #include "usb/classes/classes.h"
     53#include <usb/usb.h>
     54#include <usb/dev/pipes.h>
     55#include <usb/classes/classes.h>
    5656
    5757
  • uspace/drv/usbhub/usbhub.h

    r04c418d r7d521e24  
    3939#include <ddf/driver.h>
    4040
    41 #include <usb/hub.h>
     41#include <usb/dev/hub.h>
    4242#include <usb/classes/hub.h>
    4343
    44 #include <usb/pipes.h>
    45 #include <usb/devdrv.h>
     44#include <usb/dev/pipes.h>
     45#include <usb/dev/driver.h>
    4646
    4747#include <fibril_synch.h>
  • uspace/drv/usbhub/usbhub_private.h

    r04c418d r7d521e24  
    4747#include <usb/usb.h>
    4848#include <usb/debug.h>
    49 #include <usb/request.h>
     49#include <usb/dev/request.h>
    5050
    5151//************
  • uspace/drv/usbkbd/kbddev.c

    r04c418d r7d521e24  
    4646
    4747#include <usb/usb.h>
    48 #include <usb/dp.h>
    49 #include <usb/request.h>
     48#include <usb/dev/dp.h>
     49#include <usb/dev/request.h>
    5050#include <usb/classes/hid.h>
    51 #include <usb/pipes.h>
     51#include <usb/dev/pipes.h>
    5252#include <usb/debug.h>
    5353#include <usb/classes/hidparser.h>
     
    5858#include <usb/classes/hid/utled.h>
    5959
    60 #include <usb/devdrv.h>
     60#include <usb/dev/driver.h>
    6161
    6262#include "kbddev.h"
  • uspace/drv/usbkbd/kbddev.h

    r04c418d r7d521e24  
    4444#include <usb/classes/hidparser.h>
    4545#include <ddf/driver.h>
    46 #include <usb/pipes.h>
    47 #include <usb/devdrv.h>
     46#include <usb/dev/pipes.h>
     47#include <usb/dev/driver.h>
    4848
    4949#include "kbdrepeat.h"
  • uspace/drv/usbkbd/main.c

    r04c418d r7d521e24  
    4141#include <str_error.h>
    4242
    43 #include <usb/devdrv.h>
    44 #include <usb/devpoll.h>
     43#include <usb/dev/driver.h>
     44#include <usb/dev/poll.h>
    4545
    4646#include "kbddev.h"
  • uspace/drv/usbmast/inquiry.c

    r04c418d r7d521e24  
    3434 * Main routines of USB mass storage driver.
    3535 */
    36 #include <usb/devdrv.h>
     36#include <usb/dev/driver.h>
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
  • uspace/drv/usbmast/main.c

    r04c418d r7d521e24  
    3434 * Main routines of USB mass storage driver.
    3535 */
    36 #include <usb/devdrv.h>
     36#include <usb/dev/driver.h>
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
  • uspace/drv/usbmast/mast.c

    r04c418d r7d521e24  
    4040#include <str_error.h>
    4141#include <usb/debug.h>
    42 #include <usb/request.h>
     42#include <usb/dev/request.h>
    4343
    4444bool usb_mast_verbose = true;
  • uspace/drv/usbmast/mast.h

    r04c418d r7d521e24  
    3939#include <sys/types.h>
    4040#include <usb/usb.h>
    41 #include <usb/pipes.h>
    42 #include <usb/devdrv.h>
     41#include <usb/dev/pipes.h>
     42#include <usb/dev/driver.h>
    4343
    4444/** Result of SCSI INQUIRY command.
  • uspace/drv/usbmid/dump.c

    r04c418d r7d521e24  
    3737#include <str_error.h>
    3838#include <stdlib.h>
    39 #include <usb/pipes.h>
    40 #include <usb/dp.h>
     39#include <usb/dev/pipes.h>
     40#include <usb/dev/dp.h>
    4141#include <usb/classes/classes.h>
    4242#include "usbmid.h"
  • uspace/drv/usbmid/explore.c

    r04c418d r7d521e24  
    3838#include <stdlib.h>
    3939#include <usb/classes/classes.h>
    40 #include <usb/request.h>
    41 #include <usb/dp.h>
     40#include <usb/dev/request.h>
     41#include <usb/dev/dp.h>
    4242#include <usb/ddfiface.h>
    4343#include "usbmid.h"
  • uspace/drv/usbmid/main.c

    r04c418d r7d521e24  
    3838#include <usb/debug.h>
    3939#include <usb/classes/classes.h>
    40 #include <usb/request.h>
     40#include <usb/dev/request.h>
    4141#include <usb/descriptor.h>
    42 #include <usb/pipes.h>
     42#include <usb/dev/pipes.h>
    4343
    4444#include "usbmid.h"
  • uspace/drv/usbmid/usbmid.c

    r04c418d r7d521e24  
    3939#include <usb_iface.h>
    4040#include <usb/ddfiface.h>
    41 #include <usb/pipes.h>
     41#include <usb/dev/pipes.h>
    4242#include <usb/classes/classes.h>
    43 #include <usb/recognise.h>
     43#include <usb/dev/recognise.h>
    4444#include "usbmid.h"
    4545
  • uspace/drv/usbmid/usbmid.h

    r04c418d r7d521e24  
    4040#include <ddf/driver.h>
    4141#include <usb/usb.h>
    42 #include <usb/pipes.h>
     42#include <usb/dev/pipes.h>
    4343#include <usb/debug.h>
    44 #include <usb/devdrv.h>
     44#include <usb/dev/driver.h>
    4545
    4646#define NAME "usbmid"
  • uspace/drv/usbmouse/init.c

    r04c418d r7d521e24  
    3838#include <usb/classes/classes.h>
    3939#include <usb/classes/hid.h>
    40 #include <usb/request.h>
     40#include <usb/dev/request.h>
    4141#include <errno.h>
    4242
  • uspace/drv/usbmouse/main.c

    r04c418d r7d521e24  
    3636#include "mouse.h"
    3737#include <usb/debug.h>
    38 #include <usb/devpoll.h>
     38#include <usb/dev/poll.h>
    3939#include <errno.h>
    4040#include <str_error.h>
  • uspace/drv/usbmouse/mouse.h

    r04c418d r7d521e24  
    3737#define USBMOUSE_MOUSE_H_
    3838
    39 #include <usb/devdrv.h>
    40 #include <usb/pipes.h>
     39#include <usb/dev/driver.h>
     40#include <usb/dev/pipes.h>
    4141#include <time.h>
    4242
  • uspace/drv/vhc/hub.c

    r04c418d r7d521e24  
    4040#include <ddf/driver.h>
    4141#include <devman.h>
    42 #include <usb/hub.h>
    43 #include <usb/recognise.h>
     42#include <usb/dev/hub.h>
     43#include <usb/dev/recognise.h>
    4444
    4545#include "hub.h"
  • uspace/lib/usbdev/include/usb/dev/dp.h

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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.h

    r04c418d r7d521e24  
    3636#define LIBUSB_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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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/classes/hidreport.h

    r04c418d r7d521e24  
    3737#define LIBUSB_HIDREPORT_H_
    3838
    39 #include <usb/devdrv.h>
     39#include <usb/dev/driver.h>
    4040#include <usb/classes/hidparser.h>
    4141
  • uspace/lib/usbhid/include/usb/classes/hidreq.h

    r04c418d r7d521e24  
    4040
    4141#include <usb/classes/hid.h>
    42 #include <usb/pipes.h>
     42#include <usb/dev/pipes.h>
    4343
    4444/*----------------------------------------------------------------------------*/
  • uspace/lib/usbhid/src/hidreport.c

    r04c418d r7d521e24  
    4141#include <usb/debug.h>
    4242#include <usb/classes/hidparser.h>
    43 #include <usb/dp.h>
    44 #include <usb/devdrv.h>
    45 #include <usb/pipes.h>
     43#include <usb/dev/dp.h>
     44#include <usb/dev/driver.h>
     45#include <usb/dev/pipes.h>
    4646#include <usb/classes/hid.h>
    4747#include <usb/descriptor.h>
    48 #include <usb/request.h>
     48#include <usb/dev/request.h>
    4949
    5050#include <usb/classes/hidreport.h>
  • uspace/lib/usbhid/src/hidreq.c

    r04c418d r7d521e24  
    4040#include <usb/classes/hid.h>
    4141#include <usb/debug.h>
    42 #include <usb/request.h>
    43 #include <usb/pipes.h>
     42#include <usb/dev/request.h>
     43#include <usb/dev/pipes.h>
    4444
    4545#include <usb/classes/hidreq.h>
  • uspace/lib/usbvirt/include/usbvirt/device.h

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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

    r04c418d r7d521e24  
    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.