Changeset f4f866c in mainline for uspace/srv/hid/fb/niagara.c

Timestamp:

2010-04-23T21:42:26Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/fb/niagara.c (modified) (1 diff)

uspace/srv/hid/fb/niagara.c

@@ -91 +91 @@
 int niagara_init(void)
 {
+        sysarg_t paddr;
+        if (sysinfo_get_value("niagara.outbuf.address", &paddr) != EOK)
+                return -1;
+        
         output_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE);
-        int result = physmem_map(
-                (void *) sysinfo_value("niagara.outbuf.address"),
-                (void *) output_buffer_addr,
-                1, AS_AREA_READ | AS_AREA_WRITE);
+        int result = physmem_map((void *) paddr,
+            (void *) output_buffer_addr, 1,
+            AS_AREA_READ | AS_AREA_WRITE);
 
         if (result != 0) {