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

Timestamp:

2011-02-02T21:21:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

93ef8f6

Parents:

2f4438f5 (diff), 3597dab (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:

Merge development/ changes

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