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

Changeset e8f826b in mainline


Ignore:
Timestamp:
2011-05-20T20:29:27Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
400735e, c9256c5
Parents:
96f2aa6
Message:

Merged headers in libusb

Location:
uspace
Files:
2 deleted
8 edited

Legend:

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

    r96f2aa6 re8f826b  
    4646#include <usb/dev/hub.h>
    4747#include <usb/hc.h>
    48 #include <usb/driver.h>
    4948#include <usb/dev/pipes.h>
    5049
  • uspace/app/usbinfo/main.c

    r96f2aa6 re8f826b  
    4444#include <devmap.h>
    4545#include <usb/hc.h>
    46 #include <usb/driver.h>
    4746#include <usb/dev/pipes.h>
    48 #include <usb/driver.h>
    4947#include "usbinfo.h"
    5048
  • uspace/lib/usb/Makefile

    r96f2aa6 re8f826b  
    3737        src/ddfiface.c \
    3838        src/debug.c \
    39         src/driver.c \
    4039        src/dump.c \
    4140        src/hc.c \
  • uspace/lib/usb/include/usb/hc.h

    r96f2aa6 re8f826b  
    6262int usb_hc_get_address_by_handle(devman_handle_t);
    6363
     64int usb_hc_find(devman_handle_t, devman_handle_t *);
     65
     66int usb_resolve_device_handle(const char *, devman_handle_t *, usb_address_t *,
     67    devman_handle_t *);
     68
    6469int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
    6570
  • uspace/lib/usb/src/ddfiface.c

    r96f2aa6 re8f826b  
    3737#include <async.h>
    3838#include <usb/ddfiface.h>
    39 #include <usb/driver.h>
     39#include <usb/hc.h>
    4040#include <usb/debug.h>
    4141#include <errno.h>
  • uspace/lib/usb/src/hc.c

    r96f2aa6 re8f826b  
    3939#include <usbhc_iface.h>
    4040#include <usb/hc.h>
    41 #include <usb/driver.h>
    4241#include <usb/debug.h>
    4342#include <errno.h>
     
    232231}
    233232
     233/** Find host controller handle that is ancestor of given device.
     234 *
     235 * @param[in] device_handle Device devman handle.
     236 * @param[out] hc_handle Where to store handle of host controller
     237 *      controlling device with @p device_handle handle.
     238 * @return Error code.
     239 */
     240int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
     241{
     242        int parent_phone = devman_parent_device_connect(device_handle,
     243            IPC_FLAG_BLOCKING);
     244        if (parent_phone < 0) {
     245                return parent_phone;
     246        }
     247
     248        devman_handle_t h;
     249        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
     250            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
     251
     252        async_hangup(parent_phone);
     253
     254        if (rc != EOK) {
     255                return rc;
     256        }
     257
     258        if (hc_handle != NULL) {
     259                *hc_handle = h;
     260        }
     261
     262        return EOK;
     263}
     264
    234265/**
    235266 * @}
  • uspace/lib/usb/src/resolve.c

    r96f2aa6 re8f826b  
    3434 */
    3535#include <inttypes.h>
    36 #include <usb/driver.h>
    3736#include <usb/hc.h>
    3837#include <devman.h>
  • uspace/lib/usbdev/src/pipes.c

    r96f2aa6 re8f826b  
    3636#include <usb/dev/pipes.h>
    3737#include <usb/debug.h>
    38 #include <usb/driver.h>
     38#include <usb/hc.h>
    3939#include <usbhc_iface.h>
    4040#include <usb_iface.h>
Note: See TracChangeset for help on using the changeset viewer.