Changeset 0c0f5a5d in mainline for uspace/drv

Timestamp:

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

Location:

uspace/drv

Files:

• ehci-hcd/ehci-hcd.ma (modified) (1 diff)
• ehci-hcd/main.c (modified) (2 diffs)
• ehci-hcd/pci.c (modified) (1 diff)
• ehci-hcd/pci.h (modified) (2 diffs)
• uhci-hcd/utils/malloc32.h (modified) (1 diff)
• usbmid/usbmid.c (modified) (1 diff)
• usbmouse/init.c (modified) (1 diff)
• vhc/conndev.c (modified) (1 diff)

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)