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

Timestamp:

2011-02-10T22:14:38Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e64b250

Parents:

8bf1eeb

Message:

Get buffer replaced with asynchronous data read

The GET_BUFFER request from the USB HC interface (of DDF) was replaced
by using asynchronous version of IPC_M_DATA_READ.

Still needs to be done:

• check error handling of protocol problems
• remove the get_buffer callback from remote part of the interface completely

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -98 +98 @@
 typedef struct {
         ipc_callid_t caller;
+        ipc_callid_t data_caller;
         void *buffer;
         void *setup_packet;
@@ -127 +128 @@
 
         trans->caller = caller;
+        trans->data_caller = 0;
         trans->buffer = NULL;
         trans->setup_packet = NULL;
@@ -295 +297 @@
 
         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);
 }
 
@@ -376 +384 @@
         };
 
+        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 +395 @@
                 return;
         }
+        trans->data_caller = data_callid;
         trans->buffer = malloc(len);
         trans->size = len;
@@ -630 +645 @@
         }
 
+        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 +658 @@
                 return;
         }
+        trans->data_caller = data_callid;
         trans->setup_packet = setup_packet;
         trans->size = data_len;