Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/lib/usb/src/usbdrv.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usb/src/usbdrv.c

    r37f7cfe ra9b6bec  
    9090usb_address_t usb_drv_get_my_address(int phone, device_t *dev)
    9191{
    92         ipcarg_t address;
     92        sysarg_t address;
    9393        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
    9494            IPC_M_USBHC_GET_ADDRESS,
     
    132132usb_address_t usb_drv_request_address(int phone)
    133133{
    134         ipcarg_t address;
     134        sysarg_t address;
    135135        int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
    136136            IPC_M_USBHC_REQUEST_ADDRESS, &address);
     
    298298 * @return Error status.
    299299 */
    300 static int read_buffer_in(int phone, ipcarg_t hash,
     300static int read_buffer_in(int phone, sysarg_t hash,
    301301    void *buffer, size_t size, size_t *actual_size)
    302302{
    303303        ipc_call_t answer_data;
    304         ipcarg_t answer_rc;
     304        sysarg_t answer_rc;
    305305        aid_t req;
    306306        int rc;
     
    350350        transfer_info_t *transfer = (transfer_info_t *) handle;
    351351
    352         ipcarg_t answer_rc;
     352        sysarg_t answer_rc;
    353353        async_wait_for(transfer->request, &answer_rc);
    354354
     
    367367                 * We will use it when actually reading-in the data.
    368368                 */
    369                 ipcarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
     369                sysarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
    370370                if (buffer_hash == 0) {
    371371                        rc = ENOENT;
Note: See TracChangeset for help on using the changeset viewer.