Changeset f9dd44d in mainline

Timestamp:

2011-01-14T14:44:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2e38385

Parents:

977fcea

Message:

refactoring, use libusb device identification

Location:

uspace/drv/uhci

Files:

• Makefile (modified) (1 diff)
• root_hub/port.c (modified) (7 diffs)
• root_hub/port.h (modified) (2 diffs)
• root_hub/root_hub.c (modified) (1 diff)
• uhci.c (modified) (4 diffs)
• utils/fibril_semaphore.c (deleted)
• utils/fibril_semaphore.h (deleted)
• utils/hc_synchronizer.c (deleted)
• utils/hc_synchronizer.h (deleted)
• utils/usb_device.c (deleted)
• utils/usb_device.h (deleted)

uspace/drv/uhci/Makefile

@@ -38 +38 @@
         root_hub/port_status.c \
         root_hub/root_hub.c \
-        uhci.c \
-        utils/fibril_semaphore.c \
-        utils/hc_synchronizer.c \
-        utils/usb_device.c
+        uhci.c 
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/uhci/root_hub/port.c

@@ -1 +1 @@
 
 #include <errno.h>
-#include <usb/devreq.h> /* for usb_device_request_setup_packet_t */
+//#include <usb/devreq.h> /* for usb_device_request_setup_packet_t */
 #include <usb/usb.h>
+#include <usb/usbdrv.h>
 
 #include "debug.h"
@@ -8 +9 @@
 #include "port.h"
 #include "port_status.h"
-#include "utils/hc_synchronizer.h"
-#include "utils/usb_device.h"
 
 static int uhci_port_new_device(uhci_port_t *port);
 static int uhci_port_remove_device(uhci_port_t *port);
 static int uhci_port_set_enabled(uhci_port_t *port, bool enabled);
-static usb_address_t assign_address_to_zero_device(device_t *hc);
 
 /*----------------------------------------------------------------------------*/
@@ -21 +19 @@
         uhci_port_t *port_instance = port;
         assert(port_instance);
+        port_instance->hc_phone = devman_device_connect(port_instance->hc->handle, 0);
 
         while (1) {
@@ -52 +51 @@
         assert(port->hc);
 
+
         uhci_print_info("Adding new device on port %d.\n", port->number);
 
@@ -59 +59 @@
         usb_address_keeping_reserve_default(&uhci_instance->address_manager);
 
+        const usb_address_t usb_address =
+          usb_address_keeping_request(&uhci_instance->address_manager);
+
+        if (usb_address <= 0) {
+                return usb_address;
+        }
+
         /* enable port */
         uhci_port_set_enabled( port, true );
 
         /* assign address to device */
-        usb_address_t address = assign_address_to_zero_device(port->hc);
+        int ret = usb_drv_req_set_address( port->hc_phone, 0, usb_address );
 
 
-        if (address <= 0) { /* address assigning went wrong */
-                uhci_print_error("Failed to assign address to the device.\n");
+        if (ret != EOK) { /* address assigning went wrong */
+                uhci_print_error("Failed(%d) to assign address to the device.\n", ret);
                 uhci_port_set_enabled(port, false);
                 usb_address_keeping_release_default(&uhci_instance->address_manager);
@@ -79 +86 @@
         assert(port->attached_device == 0);
 
-#define CHECK_RET_DELETE_CHILD_RETURN(ret, child, message, args...)\
-        if (ret < 0) { \
-                uhci_print_error("Failed(%d) to "message, ret, ##args); \
-                if (child) { \
-                        delete_device(child); \
-                } \
-                uhci_port_set_enabled(port, false); \
-                usb_address_keeping_release(&uhci_instance->address_manager, address); \
-                return ret; \
-        } else (void)0
+        ret = usb_drv_register_child_in_devman(port->hc_phone, port->hc, usb_address,
+                &port->attached_device);
 
-        device_t *child = create_device();
+        if (ret != EOK) { /* something went wrong */
+                uhci_print_error("Failed(%d) in usb_drv_register_child.\n", ret);
+                uhci_port_set_enabled(port, false);
+                return ENOMEM;
+        }
 
-        int ret = child ? EOK : ENOMEM;
-        CHECK_RET_DELETE_CHILD_RETURN(ret, child, "create device.\n" );
-
-        ret = usb_device_init(child, port->hc, address, port->number );
-        CHECK_RET_DELETE_CHILD_RETURN(ret, child, "init usb device.\n" );
-
-        ret = child_device_register(child, port->hc);
-        CHECK_RET_DELETE_CHILD_RETURN(ret, child, "register usb device.\n" );
-
-        /* store device and bind address, can not fail */
-        port->attached_device = child->handle;
-        usb_address_keeping_devman_bind(&uhci_instance->address_manager,
-          address, port->attached_device);
 
         return EOK;
@@ -138 +128 @@
 }
 /*----------------------------------------------------------------------------*/
-static usb_address_t assign_address_to_zero_device( device_t *hc )
-{
-        assert( hc );
-        assert( hc->driver_data );
-
-        uhci_t *uhci_instance = (uhci_t*)hc->driver_data;
-
-        /* get new address */
-        const usb_address_t usb_address =
-          usb_address_keeping_request(&uhci_instance->address_manager);
-
-        if (usb_address <= 0) {
-                return usb_address;
-        }
-
-        /* assign new address */
-        usb_target_t new_device = { USB_ADDRESS_DEFAULT, 0 };
-        usb_device_request_setup_packet_t data =
-        {
-                .request_type = 0,
-                .request = USB_DEVREQ_SET_ADDRESS,
-                { .value = usb_address },
-                .index = 0,
-                .length = 0
-        };
-
-        sync_value_t sync;
-        uhci_setup_sync(hc, new_device,
-          USB_TRANSFER_CONTROL, &data, sizeof(data), &sync);
-
-        if (sync.result != USB_OUTCOME_OK) {
-                uhci_print_error(
-                  "Failed to assign address to the connected device.\n");
-                usb_address_keeping_release(&uhci_instance->address_manager,
-                  usb_address);
-                return -1;
-        }
-
-        uhci_print_info("Assigned address %#x.\n", usb_address);
-        return usb_address;
-}

uspace/drv/uhci/root_hub/port.h

@@ -47 +47 @@
         unsigned number;
         unsigned wait_period_usec;
+        int hc_phone;
         devman_handle_t attached_device;
 } uhci_port_t;
@@ -58 +59 @@
         port->hc = hc;
         port->number = number;
+        port->hc_phone = -1;
         port->wait_period_usec = usec;
         port->attached_device = 0;

uspace/drv/uhci/root_hub/root_hub.c

@@ -8 +8 @@
 #include "root_hub.h"
 
-#define ROOT_HUB_WAIT_USEC 10000000 /* 10 second */
+#define ROOT_HUB_WAIT_USEC 10000000 /* 10 seconds */
 
 int uhci_root_hub_init( uhci_root_hub_t *hub, device_t *hc, void *addr )

uspace/drv/uhci/uhci.c

@@ -6 +6 @@
 #include "name.h"
 #include "uhci.h"
-
 
 int uhci_init(device_t *device, void *regs)
@@ -58 +57 @@
             size);
 
-        return ENOTSUP;
+        callback( dev, 0, USB_OUTCOME_OK, arg );
+
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -74 +75 @@
             size);
 
-        return ENOTSUP;
+        callback( dev, USB_OUTCOME_OK, arg );
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -89 +91 @@
             usb_str_transfer_type(transfer_type),
             size);
+
         callback( dev, USB_OUTCOME_OK, arg );
-
-        return ENOTSUP;
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/