Changeset f126c87 in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 mainline.

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (4 diffs)

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

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbehci
  * @{
@@ -33 +34 @@
  * Main routines of EHCI driver.
  */
+
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
@@ -70 +72 @@
 
 
-static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
+    bool irq)
 {
         assert(hcd);
@@ -138 +141 @@
         return ddf_driver_main(&ehci_driver);
 }
+
 /**
  * @}