Changes in uspace/lib/drv/generic/remote_usbhc.c [93f8da1:9753220] in mainline

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -104 +104 @@
 } async_transaction_t;
 
-static void async_transaction_destroy(async_transaction_t *trans)
-{
-        if (trans == NULL) {
-                return;
-        }
-
-        if (trans->setup_packet != NULL) {
-                free(trans->setup_packet);
-        }
-        if (trans->buffer != NULL) {
-                free(trans->buffer);
-        }
-
-        free(trans);
-}
-
-static async_transaction_t *async_transaction_create(ipc_callid_t caller)
-{
-        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
-        if (trans == NULL) {
-                return NULL;
-        }
-
-        trans->caller = caller;
-        trans->buffer = NULL;
-        trans->setup_packet = NULL;
-        trans->size = 0;
-
-        return trans;
-}
-
 void remote_usbhc_get_address(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -167 +136 @@
         if (trans->buffer == NULL) {
                 ipc_answer_0(callid, EINVAL);
-                async_transaction_destroy(trans);
+                free(trans);
                 return;
         }
@@ -175 +144 @@
         if (!async_data_read_receive(&cid, &accepted_size)) {
                 ipc_answer_0(callid, EINVAL);
-                async_transaction_destroy(trans);
                 return;
         }
@@ -186 +154 @@
         ipc_answer_1(callid, EOK, accepted_size);
 
-        async_transaction_destroy(trans);
+        free(trans->buffer);
+        free(trans);
 }
 
@@ -279 +248 @@
         async_transaction_t *trans = (async_transaction_t *)arg;
 
+        // FIXME - answer according to outcome
         ipc_answer_0(trans->caller, outcome);
 
-        async_transaction_destroy(trans);
+        free(trans);
 }
 
@@ -289 +259 @@
         async_transaction_t *trans = (async_transaction_t *)arg;
 
-        if (outcome != USB_OUTCOME_OK) {
-                ipc_answer_0(trans->caller, outcome);
-                async_transaction_destroy(trans);
-                return;
-        }
+        // FIXME - answer according to outcome
+        ipc_answer_1(trans->caller, outcome, (sysarg_t)trans);
 
         trans->size = actual_size;
-        ipc_answer_1(trans->caller, USB_OUTCOME_OK, (sysarg_t)trans);
 }
 
@@ -334 +300 @@
         }
 
-        async_transaction_t *trans = async_transaction_create(callid);
-        if (trans == NULL) {
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
+        trans->buffer = buffer;
+        trans->setup_packet = NULL;
+        trans->size = len;
+
+        int rc = transfer_func(device, target, buffer, len,
+            callback_out, trans);
+
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
                 if (buffer != NULL) {
                         free(buffer);
                 }
-                ipc_answer_0(callid, ENOMEM);
-                return;
-        }
-
-        trans->buffer = buffer;
-        trans->size = len;
-
-        int rc = transfer_func(device, target, buffer, len,
-            callback_out, trans);
-
-        if (rc != EOK) {
-                ipc_answer_0(callid, rc);
-                async_transaction_destroy(trans);
+                free(trans);
         }
 }
@@ -377 +340 @@
         };
 
-        async_transaction_t *trans = async_transaction_create(callid);
-        if (trans == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                return;
-        }
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
         trans->buffer = malloc(len);
+        trans->setup_packet = NULL;
         trans->size = len;
 
@@ -390 +351 @@
         if (rc != EOK) {
                 ipc_answer_0(callid, rc);
-                async_transaction_destroy(trans);
+                free(trans->buffer);
+                free(trans);
         }
 }
@@ -434 +396 @@
         };
 
-        async_transaction_t *trans = async_transaction_create(callid);
-        if (trans == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                return;
-        }
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
+        trans->buffer = NULL;
+        trans->setup_packet = NULL;
+        trans->size = 0;
 
         int rc;
@@ -457 +419 @@
         if (rc != EOK) {
                 ipc_answer_0(callid, rc);
-                async_transaction_destroy(trans);
-        }
+                free(trans);
+        }
+        return;
 }
 
@@ -574 +537 @@
             1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
         if (rc != EOK) {
-                ipc_answer_0(callid, rc);
                 free(setup_packet);
-                return;
-        }
-
-        async_transaction_t *trans = async_transaction_create(callid);
-        if (trans == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                free(setup_packet);
-                free(data_buffer);
-                return;
-        }
+                ipc_answer_0(callid, rc);
+                return;
+        }
+
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
         trans->setup_packet = setup_packet;
         trans->buffer = data_buffer;
@@ -597 +555 @@
         if (rc != EOK) {
                 ipc_answer_0(callid, rc);
-                async_transaction_destroy(trans);
+                free(setup_packet);
+                free(data_buffer);
+                free(trans);
         }
 }
@@ -631 +591 @@
         }
 
-        async_transaction_t *trans = async_transaction_create(callid);
-        if (trans == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                free(setup_packet);
-                return;
-        }
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
         trans->setup_packet = setup_packet;
+        trans->buffer = malloc(data_len);
         trans->size = data_len;
-        trans->buffer = malloc(data_len);
-        if (trans->buffer == NULL) {
-                ipc_answer_0(callid, ENOMEM);
-                async_transaction_destroy(trans);
-                return;
-        }
 
         rc = usb_iface->control_read(device, target,
@@ -653 +604 @@
         if (rc != EOK) {
                 ipc_answer_0(callid, rc);
-                async_transaction_destroy(trans);
+                free(setup_packet);
+                free(trans->buffer);
+                free(trans);
         }
 }