Changeset 578a2547 in mainline

Timestamp:

2011-04-07T12:01:05Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3eaa5a5

Parents:

9f9b31ad

Message:

Hub driver uses standard wrapper for new devices

To allow usage of the standard function, the port reset signalling
must be done through condition variable.

Location:

uspace/drv/usbhub

Files:

• Makefile (modified) (1 diff)
• ports.c (added)
• ports.h (added)
• usbhub.c (modified) (12 diffs)
• usbhub.h (modified) (2 diffs)

uspace/drv/usbhub/Makefile

@@ -34 +34 @@
 SOURCES = \
         main.c \
+        ports.c \
         utils.c \
         usbhub.c \

uspace/drv/usbhub/usbhub.c

@@ -54 +54 @@
 
 
-static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
-                usb_speed_t speed);
+//static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
+//              usb_speed_t speed);
 
 static int usb_hub_trigger_connecting_non_removable_devices(
                 usb_hub_info_t * hub, usb_hub_descriptor_t * descriptor);
 
+#if 0
 /**
  * control loop running in hub`s fibril
@@ -81 +82 @@
         return 0;
 }
+#endif
 
 
@@ -152 +154 @@
         usb_log_debug("setting port count to %d\n",descriptor->ports_count);
         hub_info->port_count = descriptor->ports_count;
-        hub_info->attached_devs = (usb_hc_attached_device_t*)
-            malloc((hub_info->port_count+1) * sizeof(usb_hc_attached_device_t));
-        int i;
-        for(i=0;i<hub_info->port_count+1;++i){
-                hub_info->attached_devs[i].handle=0;
-                hub_info->attached_devs[i].address=0;
+        hub_info->ports = malloc(sizeof(usb_hub_port_t) * (hub_info->port_count+1));
+        size_t port;
+        for (port = 0; port < hub_info->port_count + 1; port++) {
+                usb_hub_port_init(&hub_info->ports[port]);
         }
         //handle non-removable devices
@@ -259 +259 @@
         assert(rc == EOK);
 
-        //create fibril for the hub control loop
-        fid_t fid = fibril_create(usb_hub_control_loop, hub_info);
-        if (fid == 0) {
-                usb_log_error("failed to start monitoring fibril for new hub.\n");
-                return ENOMEM;
-        }
-        fibril_add_ready(fid);
-        usb_log_debug("Hub fibril created.\n");
+        /*
+         * The processing will require opened control pipe and connection
+         * to the host controller.
+         * It is waste of resources but let's hope there will be less
+         * hubs than the phone limit.
+         * FIXME: with some proper locking over pipes and session
+         * auto destruction, this could work better.
+         */
+        rc = usb_pipe_start_session(&usb_dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Failed to start session on control pipe: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
+        rc = usb_hc_connection_open(&hub_info->connection);
+        if (rc != EOK) {
+                usb_pipe_end_session(&usb_dev->ctrl_pipe);
+                usb_log_error("Failed to open connection to HC: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
+
+        rc = usb_device_auto_poll(hub_info->usb_device, 0,
+            hub_port_changes_callback, ((hub_info->port_count+1) / 8) + 1,
+            NULL, hub_info);
+        if (rc != EOK) {
+                usb_log_error("Failed to create polling fibril: %s.\n",
+                    str_error(rc));
+                free(hub_info);
+                return rc;
+        }
 
         usb_log_info("Controlling hub `%s' (%d ports).\n",
             hub_info->usb_device->ddf_dev->name, hub_info->port_count);
         return EOK;
+
+leave:
+        free(hub_info);
+
+        return rc;
 }
 
@@ -399 +427 @@
 }
 
+#if 0
 /**
  * Reset the port with new device and reserve the default address.
@@ -440 +469 @@
         return;
 }
-
+#endif
+
+#if 0
 /**
  * Finalize adding new device after port reset
@@ -529 +560 @@
             new_device_address, child_handle);
 }
+#endif
 
 /**
@@ -539 +571 @@
  * @param port port number, starting from 1
  */
-static void usb_hub_removed_device(
+void usb_hub_removed_device(
     usb_hub_info_t * hub,uint16_t port) {
 
@@ -552 +584 @@
         
         //close address
-        if(hub->attached_devs[port].address!=0){
+        if(hub->ports[port].attached_device.address >= 0){
                 /*uncomment this code to use it when DDF allows device removal
                 opResult = usb_hc_unregister_device(
@@ -579 +611 @@
  * @param port port number, starting from 1
  */
-static void usb_hub_over_current( usb_hub_info_t * hub,
+void usb_hub_over_current( usb_hub_info_t * hub,
                 uint16_t port){
         int opResult;
@@ -590 +622 @@
 }
 
+#if 0
 /**
  * Process interrupts on given hub port
@@ -737 +770 @@
         return EOK;
 }
-
+#endif
 
 

uspace/drv/usbhub/usbhub.h

@@ -47 +47 @@
 #include <usb/devdrv.h>
 
+#include "ports.h"
+
+
 
 /** Information about attached hub. */
 typedef struct {
         /** Number of ports. */
-        int port_count;
+        size_t port_count;
 
-        /** attached device handles, for each port one */
-        usb_hc_attached_device_t * attached_devs;
+        /** Ports. */
+        usb_hub_port_t *ports;
         
         /** connection to hcd */
@@ -100 +103 @@
 int usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param);
 
+void usb_hub_removed_device(usb_hub_info_t *, uint16_t);
+void usb_hub_over_current(usb_hub_info_t *, uint16_t);
 
 int usb_hub_add_device(usb_device_t * usb_dev);