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

Timestamp:

2010-12-17T14:51:41Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

File:

• uspace/lib/usb/src/usbdrv.c (modified) (6 diffs)

uspace/lib/usb/src/usbdrv.c

@@ -72 +72 @@
         devman_handle_t handle;
 
-        rc = devman_device_get_handle("/virt/usbhc", &handle, 0);
+        rc = devman_device_get_handle("/virt/usbhc", &handle, flags);
         if (rc != EOK) {
                 return rc;
         }
         
-        int phone = devman_device_connect(handle, 0);
+        int phone = devman_device_connect(handle, flags);
 
         return phone;
@@ -90 +90 @@
 usb_address_t usb_drv_get_my_address(int phone, device_t *dev)
 {
-        ipcarg_t address;
+        sysarg_t address;
         int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_GET_ADDRESS,
@@ -132 +132 @@
 usb_address_t usb_drv_request_address(int phone)
 {
-        ipcarg_t address;
+        sysarg_t address;
         int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_REQUEST_ADDRESS, &address);
@@ -298 +298 @@
  * @return Error status.
  */
-static int read_buffer_in(int phone, ipcarg_t hash,
+static int read_buffer_in(int phone, sysarg_t hash,
     void *buffer, size_t size, size_t *actual_size)
 {
         ipc_call_t answer_data;
-        ipcarg_t answer_rc;
+        sysarg_t answer_rc;
         aid_t req;
         int rc;
@@ -350 +350 @@
         transfer_info_t *transfer = (transfer_info_t *) handle;
 
-        ipcarg_t answer_rc;
+        sysarg_t answer_rc;
         async_wait_for(transfer->request, &answer_rc);
 
@@ -367 +367 @@
                  * We will use it when actually reading-in the data.
                  */
-                ipcarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
+                sysarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
                 if (buffer_hash == 0) {
                         rc = ENOENT;