Changeset 41ef5b9 in mainline for uspace/drv/usbhub/main.c

Timestamp:

2011-03-21T17:16:10Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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/development

File:

• uspace/drv/usbhub/main.c (modified) (3 diffs)

uspace/drv/usbhub/main.c

@@ -42 +42 @@
 #include "usbhub_private.h"
 
-
-usb_endpoint_description_t hub_status_change_endpoint_description = {
+/** Hub status-change endpoint description.
+ *
+ * For more information see section 11.15.1 of USB 1.1 specification.
+ */
+static usb_endpoint_description_t hub_status_change_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
@@ -57 +60 @@
 };
 
+static usb_endpoint_description_t *usb_hub_endpoints[] = {
+        &hub_status_change_endpoint_description,
+        NULL
+};
+
 static usb_driver_t usb_hub_driver = {
-        .name = "usbhub",
-        .ops = &usb_hub_driver_ops
+        .name = NAME,
+        .ops = &usb_hub_driver_ops,
+        .endpoints = usb_hub_endpoints
 };
 
@@ -65 +74 @@
 int main(int argc, char *argv[])
 {
+        printf(NAME ": HelenOS USB hub driver.\n");
+
         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
-        usb_log_info("starting hub driver\n");
-
         
-        usb_hub_driver.endpoints = (usb_endpoint_description_t**)
-                        malloc(2 * sizeof(usb_endpoint_description_t*));
-        usb_hub_driver.endpoints[0] = &hub_status_change_endpoint_description;
-        usb_hub_driver.endpoints[1] = NULL;
-
         return usb_driver_main(&usb_hub_driver);
 }