Changes in uspace/drv/bus/usb/usbmast/main.c [38c9505:5203e256] in mainline

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +34 @@
  * Main routines of USB mass storage driver.
  */
-#include <as.h>
-#include <async.h>
-#include <ipc/bd.h>
-#include <macros.h>
 #include <usb/dev/driver.h>
 #include <usb/debug.h>
@@ -46 +41 @@
 #include <str_error.h>
 #include "cmds.h"
+#include "scsi.h"
 #include "mast.h"
-#include "scsi_ms.h"
 
 #define NAME "usbmast"
+
+#define BULK_IN_EP 0
+#define BULK_OUT_EP 1
 
 #define GET_BULK_IN(dev) ((dev)->pipes[BULK_IN_EP].pipe)
@@ -77 +75 @@
 };
 
-/** Mass storage function.
- *
- * Serves as soft state for function/LUN.
- */
-typedef struct {
-        /** DDF function */
-        ddf_fun_t *ddf_fun;
-        /** Total number of blocks. */
-        uint64_t nblocks;
-        /** Block size in bytes. */
-        size_t block_size;
-        /** USB device function belongs to */
-        usb_device_t *usb_dev;
-} usbmast_fun_t;
-
-static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
-    void *arg);
-
 /** Callback when new device is attached and recognized as a mass storage.
  *
@@ -103 +83 @@
 {
         int rc;
-        const char *fun_name = "a";
-        ddf_fun_t *fun = NULL;
-        usbmast_fun_t *msfun = NULL;
+        const char *fun_name = "ctl";
 
-        /* Allocate softstate */
-        msfun = calloc(1, sizeof(usbmast_fun_t));
-        if (msfun == NULL) {
-                usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
+        ddf_fun_t *ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed,
+            fun_name);
+        if (ctl_fun == NULL) {
+                usb_log_error("Failed to create control function.\n");
+                return ENOMEM;
+        }
+        rc = ddf_fun_bind(ctl_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind control function: %s.\n",
+                    str_error(rc));
+                return rc;
         }
 
-        fun = ddf_fun_create(dev->ddf_dev, fun_exposed, fun_name);
-        if (fun == NULL) {
-                usb_log_error("Failed to create DDF function %s.\n", fun_name);
-                rc = ENOMEM;
-                goto error;
-        }
-
-        /* Set up a connection handler. */
-        fun->conn_handler = usbmast_bd_connection;
-        fun->driver_data = msfun;
-
-        usb_log_info("Initializing mass storage `%s'.\n",
+        usb_log_info("Pretending to control mass storage `%s'.\n",
             dev->ddf_dev->name);
         usb_log_debug(" Bulk in endpoint: %d [%zuB].\n",
@@ -135 +107 @@
             (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);
 
-        usb_log_debug("Get LUN count...\n");
         size_t lun_count = usb_masstor_get_lun_count(dev);
 
-        /* XXX Handle more than one LUN properly. */
-        if (lun_count > 1) {
-                usb_log_warning ("Mass storage has %zu LUNs. Ignoring all "
-                    "but first.\n", lun_count);
-        }
-
-        usb_log_debug("Inquire...\n");
-        usbmast_inquiry_data_t inquiry;
-        rc = usbmast_inquiry(dev, &inquiry);
+        usb_massstor_inquiry_result_t inquiry;
+        rc = usb_massstor_inquiry(dev, BULK_IN_EP, BULK_OUT_EP, &inquiry);
         if (rc != EOK) {
-                usb_log_warning("Failed to inquire device `%s': %s.\n",
+                usb_log_warning("Failed to inquiry device `%s': %s.\n",
                     dev->ddf_dev->name, str_error(rc));
-                rc = EIO;
-                goto error;
+                return EOK;
         }
 
         usb_log_info("Mass storage `%s': " \
-            "%s by %s rev. %s is %s (%s), %zu LUN(s).\n",
+            "`%s' by `%s' is %s (%s), %zu LUN(s).\n",
             dev->ddf_dev->name,
-            inquiry.product,
-            inquiry.vendor,
-            inquiry.revision,
-            usbmast_scsi_dev_type_str(inquiry.device_type),
+            inquiry.product_and_revision, inquiry.vendor_id,
+            usb_str_masstor_scsi_peripheral_device_type(inquiry.peripheral_device_type),
             inquiry.removable ? "removable" : "non-removable",
             lun_count);
 
-        uint32_t nblocks, block_size;
-
-        rc = usbmast_read_capacity(dev, &nblocks, &block_size);
-        if (rc != EOK) {
-                usb_log_warning("Failed to read capacity, device `%s': %s.\n",
-                    dev->ddf_dev->name, str_error(rc));
-                rc = EIO;
-                goto error;
-        }
-
-        usb_log_info("Read Capacity: nblocks=%" PRIu32 ", "
-            "block_size=%" PRIu32 "\n", nblocks, block_size);
-
-        msfun->nblocks = nblocks;
-        msfun->block_size = block_size;
-        msfun->usb_dev = dev;
-
-        rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
-                usb_log_error("Failed to bind DDF function %s: %s.\n",
-                    fun_name, str_error(rc));
-                goto error;
-        }
-
         return EOK;
-
-        /* Error cleanup */
-error:
-        if (fun != NULL)
-                ddf_fun_destroy(fun);
-        if (msfun != NULL)
-                free(msfun);
-        return rc;
-}
-
-/** Blockdev client connection handler. */
-static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
-    void *arg)
-{
-        usbmast_fun_t *msfun;
-        void *comm_buf = NULL;
-        size_t comm_size;
-        ipc_callid_t callid;
-        ipc_call_t call;
-        unsigned int flags;
-        sysarg_t method;
-        uint64_t ba;
-        size_t cnt;
-        int retval;
-
-        async_answer_0(iid, EOK);
-
-        if (!async_share_out_receive(&callid, &comm_size, &flags)) {
-                async_answer_0(callid, EHANGUP);
-                return;
-        }
-
-        comm_buf = as_get_mappable_page(comm_size);
-        if (comm_buf == NULL) {
-                async_answer_0(callid, EHANGUP);
-                return;
-        }
-
-        (void) async_share_out_finalize(callid, comm_buf);
-
-        msfun = (usbmast_fun_t *) ((ddf_fun_t *)arg)->driver_data;
-
-        while (true) {
-                callid = async_get_call(&call);
-                method = IPC_GET_IMETHOD(call);
-
-                if (!method) {
-                        /* The other side hung up. */
-                        async_answer_0(callid, EOK);
-                        return;
-                }
-
-                switch (method) {
-                case BD_GET_BLOCK_SIZE:
-                        async_answer_1(callid, EOK, msfun->block_size);
-                        break;
-                case BD_GET_NUM_BLOCKS:
-                        async_answer_2(callid, EOK, LOWER32(msfun->nblocks),
-                            UPPER32(msfun->nblocks));
-                        break;
-                case BD_READ_BLOCKS:
-                        ba = MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-                        cnt = IPC_GET_ARG3(call);
-                        retval = usbmast_read(msfun->usb_dev, ba, cnt,
-                            msfun->block_size, comm_buf);
-                        async_answer_0(callid, retval);
-                        break;
-                case BD_WRITE_BLOCKS:
-                        ba = MERGE_LOUP32(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-                        cnt = IPC_GET_ARG3(call);
-                        retval = usbmast_write(msfun->usb_dev, ba, cnt,
-                            msfun->block_size, comm_buf);
-                        async_answer_0(callid, retval);
-                        break;
-                default:
-                        async_answer_0(callid, EINVAL);
-                }
-        }
 }