Changeset eac610e in mainline

Timestamp:

2010-12-08T23:40:38Z (14 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).

Location:

uspace

Files:

• drv/vhc/connhost.c (modified) (1 diff)
• lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• lib/drv/generic/remote_usbhc.c (modified) (8 diffs)
• lib/usb/src/usbdrvreq.c (modified) (2 diffs)

uspace/drv/vhc/connhost.c

@@ -58 +58 @@
                 case USB_DIRECTION_IN:
                         transfer->in_callback(transfer->dev,
-                            size, outcome,
+                            outcome, size,
                             transfer->arg);
                         break;

uspace/lib/c/include/ipc/dev_iface.h

@@ -54 +54 @@
         DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX)
 
+/*
+ * The first argument is actually method (as the "real" method is used
+ * for indexing into interfaces.
+ */
+
+#define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call))
+#define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call))
+#define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call))
+#define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call))
+
 
 #endif

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)
         };
 

uspace/lib/usb/src/usbdrvreq.c

@@ -117 +117 @@
         /* Prepare the setup packet. */
         usb_device_request_setup_packet_t setup_packet = {
-                .request_type = 0,
+                .request_type = 128,
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .index = 0,
@@ -130 +130 @@
         /* Start the control read transfer. */
         rc = usb_drv_async_control_read_setup(phone, target,
-            &setup_packet, sizeof(setup_packet), &handle);
+            &setup_packet, sizeof(usb_device_request_setup_packet_t), &handle);
         if (rc != EOK) {
                 return rc;