Changeset 272f46f8 in mainline

Timestamp:

2011-11-25T18:55:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b4292e7

Parents:

095bddfc

Message:

libdrv/drvusbhc: Remove data_size field.

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -357 +357 @@
         ipc_callid_t data_caller;
         void *buffer;
-        size_t size;
 } async_transaction_t;
 
@@ -382 +381 @@
         trans->data_caller = 0;
         trans->buffer = NULL;
-        trans->size = 0;
 
         return trans;
@@ -466 +464 @@
     int outcome, void *arg)
 {
-        async_transaction_t *trans = (async_transaction_t *)arg;
+        async_transaction_t *trans = arg;
 
         async_answer_0(trans->caller, outcome);
@@ -472 +470 @@
         async_transaction_destroy(trans);
 }
-
+/*----------------------------------------------------------------------------*/
 static void callback_in(ddf_fun_t *fun,
     int outcome, size_t actual_size, void *arg)
@@ -487 +485 @@
         }
 
-        trans->size = actual_size;
-
         if (trans->data_caller) {
                 async_data_read_finalize(trans->data_caller,
@@ -498 +494 @@
         async_transaction_destroy(trans);
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_register_endpoint(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -576 +572 @@
         }
 
-        if (!async_data_read_receive(&trans->data_caller, &trans->size)) {
+        size_t size = 0;
+        if (!async_data_read_receive(&trans->data_caller, &size)) {
                 async_answer_0(callid, EPARTY);
                 return;
         }
 
-        trans->buffer = malloc(trans->size);
+        trans->buffer = malloc(size);
         if (trans->buffer == NULL) {
                 async_answer_0(trans->data_caller, ENOMEM);
@@ -589 +586 @@
 
         const int rc = hc_iface->read(
-            fun, target, setup, trans->buffer, trans->size, callback_in, trans);
+            fun, target, setup, trans->buffer, size, callback_in, trans);
 
         if (rc != EOK) {
@@ -597 +594 @@
         }
 }
-
+/*----------------------------------------------------------------------------*/
 void remote_usbhc_write(
     ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
@@ -624 +621 @@
         }
 
+        size_t size = 0;
         if (data_buffer_len > 0) {
-                int rc = async_data_write_accept(&trans->buffer, false,
+                const int rc = async_data_write_accept(&trans->buffer, false,
                     1, USB_MAX_PAYLOAD_SIZE,
-                    0, &trans->size);
+                    0, &size);
 
                 if (rc != EOK) {
@@ -636 +634 @@
         }
 
-        int rc = hc_iface->write(
-            fun, target, setup, trans->buffer, trans->size, callback_out, trans);
+        const int rc = hc_iface->write(
+            fun, target, setup, trans->buffer, size, callback_out, trans);
 
         if (rc != EOK) {
@@ -644 +642 @@
         }
 }
-
-
 /**
  * @}