Changeset 25eec4e in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

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;