Index: uspace/lib/usbdev/src/devdrv.c =================================================================== --- uspace/lib/usbdev/src/devdrv.c (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/devdrv.c (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -373,20 +373,8 @@ } - /* Register the endpoints with HC. */ - usb_hc_connection_t hc_conn; - rc = usb_hc_connection_initialize_from_device(&hc_conn, dev); - if (rc != EOK) { - goto rollback_free_only; - } - - rc = usb_hc_connection_open(&hc_conn); - if (rc != EOK) { - goto rollback_free_only; - } - for (i = 0; i < pipe_count; i++) { if (pipes[i].present) { rc = usb_pipe_register(&pipes[i].pipe, - pipes[i].descriptor->poll_interval, &hc_conn); + pipes[i].descriptor->poll_interval); if (rc != EOK) { goto rollback_unregister_endpoints; @@ -394,8 +382,4 @@ } } - - if (usb_hc_connection_close(&hc_conn) != EOK) - usb_log_warning("%s: Failed to close connection.\n", - __FUNCTION__); *pipes_ptr = pipes; @@ -415,11 +399,7 @@ for (i = 0; i < pipe_count; i++) { if (pipes[i].present) { - usb_pipe_unregister(&pipes[i].pipe, &hc_conn); + usb_pipe_unregister(&pipes[i].pipe); } } - - if (usb_hc_connection_close(&hc_conn) != EOK) - usb_log_warning("usb_device_create_pipes(): " - "Failed to close connection.\n"); /* @@ -470,10 +450,6 @@ i, pipes[i].present ? "" : "not "); if (pipes[i].present) - usb_pipe_unregister(&pipes[i].pipe, &hc_conn); - } - - if (usb_hc_connection_close(&hc_conn) != EOK) - usb_log_warning("usb_device_destroy_pipes(): " - "Failed to close connection.\n"); + usb_pipe_unregister(&pipes[i].pipe); + } free(pipes); @@ -505,7 +481,10 @@ usb_dev->pipes = NULL; + usb_hc_connection_initialize_from_device(&usb_dev->hc_conn, ddf_dev); + const usb_address_t address = + usb_get_address_by_handle(ddf_dev->handle); /* Initialize backing wire and control pipe. */ - int rc = usb_device_connection_initialize_from_device( - &usb_dev->wire, ddf_dev); + int rc = usb_device_connection_initialize( + &usb_dev->wire, &usb_dev->hc_conn, address); if (rc != EOK) { *errstr_ptr = "device connection initialization"; Index: uspace/lib/usbdev/src/hub.c =================================================================== --- uspace/lib/usbdev/src/hub.c (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/hub.c (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -63,28 +63,4 @@ } while (false) -/** Ask host controller for free address assignment. - * - * @param connection Opened connection to host controller. - * @param preferred Preferred SUB address. - * @param strict Fail if the preferred address is not avialable. - * @param speed Speed of the new device (device that will be assigned - * the returned address). - * @return Assigned USB address or negative error code. - */ -usb_address_t usb_hc_request_address(usb_hc_connection_t *connection, - usb_address_t preferred, bool strict, usb_speed_t speed) -{ - CHECK_CONNECTION(connection); - - async_exch_t *exch = async_exchange_begin(connection->hc_sess); - if (!exch) - return (usb_address_t)ENOMEM; - - usb_address_t address = preferred; - const int ret = usbhc_request_address(exch, &address, strict, speed); - - async_exchange_end(exch); - return ret == EOK ? address : ret; -} /** Inform host controller about new device. @@ -97,5 +73,5 @@ const usb_hub_attached_device_t *attached_device) { - CHECK_CONNECTION(connection); +// CHECK_CONNECTION(connection); if (attached_device == NULL || attached_device->fun == NULL) return EINVAL; @@ -120,5 +96,5 @@ usb_address_t address) { - CHECK_CONNECTION(connection); +// CHECK_CONNECTION(connection); async_exch_t *exch = async_exchange_begin(connection->hc_sess); @@ -166,5 +142,5 @@ /* TODO: prevent others from accessing the wire now. */ - if (usb_pipe_unregister(pipe, hc_conn) != EOK) { + if (usb_pipe_unregister(pipe) != EOK) { usb_log_warning( "Failed to unregister the old pipe on address change.\n"); @@ -172,5 +148,5 @@ /* The address is already changed so set it in the wire */ pipe->wire->address = new_address; - rc = usb_pipe_register(pipe, 0, hc_conn); + rc = usb_pipe_register(pipe, 0); if (rc != EOK) return EADDRNOTAVAIL; @@ -288,5 +264,5 @@ /* Register control pipe on default address. */ - rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn); + rc = usb_pipe_register(&ctrl_pipe, 0); if (rc != EOK) { rc = ENOTCONN; @@ -385,5 +361,5 @@ leave_release_free_address: /* This might be either 0:0 or dev_addr:0 */ - if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK) + if (usb_pipe_unregister(&ctrl_pipe) != EOK) usb_log_warning("%s: Failed to unregister default pipe.\n", __FUNCTION__); Index: uspace/lib/usbdev/src/pipepriv.c =================================================================== --- uspace/lib/usbdev/src/pipepriv.c (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/pipepriv.c (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -90,5 +90,5 @@ /* Need to open the phone by ourselves. */ async_sess_t *sess = - devman_device_connect(EXCHANGE_SERIALIZE, pipe->wire->hc_handle, 0); + devman_device_connect(EXCHANGE_SERIALIZE, pipe->wire->hc_connection->hc_handle, 0); if (!sess) { if (hide_failure) { Index: uspace/lib/usbdev/src/pipepriv.h =================================================================== --- uspace/lib/usbdev/src/pipepriv.h (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/pipepriv.h (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -26,5 +26,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup libusbdev * @{ Index: uspace/lib/usbdev/src/pipes.c =================================================================== --- uspace/lib/usbdev/src/pipes.c (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/pipes.c (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -1,4 +1,5 @@ /* * Copyright (c) 2011 Vojtech Horky + * Copyright (c) 2011 Jan Vesely * All rights reserved. * @@ -26,5 +27,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup libusbdev * @{ @@ -33,37 +33,10 @@ * USB endpoint pipes miscellaneous functions. */ -#include +#include #include -#include -#include -#include -#include -#include +#include #include #include #include "pipepriv.h" - -#define IPC_AGAIN_DELAY (1000 * 2) /* 2ms */ - -/** Tell USB address assigned to given device. - * - * @param sess Session to parent device. - * @param dev Device in question. - * @return USB address or error code. - */ -static usb_address_t get_my_address(async_sess_t *sess, const ddf_dev_t *dev) -{ - assert(sess); - async_exch_t *exch = async_exchange_begin(sess); - if (!exch) - return ENOMEM; - - usb_address_t address; - const int ret = usb_get_my_address(exch, &address); - - async_exchange_end(exch); - - return (ret == EOK) ? address : ret; -} /** Tell USB interface assigned to given device. @@ -91,107 +64,4 @@ return ret == EOK ? iface_no : ret; -} - -/** Initialize connection to USB device. - * - * @param connection Connection structure to be initialized. - * @param dev Generic device backing the USB device. - * @return Error code. - */ -int usb_device_connection_initialize_from_device( - usb_device_connection_t *connection, const ddf_dev_t *dev) -{ - assert(connection); - assert(dev); - - int rc; - devman_handle_t hc_handle; - usb_address_t my_address; - - rc = usb_hc_find(dev->handle, &hc_handle); - if (rc != EOK) - return rc; - - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_ATOMIC, dev->handle, - IPC_FLAG_BLOCKING); - if (!parent_sess) - return ENOMEM; - - /* - * Asking for "my" address may require several attempts. - * That is because following scenario may happen: - * - parent driver (i.e. driver of parent device) announces new device - * and devman launches current driver - * - parent driver is preempted and thus does not send address-handle - * binding to HC driver - * - this driver gets here and wants the binding - * - the HC does not know the binding yet and thus it answers ENOENT - * So, we need to wait for the HC to learn the binding. - */ - - do { - my_address = get_my_address(parent_sess, dev); - - if (my_address == ENOENT) { - /* Be nice, let other fibrils run and try again. */ - async_usleep(IPC_AGAIN_DELAY); - } else if (my_address < 0) { - /* Some other problem, no sense trying again. */ - rc = my_address; - goto leave; - } - - } while (my_address < 0); - - rc = usb_device_connection_initialize(connection, - hc_handle, my_address); - -leave: - async_hangup(parent_sess); - return rc; -} - -/** Initialize connection to USB device. - * - * @param connection Connection structure to be initialized. - * @param host_controller_handle Devman handle of host controller device is - * connected to. - * @param device_address Device USB address. - * @return Error code. - */ -int usb_device_connection_initialize(usb_device_connection_t *connection, - devman_handle_t host_controller_handle, usb_address_t device_address) -{ - assert(connection); - - if ((device_address < 0) || (device_address >= USB11_ADDRESS_MAX)) { - return EINVAL; - } - - connection->hc_handle = host_controller_handle; - connection->address = device_address; - - return EOK; -} - -/** Initialize connection to USB device on default address. - * - * @param dev_connection Device connection structure to be initialized. - * @param hc_connection Initialized connection to host controller. - * @return Error code. - */ -int usb_device_connection_initialize_on_default_address( - usb_device_connection_t *dev_connection, - usb_hc_connection_t *hc_connection) -{ - assert(dev_connection); - - if (hc_connection == NULL) { - return EBADMEM; - } - - return usb_device_connection_initialize(dev_connection, - hc_connection->hc_handle, (usb_address_t) 0); } Index: uspace/lib/usbdev/src/pipesinit.c =================================================================== --- uspace/lib/usbdev/src/pipesinit.c (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/pipesinit.c (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -349,12 +349,8 @@ fibril_mutex_initialize(&pipe->guard); pipe->wire = connection; - pipe->hc_sess = NULL; - fibril_mutex_initialize(&pipe->hc_sess_mutex); pipe->endpoint_no = endpoint_no; pipe->transfer_type = transfer_type; pipe->max_packet_size = max_packet_size; pipe->direction = direction; - pipe->refcount = 0; - pipe->refcount_soft = 0; pipe->auto_reset_halt = false; @@ -442,22 +438,13 @@ * @return Error code. */ -int usb_pipe_register(usb_pipe_t *pipe, unsigned interval, - usb_hc_connection_t *hc_connection) +int usb_pipe_register(usb_pipe_t *pipe, unsigned interval) { assert(pipe); assert(pipe->wire); - assert(hc_connection); - - if (!usb_hc_connection_is_opened(hc_connection)) - return EBADF; - async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess); - if (!exch) - return ENOMEM; - const int ret = usbhc_register_endpoint(exch, - pipe->wire->address, pipe->endpoint_no, pipe->transfer_type, - pipe->direction, pipe->max_packet_size, interval); - - async_exchange_end(exch); - return ret; + assert(pipe->wire->hc_connection); + + return usb_hc_register_endpoint(pipe->wire->hc_connection, + pipe->wire->address, pipe->endpoint_no, pipe->transfer_type, + pipe->direction, pipe->max_packet_size, interval); } @@ -468,22 +455,12 @@ * @return Error code. */ -int usb_pipe_unregister(usb_pipe_t *pipe, - usb_hc_connection_t *hc_connection) +int usb_pipe_unregister(usb_pipe_t *pipe) { assert(pipe); assert(pipe->wire); - assert(hc_connection); - - if (!usb_hc_connection_is_opened(hc_connection)) - return EBADF; - - async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess); - if (!exch) - return ENOMEM; - const int ret = usbhc_unregister_endpoint(exch, + assert(pipe->wire->hc_connection); + + return usb_hc_unregister_endpoint(pipe->wire->hc_connection, pipe->wire->address, pipe->endpoint_no, pipe->direction); - async_exchange_end(exch); - - return ret; } Index: uspace/lib/usbdev/src/pipesio.c =================================================================== --- uspace/lib/usbdev/src/pipesio.c (revision 7711296185acc8f5f9ddb9bbd20d36e36cc61ebd) +++ uspace/lib/usbdev/src/pipesio.c (revision 7d5ef9447774b884f0e8d1011f19ba92f881725b) @@ -71,24 +71,7 @@ return ENOTSUP; - int ret = pipe_add_ref(pipe, false); - if (ret != EOK) { - return ret; - } - - /* Ensure serialization over the phone. */ - pipe_start_transaction(pipe); - async_exch_t *exch = async_exchange_begin(pipe->hc_sess); - if (!exch) { - pipe_end_transaction(pipe); - pipe_drop_ref(pipe); - return ENOMEM; - } - - ret = usbhc_read(exch, pipe->wire->address, pipe->endpoint_no, - setup, buffer, size, size_transfered); - async_exchange_end(exch); - pipe_end_transaction(pipe); - pipe_drop_ref(pipe); - return ret; + return usb_hc_control_read(pipe->wire->hc_connection, + pipe->wire->address, pipe->endpoint_no, setup, buffer, size, + size_transfered); } @@ -109,23 +92,6 @@ return ENOTSUP; - int ret = pipe_add_ref(pipe, false); - if (ret != EOK) { - return ret; - } - - /* Ensure serialization over the phone. */ - pipe_start_transaction(pipe); - async_exch_t *exch = async_exchange_begin(pipe->hc_sess); - if (!exch) { - pipe_end_transaction(pipe); - pipe_drop_ref(pipe); - return ENOMEM; - } - ret = usbhc_write(exch, pipe->wire->address, pipe->endpoint_no, - setup, buffer, size); - async_exchange_end(exch); - pipe_end_transaction(pipe); - pipe_drop_ref(pipe); - return ret; + return usb_hc_control_write(pipe->wire->hc_connection, + pipe->wire->address, pipe->endpoint_no, setup, buffer, size); }