Changeset db6e419 in mainline for uspace/drv

Timestamp:

2011-08-16T18:53:00Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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:

Merge mainline changes.

Location:

uspace/drv/bus/usb

Files:

• ohci/endpoint_list.c (modified) (2 diffs)
• uhci/transfer_list.c (modified) (2 diffs)
• usbhid/generic/hiddev.c (modified) (1 diff)
• usbhid/kbd/kbddev.c (modified) (2 diffs)
• usbhid/mouse/mousedev.c (modified) (2 diffs)
• usbhid/multimedia/multimedia.c (modified) (2 diffs)
• vhc/main.c (modified) (1 diff)

uspace/drv/bus/usb/ohci/endpoint_list.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbohci
  * @{
@@ -32 +33 @@
  * @brief OHCI driver transfer list implementation
  */
+
 #include <errno.h>
 #include <usb/debug.h>
-#include <arch/barrier.h>
-
+#include <libarch/barrier.h>
 #include "endpoint_list.h"
 

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbuhcihc
  * @{
@@ -32 +33 @@
  * @brief UHCI driver transfer list implementation
  */
+
 #include <errno.h>
 #include <usb/debug.h>
-#include <arch/barrier.h>
-
-
+#include <libarch/barrier.h>
 #include "transfer_list.h"
 #include "batch.h"

uspace/drv/bus/usb/usbhid/generic/hiddev.c

@@ -192 +192 @@
 static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
 {       
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         /** @todo Generate numbers for the devices? */
         usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -72 +72 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 /*----------------------------------------------------------------------------*/
@@ -524 +524 @@
         assert(kbd_dev != NULL);
         
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -57 +57 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "mouse"
@@ -325 +325 @@
         assert(mouse != NULL);
         
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 

uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

@@ -54 +54 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "multimedia-keys"
@@ -185 +185 @@
     usb_multimedia_t *multim_dev)
 {
-        /* Create the function exposed under /dev/devices. */
+        /* Create the exposed function. */
         ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
             NAME);

uspace/drv/bus/usb/vhc/main.c

@@ -34 +34 @@
  */
 
-#include <devmap.h>
+#include <loc.h>
 #include <async.h>
 #include <unistd.h>