Changeset eb522e8 in mainline for uspace/drv/usbhub/main.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/drv/usbhub/main.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_module.c ) (2 diffs)

uspace/drv/usbhub/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Lukas Mejdrech
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
+/** @addtogroup drvusbhub
  * @{
  */
 
-/** @file
- * ICMP standalone module implementation.
- * Contains skeleton module functions mapping.
- * The functions are used by the module skeleton as module specific entry points.
- * @see module.c
+#include <ddf/driver.h>
+#include <errno.h>
+#include <async.h>
+#include <stdio.h>
+
+#include <usb/dev/driver.h>
+#include <usb/classes/classes.h>
+
+#include "usbhub.h"
+#include "usbhub_private.h"
+
+/** 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
+};
+
+/**
+ * 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
+};
+
+/**
+ * hub endpoints, excluding control endpoint
+ */
+static usb_endpoint_description_t *usb_hub_endpoints[] = {
+        &hub_status_change_endpoint_description,
+        NULL
+};
+
+/**
+ * static usb hub driver information
+ */
+static usb_driver_t usb_hub_driver = {
+        .name = NAME,
+        .ops = &usb_hub_driver_ops,
+        .endpoints = usb_hub_endpoints
+};
+
+
+int main(int argc, char *argv[])
+{
+        printf(NAME ": HelenOS USB hub driver.\n");
+
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+
+        return usb_driver_main(&usb_hub_driver);
+}
+
+/**
+ * @}
  */
 
-#include "icmp.h"
-#include "icmp_module.h"
-
-#include <async.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-
-#include <net/modules.h>
-#include <net/packet.h>
-#include <net_interface.h>
-
-#include <tl_local.h>
-
-/** ICMP module global data. */
-extern icmp_globals_t icmp_globals;
-
-int tl_module_start_standalone(async_client_conn_t client_connection)
-{
-        ipcarg_t phonehash;
-        int rc;
-
-        async_set_client_connection(client_connection);
-        icmp_globals.net_phone = net_connect_module();
-        if (icmp_globals.net_phone < 0)
-                return icmp_globals.net_phone;
-
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
-        
-        rc = icmp_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-
-        rc = REGISTER_ME(SERVICE_ICMP, &phonehash);
-        if (rc != EOK)
-                goto out;
-
-        async_manager();
-
-out:
-        pm_destroy();
-        return rc;
-}
-
-int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
-{
-        return icmp_message_standalone(callid, call, answer, answer_count);
-}
-
-/** @}
- */