Changes in / [ee0d8a8:1eb272d] in mainline


Ignore:
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    ree0d8a8 r1eb272d  
    113113        rootvirt \
    114114        test1 \
    115         test2 \
    116         vhc
     115        test2
    117116
    118117RD_DRV_CFG =
  • boot/arch/amd64/Makefile.inc

    ree0d8a8 r1eb272d  
    4343        uhci \
    4444        usbhub \
    45         usbkbd
     45        usbkbd \
     46        vhc
    4647       
    4748RD_DRV_CFG += \
  • uspace/Makefile

    ree0d8a8 r1eb272d  
    9090        drv/rootvirt \
    9191        drv/test1 \
    92         drv/test2 \
    93         drv/vhc
     92        drv/test2
    9493
    9594## Networking
     
    118117        DIRS += drv/isa
    119118        DIRS += drv/ns8250
     119        DIRS += drv/uhci
     120        DIRS += drv/usbhub
     121        DIRS += drv/usbkbd
     122        DIRS += drv/vhc
    120123endif
    121124
     
    128131        DIRS += drv/usbhub
    129132        DIRS += drv/usbkbd
     133        DIRS += drv/vhc
    130134endif
    131135
  • uspace/drv/uhci/transfers.c

    ree0d8a8 r1eb272d  
    3636    usbhc_iface_transfer_out_callback_t callback, void *arg)
    3737{
    38         printf(NAME ": transfer OUT [%d.%d (%s); %u]\n",
     38        printf(NAME ": transfer OUT [%d.%d (%s); %zu]\n",
    3939            target.address, target.endpoint,
    4040            usb_str_transfer_type(transfer_type),
     
    4949    usbhc_iface_transfer_out_callback_t callback, void *arg)
    5050{
    51         printf(NAME ": transfer SETUP [%d.%d (%s); %u]\n",
     51        printf(NAME ": transfer SETUP [%d.%d (%s); %zu]\n",
    5252            target.address, target.endpoint,
    5353            usb_str_transfer_type(transfer_type),
     
    6262    usbhc_iface_transfer_in_callback_t callback, void *arg)
    6363{
    64         printf(NAME ": transfer IN [%d.%d (%s); %u]\n",
     64        printf(NAME ": transfer IN [%d.%d (%s); %zu]\n",
    6565            target.address, target.endpoint,
    6666            usb_str_transfer_type(transfer_type),
  • uspace/lib/usb/src/usbdrv.c

    ree0d8a8 r1eb272d  
    3636#include <usbhc_iface.h>
    3737#include <errno.h>
     38#include <str_error.h>
    3839
    3940/** Information about pending transaction on HC. */
     
    9091{
    9192        ipcarg_t address;
    92         int rc = async_req_1_1(phone, IPC_M_USBHC_GET_ADDRESS,
     93        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
     94            IPC_M_USBHC_GET_ADDRESS,
    9395            dev->handle, &address);
    9496
    9597        if (rc != EOK) {
     98                printf("usb_drv_get_my_address over %d failed: %s\n", phone, str_error(rc));
    9699                return rc;
    97100        }
     
    107110int usb_drv_reserve_default_address(int phone)
    108111{
    109         return async_req_0_0(phone, IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
     112        return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
     113            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
    110114}
    111115
     
    117121int usb_drv_release_default_address(int phone)
    118122{
    119         return async_req_0_0(phone, IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
     123        return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
     124            IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
    120125}
    121126
     
    128133{
    129134        ipcarg_t address;
    130         int rc = async_req_0_1(phone, IPC_M_USBHC_REQUEST_ADDRESS, &address);
     135        int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
     136            IPC_M_USBHC_REQUEST_ADDRESS, &address);
    131137        if (rc != EOK) {
    132138                return rc;
     
    146152    devman_handle_t handle)
    147153{
    148         int rc = async_req_2_0(phone, IPC_M_USBHC_BIND_ADDRESS,
     154        int rc = async_req_3_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
     155            IPC_M_USBHC_BIND_ADDRESS,
    149156            address, handle);
    150157
     
    160167int usb_drv_release_address(int phone, usb_address_t address)
    161168{
    162         return async_req_1_0(phone, IPC_M_USBHC_RELEASE_ADDRESS, address);
     169        return async_req_2_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
     170            IPC_M_USBHC_RELEASE_ADDRESS, address);
    163171}
    164172
Note: See TracChangeset for help on using the changeset viewer.