Changeset 27ed734c in mainline for uspace/drv/bus


Ignore:
Timestamp:
2011-10-31T13:06:57Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5e07cbc0
Parents:
d25e0a4
Message:

usb: Rename get_address ⇒ get_my_address and remove redundant handle parameter.

If you want to know what address the device uses ask the device not host controller.

Location:
uspace/drv/bus/usb
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/ohci/ohci.c

    rd25e0a4 r27ed734c  
    7676}
    7777/*----------------------------------------------------------------------------*/
    78 /** Get address of the device identified by handle.
    79  *
    80  * @param[in] dev DDF instance of the device to use.
    81  * @param[in] iid (Unused).
    82  * @param[in] call Pointer to the call that represents interrupt.
    83  */
    84 static int usb_iface_get_address(
    85     ddf_fun_t *fun, devman_handle_t handle, usb_address_t *address)
     78/** Get USB address assigned to root hub.
     79 *
     80 * @param[in] fun Root hub function.
     81 * @param[out] address Store the address here.
     82 * @return Error code.
     83 */
     84static int rh_get_my_address(ddf_fun_t *fun, usb_address_t *address)
    8685{
    8786        assert(fun);
    88         assert(handle == 0);
    8987
    9088        if (address != NULL) {
    … …  
    10199 * @return Error code.
    102100 */
    103 static int usb_iface_get_hc_handle(
     101static int rh_get_hc_handle(
    104102    ddf_fun_t *fun, devman_handle_t *handle)
    105103{
    … …  
    115113/** Root hub USB interface */
    116114static usb_iface_t usb_iface = {
    117         .get_hc_handle = usb_iface_get_hc_handle,
    118         .get_address = usb_iface_get_address
     115        .get_hc_handle = rh_get_hc_handle,
     116        .get_my_address = rh_get_my_address,
    119117};
    120118/*----------------------------------------------------------------------------*/

  • uspace/drv/bus/usb/usbmid/usbmid.c

    rd25e0a4 r27ed734c  
    6363static usb_iface_t child_usb_iface = {
    6464        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
    65         .get_address = usb_iface_get_address_forward_impl,
    66         .get_interface = usb_iface_get_interface_impl
     65        .get_my_address = usb_iface_get_my_address_forward_impl,
     66        .get_interface = usb_iface_get_interface_impl,
    6767};
    6868

  • uspace/drv/bus/usb/vhc/connhost.c

    rd25e0a4 r27ed734c  
    479479}
    480480
    481 static int tell_address(ddf_fun_t *fun, devman_handle_t handle,
    482     usb_address_t *address)
     481static int tell_address(ddf_fun_t *fun, usb_address_t *address)
    483482{
    484483        UNSUPPORTED("tell_address");
    … …  
    497496}
    498497
    499 static int tell_address_rh(ddf_fun_t *root_hub_fun, devman_handle_t handle,
    500     usb_address_t *address)
     498static int tell_address_rh(ddf_fun_t *root_hub_fun, usb_address_t *address)
    501499{
    502500        VHC_DATA(vhc, root_hub_fun);
    503501
    504         if (handle == 0) {
    505                 handle = root_hub_fun->handle;
    506         }
     502        devman_handle_t handle = root_hub_fun->handle;
    507503
    508504        usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
    … …  
    532528usb_iface_t vhc_usb_iface = {
    533529        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
    534         .get_address = tell_address
     530        .get_my_address = tell_address
    535531};
    536532
    537533usb_iface_t rh_usb_iface = {
    538534        .get_hc_handle = usb_iface_get_hc_handle_rh_impl,
    539         .get_address = tell_address_rh
     535        .get_my_address = tell_address_rh
    540536};
    541537
Note: See TracChangeset for help on using the changeset viewer.