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

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

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.
@@ -46 +47 @@
  * For more information see section 11.15.1 of USB 1.1 specification.
  */
-static usb_endpoint_description_t hub_status_change_endpoint_description = {
+static const usb_endpoint_description_t hub_status_change_endpoint_description =
+{
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
@@ -55 +57 @@
 };
 
-/**
- * usb hub driver operations
- *
- * The most important one is add_device, which is set to usb_hub_add_device.
- */
-static usb_driver_ops_t usb_hub_driver_ops = {
-        .add_device = usb_hub_add_device
+/** USB hub driver operations. */
+static const usb_driver_ops_t usb_hub_driver_ops = {
+        .device_add = usb_hub_device_add,
+//      .device_rem = usb_hub_device_remove,
+        .device_gone = usb_hub_device_gone,
 };
 
-/**
- * hub endpoints, excluding control endpoint
- */
-static usb_endpoint_description_t *usb_hub_endpoints[] = {
+/** Hub endpoints, excluding control endpoint. */
+static const usb_endpoint_description_t *usb_hub_endpoints[] = {
         &hub_status_change_endpoint_description,
-        NULL
+        NULL,
 };
-
-/**
- * static usb hub driver information
- */
-static usb_driver_t usb_hub_driver = {
+/** Static usb hub driver information. */
+static const usb_driver_t usb_hub_driver = {
         .name = NAME,
         .ops = &usb_hub_driver_ops,
@@ -81 +76 @@
 };
 
-
 int main(int argc, char *argv[])
 {
         printf(NAME ": HelenOS USB hub driver.\n");
-
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
 
@@ -94 +87 @@
  * @}
  */
-