Changeset 0c0f5a5d in mainline
- Timestamp:
- 2011-03-08T21:30:48Z (14 years ago)
- 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. - Files:
-
- 2 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
.bzrignore
r18e9eeb r0c0f5a5d 77 77 ./uspace/dist/srv/* 78 78 ./uspace/drv/root/root 79 ./uspace/drv/ehci-hcd/ehci-hcd80 79 ./uspace/drv/isa/isa 81 80 ./uspace/drv/ns8250/ns8250 -
uspace/doc/doxygroups.h
r18e9eeb r0c0f5a5d 256 256 */ 257 257 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 1 10 pci/ven=1002&dev=4345 2 10 pci/ven=1002&dev=4386 3 10 pci/ven=1002&dev=4396 4 10 pci/ven=1022&dev=7463 5 10 pci/ven=1022&dev=7808 6 10 pci/ven=102f&dev=01b5 7 10 pci/ven=10cf&dev=1415 8 10 pci/ven=10de&dev=00e8 9 10 pci/ven=10de&dev=055f 10 10 pci/ven=10de&dev=056a 11 10 pci/ven=10de&dev=077c 12 10 pci/ven=10de&dev=077e 13 10 pci/ven=10de&dev=0aa6 14 10 pci/ven=10de&dev=0aa9 15 10 pci/ven=10de&dev=0aaa 16 10 pci/ven=10de&dev=0d9d 17 10 pci/ven=1166&dev=0414 18 10 pci/ven=1166&dev=0416 19 10 pci/ven=1414&dev=5805 20 10 pci/ven=1414&dev=5807 21 10 pci/ven=15ad&dev=0770 22 10 pci/ven=17a0&dev=8084 23 10 pci/ven=8086&dev=24cd 24 10 pci/ven=8086&dev=24dd 25 10 pci/ven=8086&dev=265c 26 10 pci/ven=8086&dev=268c 27 10 pci/ven=8086&dev=27cc 1 28 10 pci/ven=8086&dev=2836 2 29 10 pci/ven=8086&dev=283a 30 10 pci/ven=8086&dev=293a 31 10 pci/ven=8086&dev=293c 32 10 pci/ven=8086&dev=3a3a 33 10 pci/ven=8086&dev=3a3c 34 10 pci/ven=8086&dev=3a6a 35 10 pci/ven=8086&dev=3a6c 36 10 pci/ven=8086&dev=8117 37 10 pci/ven=8086&dev=8807 38 10 pci/ven=8086&dev=880f -
uspace/drv/ehci-hcd/main.c
r18e9eeb r0c0f5a5d 1 1 /* 2 * Copyright (c) 2011 Vojtech Horky, Jan Vesely 2 * Copyright (c) 2011 Jan Vesely 3 * Copyright (c) 2011 Vojtech Horky 3 4 * All rights reserved. 4 5 * … … 26 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 28 */ 28 /** @addtogroup usb 29 /** @addtogroup usbdrvehci 29 30 * @{ 30 31 */ 31 32 /** @file 32 * @brief UHCI driver33 * Main routines of EHCI driver. 33 34 */ 34 35 #include <ddf/driver.h> -
uspace/drv/ehci-hcd/pci.c
r18e9eeb r0c0f5a5d 27 27 */ 28 28 /** 29 * @addtogroup drvusb uhci29 * @addtogroup drvusbehci 30 30 * @{ 31 31 */ 32 32 /** 33 33 * @file 34 * PCI related functions needed by the UHCI driver.34 * PCI related functions needed by the EHCI driver. 35 35 */ 36 36 #include <errno.h> -
uspace/drv/ehci-hcd/pci.h
r18e9eeb r0c0f5a5d 1 1 /* 2 * Copyright (c) 201 0Vojtech Horky2 * Copyright (c) 2011 Vojtech Horky 3 3 * All rights reserved. 4 4 * … … 27 27 */ 28 28 29 /** @addtogroup drvusb uhci29 /** @addtogroup drvusbehci 30 30 * @{ 31 31 */ 32 32 /** @file 33 * @brief UHCI driver33 * PCI related functions needed by EHCI driver. 34 34 */ 35 #ifndef DRV_ UHCI_PCI_H36 #define DRV_ UHCI_PCI_H35 #ifndef DRV_EHCI_PCI_H 36 #define DRV_EHCI_PCI_H 37 37 38 38 #include <ddf/driver.h> -
uspace/drv/uhci-hcd/utils/malloc32.h
r18e9eeb r0c0f5a5d 34 34 #ifndef DRV_UHCI_TRANSLATOR_H 35 35 #define DRV_UHCI_TRANSLATOR_H 36 37 #include <usb/usbmem.h>38 36 39 37 #include <assert.h> -
uspace/drv/usbmid/usbmid.c
r18e9eeb r0c0f5a5d 125 125 /** Create new interface for USB MID device. 126 126 * 127 * @param dev Backing generic DDF child device(representing interface).127 * @param fun Backing generic DDF device function (representing interface). 128 128 * @param iface_no Interface number. 129 129 * @return New interface. -
uspace/drv/usbmouse/init.c
r18e9eeb r0c0f5a5d 108 108 /** Default handler for IPC methods not handled by DDF. 109 109 * 110 * @param dev Devicehandling the call.110 * @param fun Device function handling the call. 111 111 * @param icallid Call id. 112 112 * @param icall Call data. -
uspace/drv/vhc/conndev.c
r18e9eeb r0c0f5a5d 110 110 /** Callback for DDF when client disconnects. 111 111 * 112 * @param d Devicethe client was connected to.112 * @param fun Device function the client was connected to. 113 113 */ 114 114 void on_client_close(ddf_fun_t *fun) -
uspace/lib/usb/Makefile
r18e9eeb r0c0f5a5d 47 47 src/request.c \ 48 48 src/usb.c \ 49 src/usbdevice.c \ 50 src/usbmem.c 49 src/usbdevice.c 51 50 52 51 include $(USPACE_PREFIX)/Makefile.common -
uspace/lib/usb/src/ddfiface.c
r18e9eeb r0c0f5a5d 56 56 /** Get host controller handle, interface implementation for hub driver. 57 57 * 58 * @param[in] device Devicethe operation is running on.58 * @param[in] fun Device function the operation is running on. 59 59 * @param[out] handle Storage for the host controller handle. 60 60 * @return Error code. … … 69 69 * a hub driver. 70 70 * 71 * @param[in] device Devicethe operation is running on.71 * @param[in] fun Device function the operation is running on. 72 72 * @param[out] handle Storage for the host controller handle. 73 73 * @return Error code. … … 101 101 /** Get host controller handle, interface implementation for HC driver. 102 102 * 103 * @param[in] device Devicethe operation is running on.103 * @param[in] fun Device function the operation is running on. 104 104 * @param[out] handle Storage for the host controller handle. 105 105 * @return Always EOK. … … 118 118 /** Get USB device address, interface implementation for hub driver. 119 119 * 120 * @param[in] device Devicethe operation is running on.120 * @param[in] fun Device function the operation is running on. 121 121 * @param[in] handle Devman handle of USB device we want address of. 122 122 * @param[out] address Storage for USB address of device with handle @p handle. … … 153 153 * a hub driver. 154 154 * 155 * @param[in] device Devicethe operation is running on.155 * @param[in] fun Device function the operation is running on. 156 156 * @param[in] handle Devman handle of USB device we want address of. 157 157 * @param[out] address Storage for USB address of device with handle @p handle. -
uspace/lib/usb/src/hub.c
r18e9eeb r0c0f5a5d 57 57 * 58 58 * @param connection Opened connection to host controller. 59 * @param speed Speed of the device that will respond on the default address. 59 60 * @return Error code. 60 61 */ … … 86 87 * 87 88 * @param connection Opened connection to host controller. 89 * @param speed Speed of the new device (device that will be assigned 90 * the returned address). 88 91 * @return Assigned USB address or negative error code. 89 92 */ … … 156 159 * error codes than those listed as return codes by this function itself). 157 160 * 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 the161 * @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 162 165 * 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. 165 168 * @param[out] assigned_address USB address of the device. 166 169 * @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. 167 175 * @return Error code. 168 176 * @retval ENOENT Connection to HC not opened. -
uspace/lib/usb/src/pipes.c
r18e9eeb r0c0f5a5d 99 99 * 100 100 * @param connection Connection structure to be initialized. 101 * @param dev iceGeneric device backing the USB device.101 * @param dev Generic device backing the USB device. 102 102 * @return Error code. 103 103 */ -
uspace/lib/usb/src/recognise.c
r18e9eeb r0c0f5a5d 138 138 /** Create device match ids based on its interface. 139 139 * 140 * @param[in] descriptor Interface descriptor. 140 * @param[in] desc_device Device descriptor. 141 * @param[in] desc_interface Interface descriptor. 141 142 * @param[out] matches Initialized list of match ids. 142 143 * @return Error code (the two mentioned are not the only ones). 143 144 * @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". 145 146 */ 146 147 int usb_device_create_match_ids_from_interface( … … 333 334 * @param[in] parent Parent device. 334 335 * @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. 335 341 * @return Error code. 336 342 */ -
uspace/lib/usb/src/request.c
r18e9eeb r0c0f5a5d 195 195 * @param[in] pipe Control endpoint pipe (session must be already started). 196 196 * @param[in] request_type Request type (standard/class/vendor). 197 * @param[in] recipient Request recipient (device/interface/endpoint). 197 198 * @param[in] descriptor_type Descriptor type (device/configuration/HID/...). 198 199 * @param[in] descriptor_index Descriptor index. … … 229 230 * @param[in] pipe Control endpoint pipe (session must be already started). 230 231 * @param[in] request_type Request type (standard/class/vendor). 232 * @param[in] recipient Request recipient (device/interface/endpoint). 231 233 * @param[in] descriptor_type Descriptor type (device/configuration/HID/...). 232 234 * @param[in] descriptor_index Descriptor index.
Note:
See TracChangeset
for help on using the changeset viewer.