Changeset 1968de5 in mainline for uspace/lib/drv

Timestamp:

2011-02-11T16:27:45Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

608afb9

Parents:

03197ffc (diff), 5842493 (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 get_buffer request removal (ticket 54)

Location:

uspace/lib/drv

Files:

• generic/remote_usbhc.c (modified) (11 diffs)
• include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -42 +42 @@
 
 static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_get_buffer(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -64 +63 @@
         remote_usbhc_get_address,
 
-        remote_usbhc_get_buffer,
-
         remote_usbhc_reserve_default_address,
         remote_usbhc_release_default_address,
@@ -98 +95 @@
 typedef struct {
         ipc_callid_t caller;
+        ipc_callid_t data_caller;
         void *buffer;
         void *setup_packet;
@@ -127 +125 @@
 
         trans->caller = caller;
+        trans->data_caller = 0;
         trans->buffer = NULL;
         trans->setup_packet = NULL;
@@ -155 +154 @@
 }
 
-void remote_usbhc_get_buffer(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        sysarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
-        async_transaction_t * trans = (async_transaction_t *)buffer_hash;
-        if (trans == NULL) {
-                async_answer_0(callid, ENOENT);
-                return;
-        }
-        if (trans->buffer == NULL) {
-                async_answer_0(callid, EINVAL);
-                async_transaction_destroy(trans);
-                return;
-        }
-
-        ipc_callid_t cid;
-        size_t accepted_size;
-        if (!async_data_read_receive(&cid, &accepted_size)) {
-                async_answer_0(callid, EINVAL);
-                async_transaction_destroy(trans);
-                return;
-        }
-
-        if (accepted_size > trans->size) {
-                accepted_size = trans->size;
-        }
-        async_data_read_finalize(cid, trans->buffer, accepted_size);
-
-        async_answer_1(callid, EOK, accepted_size);
-
-        async_transaction_destroy(trans);
-}
-
 void remote_usbhc_reserve_default_address(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -290 +256 @@
         if (outcome != USB_OUTCOME_OK) {
                 async_answer_0(trans->caller, outcome);
+                if (trans->data_caller) {
+                        async_answer_0(trans->data_caller, EINTR);
+                }
                 async_transaction_destroy(trans);
                 return;
@@ -295 +264 @@
 
         trans->size = actual_size;
-        async_answer_1(trans->caller, USB_OUTCOME_OK, (sysarg_t)trans);
+
+        if (trans->data_caller) {
+                async_data_read_finalize(trans->data_caller,
+                    trans->buffer, actual_size);
+        }
+
+        async_answer_0(trans->caller, USB_OUTCOME_OK);
+
+        async_transaction_destroy(trans);
 }
 
@@ -376 +353 @@
         };
 
+        ipc_callid_t data_callid;
+        if (!async_data_read_receive(&data_callid, &len)) {
+                async_answer_0(callid, EPARTY);
+                return;
+        }
+
         async_transaction_t *trans = async_transaction_create(callid);
         if (trans == NULL) {
@@ -381 +364 @@
                 return;
         }
+        trans->data_caller = data_callid;
         trans->buffer = malloc(len);
         trans->size = len;
@@ -630 +614 @@
         }
 
+        ipc_callid_t data_callid;
+        if (!async_data_read_receive(&data_callid, &data_len)) {
+                async_answer_0(callid, EPARTY);
+                free(setup_packet);
+                return;
+        }
+
         async_transaction_t *trans = async_transaction_create(callid);
         if (trans == NULL) {
@@ -636 +627 @@
                 return;
         }
+        trans->data_caller = data_callid;
         trans->setup_packet = setup_packet;
         trans->size = data_len;

uspace/lib/drv/include/usbhc_iface.h

@@ -66 +66 @@
  *   - argument #2 is target endpoint
  *   - argument #3 is buffer size
+ * - this call is immediately followed by IPC data read (async version)
  * - the call is not answered until the device returns some data (or until
  *   error occurs)
- * - if the call is answered with EOK, first argument of the answer is buffer
- *   hash that could be used to retrieve the actual data
  *
  * Some special methods (NO-DATA transactions) do not send any data. These
  * might behave as both OUT or IN transactions because communication parts
  * where actual buffers are exchanged are omitted.
- *
- * The mentioned data retrieval can be done any time after receiving EOK
- * answer to IN method.
- * This retrieval is done using the IPC_M_USBHC_GET_BUFFER where
- * the first argument is buffer hash from call answer.
- * This call must be immediately followed by data read-in and after the
- * data are transferred, the initial call (IPC_M_USBHC_GET_BUFFER)
- * is answered. Each buffer can be retrieved only once.
- *
+ **
  * For all these methods, wrap functions exists. Important rule: functions
  * for IN transactions have (as parameters) buffers where retrieved data
@@ -104 +95 @@
         IPC_M_USBHC_GET_ADDRESS,
 
-        /** Asks for data buffer.
-         * See explanation at usb_iface_funcs_t.
-         * This function does not have counter part in functional interface
-         * as it is handled by the remote part itself.
-         */
-        IPC_M_USBHC_GET_BUFFER,
-
 
         /** Reserve usage of default address.