Changeset 013517b in mainline


Ignore:
Timestamp:
2011-10-12T20:23:23Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
32ec5671
Parents:
162726b
Message:

usb: Remove assigned_handle output parameter.

Use new_fun instead.

Location:
uspace
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/uhcirh/port.c

    r162726b r013517b  
    261261                ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
    262262                    speed, uhci_port_reset_enable, port->number, port,
    263                     &port->attached_device.address, NULL, NULL, NULL,
     263                    &port->attached_device.address, NULL, NULL,
    264264                    &port->attached_device.fun);
    265265        } while (ret != EOK && ++count < 4);

  • uspace/drv/bus/usb/usbhub/port.c

    r162726b r013517b  
    423423            &data->hub->connection, data->speed,
    424424            enable_port_callback, (int) data->port->port_number,
    425             data->port, &new_address, NULL,
    426             NULL, NULL, &child_fun);
     425            data->port, &new_address, NULL, NULL, &child_fun);
    427426
    428427        if (rc != EOK) {

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

    r162726b r013517b  
    114114
    115115        ddf_fun_t *hub_dev;
    116         rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn,
    117             USB_SPEED_FULL,
    118             pretend_port_rest, 0, NULL,
    119             NULL, NULL, &rh_ops, hc_dev, &hub_dev);
     116        rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn, USB_SPEED_FULL,
     117            pretend_port_rest, 0, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
    120118        if (rc != EOK) {
    121119                usb_log_fatal("Failed to create root hub: %s.\n",

  • uspace/lib/usbdev/include/usb/dev/hub.h

    r162726b r013517b  
    4444int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
    4545    int (*)(int, void *), int, void *,
    46     usb_address_t *, devman_handle_t *,
    47     ddf_dev_ops_t *, void *, ddf_fun_t **);
     46    usb_address_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
    4847
    4948/** Info about device attached to host controller.

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

    r162726b r013517b  
    178178 * @param[in] arg Any data argument to @p enable_port.
    179179 * @param[out] assigned_address USB address of the device.
    180  * @param[out] assigned_handle Devman handle of the new device.
    181180 * @param[in] dev_ops Child device ops.
    182181 * @param[in] new_dev_data Arbitrary pointer to be stored in the child
    … …  
    195194    usb_speed_t dev_speed,
    196195    int (*enable_port)(int port_no, void *arg), int port_no, void *arg,
    197     usb_address_t *assigned_address, devman_handle_t *assigned_handle,
     196    usb_address_t *assigned_address,
    198197    ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
    199198{
    … …  
    349348                *assigned_address = dev_addr;
    350349        }
    351         if (assigned_handle != NULL) {
    352                 *assigned_handle = child_fun->handle;
    353         }
    354350        if (new_fun != NULL) {
    355351                *new_fun = child_fun;
Note: See TracChangeset for help on using the changeset viewer.