Changeset c53b58e in mainline

Timestamp:

2014-09-12T05:25:57Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

83062ff

Parents:

8e7c9fe

Message:

usbmast: Fix cache sync command

the code was obviously never run, let alone tested
add cleanup

File:

• uspace/drv/bus/usb/usbmast/bo_trans.c (modified) (5 diffs)

uspace/drv/bus/usb/usbmast/bo_trans.c

@@ -65 +65 @@
 {
         int rc;
-        int retval = EOK;
-        size_t act_size;
+
+        if (cmd->data_in && cmd->data_out)
+                return EINVAL;
+
         usb_pipe_t *bulk_in_pipe = mfun->mdev->bulk_in_pipe;
         usb_pipe_t *bulk_out_pipe = mfun->mdev->bulk_out_pipe;
-        usb_direction_t ddir;
-        void *dbuf;
-        size_t dbuf_size;
-
-        if (cmd->data_out != NULL && cmd->data_in == NULL) {
-                ddir = USB_DIRECTION_OUT;
-                dbuf = (void *)cmd->data_out;
-                dbuf_size = cmd->data_out_size;
-        } else if (cmd->data_out == NULL && cmd->data_in != NULL) {
+
+        usb_pipe_t *dpipe = bulk_out_pipe;
+        usb_direction_t ddir = USB_DIRECTION_OUT;
+        size_t dbuf_size = cmd->data_out_size;
+
+        if (cmd->data_in) {
                 ddir = USB_DIRECTION_IN;
-                dbuf = cmd->data_in;
                 dbuf_size = cmd->data_in_size;
-        } else {
-                assert(false);
+                dpipe = bulk_in_pipe;
         }
 
@@ -100 +97 @@
 
         MASTLOG("Transferring data.\n");
-        if (ddir == USB_DIRECTION_IN) {
+        if (cmd->data_in) {
+                size_t act_size;
                 /* Recieve data from the device. */
-                rc = usb_pipe_read(bulk_in_pipe, dbuf, dbuf_size, &act_size);
+                rc = usb_pipe_read(dpipe, cmd->data_in, cmd->data_in_size,
+                    &act_size);
                 MASTLOG("Received %zu bytes (%s): %s.\n", act_size,
-                    usb_debug_str_buffer((uint8_t *) dbuf, act_size, 0),
+                    usb_debug_str_buffer(cmd->data_in, act_size, 0),
                     str_error(rc));
-        } else {
+        }
+        if (cmd->data_out) {
                 /* Send data to the device. */
-                rc = usb_pipe_write(bulk_out_pipe, dbuf, dbuf_size);
-                MASTLOG("Sent %zu bytes (%s): %s.\n", act_size,
-                    usb_debug_str_buffer((uint8_t *) dbuf, act_size, 0),
+                rc = usb_pipe_write(dpipe, cmd->data_out, cmd->data_out_size);
+                MASTLOG("Sent %zu bytes (%s): %s.\n", cmd->data_out_size,
+                    usb_debug_str_buffer(cmd->data_out, cmd->data_out_size, 0),
                     str_error(rc));
         }
@@ -116 +116 @@
         if (rc == ESTALL) {
                 /* Clear stall condition and continue below to read CSW. */
-                if (ddir == USB_DIRECTION_IN) {
-                        usb_pipe_clear_halt(
-                            usb_device_get_default_pipe(mfun->mdev->usb_dev),
-                            bulk_in_pipe);
-                } else {
-                        usb_pipe_clear_halt(
-                            usb_device_get_default_pipe(mfun->mdev->usb_dev),
-                            bulk_out_pipe);
-                }
+                usb_pipe_clear_halt(
+                    usb_device_get_default_pipe(mfun->mdev->usb_dev), dpipe);
         } else if (rc != EOK) {
                 return EIO;
@@ -165 +158 @@
         case cbs_phase_error:
                 MASTLOG("Phase error\n");
-                retval = EIO;
+                rc = EIO;
                 break;
         default:
-                retval = EIO;
-                break;
-        }
-
-        size_t residue = (size_t) uint32_usb2host(csw.dCSWDataResidue);
+                rc = EIO;
+                break;
+        }
+
+        const size_t residue = uint32_usb2host(csw.dCSWDataResidue);
         if (residue > dbuf_size) {
                 MASTLOG("residue > dbuf_size\n");
@@ -186 +179 @@
          */
 
-        if (ddir == USB_DIRECTION_IN)
+        if (cmd->data_in)
                 cmd->rcvd_size = dbuf_size - residue;
 
-        return retval;
+        return rc;
 }