Changes in / [8dd039a:557c7d0] in mainline

Location:

uspace

Files:

• drv/usbhub/Makefile (modified) (1 diff)
• drv/usbhub/main.c (modified) (2 diffs)
• drv/usbhub/usbhub.c (deleted)
• drv/usbhub/usbhub_private.h (modified) (2 diffs)
• drv/usbhub/usblist.c (deleted)
• drv/usbhub/usblist.h (deleted)
• drv/usbhub/utils.c (modified) (5 diffs)
• lib/usb/include/usb/hcdhubd.h (modified) (1 diff)

uspace/drv/usbhub/Makefile

@@ -34 +34 @@
 SOURCES = \
         main.c \
-        utils.c \
-        usbhub.c \
-        usblist.c
+        utils.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/usbhub/main.c

@@ -32 +32 @@
 
 #include <usb/usbdrv.h>
-
 #include "usbhub.h"
 #include "usbhub_private.h"
@@ -59 +58 @@
 int main(int argc, char *argv[])
 {
-        usb_dprintf_enable(NAME,1);
         usb_lst_init(&usb_hub_list);
         fid_t fid = fibril_create(usb_hub_control_loop, NULL);
         if (fid == 0) {
-                dprintf(1, "failed to start fibril for HUB devices");
-                //printf("%s: failed to start fibril for HUB devices\n", NAME);
+                printf("%s: failed to start fibril for HUB devices\n", NAME);
                 return ENOMEM;
         }

uspace/drv/usbhub/usbhub_private.h

@@ -38 +38 @@
 
 #include "usbhub.h"
-#include "usblist.h"
-
 #include <adt/list.h>
 #include <bool.h>
 #include <driver.h>
 #include <usb/usb.h>
-#include <usb/usbdrv.h>
 #include <usb/classes/hub.h>
 #include <usb/devreq.h>
-#include <usb/debug.h>
 
 //************
@@ -59 +55 @@
 //************
 //
-// convenience debug printf
-//
-//************
-#define dprintf(level, format, ...) \
-        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
+// My private list implementation; I did not like the original helenos list
+//
+// This one does not depend on the structure of stored data
+//
+//************
+
+/** general list structure */
+
+
+typedef struct usb_general_list{
+        void * data;
+        struct usb_general_list * prev, * next;
+} usb_general_list_t;
+
+/** create head of usb general list */
+usb_general_list_t * usb_lst_create(void);
+
+/** initialize head of usb general list */
+void usb_lst_init(usb_general_list_t * lst);
+
+
+/** is the list empty? */
+static inline bool usb_lst_empty(usb_general_list_t * lst){
+        return lst?(lst->next==lst):true;
+}
+
+/** append data behind item */
+void usb_lst_append(usb_general_list_t * lst, void * data);
+
+/** prepend data beore item */
+void usb_lst_prepend(usb_general_list_t * lst, void * data);
+
+/** remove list item from list */
+void usb_lst_remove(usb_general_list_t * item);
+
+/** get data o specified type from list item */
+#define usb_lst_get_data(item, type)  (type *) (item->data)
+
+/** get usb_hub_info_t data from list item */
+static inline usb_hub_info_t * usb_hub_lst_get_data(usb_general_list_t * item) {
+        return usb_lst_get_data(item,usb_hub_info_t);
+}
 
 /**

uspace/drv/usbhub/utils.c

@@ -31 +31 @@
  */
 /** @file
- * @brief various utilities
+ * @brief Hub driver.
  */
 #include <driver.h>
@@ -90 +90 @@
 
         if (sdescriptor[1] != USB_DESCTYPE_HUB) {
-                dprintf(1,"[usb_hub] wrong descriptor %x\n",sdescriptor[1]);
+                printf("[usb_hub] wrong descriptor %x\n",sdescriptor[1]);
                 return NULL;
         }
@@ -102 +102 @@
         result->pwr_on_2_good_time = sdescriptor[5];
         result->current_requirement = sdescriptor[6];
-        size_t var_size = result->ports_count / 8 + ((result->ports_count % 8 > 0)
-                        ? 1 : 0);
+        size_t var_size = result->ports_count / 8 + ((result->ports_count % 8 > 0) ? 1 : 0);
         result->devices_removable = (uint8_t*) malloc(var_size);
         //printf("[usb_hub] getting removable devices data \n");
@@ -199 +198 @@
 }
 
-
-/*
- * method for testing port status bitmap
- 
+//list implementation
+
+usb_general_list_t * usb_lst_create(void) {
+        usb_general_list_t* result = usb_new(usb_general_list_t);
+        usb_lst_init(result);
+        return result;
+}
+
+void usb_lst_init(usb_general_list_t * lst) {
+        lst->prev = lst;
+        lst->next = lst;
+        lst->data = NULL;
+}
+
+void usb_lst_prepend(usb_general_list_t* item, void* data) {
+        usb_general_list_t* appended = usb_new(usb_general_list_t);
+        appended->data = data;
+        appended->next = item;
+        appended->prev = item->prev;
+        item->prev->next = appended;
+        item->prev = appended;
+}
+
+void usb_lst_append(usb_general_list_t* item, void* data) {
+        usb_general_list_t* appended = usb_new(usb_general_list_t);
+        appended->data = data;
+        appended->next = item->next;
+        appended->prev = item;
+        item->next->prev = appended;
+        item->next = appended;
+}
+
+void usb_lst_remove(usb_general_list_t* item) {
+        item->next->prev = item->prev;
+        item->prev->next = item->next;
+}
+
 static void usb_hub_test_port_status(void) {
         printf("[usb_hub] -------------port status test---------\n");
@@ -254 +286 @@
         //printf("this should be 0: %d \n",usb_port_get_bit(&status,4));
 
-}
-*/
-
+
+
+
+}
+
+//*********************************************
+//
+//  hub driver code, initialization
+//
+//*********************************************
+
+usb_hub_info_t * usb_create_hub_info(device_t * device, int hc) {
+        usb_hub_info_t* result = usb_new(usb_hub_info_t);
+        //result->device = device;
+        result->port_count = -1;
+        /// \TODO is this correct? is the device stored?
+        result->device = device;
+
+
+        //printf("[usb_hub] phone to hc = %d\n", hc);
+        if (hc < 0) {
+                return result;
+        }
+        //get some hub info
+        usb_address_t addr = usb_drv_get_my_address(hc, device);
+        printf("[usb_hub] addres of newly created hub = %d\n", addr);
+        /*if(addr<0){
+                //return result;
+                
+        }*/
+
+        result->usb_device = usb_new(usb_hcd_attached_device_info_t);
+        result->usb_device->address = addr;
+
+        // get hub descriptor
+        usb_target_t target;
+        target.address = addr;
+        target.endpoint = 0;
+        usb_device_request_setup_packet_t request;
+        //printf("[usb_hub] creating descriptor request\n");
+        usb_hub_set_descriptor_request(&request);
+
+        //printf("[usb_hub] creating serialized descriptor\n");
+        void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
+        usb_hub_descriptor_t * descriptor;
+        size_t received_size;
+        int opResult;
+        //printf("[usb_hub] starting control transaction\n");
+        opResult = usb_drv_sync_control_read(
+                        hc, target, &request, serialized_descriptor,
+                        USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
+        if (opResult != EOK) {
+                printf("[usb_hub] failed when receiving hub descriptor, badcode = %d\n",opResult);
+                ///\TODO memory leak will occur here!
+                return result;
+        }
+        //printf("[usb_hub] deserializing descriptor\n");
+        descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
+        if(descriptor==NULL){
+                printf("[usb_hub] could not deserialize descriptor \n");
+                result->port_count = 1;///\TODO this code is only for debug!!!
+                return result;
+        }
+        //printf("[usb_hub] setting port count to %d\n",descriptor->ports_count);
+        result->port_count = descriptor->ports_count;
+        result->attached_devs = (usb_hub_attached_device_t*)
+            malloc((result->port_count+1) * sizeof(usb_hub_attached_device_t));
+        int i;
+        for(i=0;i<result->port_count+1;++i){
+                result->attached_devs[i].devman_handle=0;
+                result->attached_devs[i].address=0;
+        }
+        //printf("[usb_hub] freeing data\n");
+        free(serialized_descriptor);
+        free(descriptor->devices_removable);
+        free(descriptor);
+
+        //finish
+
+        printf("[usb_hub] hub info created\n");
+
+        return result;
+}
+
+int usb_add_hub_device(device_t *dev) {
+        printf(NAME ": add_hub_device(handle=%d)\n", (int) dev->handle);
+        printf("[usb_hub] hub device\n");
+
+        /*
+         * We are some (probably deeply nested) hub.
+         * Thus, assign our own operations and explore already
+         * connected devices.
+         */
+
+        //create the hub structure
+        //get hc connection
+        /// \TODO correct params
+        int hc = usb_drv_hc_connect(dev, 0);
+
+        usb_hub_info_t * hub_info = usb_create_hub_info(dev, hc);
+        int port;
+        int opResult;
+        usb_device_request_setup_packet_t request;
+        usb_target_t target;
+        target.address = hub_info->usb_device->address;
+        target.endpoint = 0;
+
+        //get configuration descriptor
+        // this is not fully correct - there are more configurations
+        // and all should be checked
+        usb_standard_device_descriptor_t std_descriptor;
+        opResult = usb_drv_req_get_device_descriptor(hc, target.address,
+    &std_descriptor);
+        if(opResult!=EOK){
+                printf("[usb_hub] could not get device descriptor, %d\n",opResult);
+                return 1;///\TODO some proper error code needed
+        }
+        printf("[usb_hub] hub has %d configurations\n",std_descriptor.configuration_count);
+        if(std_descriptor.configuration_count<1){
+                printf("[usb_hub] THERE ARE NO CONFIGURATIONS AVAILABLE\n");
+        }
+        usb_standard_configuration_descriptor_t config_descriptor;
+        opResult = usb_drv_req_get_bare_configuration_descriptor(hc,
+        target.address, 0,
+        &config_descriptor);
+        if(opResult!=EOK){
+                printf("[usb_hub] could not get configuration descriptor, %d\n",opResult);
+                return 1;///\TODO some proper error code needed
+        }
+        //set configuration
+        request.request_type = 0;
+        request.request = USB_DEVREQ_SET_CONFIGURATION;
+        request.index=0;
+        request.length=0;
+        request.value_high=0;
+        request.value_low = config_descriptor.configuration_number;
+        opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
+        if (opResult != EOK) {
+                printf("[usb_hub]something went wrong when setting hub`s configuration, %d\n", opResult);
+        }
+
+
+        for (port = 1; port < hub_info->port_count+1; ++port) {
+                usb_hub_set_power_port_request(&request, port);
+                opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
+                printf("[usb_hub] powering port %d\n",port);
+                if (opResult != EOK) {
+                        printf("[usb_hub]something went wrong when setting hub`s %dth port\n", port);
+                }
+        }
+        //ports powered, hub seems to be enabled
+        
+
+        ipc_hangup(hc);
+
+        //add the hub to list
+        usb_lst_append(&usb_hub_list, hub_info);
+        printf("[usb_hub] hub info added to list\n");
+        //(void)hub_info;
+        usb_hub_check_hub_changes();
+
+        /// \TODO start the check loop, if not already started...
+
+        //this is just a test for port status bitmap type
+        usb_hub_test_port_status();
+
+        printf("[usb_hub] hub dev added\n");
+        printf("\taddress %d, has %d ports \n",
+                        hub_info->usb_device->address,
+                        hub_info->port_count);
+        printf("\tused configuration %d\n",config_descriptor.configuration_number);
+
+        return EOK;
+        //return ENOTSUP;
+}
+
+//*********************************************
+//
+//  hub driver code, main loop
+//
+//*********************************************
+
+/**
+ * reset the port with new device and reserve the default address
+ * @param hc
+ * @param port
+ * @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;
+        int opResult;
+        printf("[usb_hub] some connection changed\n");
+        //get default address
+        opResult = usb_drv_reserve_default_address(hc);
+        if (opResult != EOK) {
+                printf("[usb_hub] cannot assign default address, it is probably used\n");
+                return;
+        }
+        //reset port
+        usb_hub_set_reset_port_request(&request, port);
+        opResult = usb_drv_sync_control_write(
+                        hc, target,
+                        &request,
+                        NULL, 0
+                        );
+        if (opResult != EOK) {
+                //continue;
+                printf("[usb_hub] something went wrong when reseting a port\n");
+        }
+}
+
+/**
+ * finalize adding new device after port reset
+ * @param hc
+ * @param port
+ * @param target
+ */
+static void usb_hub_finalize_add_device( usb_hub_info_t * hub,
+                int hc, uint16_t port, usb_target_t target) {
+
+        int opResult;
+        printf("[usb_hub] finalizing add device\n");
+        opResult = usb_hub_clear_port_feature(hc, target.address,
+            port, USB_HUB_FEATURE_C_PORT_RESET);
+        if (opResult != EOK) {
+                goto release;
+        }
+
+        /* Request address at from host controller. */
+        usb_address_t new_device_address = usb_drv_request_address(hc);
+        if (new_device_address < 0) {
+                printf("[usb_hub] failed to get free USB address\n");
+                opResult = new_device_address;
+                goto release;
+        }
+        printf("[usb_hub] setting new address\n");
+        opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
+            new_device_address);
+
+        if (opResult != EOK) {
+                printf("[usb_hub] could not set address for new device\n");
+                goto release;
+        }
+
+release:
+        printf("[usb_hub] releasing default address\n");
+        usb_drv_release_default_address(hc);
+        if (opResult != EOK) {
+                return;
+        }
+
+        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;
+        }
+        hub->attached_devs[port].devman_handle = child_handle;
+        hub->attached_devs[port].address = new_device_address;
+
+        opResult = usb_drv_bind_address(hc, new_device_address, child_handle);
+        if (opResult != EOK) {
+                printf("[usb_hub] could not assign address of device in hcd \n");
+                return;
+        }
+        printf("[usb_hub] new device address %d, handle %zu\n",
+            new_device_address, child_handle);
+        
+}
+
+/**
+ * unregister device address in hc, close the port
+ * @param hc
+ * @param port
+ * @param target
+ */
+static void usb_hub_removed_device(
+    usb_hub_info_t * hub, int hc, uint16_t port, usb_target_t target) {
+        //usb_device_request_setup_packet_t request;
+        int opResult;
+        //disable port
+        /*usb_hub_set_disable_port_request(&request, port);
+        opResult = usb_drv_sync_control_write(
+                        hc, target,
+                        &request,
+                        NULL, 0
+                        );
+        if (opResult != EOK) {
+                //continue;
+                printf("[usb_hub] something went wrong when disabling a port\n");
+        }*/
+        /// \TODO remove device
+
+        hub->attached_devs[port].devman_handle=0;
+        //close address
+        if(hub->attached_devs[port].address!=0){
+                opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
+                if(opResult != EOK) {
+                        printf("[usb_hub] could not release address of removed device: %d\n",opResult);
+                }
+                hub->attached_devs[port].address = 0;
+        }else{
+                printf("[usb_hub] this is strange, disconnected device had no address\n");
+                //device was disconnected before it`s port was reset - return default address
+                usb_drv_release_default_address(hc);
+        }
+}
+
+/**
+ * process interrupts on given hub port
+ * @param hc
+ * @param port
+ * @param target
+ */
+static void usb_hub_process_interrupt(usb_hub_info_t * hub, int hc,
+        uint16_t port, usb_address_t address) {
+        printf("[usb_hub] interrupt at port %d\n", port);
+        //determine type of change
+        usb_target_t target;
+        target.address=address;
+        target.endpoint=0;
+        usb_port_status_t status;
+        size_t rcvd_size;
+        usb_device_request_setup_packet_t request;
+        int opResult;
+        usb_hub_set_port_status_request(&request, port);
+        //endpoint 0
+
+        opResult = usb_drv_sync_control_read(
+                        hc, target,
+                        &request,
+                        &status, 4, &rcvd_size
+                        );
+        if (opResult != EOK) {
+                printf("[usb_hub] ERROR: could not get port status\n");
+                return;
+        }
+        if (rcvd_size != sizeof (usb_port_status_t)) {
+                printf("[usb_hub] ERROR: received status has incorrect size\n");
+                return;
+        }
+        //something connected/disconnected
+        if (usb_port_connect_change(&status)) {
+                opResult = usb_hub_clear_port_feature(hc, target.address,
+                    port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+                // TODO: check opResult
+                if (usb_port_dev_connected(&status)) {
+                        printf("[usb_hub] some connection changed\n");
+                        usb_hub_init_add_device(hc, port, target);
+                } else {
+                        usb_hub_removed_device(hub, hc, port, target);
+                }
+        }
+        //port reset
+        if (usb_port_reset_completed(&status)) {
+                printf("[usb_hub] port reset complete\n");
+                if (usb_port_enabled(&status)) {
+                        usb_hub_finalize_add_device(hub, hc, port, target);
+                } else {
+                        printf("[usb_hub] ERROR: port reset, but port still not enabled\n");
+                }
+        }
+
+        usb_port_set_connect_change(&status, false);
+        usb_port_set_reset(&status, false);
+        usb_port_set_reset_completed(&status, false);
+        usb_port_set_dev_connected(&status, false);
+        if (status) {
+                printf("[usb_hub]there was some unsupported change on port %d\n",port);
+        }
+        /// \TODO handle other changes
+        /// \TODO debug log for various situations
+
+
+
+        /*
+        //configure device
+        usb_drv_reserve_default_address(hc);
+
+        usb_address_t new_device_address = usb_drv_request_address(hc);
+
+
+        usb_drv_release_default_address(hc);
+         * */
+}
+
+/** Check changes on all known hubs.
+ */
+void usb_hub_check_hub_changes(void) {
+        /*
+         * Iterate through all hubs.
+         */
+        usb_general_list_t * lst_item;
+        for (lst_item = usb_hub_list.next;
+                        lst_item != &usb_hub_list;
+                        lst_item = lst_item->next) {
+                usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
+                /*
+                 * Check status change pipe of this hub.
+                 */
+
+                usb_target_t target;
+                target.address = hub_info->usb_device->address;
+                target.endpoint = 1;/// \TODO get from endpoint descriptor
+                printf("[usb_hub] checking changes for hub at addr %d\n",
+                    target.address);
+
+                size_t port_count = hub_info->port_count;
+
+                /*
+                 * Connect to respective HC.
+                 */
+                int hc = usb_drv_hc_connect(hub_info->device, 0);
+                if (hc < 0) {
+                        continue;
+                }
+
+                // FIXME: count properly
+                size_t byte_length = ((port_count+1) / 8) + 1;
+
+                void *change_bitmap = malloc(byte_length);
+                size_t actual_size;
+                usb_handle_t handle;
+
+                /*
+                 * Send the request.
+                 */
+                int opResult = usb_drv_async_interrupt_in(hc, target,
+                                change_bitmap, byte_length, &actual_size,
+                                &handle);
+
+                usb_drv_async_wait_for(handle);
+
+                if (opResult != EOK) {
+                        printf("[usb_hub] something went wrong while getting status of hub\n");
+                        continue;
+                }
+                unsigned int port;
+                for (port = 1; port < port_count+1; ++port) {
+                        bool interrupt = (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2;
+                        if (interrupt) {
+                                usb_hub_process_interrupt(
+                                        hub_info, hc, port, hub_info->usb_device->address);
+                        }
+                }
+
+
+                /*
+                 * TODO: handle the changes.
+                 */
+
+                /*
+                 * WARNING: sample code, will not work out of the box.
+                 * And does not contain code for checking for errors.
+                 */
+#if 0
+                /*
+                 * Before opening the port, we must acquire the default
+                 * address.
+                 */
+                usb_drv_reserve_default_address(hc);
+
+                usb_address_t new_device_address = usb_drv_request_address(hc);
+
+                // TODO: open the port
+
+                // TODO: send request for setting address to new_device_address
+
+                /*
+                 * Once new address is set, we can release the default
+                 * address.
+                 */
+                usb_drv_release_default_address(hc);
+
+                /*
+                 * Obtain descriptors and create match ids for devman.
+                 */
+
+                // TODO: get device descriptors
+
+                // TODO: create match ids
+
+                // TODO: add child device
+
+                // child_device_register sets the device handle
+                // TODO: store it here
+                devman_handle_t new_device_handle = 0;
+
+                /*
+                 * Inform the HC that the new device has devman handle
+                 * assigned.
+                 */
+                usb_drv_bind_address(hc, new_device_address, new_device_handle);
+
+                /*
+                 * That's all.
+                 */
+#endif
+
+
+                /*
+                 * Hang-up the HC-connected phone.
+                 */
+                ipc_hangup(hc);
+        }
+}
 
 /**

uspace/lib/usb/include/usb/hcdhubd.h

@@ -207 +207 @@
 int usb_hc_add_child_device(device_t *, const char *, const char *, bool);
 
-
-/**
- * @}
- */
-
 #endif