Changeset 62f4212 in mainline for uspace/drv/usbhub/main.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

• uspace/drv/usbhub/main.c (modified) (1 diff)

uspace/drv/usbhub/main.c

@@ -36 +36 @@
 #include <stdio.h>
 
+#include <usb/devdrv.h>
+#include <usb/classes/classes.h>
+
 #include "usbhub.h"
 #include "usbhub_private.h"
 
-
-usb_general_list_t usb_hub_list;
-fibril_mutex_t usb_hub_list_lock;
-
-static driver_ops_t hub_driver_ops = {
-        .add_device = usb_add_hub_device,
+/** 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,
+        .interface_class = USB_CLASS_HUB,
+        .interface_subclass = 0,
+        .interface_protocol = 0,
+        .flags = 0
 };
 
-static driver_t hub_driver = {
-        .name = "usbhub",
-        .driver_ops = &hub_driver_ops
+
+static usb_driver_ops_t usb_hub_driver_ops = {
+        .add_device = usb_hub_add_device
 };
+
+static usb_endpoint_description_t *usb_hub_endpoints[] = {
+        &hub_status_change_endpoint_description,
+        NULL
+};
+
+static usb_driver_t usb_hub_driver = {
+        .name = NAME,
+        .ops = &usb_hub_driver_ops,
+        .endpoints = usb_hub_endpoints
+};
+
 
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
-        dprintf(USB_LOG_LEVEL_INFO, "starting hub driver");
+        printf(NAME ": HelenOS USB hub driver.\n");
 
-        //this is probably not needed anymore
-        fibril_mutex_initialize(&usb_hub_list_lock);
-        fibril_mutex_lock(&usb_hub_list_lock);
-        usb_lst_init(&usb_hub_list);
-        fibril_mutex_unlock(&usb_hub_list_lock);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
         
-        return ddf_driver_main(&hub_driver);
+        return usb_driver_main(&usb_hub_driver);
 }