Changeset 4fe3b6d in mainline for uspace/lib/usbdev/src


Ignore:
Timestamp:
2011-05-20T11:07:00Z (15 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8bb61e6
Parents:
3476be8 (diff), 7941bd6 (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:

merge with development

Location:
uspace/lib/usbdev/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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>
    4141#include <assert.h>
    4242#include <usb/debug.h>
     43#include <time.h>
    4344
    4445/** How much time to wait between attempts to register endpoint 0:0.
    … …  
    218219
    219220        int rc;
     221        struct timeval start_time;
     222
     223        rc = gettimeofday(&start_time, NULL);
     224        if (rc != EOK) {
     225                return rc;
     226        }
    220227
    221228        rc = usb_hc_connection_open(&hc_conn);
    … …  
    264271                }
    265272        } while (rc != EOK);
     273        struct timeval end_time;
     274
     275        rc = gettimeofday(&end_time, NULL);
     276        if (rc != EOK) {
     277                goto leave_release_default_address;
     278        }
     279
     280        /* According to the USB spec part 9.1.2 host allows 100ms time for
     281         * the insertion process to complete. According to 7.1.7.1 this is the
     282         * time between attach detected and port reset. However, the setup done
     283         * above might use much of this time so we should only wait to fill
     284         * up the 100ms quota*/
     285        suseconds_t elapsed = tv_sub(&end_time, &start_time);
     286        if (elapsed < 100000) {
     287                async_usleep(100000 - elapsed);
     288        }
    266289
    267290        /*
    … …  
    273296                goto leave_release_default_address;
    274297        }
     298        /* USB spec 7.1.7.1: The USB System Software guarantees a minimum of
     299         * 10ms for reset recovery. Device response to any bus transactions
     300         * addressed to the default device address during the reset recovery
     301         * time is undefined.
     302         */
     303        async_usleep(10000);
    275304
    276305        rc = usb_pipe_probe_default_control(&ctrl_pipe);

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

    r3476be8 r4fe3b6d  
    2727 */
    2828
    29 /** @addtogroup libusb
     29/** @addtogroup libusbdev
    3030 * @{
    3131 */

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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

    r3476be8 r4fe3b6d  
    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

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