Changeset 0ab362c in mainline for uspace/srv

Timestamp:

2012-11-22T14:36:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e32720ff

Parents:

1f7753a (diff), 0f2c80a (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 support for BeagleBoard-xM (armv7).

Most of the changes outside arm arch are pio_* stuff (addition of pio_trace capability, header consolidation)

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (1 diff)
• bd/gxe_bd/gxe_bd.c (modified) (1 diff)
• hid/input/port/pl050.c (modified) (1 diff)
• hid/output/port/ega.c (modified) (2 diffs)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (1 diff)
• hw/irc/i8259/i8259.c (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -49 +49 @@
 
 #include <stdio.h>
-#include <libarch/ddi.h>
 #include <ddi.h>
 #include <async.h>

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -37 +37 @@
 
 #include <stdio.h>
-#include <libarch/ddi.h>
 #include <ddi.h>
 #include <async.h>

uspace/srv/hid/input/port/pl050.c

@@ -37 +37 @@
 
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <async.h>
 #include <unistd.h>
 #include <sysinfo.h>
-#include <ddi.h>
 #include <stdio.h>
 #include <errno.h>

uspace/srv/hid/output/port/ega.c

@@ -36 +36 @@
 #include <as.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <io/chargrid.h>
 #include "../output.h"
@@ -211 +210 @@
                 return rc;
         
-        rc = iospace_enable(task_get_id(), (void *) EGA_IO_BASE,
-            EGA_IO_SIZE);
+        rc = pio_enable((void*)EGA_IO_BASE, EGA_IO_SIZE, NULL);
         if (rc != EOK)
                 return rc;

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -38 +38 @@
 
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <loc.h>
 #include <io/console.h>

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -38 +38 @@
 
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <loc.h>
 #include <ipc/char.h>

uspace/srv/hw/irc/i8259/i8259.c

@@ -42 +42 @@
 #include <as.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <align.h>
 #include <bool.h>