Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

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

@@ -44 +44 @@
 #include <usb/classes/massstor.h>
 #include <errno.h>
+#include <io/logctl.h>
 #include <str_error.h>
 #include "cmdw.h"
@@ -51 +52 @@
 
 #define NAME "usbmast"
-
-#define GET_BULK_IN(dev) ((dev)->pipes[BULK_IN_EP].pipe)
-#define GET_BULK_OUT(dev) ((dev)->pipes[BULK_OUT_EP].pipe)
 
 static const usb_endpoint_description_t bulk_in_ep = {
@@ -112 +110 @@
 static int usbmast_device_gone(usb_device_t *dev)
 {
-        usbmast_dev_t *mdev = dev->driver_data;
+        usbmast_dev_t *mdev = usb_device_data_get(dev);
         assert(mdev);
 
@@ -152 +150 @@
         unsigned i;
 
+        usb_endpoint_mapping_t *epm_in =
+            usb_device_get_mapped_ep_desc(dev, &bulk_in_ep);
+        usb_endpoint_mapping_t *epm_out =
+            usb_device_get_mapped_ep_desc(dev, &bulk_out_ep);
+        if (!epm_in || !epm_out || !epm_in->present || !epm_out->present) {
+                usb_log_error("Required EPs were not mapped.\n");
+                return ENOENT;
+        }
+
         /* Allocate softstate */
         mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t));
@@ -159 +166 @@
         }
 
-        mdev->ddf_dev = dev->ddf_dev;
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("Initializing mass storage `%s'.\n",
+            usb_device_get_name(dev));
         usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_IN_EP].pipe.endpoint_no,
-            dev->pipes[BULK_IN_EP].pipe.max_packet_size);
+            epm_in->pipe.endpoint_no, epm_in->pipe.max_packet_size);
         usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_OUT_EP].pipe.endpoint_no,
-            dev->pipes[BULK_OUT_EP].pipe.max_packet_size);
+            epm_out->pipe.endpoint_no, epm_out->pipe.max_packet_size);
 
         usb_log_debug("Get LUN count...\n");
@@ -179 +184 @@
         }
 
+        mdev->bulk_in_pipe = &epm_in->pipe;
+        mdev->bulk_out_pipe = &epm_out->pipe;
         for (i = 0; i < mdev->lun_count; i++) {
                 rc = usbmast_fun_create(mdev, i);
@@ -223 +230 @@
         }
 
-        fun = ddf_fun_create(mdev->ddf_dev, fun_exposed, fun_name);
+        fun = usb_device_ddf_fun_create(mdev->usb_dev, fun_exposed, fun_name);
         if (fun == NULL) {
                 usb_log_error("Failed to create DDF function %s.\n", fun_name);
@@ -254 +261 @@
         if (rc != EOK) {
                 usb_log_warning("Failed to inquire device `%s': %s.\n",
-                    ddf_dev_get_name(mdev->ddf_dev), str_error(rc));
+                    usb_device_get_name(mdev->usb_dev), str_error(rc));
                 rc = EIO;
                 goto error;
@@ -261 +268 @@
         usb_log_info("Mass storage `%s' LUN %u: " \
             "%s by %s rev. %s is %s (%s).\n",
-            ddf_dev_get_name(mdev->ddf_dev),
+            usb_device_get_name(mdev->usb_dev),
             lun,
             inquiry.product,
@@ -274 +281 @@
         if (rc != EOK) {
                 usb_log_warning("Failed to read capacity, device `%s': %s.\n",
-                    ddf_dev_get_name(mdev->ddf_dev), str_error(rc));
+                    usb_device_get_name(mdev->usb_dev), str_error(rc));
                 rc = EIO;
                 goto error;
@@ -396 +403 @@
 {
         log_init(NAME);
-
+        logctl_set_log_level(NAME, LVL_NOTE);
         return usb_driver_main(&usbmast_driver);
 }