Changeset ab545980 in mainline for uspace/drv/bus/usb/usbhub/main.c

Timestamp:

2011-09-27T11:37:44Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

747a1e71

Parents:

c94f643 (diff), a1cb170 (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 usb branch.

usbhub driver rewrite.

There are still some TODOs to fix but the
codebase should be smaller and cleaner.

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/classes.h>
+#include <usb/debug.h>
 
 #include "usbhub.h"
-#include "usbhub_private.h"
 
 /** Hub status-change endpoint description.
@@ -56 +57 @@
 
 /**
- * usb hub driver operations
+ * USB hub driver operations
  *
  * The most important one is add_device, which is set to usb_hub_add_device.
@@ -64 +65 @@
 };
 
-/**
- * hub endpoints, excluding control endpoint
- */
+/** Hub endpoints, excluding control endpoint. */
 static usb_endpoint_description_t *usb_hub_endpoints[] = {
         &hub_status_change_endpoint_description,
-        NULL
+        NULL,
 };
-
-/**
- * static usb hub driver information
- */
+/** Static usb hub driver information. */
 static usb_driver_t usb_hub_driver = {
         .name = NAME,
@@ -85 +81 @@
 {
         printf(NAME ": HelenOS USB hub driver.\n");
-
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
 
@@ -94 +89 @@
  * @}
  */
-