Changeset eac610e in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2010-12-08T23:40:38Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

07b9203e

Parents:

90fb679

Message:

Fix of several stupid bugs

There were actually four (kind of) bugs fixed in this commit:

• switched arguments in a function call (really stupid)
• async_data_read_receive and async_data_read_finalize not paired together
• reading wrong arguments of a call (the DDF uses IPC_GET_ARG1 for the actual method (as the IPC_GET_METHOD returns interface index) and first argument is in IPC_GET_ARG2)
• wrong SETUP packet for GET_DESCRIPTOR request

Also, added DEV_IPC_GET_ARG[1-4] for retrieveing arguments in DDF
interfaces in less confusing way (hope so).

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (8 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -108 +108 @@
         }
 
-        devman_handle_t handle = IPC_GET_ARG1(*call);
+        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
 
         usb_address_t address;
@@ -122 +122 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        ipcarg_t buffer_hash = IPC_GET_ARG1(*call);
+        ipcarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
         async_transaction_t * trans = (async_transaction_t *)buffer_hash;
         if (trans == NULL) {
@@ -144 +144 @@
                 accepted_size = trans->size;
         }
-        async_data_read_finalize(callid, trans->buffer, accepted_size);
+        async_data_read_finalize(cid, trans->buffer, accepted_size);
 
         ipc_answer_1(callid, EOK, accepted_size);
@@ -211 +211 @@
         }
 
-        usb_address_t address = (usb_address_t) IPC_GET_ARG1(*call);
-        devman_handle_t handle = (devman_handle_t) IPC_GET_ARG2(*call);
+        usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call);
+        devman_handle_t handle = (devman_handle_t) DEV_IPC_GET_ARG2(*call);
 
         int rc = usb_iface->bind_address(device, address, handle);
@@ -229 +229 @@
         }
 
-        usb_address_t address = (usb_address_t) IPC_GET_ARG1(*call);
+        usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call);
 
         int rc = usb_iface->release_address(device, address);
@@ -275 +275 @@
         }
 
-        size_t expected_len = IPC_GET_ARG3(*call);
+        size_t expected_len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
-                .address = IPC_GET_ARG1(*call),
-                .endpoint = IPC_GET_ARG2(*call)
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
         };
 
@@ -327 +327 @@
         }
 
-        size_t len = IPC_GET_ARG3(*call);
+        size_t len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
-                .address = IPC_GET_ARG1(*call),
-                .endpoint = IPC_GET_ARG2(*call)
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
         };
 
@@ -384 +384 @@
 
         usb_target_t target = {
-                .address = IPC_GET_ARG1(*call),
-                .endpoint = IPC_GET_ARG2(*call)
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
         };