Changeset 6843a9c in mainline for uspace/srv/hid/fb/port/niagara.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/hid/fb/port/niagara.c (modified) (2 diffs)

uspace/srv/hid/fb/port/niagara.c

@@ -68 +68 @@
 static void niagara_putchar(wchar_t ch)
 {
-        if ((ch >= 0) && (ch < 128))
+        if (ascii_check(ch))
                 niagara_putc(ch);
         else
@@ -103 +103 @@
                 return rc;
         
-        niagara.fifo =
-            (output_fifo_t *) as_get_mappable_page(sizeof(output_fifo_t));
-        if (niagara.fifo == NULL)
-                return ENOMEM;
-        
-        rc = physmem_map((void *) paddr, (void *) niagara.fifo, 1,
-            AS_AREA_READ | AS_AREA_WRITE);
+        rc = physmem_map((void *) paddr, 1,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &niagara.fifo);
         if (rc != EOK)
                 return rc;