Changeset 2586860 in mainline for uspace/drv


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/drv
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ohci/root_hub.c

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    4646
    4747#include <usb/usb.h>
    48 #include <usb/dp.h>
    49 #include <usb/request.h>
    50 #include <usb/classes/hid.h>
    51 #include <usb/pipes.h>
     48#include <usb/dev/dp.h>
     49#include <usb/dev/request.h>
     50#include <usb/hid/hid.h>
     51#include <usb/dev/pipes.h>
    5252#include <usb/debug.h>
    53 #include <usb/classes/hidparser.h>
     53#include <usb/hid/hidparser.h>
    5454#include <usb/classes/classes.h>
    55 #include <usb/classes/hidut.h>
    56 #include <usb/classes/hidreq.h>
    57 #include <usb/classes/hidreport.h>
    58 #include <usb/classes/hid/utled.h>
    59 
    60 #include <usb/devdrv.h>
     55#include <usb/hid/usages/core.h>
     56#include <usb/hid/request.h>
     57#include <usb/hid/hidreport.h>
     58#include <usb/hid/usages/led.h>
     59
     60#include <usb/dev/driver.h>
    6161
    6262#include "kbddev.h"

  • uspace/drv/usbhid/kbd/kbddev.h

    r3375bd4 r2586860  
    4141#include <fibril_synch.h>
    4242
    43 #include <usb/classes/hid.h>
    44 #include <usb/classes/hidparser.h>
     43#include <usb/hid/hid.h>
     44#include <usb/hid/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

    r3375bd4 r2586860  
    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.c

    r3375bd4 r2586860  
    4040#include "keymap.h"
    4141
    42 #include <usb/classes/hidparser.h>
     42#include <usb/hid/hidparser.h>
    4343#include <usb/debug.h>
    44 #include <usb/classes/hidut.h>
     44#include <usb/hid/usages/core.h>
    4545
    4646#include <errno.h>

  • uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.h

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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.c

    r3375bd4 r2586860  
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
    39 #include <usb/classes/hid.h>
    40 #include <usb/classes/hidreq.h>
    41 #include <usb/classes/hidut.h>
     39#include <usb/hid/hid.h>
     40#include <usb/hid/request.h>
     41#include <usb/hid/usages/core.h>
    4242#include <errno.h>
    4343#include <str_error.h>

  • uspace/drv/usbhid/mouse/mousedev.h

    r3375bd4 r2586860  
    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/subdrivers.c

    r3375bd4 r2586860  
    3535
    3636#include "subdrivers.h"
    37 #include "usb/classes/hidut.h"
    38 #include "usb/classes/hidpath.h"
     37#include <usb/hid/usages/core.h>
     38#include <usb/hid/hidpath.h>
    3939
    4040#include "lgtch-ultrax/lgtch-ultrax.h"

  • uspace/drv/usbhid/usbhid.c

    r3375bd4 r2586860  
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
    39 #include <usb/classes/hid.h>
    40 #include <usb/classes/hidparser.h>
    41 #include <usb/classes/hidreport.h>
    42 #include <usb/classes/hidreq.h>
     39#include <usb/hid/hid.h>
     40#include <usb/hid/hidparser.h>
     41#include <usb/hid/hidreport.h>
     42#include <usb/hid/request.h>
    4343#include <errno.h>
    4444#include <str_error.h>

  • uspace/drv/usbhid/usbhid.h

    r3375bd4 r2586860  
    3939#include <stdint.h>
    4040
    41 #include <usb/classes/hidparser.h>
     41#include <usb/hid/hidparser.h>
    4242#include <ddf/driver.h>
    43 #include <usb/pipes.h>
    44 #include <usb/devdrv.h>
    45 #include <usb/classes/hid.h>
     43#include <usb/dev/pipes.h>
     44#include <usb/dev/driver.h>
     45#include <usb/hid/hid.h>
    4646#include <bool.h>
    4747

  • uspace/drv/usbhub/main.c

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    4646
    4747#include <usb/usb.h>
    48 #include <usb/dp.h>
    49 #include <usb/request.h>
    50 #include <usb/classes/hid.h>
    51 #include <usb/pipes.h>
     48#include <usb/dev/dp.h>
     49#include <usb/dev/request.h>
     50#include <usb/hid/hid.h>
     51#include <usb/dev/pipes.h>
    5252#include <usb/debug.h>
    53 #include <usb/classes/hidparser.h>
     53#include <usb/hid/hidparser.h>
    5454#include <usb/classes/classes.h>
    55 #include <usb/classes/hidut.h>
    56 #include <usb/classes/hidreq.h>
    57 #include <usb/classes/hidreport.h>
    58 #include <usb/classes/hid/utled.h>
    59 
    60 #include <usb/devdrv.h>
     55#include <usb/hid/usages/core.h>
     56#include <usb/hid/request.h>
     57#include <usb/hid/hidreport.h>
     58#include <usb/hid/usages/led.h>
     59
     60#include <usb/dev/driver.h>
    6161
    6262#include "kbddev.h"

  • uspace/drv/usbkbd/kbddev.h

    r3375bd4 r2586860  
    4141#include <fibril_synch.h>
    4242
    43 #include <usb/classes/hid.h>
    44 #include <usb/classes/hidparser.h>
     43#include <usb/hid/hid.h>
     44#include <usb/hid/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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    3737#include <usb/debug.h>
    3838#include <usb/classes/classes.h>
    39 #include <usb/classes/hid.h>
    40 #include <usb/request.h>
     39#include <usb/hid/hid.h>
     40#include <usb/dev/request.h>
    4141#include <errno.h>
    4242

  • uspace/drv/usbmouse/main.c

    r3375bd4 r2586860  
    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

    r3375bd4 r2586860  
    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/connhost.c

    r3375bd4 r2586860  
    3636#include <errno.h>
    3737#include <usb/usb.h>
    38 #include <usb/addrkeep.h>
    3938#include <usb/ddfiface.h>
    4039#include <usb/debug.h>

  • uspace/drv/vhc/hub.c

    r3375bd4 r2586860  
    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"
Note: See TracChangeset for help on using the changeset viewer.