Changeset 0c0f5a5d in mainline


Ignore:
Timestamp:
2011-03-08T21:30:48Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c0964800
Parents:
18e9eeb (diff), a8e98498 (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:

Development branch changes

Files:
2 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    r18e9eeb r0c0f5a5d  
    7777./uspace/dist/srv/*
    7878./uspace/drv/root/root
    79 ./uspace/drv/ehci-hcd/ehci-hcd
    8079./uspace/drv/isa/isa
    8180./uspace/drv/ns8250/ns8250
  • uspace/doc/doxygroups.h

    r18e9eeb r0c0f5a5d  
    256256         */
    257257
     258        /**
     259         * @defgroup drvusbehci EHCI driver
     260         * @ingroup usb
     261         * @brief Driver for EHCI host controller.
     262         */
     263
     264
  • uspace/drv/ehci-hcd/ehci-hcd.ma

    r18e9eeb r0c0f5a5d  
     110 pci/ven=1002&dev=4345
     210 pci/ven=1002&dev=4386
     310 pci/ven=1002&dev=4396
     410 pci/ven=1022&dev=7463
     510 pci/ven=1022&dev=7808
     610 pci/ven=102f&dev=01b5
     710 pci/ven=10cf&dev=1415
     810 pci/ven=10de&dev=00e8
     910 pci/ven=10de&dev=055f
     1010 pci/ven=10de&dev=056a
     1110 pci/ven=10de&dev=077c
     1210 pci/ven=10de&dev=077e
     1310 pci/ven=10de&dev=0aa6
     1410 pci/ven=10de&dev=0aa9
     1510 pci/ven=10de&dev=0aaa
     1610 pci/ven=10de&dev=0d9d
     1710 pci/ven=1166&dev=0414
     1810 pci/ven=1166&dev=0416
     1910 pci/ven=1414&dev=5805
     2010 pci/ven=1414&dev=5807
     2110 pci/ven=15ad&dev=0770
     2210 pci/ven=17a0&dev=8084
     2310 pci/ven=8086&dev=24cd
     2410 pci/ven=8086&dev=24dd
     2510 pci/ven=8086&dev=265c
     2610 pci/ven=8086&dev=268c
     2710 pci/ven=8086&dev=27cc
    12810 pci/ven=8086&dev=2836
    22910 pci/ven=8086&dev=283a
     3010 pci/ven=8086&dev=293a
     3110 pci/ven=8086&dev=293c
     3210 pci/ven=8086&dev=3a3a
     3310 pci/ven=8086&dev=3a3c
     3410 pci/ven=8086&dev=3a6a
     3510 pci/ven=8086&dev=3a6c
     3610 pci/ven=8086&dev=8117
     3710 pci/ven=8086&dev=8807
     3810 pci/ven=8086&dev=880f
  • uspace/drv/ehci-hcd/main.c

    r18e9eeb r0c0f5a5d  
    11/*
    2  * Copyright (c) 2011 Vojtech Horky, Jan Vesely
     2 * Copyright (c) 2011 Jan Vesely
     3 * Copyright (c) 2011 Vojtech Horky
    34 * All rights reserved.
    45 *
     
    2627 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2728 */
    28 /** @addtogroup usb
     29/** @addtogroup usbdrvehci
    2930 * @{
    3031 */
    3132/** @file
    32  * @brief UHCI driver
     33 * Main routines of EHCI driver.
    3334 */
    3435#include <ddf/driver.h>
  • uspace/drv/ehci-hcd/pci.c

    r18e9eeb r0c0f5a5d  
    2727 */
    2828/**
    29  * @addtogroup drvusbuhci
     29 * @addtogroup drvusbehci
    3030 * @{
    3131 */
    3232/**
    3333 * @file
    34  * PCI related functions needed by the UHCI driver.
     34 * PCI related functions needed by the EHCI driver.
    3535 */
    3636#include <errno.h>
  • uspace/drv/ehci-hcd/pci.h

    r18e9eeb r0c0f5a5d  
    11/*
    2  * Copyright (c) 2010 Vojtech Horky
     2 * Copyright (c) 2011 Vojtech Horky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup drvusbuhci
     29/** @addtogroup drvusbehci
    3030 * @{
    3131 */
    3232/** @file
    33  * @brief UHCI driver
     33 * PCI related functions needed by EHCI driver.
    3434 */
    35 #ifndef DRV_UHCI_PCI_H
    36 #define DRV_UHCI_PCI_H
     35#ifndef DRV_EHCI_PCI_H
     36#define DRV_EHCI_PCI_H
    3737
    3838#include <ddf/driver.h>
  • uspace/drv/uhci-hcd/utils/malloc32.h

    r18e9eeb r0c0f5a5d  
    3434#ifndef DRV_UHCI_TRANSLATOR_H
    3535#define DRV_UHCI_TRANSLATOR_H
    36 
    37 #include <usb/usbmem.h>
    3836
    3937#include <assert.h>
  • uspace/drv/usbmid/usbmid.c

    r18e9eeb r0c0f5a5d  
    125125/** Create new interface for USB MID device.
    126126 *
    127  * @param dev Backing generic DDF child device (representing interface).
     127 * @param fun Backing generic DDF device function (representing interface).
    128128 * @param iface_no Interface number.
    129129 * @return New interface.
  • uspace/drv/usbmouse/init.c

    r18e9eeb r0c0f5a5d  
    108108/** Default handler for IPC methods not handled by DDF.
    109109 *
    110  * @param dev Device handling the call.
     110 * @param fun Device function handling the call.
    111111 * @param icallid Call id.
    112112 * @param icall Call data.
  • uspace/drv/vhc/conndev.c

    r18e9eeb r0c0f5a5d  
    110110/** Callback for DDF when client disconnects.
    111111 *
    112  * @param d Device the client was connected to.
     112 * @param fun Device function the client was connected to.
    113113 */
    114114void on_client_close(ddf_fun_t *fun)
  • uspace/lib/usb/Makefile

    r18e9eeb r0c0f5a5d  
    4747        src/request.c \
    4848        src/usb.c \
    49         src/usbdevice.c \
    50         src/usbmem.c
     49        src/usbdevice.c
    5150
    5251include $(USPACE_PREFIX)/Makefile.common
  • uspace/lib/usb/src/ddfiface.c

    r18e9eeb r0c0f5a5d  
    5656/** Get host controller handle, interface implementation for hub driver.
    5757 *
    58  * @param[in] device Device the operation is running on.
     58 * @param[in] fun Device function the operation is running on.
    5959 * @param[out] handle Storage for the host controller handle.
    6060 * @return Error code.
     
    6969 * a hub driver.
    7070 *
    71  * @param[in] device Device the operation is running on.
     71 * @param[in] fun Device function the operation is running on.
    7272 * @param[out] handle Storage for the host controller handle.
    7373 * @return Error code.
     
    101101/** Get host controller handle, interface implementation for HC driver.
    102102 *
    103  * @param[in] device Device the operation is running on.
     103 * @param[in] fun Device function the operation is running on.
    104104 * @param[out] handle Storage for the host controller handle.
    105105 * @return Always EOK.
     
    118118/** Get USB device address, interface implementation for hub driver.
    119119 *
    120  * @param[in] device Device the operation is running on.
     120 * @param[in] fun Device function the operation is running on.
    121121 * @param[in] handle Devman handle of USB device we want address of.
    122122 * @param[out] address Storage for USB address of device with handle @p handle.
     
    153153 * a hub driver.
    154154 *
    155  * @param[in] device Device the operation is running on.
     155 * @param[in] fun Device function the operation is running on.
    156156 * @param[in] handle Devman handle of USB device we want address of.
    157157 * @param[out] address Storage for USB address of device with handle @p handle.
  • uspace/lib/usb/src/hub.c

    r18e9eeb r0c0f5a5d  
    5757 *
    5858 * @param connection Opened connection to host controller.
     59 * @param speed Speed of the device that will respond on the default address.
    5960 * @return Error code.
    6061 */
     
    8687 *
    8788 * @param connection Opened connection to host controller.
     89 * @param speed Speed of the new device (device that will be assigned
     90 *    the returned address).
    8891 * @return Assigned USB address or negative error code.
    8992 */
     
    156159 * error codes than those listed as return codes by this function itself).
    157160 *
    158  * @param parent Parent device (i.e. the hub device).
    159  * @param connection Opened connection to host controller.
    160  * @param dev_speed New device speed.
    161  * @param enable_port Function for enabling signaling through the port the
     161 * @param[in] parent Parent device (i.e. the hub device).
     162 * @param[in] connection Opened connection to host controller.
     163 * @param[in] dev_speed New device speed.
     164 * @param[in] enable_port Function for enabling signaling through the port the
    162165 *      device is attached to.
    163  * @param port_no Port number (passed through to @p enable_port).
    164  * @param arg Any data argument to @p enable_port.
     166 * @param[in] port_no Port number (passed through to @p enable_port).
     167 * @param[in] arg Any data argument to @p enable_port.
    165168 * @param[out] assigned_address USB address of the device.
    166169 * @param[out] assigned_handle Devman handle of the new device.
     170 * @param[in] dev_ops Child device ops.
     171 * @param[in] new_dev_data Arbitrary pointer to be stored in the child
     172 *      as @c driver_data.
     173 * @param[out] new_fun Storage where pointer to allocated child function
     174 *      will be written.
    167175 * @return Error code.
    168176 * @retval ENOENT Connection to HC not opened.
  • uspace/lib/usb/src/pipes.c

    r18e9eeb r0c0f5a5d  
    9999 *
    100100 * @param connection Connection structure to be initialized.
    101  * @param device Generic device backing the USB device.
     101 * @param dev Generic device backing the USB device.
    102102 * @return Error code.
    103103 */
  • uspace/lib/usb/src/recognise.c

    r18e9eeb r0c0f5a5d  
    138138/** Create device match ids based on its interface.
    139139 *
    140  * @param[in] descriptor Interface descriptor.
     140 * @param[in] desc_device Device descriptor.
     141 * @param[in] desc_interface Interface descriptor.
    141142 * @param[out] matches Initialized list of match ids.
    142143 * @return Error code (the two mentioned are not the only ones).
    143144 * @retval EINVAL Invalid input parameters (expects non NULL pointers).
    144  * @retval ENOENT Interface does not specify class.
     145 * @retval ENOENT Device class is not "use interface".
    145146 */
    146147int usb_device_create_match_ids_from_interface(
     
    333334 * @param[in] parent Parent device.
    334335 * @param[out] child_handle Handle of the child device.
     336 * @param[in] dev_ops Child device ops.
     337 * @param[in] dev_data Arbitrary pointer to be stored in the child
     338 *      as @c driver_data.
     339 * @param[out] child_fun Storage where pointer to allocated child function
     340 *      will be written.
    335341 * @return Error code.
    336342 */
  • uspace/lib/usb/src/request.c

    r18e9eeb r0c0f5a5d  
    195195 * @param[in] pipe Control endpoint pipe (session must be already started).
    196196 * @param[in] request_type Request type (standard/class/vendor).
     197 * @param[in] recipient Request recipient (device/interface/endpoint).
    197198 * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
    198199 * @param[in] descriptor_index Descriptor index.
     
    229230 * @param[in] pipe Control endpoint pipe (session must be already started).
    230231 * @param[in] request_type Request type (standard/class/vendor).
     232 * @param[in] recipient Request recipient (device/interface/endpoint).
    231233 * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
    232234 * @param[in] descriptor_index Descriptor index.
Note: See TracChangeset for help on using the changeset viewer.