Changeset df6ded8 in mainline for uspace/drv/block/usbmast/main.c

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

uspace/drv/block/usbmast/main.c

@@ -2 +2 @@
  * Copyright (c) 2011 Vojtech Horky
  * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -156 +157 @@
             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");
+                usb_log_error("Required EPs were not mapped.");
                 return ENOENT;
         }
@@ -163 +164 @@
         mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
-                usb_log_error("Failed allocating softstate.\n");
+                usb_log_error("Failed allocating softstate.");
                 return ENOMEM;
         }
@@ -169 +170 @@
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n",
+        usb_log_info("Initializing mass storage `%s'.",
             usb_device_get_name(dev));
-        usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
-            epm_in->pipe.endpoint_no, epm_in->pipe.max_packet_size);
-        usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
-            epm_out->pipe.endpoint_no, epm_out->pipe.max_packet_size);
-
-        usb_log_debug("Get LUN count...\n");
+        usb_log_debug("Bulk in endpoint: %d [%zuB].",
+            epm_in->pipe.desc.endpoint_no, epm_in->pipe.desc.max_transfer_size);
+        usb_log_debug("Bulk out endpoint: %d [%zuB].",
+            epm_out->pipe.desc.endpoint_no, epm_out->pipe.desc.max_transfer_size);
+
+        usb_log_debug("Get LUN count...");
         mdev->lun_count = usb_masstor_get_lun_count(mdev);
         mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
         if (mdev->luns == NULL) {
-                rc = ENOMEM;
-                usb_log_error("Failed allocating luns table.\n");
-                goto error;
+                usb_log_error("Failed allocating luns table.");
+                return ENOMEM;
         }
 
@@ -226 +226 @@
 
         if (asprintf(&fun_name, "l%u", lun) < 0) {
-                usb_log_error("Out of memory.\n");
+                usb_log_error("Out of memory.");
                 rc = ENOMEM;
                 goto error;
@@ -233 +233 @@
         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);
+                usb_log_error("Failed to create DDF function %s.", fun_name);
                 rc = ENOMEM;
                 goto error;
@@ -241 +241 @@
         mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
         if (mfun == NULL) {
-                usb_log_error("Failed allocating softstate.\n");
+                usb_log_error("Failed allocating softstate.");
                 rc = ENOMEM;
                 goto error;
@@ -257 +257 @@
         ddf_fun_set_conn_handler(fun, usbmast_bd_connection);
 
-        usb_log_debug("Inquire...\n");
+        usb_log_debug("Inquire...");
         usbmast_inquiry_data_t inquiry;
         rc = usbmast_inquiry(mfun, &inquiry);
         if (rc != EOK) {
-                usb_log_warning("Failed to inquire device `%s': %s.\n",
+                usb_log_warning("Failed to inquire device `%s': %s.",
                     usb_device_get_name(mdev->usb_dev), str_error(rc));
                 rc = EIO;
@@ -281 +281 @@
         rc = usbmast_read_capacity(mfun, &nblocks, &block_size);
         if (rc != EOK) {
-                usb_log_warning("Failed to read capacity, device `%s': %s.\n",
+                usb_log_warning("Failed to read capacity, device `%s': %s.",
                     usb_device_get_name(mdev->usb_dev), str_error(rc));
                 rc = EIO;
@@ -295 +295 @@
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                usb_log_error("Failed to bind DDF function %s: %s.\n",
+                usb_log_error("Failed to bind DDF function %s: %s.",
                     fun_name, str_error(rc));
                 goto error;
@@ -390 +390 @@
 static const usb_driver_ops_t usbmast_driver_ops = {
         .device_add = usbmast_device_add,
-        .device_rem = usbmast_device_remove,
+        .device_remove = usbmast_device_remove,
         .device_gone = usbmast_device_gone,
 };