Changeset c9113d2 in mainline

Timestamp:

2010-12-12T14:52:39Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

138a7fd

Parents:

a822cd8 (diff), 3b9f1fd (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 development/ changes

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (2 diffs)
• usbhub.h (modified) (1 diff)
• utils.c (modified) (15 diffs)

uspace/drv/usbhub/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/usbdrv.h>
+
 #include <driver.h>
 #include <errno.h>
+#include <async.h>
+
+#include <usb/usbdrv.h>
 #include "usbhub.h"
 #include "usbhub_private.h"
@@ -44 +47 @@
 };
 
+int usb_hub_control_loop(void * noparam){
+        while(true){
+                usb_hub_check_hub_changes();
+                async_usleep(10000);
+        }
+        return 0;
+}
+
+
 int main(int argc, char *argv[])
 {
         usb_lst_init(&usb_hub_list);
+        fid_t fid = fibril_create(usb_hub_control_loop, NULL);
+        if (fid == 0) {
+                printf("%s: failed to start fibril for HUB devices\n", NAME);
+                return ENOMEM;
+        }
+        fibril_add_ready(fid);
+
         return driver_main(&hub_driver);
 }

uspace/drv/usbhub/usbhub.h

@@ -46 +46 @@
         /** Number of ports. */
         int port_count;
-        /** General device info. */
-        usb_hcd_attached_device_info_t * device;
+        /** General usb device info. */
+        usb_hcd_attached_device_info_t * usb_device;
+        /** General device info*/
+        device_t * device;
+
 } usb_hub_info_t;
 
-int usb_add_hub_device(device_t *);
+/**
+ * function running the hub-controlling loop.
+ * @param noparam fundtion does not need any parameters
+ */
+int usb_hub_control_loop(void * noparam);
+
+/** Callback when new hub device is detected.
+ *
+ * @param dev New device.
+ * @return Error code.
+ */
+int usb_add_hub_device(device_t *dev);
+
+/**
+ * check changes on all registered hubs
+ */
+void usb_hub_check_hub_changes(void);
+
+
+//int usb_add_hub_device(device_t *);
+
+
 
 #endif

uspace/drv/usbhub/utils.c

@@ -34 +34 @@
  */
 #include <driver.h>
-#include <usb/devreq.h>
+#include <bool.h>
+#include <errno.h>
+
 #include <usbhc_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
-#include <driver.h>
-#include <bool.h>
-#include <errno.h>
+#include <usb/devreq.h>
 #include <usb/classes/hub.h>
+
 #include "usbhub.h"
 #include "usbhub_private.h"
 #include "port_status.h"
-#include <usb/devreq.h>
-
-static void check_hub_changes(void);
+
 
 size_t USB_HUB_MAX_DESCRIPTOR_SIZE = 71;
@@ -302 +301 @@
         //result->device = device;
         result->port_count = -1;
+        /// \TODO is this correct? is the device stored?
+        result->device = device;
 
 
@@ -316 +317 @@
         }*/
 
-        result->device = usb_new(usb_hcd_attached_device_info_t);
-        result->device->address = addr;
+        result->usb_device = usb_new(usb_hcd_attached_device_info_t);
+        result->usb_device->address = addr;
 
         // get hub descriptor
@@ -362 +363 @@
 }
 
-/** Callback when new hub device is detected.
- *
- * @param dev New device.
- * @return Error code.
- */
 int usb_add_hub_device(device_t *dev) {
         printf(NAME ": add_hub_device(handle=%d)\n", (int) dev->handle);
@@ -387 +383 @@
         usb_device_request_setup_packet_t request;
         usb_target_t target;
-        target.address = hub_info->device->address;
+        target.address = hub_info->usb_device->address;
         target.endpoint = 0;
         for (port = 0; port < hub_info->port_count; ++port) {
@@ -404 +400 @@
         printf("[usb_hub] hub info added to list\n");
         //(void)hub_info;
-        check_hub_changes();
+        usb_hub_check_hub_changes();
 
         /// \TODO start the check loop, if not already started...
@@ -412 +408 @@
 
         printf("[usb_hub] hub dev added\n");
+        printf("\taddress %d, has %d ports \n",
+                        hub_info->usb_device->address,
+                        hub_info->port_count);
 
         return EOK;
@@ -429 +428 @@
  * @param target
  */
-
 static void usb_hub_init_add_device(int hc, uint16_t port, usb_target_t target) {
         usb_device_request_setup_packet_t request;
@@ -459 +457 @@
  * @param target
  */
-static void usb_hub_finalize_add_device(
+static void usb_hub_finalize_add_device( usb_hub_info_t * hub,
                 int hc, uint16_t port, usb_target_t target) {
 
@@ -479 +477 @@
                 return;
         }
+
+
         usb_drv_release_default_address(hc);
 
-
-        /// \TODO driver work
-        //add_child_device.....
+        devman_handle_t child_handle;
+        opResult = usb_drv_register_child_in_devman(hc, hub->device,
+        new_device_address, &child_handle);
+        if (opResult != EOK) {
+                printf("[usb_hub] could not start driver for new device \n");
+                return;
+        }
+        usb_drv_bind_address(hc, new_device_address, child_handle);
+        
 }
 
@@ -519 +525 @@
  * @param target
  */
-static void usb_hub_process_interrupt(int hc, uint16_t port, usb_target_t target) {
+static void usb_hub_process_interrupt(usb_hub_info_t * hub, int hc, uint16_t port, usb_target_t target) {
         printf("[usb_hub] interrupt at port %d\n", port);
         //determine type of change
@@ -554 +560 @@
                 printf("[usb_hub] finalizing add device\n");
                 if (usb_port_enabled(&status)) {
-                        usb_hub_finalize_add_device(hc, port, target);
+                        usb_hub_finalize_add_device(hub, hc, port, target);
                 } else {
                         printf("[usb_hub] ERROR: port reset, but port still not enabled\n");
@@ -585 +591 @@
 /** Check changes on all known hubs.
  */
-static void check_hub_changes(void) {
+void usb_hub_check_hub_changes(void) {
         /*
          * Iterate through all hubs.
@@ -594 +600 @@
                         lst_item = lst_item->next) {
                 printf("[usb_hub] checking hub changes\n");
+                usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
                 /*
                  * Check status change pipe of this hub.
                  */
 
-                usb_target_t target = {
-                        .address = 5,
-                        .endpoint = 1
-                };
-                /// \TODO uncomment once it works correctly
-                //target.address = usb_create_hub_info(lst_item)->device->address;
-
-                size_t port_count = 7;
+                usb_target_t target;
+                target.address = hub_info->usb_device->address;
+                target.endpoint = 1;
+
+                size_t port_count = hub_info->port_count;
 
                 /*
                  * Connect to respective HC.
                  */
-                /// \FIXME this is incorrect code: here
-                /// must be used particular device instead of NULL
-                //which one?
-                int hc = usb_drv_hc_connect(NULL, 0);
+                int hc = usb_drv_hc_connect(hub_info->device, 0);
                 if (hc < 0) {
                         continue;
@@ -642 +643 @@
                         bool interrupt = (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2;
                         if (interrupt) {
-                                usb_hub_process_interrupt(hc, port, target);
+                                usb_hub_process_interrupt(hub_info, hc, port, target);
                         }
                 }