Changeset 850235d in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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

File:

• uspace/srv/hid/output/port/ega.c (modified) (2 diffs)

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;