Changeset 0c0f5a5d in mainline

Timestamp:

2011-03-08T21:30:48Z (13 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:

• .bzrignore (modified) (1 diff)
• uspace/doc/doxygroups.h (modified) (1 diff)
• uspace/drv/ehci-hcd/ehci-hcd.ma (modified) (1 diff)
• uspace/drv/ehci-hcd/main.c (modified) (2 diffs)
• uspace/drv/ehci-hcd/pci.c (modified) (1 diff)
• uspace/drv/ehci-hcd/pci.h (modified) (2 diffs)
• uspace/drv/uhci-hcd/utils/malloc32.h (modified) (1 diff)
• uspace/drv/usbmid/usbmid.c (modified) (1 diff)
• uspace/drv/usbmouse/init.c (modified) (1 diff)
• uspace/drv/vhc/conndev.c (modified) (1 diff)
• uspace/lib/usb/Makefile (modified) (1 diff)
• uspace/lib/usb/include/usb/usbmem.h (deleted)
• uspace/lib/usb/src/ddfiface.c (modified) (5 diffs)
• uspace/lib/usb/src/hub.c (modified) (3 diffs)
• uspace/lib/usb/src/pipes.c (modified) (1 diff)
• uspace/lib/usb/src/recognise.c (modified) (2 diffs)
• uspace/lib/usb/src/request.c (modified) (2 diffs)
• uspace/lib/usb/src/usbmem.c (deleted)

.bzrignore

@@ -77 +77 @@
 ./uspace/dist/srv/*
 ./uspace/drv/root/root
-./uspace/drv/ehci-hcd/ehci-hcd
 ./uspace/drv/isa/isa
 ./uspace/drv/ns8250/ns8250

uspace/doc/doxygroups.h

@@ -256 +256 @@
          */
 
+        /**
+         * @defgroup drvusbehci EHCI driver
+         * @ingroup usb
+         * @brief Driver for EHCI host controller.
+         */
+
+

uspace/drv/ehci-hcd/ehci-hcd.ma

@@ +1 @@
+10 pci/ven=1002&dev=4345
+10 pci/ven=1002&dev=4386
+10 pci/ven=1002&dev=4396
+10 pci/ven=1022&dev=7463
+10 pci/ven=1022&dev=7808
+10 pci/ven=102f&dev=01b5
+10 pci/ven=10cf&dev=1415
+10 pci/ven=10de&dev=00e8
+10 pci/ven=10de&dev=055f
+10 pci/ven=10de&dev=056a
+10 pci/ven=10de&dev=077c
+10 pci/ven=10de&dev=077e
+10 pci/ven=10de&dev=0aa6
+10 pci/ven=10de&dev=0aa9
+10 pci/ven=10de&dev=0aaa
+10 pci/ven=10de&dev=0d9d
+10 pci/ven=1166&dev=0414
+10 pci/ven=1166&dev=0416
+10 pci/ven=1414&dev=5805
+10 pci/ven=1414&dev=5807
+10 pci/ven=15ad&dev=0770
+10 pci/ven=17a0&dev=8084
+10 pci/ven=8086&dev=24cd
+10 pci/ven=8086&dev=24dd
+10 pci/ven=8086&dev=265c
+10 pci/ven=8086&dev=268c
+10 pci/ven=8086&dev=27cc
 10 pci/ven=8086&dev=2836
 10 pci/ven=8086&dev=283a
+10 pci/ven=8086&dev=293a
+10 pci/ven=8086&dev=293c
+10 pci/ven=8086&dev=3a3a
+10 pci/ven=8086&dev=3a3c
+10 pci/ven=8086&dev=3a6a
+10 pci/ven=8086&dev=3a6c
+10 pci/ven=8086&dev=8117
+10 pci/ven=8086&dev=8807
+10 pci/ven=8086&dev=880f

uspace/drv/ehci-hcd/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky, Jan Vesely
+ * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup usbdrvehci
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * Main routines of EHCI driver.
  */
 #include <ddf/driver.h>

uspace/drv/ehci-hcd/pci.c

@@ -27 +27 @@
  */
 /**
- * @addtogroup drvusbuhci
+ * @addtogroup drvusbehci
  * @{
  */
 /**
  * @file
- * PCI related functions needed by the UHCI driver.
+ * PCI related functions needed by the EHCI driver.
  */
 #include <errno.h>

uspace/drv/ehci-hcd/pci.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhci
+/** @addtogroup drvusbehci
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * PCI related functions needed by EHCI driver.
  */
-#ifndef DRV_UHCI_PCI_H
-#define DRV_UHCI_PCI_H
+#ifndef DRV_EHCI_PCI_H
+#define DRV_EHCI_PCI_H
 
 #include <ddf/driver.h>

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -34 +34 @@
 #ifndef DRV_UHCI_TRANSLATOR_H
 #define DRV_UHCI_TRANSLATOR_H
-
-#include <usb/usbmem.h>
 
 #include <assert.h>

uspace/drv/usbmid/usbmid.c

@@ -125 +125 @@
 /** Create new interface for USB MID device.
  *
- * @param dev Backing generic DDF child device (representing interface).
+ * @param fun Backing generic DDF device function (representing interface).
  * @param iface_no Interface number.
  * @return New interface.

uspace/drv/usbmouse/init.c

@@ -108 +108 @@
 /** Default handler for IPC methods not handled by DDF.
  *
- * @param dev Device handling the call.
+ * @param fun Device function handling the call.
  * @param icallid Call id.
  * @param icall Call data.

uspace/drv/vhc/conndev.c

@@ -110 +110 @@
 /** Callback for DDF when client disconnects.
  *
- * @param d Device the client was connected to.
+ * @param fun Device function the client was connected to.
  */
 void on_client_close(ddf_fun_t *fun)

uspace/lib/usb/Makefile

@@ -47 +47 @@
         src/request.c \
         src/usb.c \
-        src/usbdevice.c \
-        src/usbmem.c
+        src/usbdevice.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usb/src/ddfiface.c

@@ -56 +56 @@
 /** Get host controller handle, interface implementation for hub driver.
  *
- * @param[in] device Device the operation is running on.
+ * @param[in] fun Device function the operation is running on.
  * @param[out] handle Storage for the host controller handle.
  * @return Error code.
@@ -69 +69 @@
  * a hub driver.
  *
- * @param[in] device Device the operation is running on.
+ * @param[in] fun Device function the operation is running on.
  * @param[out] handle Storage for the host controller handle.
  * @return Error code.
@@ -101 +101 @@
 /** Get host controller handle, interface implementation for HC driver.
  *
- * @param[in] device Device the operation is running on.
+ * @param[in] fun Device function the operation is running on.
  * @param[out] handle Storage for the host controller handle.
  * @return Always EOK.
@@ -118 +118 @@
 /** Get USB device address, interface implementation for hub driver.
  *
- * @param[in] device Device the operation is running on.
+ * @param[in] fun Device function the operation is running on.
  * @param[in] handle Devman handle of USB device we want address of.
  * @param[out] address Storage for USB address of device with handle @p handle.
@@ -153 +153 @@
  * a hub driver.
  *
- * @param[in] device Device the operation is running on.
+ * @param[in] fun Device function the operation is running on.
  * @param[in] handle Devman handle of USB device we want address of.
  * @param[out] address Storage for USB address of device with handle @p handle.

uspace/lib/usb/src/hub.c

@@ -57 +57 @@
  *
  * @param connection Opened connection to host controller.
+ * @param speed Speed of the device that will respond on the default address.
  * @return Error code.
  */
@@ -86 +87 @@
  *
  * @param connection Opened connection to host controller.
+ * @param speed Speed of the new device (device that will be assigned
+ *    the returned address).
  * @return Assigned USB address or negative error code.
  */
@@ -156 +159 @@
  * error codes than those listed as return codes by this function itself).
  *
- * @param parent Parent device (i.e. the hub device).
- * @param connection Opened connection to host controller.
- * @param dev_speed New device speed.
- * @param enable_port Function for enabling signaling through the port the
+ * @param[in] parent Parent device (i.e. the hub device).
+ * @param[in] connection Opened connection to host controller.
+ * @param[in] dev_speed New device speed.
+ * @param[in] enable_port Function for enabling signaling through the port the
  *      device is attached to.
- * @param port_no Port number (passed through to @p enable_port).
- * @param arg Any data argument to @p enable_port.
+ * @param[in] port_no Port number (passed through to @p enable_port).
+ * @param[in] arg Any data argument to @p enable_port.
  * @param[out] assigned_address USB address of the device.
  * @param[out] assigned_handle Devman handle of the new device.
+ * @param[in] dev_ops Child device ops.
+ * @param[in] new_dev_data Arbitrary pointer to be stored in the child
+ *      as @c driver_data.
+ * @param[out] new_fun Storage where pointer to allocated child function
+ *      will be written.
  * @return Error code.
  * @retval ENOENT Connection to HC not opened.

uspace/lib/usb/src/pipes.c

@@ -99 +99 @@
  *
  * @param connection Connection structure to be initialized.
- * @param device Generic device backing the USB device.
+ * @param dev Generic device backing the USB device.
  * @return Error code.
  */

uspace/lib/usb/src/recognise.c

@@ -138 +138 @@
 /** Create device match ids based on its interface.
  *
- * @param[in] descriptor Interface descriptor.
+ * @param[in] desc_device Device descriptor.
+ * @param[in] desc_interface Interface descriptor.
  * @param[out] matches Initialized list of match ids.
  * @return Error code (the two mentioned are not the only ones).
  * @retval EINVAL Invalid input parameters (expects non NULL pointers).
- * @retval ENOENT Interface does not specify class.
+ * @retval ENOENT Device class is not "use interface".
  */
 int usb_device_create_match_ids_from_interface(
@@ -333 +334 @@
  * @param[in] parent Parent device.
  * @param[out] child_handle Handle of the child device.
+ * @param[in] dev_ops Child device ops.
+ * @param[in] dev_data Arbitrary pointer to be stored in the child
+ *      as @c driver_data.
+ * @param[out] child_fun Storage where pointer to allocated child function
+ *      will be written.
  * @return Error code.
  */

uspace/lib/usb/src/request.c

@@ -195 +195 @@
  * @param[in] pipe Control endpoint pipe (session must be already started).
  * @param[in] request_type Request type (standard/class/vendor).
+ * @param[in] recipient Request recipient (device/interface/endpoint).
  * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
  * @param[in] descriptor_index Descriptor index.
@@ -229 +230 @@
  * @param[in] pipe Control endpoint pipe (session must be already started).
  * @param[in] request_type Request type (standard/class/vendor).
+ * @param[in] recipient Request recipient (device/interface/endpoint).
  * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
  * @param[in] descriptor_index Descriptor index.