Changeset fa48ebe in mainline


Ignore:
Timestamp:
2011-02-18T16:08:12Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1dde2eb1
Parents:
735eac3
Message:

New device's speed uses enum

Location:
uspace
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/iface.c

    r735eac3 rfa48ebe  
    5454}
    5555/*----------------------------------------------------------------------------*/
    56 static int reserve_default_address(device_t *dev, bool full_speed)
     56static int reserve_default_address(device_t *dev, usb_speed_t speed)
    5757{
    5858        assert(dev);
    … …  
    7272}
    7373/*----------------------------------------------------------------------------*/
    74 static int request_address(device_t *dev, bool full_speed,
     74static int request_address(device_t *dev, usb_speed_t speed,
    7575    usb_address_t *address)
    7676{

  • uspace/drv/uhci-rhd/port.c

    r735eac3 rfa48ebe  
    141141        /* get address of the future device */
    142142        const usb_address_t usb_address = usb_hc_request_address(
    143             &port->hc_connection, true);
     143            &port->hc_connection, USB_SPEED_FULL);
    144144
    145145        if (usb_address <= 0) {
    … …  
    151151
    152152        /* get default address */
    153         int ret = usb_hc_reserve_default_address(&port->hc_connection, true);
     153        int ret = usb_hc_reserve_default_address(&port->hc_connection, USB_SPEED_FULL);
    154154        if (ret != EOK) {
    155155                usb_log_error("Failed to reserve default address on port %d.\n",

  • uspace/drv/vhc/connhost.c

    r735eac3 rfa48ebe  
    382382
    383383
    384 static int reserve_default_address(device_t *dev, bool ignored)
     384static int reserve_default_address(device_t *dev, usb_speed_t ignored)
    385385{
    386386        usb_address_keeping_reserve_default(&addresses);
    … …  
    394394}
    395395
    396 static int request_address(device_t *dev, bool ignored, usb_address_t *address)
     396static int request_address(device_t *dev, usb_speed_t ignored,
     397    usb_address_t *address)
    397398{
    398399        usb_address_t addr = usb_address_keeping_request(&addresses);

  • uspace/lib/drv/generic/remote_usbhc.c

    r735eac3 rfa48ebe  
    164164        }
    165165       
    166         bool full_speed = DEV_IPC_GET_ARG1(*call);
     166        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
    167167       
    168         int rc = usb_iface->reserve_default_address(device, full_speed);
     168        int rc = usb_iface->reserve_default_address(device, speed);
    169169
    170170        async_answer_0(callid, rc);
    … …  
    196196        }
    197197       
    198         bool full_speed = DEV_IPC_GET_ARG1(*call);
     198        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
    199199
    200200        usb_address_t address;
    201         int rc = usb_iface->request_address(device, full_speed, &address);
     201        int rc = usb_iface->request_address(device, speed, &address);
    202202        if (rc != EOK) {
    203203                async_answer_0(callid, rc);

  • uspace/lib/drv/include/usbhc_iface.h

    r735eac3 rfa48ebe  
    232232        int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
    233233
    234         int (*reserve_default_address)(device_t *, bool);
     234        int (*reserve_default_address)(device_t *, usb_speed_t);
    235235        int (*release_default_address)(device_t *);
    236         int (*request_address)(device_t *, bool, usb_address_t *);
     236        int (*request_address)(device_t *, usb_speed_t, usb_address_t *);
    237237        int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
    238238        int (*release_address)(device_t *, usb_address_t);

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

    r735eac3 rfa48ebe  
    5252} usb_hc_attached_device_t;
    5353
    54 int usb_hc_reserve_default_address(usb_hc_connection_t *, bool);
     54int usb_hc_reserve_default_address(usb_hc_connection_t *, usb_speed_t);
    5555int usb_hc_release_default_address(usb_hc_connection_t *);
    5656
    57 usb_address_t usb_hc_request_address(usb_hc_connection_t *, bool);
     57usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t);
    5858int usb_hc_register_device(usb_hc_connection_t *,
    5959    const usb_hc_attached_device_t *);

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

    r735eac3 rfa48ebe  
    5656 */
    5757int usb_hc_reserve_default_address(usb_hc_connection_t *connection,
    58     bool full_speed)
     58    usb_speed_t speed)
    5959{
    6060        CHECK_CONNECTION(connection);
    … …  
    6262        return async_req_2_0(connection->hc_phone,
    6363            DEV_IFACE_ID(USBHC_DEV_IFACE),
    64             IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, full_speed);
     64            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, speed);
    6565}
    6666
    … …  
    8585 */
    8686usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
    87     bool full_speed)
     87    usb_speed_t speed)
    8888{
    8989        CHECK_CONNECTION(connection);
    … …  
    9292        int rc = async_req_2_1(connection->hc_phone,
    9393            DEV_IFACE_ID(USBHC_DEV_IFACE),
    94             IPC_M_USBHC_REQUEST_ADDRESS, full_speed,
     94            IPC_M_USBHC_REQUEST_ADDRESS, speed,
    9595            &address);
    9696        if (rc != EOK) {
Note: See TracChangeset for help on using the changeset viewer.