VirtualBox

Changeset 33540 in vbox for trunk/src/VBox/Devices/USB


Ignore:
Timestamp:
Oct 28, 2010 9:27:05 AM (14 years ago)
Author:
vboxsync
Message:

*: spelling fixes, thanks Timeless!

Location:
trunk/src/VBox/Devices/USB
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/USB/DevOHCI.cpp

    r33419 r33540  
    5656 * routine (ohciRhXferComplete) carries out a number of tasks:
    5757 *      -# Retires the TD associated with the transfer, setting the
    58  *         relevent error code etc.
     58 *         relevant error code etc.
    5959 *      -# Updates done-queue interrupt timer and potentially causes
    6060 *         a writeback of the done-queue.
    … …  
    394394    /** HeadP - TD Queue head pointer. Bit 0 - Halted, Bit 1 - toggleCarry. Bit 2&3 - 0. */
    395395    uint32_t HeadP;
    396     /** NextED - Next Endpoint Desciptor. Bits 0-3 ignored / preserved. */
     396    /** NextED - Next Endpoint Descriptor. Bits 0-3 ignored / preserved. */
    397397    uint32_t NextED;
    398398} OHCIED, *POHCIED;
    … …  
    860860
    861861/**
    862  * Get the number of avilable ports in the hub.
     862 * Get the number of available ports in the hub.
    863863 *
    864864 * @returns The number of ports available.
    … …  
    10041004
    10051005    /*
    1006      * We're prending to _reattach_ the device without resetting them.
     1006     * We're pending to _reattach_ the device without resetting them.
    10071007     * Except, during VM reset where we use the opportunity to do a proper
    10081008     * reset before the guest comes along and expect things.
    10091009     *
    10101010     * However, it's very very likely that we're not doing the right thing
    1011      * here if comming from the guest (USB Reset state). The docs talks about
     1011     * here if coming from the guest (USB Reset state). The docs talks about
    10121012     * root hub resetting, however what exact behaviour in terms of root hub
    10131013     * status and changed bits, and HC interrupts aren't stated clearly. IF we
    … …  
    17731773 * This is called upon completion to adjust the sector lengths if
    17741774 * the total length has changed. (received less then we had space for
    1775  * or a parital transfer.)
     1775 * or a partial transfer.)
    17761776 *
    17771777 * @param   pBuf        The buffer to update. cbTotal contains the new total on input.
    … …  
    18921892            {
    18931893                /*
    1894                  * It's proably somewhere in the list, not a unlikely situation with
     1894                 * It's probably somewhere in the list, not a unlikely situation with
    18951895                 * the current isochronous code.
    18961896                 */
    … …  
    24552455        ohciRhXferCompleteGeneralURB(pOhci, pUrb, &Ed, cFmAge);
    24562456
    2457     /* finaly write back the endpoint descriptor. */
     2457    /* finally write back the endpoint descriptor. */
    24582458    ohciWriteEd(pOhci, pUrb->Hci.EdAddr, &Ed);
    24592459}
    … …  
    24642464 *
    24652465 * VUSB calls this when a transfer attempt failed. This function will respond
    2466  * indicating wheter to retry or complete the URB with failure.
     2466 * indicating whether to retry or complete the URB with failure.
    24672467 *
    24682468 * @returns true if the URB should be retired.
    … …  
    25382538
    25392539    /*
    2540      * Determin the direction.
     2540     * Determine the direction.
    25412541     */
    25422542    VUSBDIRECTION enmDir;
    … …  
    26932693
    26942694    /*
    2695      * Determin the direction.
     2695     * Determine the direction.
    26962696     */
    26972697    VUSBDIRECTION enmDir;
    … …  
    30123012    /*
    30133013     * We currently process this as if the guest follows the interrupt end point chaining
    3014      * hiearchy described in the documenation. This means that for an isochronous endpoint
     3014     * hierarchy described in the documenation. This means that for an isochronous endpoint
    30153015     * with a 1 ms interval we expect to find in-flight TDs at the head of the list. We will
    30163016     * skip over all in-flight TDs which timeframe has been exceed. Those which aren't in
    … …  
    30823082             * Windows will, upon the completion of another ITD it seems, check for if
    30833083             * any other TDs has been unlinked. If we unlink them before they really
    3084              * complete all the packet status codes will be NotAccesed and Windows
     3084             * complete all the packet status codes will be NotAccessed and Windows
    30853085             * will fail the URB with status USBD_STATUS_ISOCH_REQUEST_FAILED.
    30863086             *
    … …  
    31043104             * If it's in flight we will try unlink it from the list prematurely to
    31053105             * help the guest to move on and shorten the list we have to walk. We currently
    3106              * are successfull with the first URB but then it goes too slowly...
     3106             * are successful with the first URB but then it goes too slowly...
    31073107             */
    31083108            int iInFlight = ohci_in_flight_find(pOhci, ITdAddr);
    … …  
    36663666    VUSBIRhReapAsyncUrbs(pOhci->RootHub.pIRhConn, 0);
    36673667
    3668     /* Frame boundary, so do EOF stuf here */
     3668    /* Frame boundary, so do EOF stuff here */
    36693669    bump_frame_number(pOhci);
    36703670    if ( (pOhci->dqic != 0x7) && (pOhci->dqic != 0) )
    … …  
    40194019          chg & RT_BIT(30) ? "*" : "", (res >> 30) & 1,
    40204020          chg & RT_BIT(31) ? "*" : "", (res >> 31) & 1));
    4021     /* Don't bitch about invalid bits here since it makes sense to disble
     4021    /* Don't bitch about invalid bits here since it makes sense to disable
    40224022     * interrupts you don't know about. */
    40234023
    … …  
    42744274/**
    42754275 * Read the HcPeriodicStart register.
    4276  * The register determins when in a frame to switch from control&bulk to periodic lists.
     4276 * The register determines when in a frame to switch from control&bulk to periodic lists.
    42774277 */
    42784278static int HcPeriodicStart_r(POHCI pOhci, uint32_t iReg, uint32_t *pu32Value)
    … …  
    42854285/**
    42864286 * Write to the HcPeriodicStart register.
    4287  * The register determins when in a frame to switch from control&bulk to periodic lists.
     4287 * The register determines when in a frame to switch from control&bulk to periodic lists.
    42884288 */
    42894289static int HcPeriodicStart_w(POHCI pOhci, uint32_t iReg, uint32_t val)
    … …  
    45244524    if (!pPort)
    45254525    {
    4526         Assert(pPort); /* sometimes happends because of #1510 */
     4526        Assert(pPort); /* sometimes happens because of #1510 */
    45274527        return;
    45284528    }
    … …  
    45444544        {
    45454545            /*
    4546              * Damn, something weird happend during reset. We'll pretend the user did an
    4547              * incredible fast reconnect or something. (prolly not gonna work)
     4546             * Damn, something weird happened during reset. We'll pretend the user did an
     4547             * incredible fast reconnect or something. (probably not gonna work)
    45484548             */
    45494549            Log2(("uchi_port_reset_done: The reset failed (rc=%Rrc)!!! Pretending reconnect at the speed of light.\n", rc));
    … …  
    50415041        }
    50425042    }
    5043     /* else: we ASSUME no device can be attached or detach in the periode
     5043    /* else: we ASSUME no device can be attached or detach in the period
    50445044     *       between a state load and the pLoad stuff is processed. */
    50455045    return rc;

  • trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

    r32010 r33540  
    3232 *
    3333 * The URB is created when the HCI calls the roothub (VUSB) method pfnNewUrb.
    34  * VUSB has a pool of URBs, if no free URBs are availabe a new one is
     34 * VUSB has a pool of URBs, if no free URBs are available a new one is
    3535 * allocated. The returned URB starts life in the ALLOCATED state and all
    36  * fields are initalized with sensible defaults.
     36 * fields are initialized with sensible defaults.
    3737 *
    3838 * The HCI then copies any request data into the URB if it's an host2dev
    … …  
    8585 * the STATUS stage.
    8686 *
    87  * To complicate matters futher, VUSB must intercept and in some cases emulate
     87 * To complicate matters further, VUSB must intercept and in some cases emulate
    8888 * some of the standard requests in order to keep the virtual device state
    8989 * correct and provide the correct virtualization of a device.

  • trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

    r31890 r33540  
    306306                break;
    307307
    308             /* Check we didnt see this alternate setting already
     308            /* Check we didn't see this alternate setting already
    309309             * because that will break stuff
    310310             */

  • trunk/src/VBox/Devices/USB/USBProxyDevice.h

    r32472 r33540  
    6767
    6868    /**
    69      * Optional callback for initalizing the device after the configuration
     69     * Optional callback for initializing the device after the configuration
    7070     * has been established.
    7171     *
    … …  
    183183    /** Pointer to the backend. */
    184184    PCUSBPROXYBACK      pOps;
    185     /** The currently active configration.
     185    /** The currently active configuration.
    186186     * It's -1 if no configuration is active. This is set to -1 before open and reset,
    187187     * the backend will change it if open or reset implies SET_CONFIGURATION. */

  • trunk/src/VBox/Devices/USB/VUSBDevice.cpp

    r32010 r33540  
    13021302
    13031303    /*
    1304      * We use a timer to commuicate the result back to EMT.
     1304     * We use a timer to communicate the result back to EMT.
    13051305     * This avoids suspend + poweroff issues, and it should give
    13061306     * us more accurate scheduling than making this thread sleep.

  • trunk/src/VBox/Devices/USB/VUSBUrb.cpp

    r32431 r33540  
    11801180/**
    11811181 * Queues an URB for asynchronous transfer.
    1182  * A list of asynchornous URBs is kept by the roothub.
     1182 * A list of asynchronous URBs is kept by the roothub.
    11831183 *
    11841184 * @returns VBox status code (from pfnUrbQueue).
    … …  
    12821282 * Callback to free a cancelled message URB.
    12831283 *
    1284  * This is yet another place we're we have to performce acrobatics to
     1284 * This is yet another place we're we have to performance acrobatics to
    12851285 * deal with cancelled URBs. sigh.
    12861286 *

  • trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

    r31890 r33540  
    11791179
    11801180                                /*
    1181                                  * Determin the active configuration.
     1181                                 * Determine the active configuration.
    11821182                                 * Can cause hangs, so drop it for now.
    11831183                                 */
    … …  
    17741774
    17751775    /*
    1776      * Determin the interface / endpoint ref and invoke AbortPipe.
     1776     * Determine the interface / endpoint ref and invoke AbortPipe.
    17771777     */
    17781778    IOReturn irc = kIOReturnSuccess;

  • trunk/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp

    r31890 r33540  
    129129 * Wrapper for the ioctl call.
    130130 *
    131  * This wrapper will repeate the call if we get an EINTR or EAGAIN. It can also
     131 * This wrapper will repeat the call if we get an EINTR or EAGAIN. It can also
    132132 * handle ENODEV (detached device) errors.
    133133 *
    … …  
    521521        usbProxyFreeBSDEndpointClose(pProxyDev, i);
    522522
    523     /* We need to release kernel ressources first. */
     523    /* We need to release kernel resources first. */
    524524    struct usb_fs_uninit UsbFsUninit;
    525525    UsbFsUninit.dummy = 0;
    … …  
    536536#endif
    537537
    538     /* Allocate kernel ressources again. */
     538    /* Allocate kernel resources again. */
    539539    struct usb_fs_init UsbFsInit;
    540540
    … …  
    587587        usbProxyFreeBSDEndpointClose(pProxyDev, i);
    588588
    589     /* We need to release kernel ressources first. */
     589    /* We need to release kernel resources first. */
    590590    struct usb_fs_uninit UsbFsUninit;
    591591    UsbFsUninit.dummy = 0;
    … …  
    596596    int iCfgIndex = 0;
    597597
    598     /* Get theconfiguration index matching the value. */
     598    /* Get the configuration index matching the value. */
    599599    for (iCfgIndex = 0; iCfgIndex < pProxyDev->DevDesc.bNumConfigurations; iCfgIndex++)
    600600    {
    … …  
    617617    }
    618618
    619     /* Allocate kernel ressources again. */
     619    /* Allocate kernel resources again. */
    620620    struct usb_fs_init UsbFsInit;
    621621
    … …  
    681681        usbProxyFreeBSDEndpointClose(pProxyDev, i);
    682682
    683     /* We need to release kernel ressources first. */
     683    /* We need to release kernel resources first. */
    684684    struct usb_fs_uninit UsbFsUninit;
    685685    UsbFsUninit.dummy = 0;
    … …  
    698698    }
    699699
    700     /* Allocate kernel ressources again. */
     700    /* Allocate kernel resources again. */
    701701    struct usb_fs_init UsbFsInit;
    702702

  • trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

    r32472 r33540  
    175175 * Wrapper for the ioctl call.
    176176 *
    177  * This wrapper will repeate the call if we get an EINTR or EAGAIN. It can also
     177 * This wrapper will repeat the call if we get an EINTR or EAGAIN. It can also
    178178 * handle ENODEV (detached device) errors.
    179179 *
    … …  
    716716
    717717    /*
    718      * Determin the active configuration.
     718     * Determine the active configuration.
    719719     *
    720720     * If there isn't any active configuration, we will get EHOSTUNREACH (113) errors
    … …  
    10501050
    10511051    /*
    1052      * This is the alternative, we will allways reset when asked to do so.
     1052     * This is the alternative, we will always reset when asked to do so.
    10531053     *
    10541054     * The problem we're facing here is that on reset failure linux will do
    … …  
    16241624        }
    16251625#if 0
    1626         /* Disabled for the time beeing as some USB devices have URBs pending for an unknown amount of time.
     1626        /* Disabled for the time being as some USB devices have URBs pending for an unknown amount of time.
    16271627         * One example is the OmniKey CardMan 3821. */
    16281628        else if (u64MilliTS - pCur->u64SubmitTS >= 200*1000 /* 200 sec (180 sec has been observed with XP) */)

  • trunk/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp

    r31890 r33540  
    487487
    488488    /*
    489      * Try open (aquire) it.
     489     * Try open (acquire) it.
    490490     */
    491491    USBHANDLE hDevice = 0;
    … …  
    510510
    511511                    /** @todo
    512                      * Determin the active configuration.
     512                     * Determine the active configuration.
    513513                     */
    514514                    //pProxyDev->cIgnoreSetConfigs = 1;

  • trunk/src/VBox/Devices/USB/testcase/tstPalmOne.c

    r31890 r33540  
    296296//    reset_ep(6);
    297297
    298     /* This seems to be some kind of 'indentify device' request. */
     298    /* This seems to be some kind of 'identify device' request. */
    299299    uint8_t abVendor[0x14] = {0};
    300300    int cb = doctrl(VUSB_DIR_TO_HOST | VUSB_REQ_VENDOR | VUSB_TO_ENDPOINT,
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette