Index: uspace/drv/bus/usb/ehci/Makefile =================================================================== --- uspace/drv/bus/usb/ehci/Makefile (revision 095bddfcbf5a6087d4cf0bf9f5fdd6d67fea8f8e) +++ uspace/drv/bus/usb/ehci/Makefile (revision c3887ad51d98fb2ab33fb44ebfb8994afaba2cbf) @@ -42,5 +42,4 @@ SOURCES = \ - hc_iface.c \ main.c \ pci.c Index: uspace/drv/bus/usb/ehci/ehci.h =================================================================== --- uspace/drv/bus/usb/ehci/ehci.h (revision 095bddfcbf5a6087d4cf0bf9f5fdd6d67fea8f8e) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup drvusbehci - * @{ - */ -/** @file - * Common EHCI definitions. - */ -#ifndef DRV_EHCI_EHCI_H -#define DRV_EHCI_EHCI_H - -#include - -#define NAME "ehci" - -extern usbhc_iface_t ehci_hc_iface; - -#endif -/** - * @} - */ - Index: uspace/drv/bus/usb/ehci/hc_iface.c =================================================================== --- uspace/drv/bus/usb/ehci/hc_iface.c (revision 095bddfcbf5a6087d4cf0bf9f5fdd6d67fea8f8e) +++ (revision ) @@ -1,160 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/** @addtogroup drvusbehci - * @{ - */ -/** @file - * USB-HC interface implementation. - */ -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "ehci.h" - -#define UNSUPPORTED(methodname) \ - usb_log_debug("Client called unsupported interface method " \ - "`%s()' in %s:%d.\n", \ - methodname, __FILE__, __LINE__) - -/** Found free USB address. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] speed Speed of the device that will get this address. - * @param[out] address Non-null pointer where to store the free address. - * @return Error code. - */ -static int request_address(ddf_fun_t *fun, usb_address_t *address, bool strict, - usb_speed_t speed) -{ - UNSUPPORTED("request_address"); - - return ENOTSUP; -} - -/** Bind USB address with device devman handle. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address of the device. - * @param[in] handle Devman handle of the device. - * @return Error code. - */ -static int bind_address(ddf_fun_t *fun, - usb_address_t address, devman_handle_t handle) -{ - UNSUPPORTED("bind_address"); - - return ENOTSUP; -} - -/** Find device handle by USB address. - * - * @param[in] fun DDF function that was called. - * @param[in] address Address in question. - * @param[out] handle Where to store device handle if found. - * @return Error code. - */ -static int find_by_address(ddf_fun_t *fun, usb_address_t address, - devman_handle_t *handle) -{ - UNSUPPORTED("find_by_address"); - - return ENOTSUP; -} - -/** Release previously requested address. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address to be released. - * @return Error code. - */ -static int release_address(ddf_fun_t *fun, usb_address_t address) -{ - UNSUPPORTED("release_address"); - - return ENOTSUP; -} - -/** Register endpoint for bandwidth reservation. - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address of the device. - * @param[in] speed Endpoint speed (invalid means to use device one). - * @param[in] endpoint Endpoint number. - * @param[in] transfer_type USB transfer type. - * @param[in] direction Endpoint data direction. - * @param[in] max_packet_size Max packet size of the endpoint. - * @param[in] interval Polling interval. - * @return Error code. - */ -static int register_endpoint(ddf_fun_t *fun, - usb_address_t address, usb_endpoint_t endpoint, - usb_transfer_type_t transfer_type, usb_direction_t direction, - size_t max_packet_size, unsigned int interval) -{ - UNSUPPORTED("register_endpoint"); - - return ENOTSUP; -} - -/** Unregister endpoint (free some bandwidth reservation). - * - * @param[in] fun Device function the action was invoked on. - * @param[in] address USB address of the device. - * @param[in] endpoint Endpoint number. - * @param[in] direction Endpoint data direction. - * @return Error code. - */ -static int unregister_endpoint(ddf_fun_t *fun, usb_address_t address, - usb_endpoint_t endpoint, usb_direction_t direction) -{ - UNSUPPORTED("unregister_endpoint"); - - return ENOTSUP; -} - -/** Host controller interface implementation for EHCI. */ -usbhc_iface_t ehci_hc_iface = { - .request_address = request_address, - .bind_address = bind_address, - .get_handle = find_by_address, - .release_address = release_address, - - .register_endpoint = register_endpoint, - .unregister_endpoint = unregister_endpoint, -}; - -/** - * @} - */ Index: uspace/drv/bus/usb/ehci/main.c =================================================================== --- uspace/drv/bus/usb/ehci/main.c (revision 095bddfcbf5a6087d4cf0bf9f5fdd6d67fea8f8e) +++ uspace/drv/bus/usb/ehci/main.c (revision c3887ad51d98fb2ab33fb44ebfb8994afaba2cbf) @@ -42,7 +42,9 @@ #include #include +#include #include "pci.h" -#include "ehci.h" + +#define NAME "ehci" static int ehci_dev_add(ddf_dev_t *device); @@ -57,5 +59,5 @@ }; static ddf_dev_ops_t hc_ops = { - .interfaces[USBHC_DEV_IFACE] = &ehci_hc_iface, + .interfaces[USBHC_DEV_IFACE] = &hcd_iface, }; @@ -95,4 +97,11 @@ return ENOMEM; } + hcd_t *ehci_hc = ddf_fun_data_alloc(hc_fun, sizeof(hcd_t)); + if (ehci_hc == NULL) { + usb_log_error("Failed to alloc generic HC driver.\n"); + return ENOMEM; + } + /* High Speed, no bandwidth */ + hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL); hc_fun->ops = &hc_ops;