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

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/sgcn.c (modified) (1 diff)

uspace/srv/hid/fb/sgcn.c

@@ -122 +122 @@
 int sgcn_init(void)
 {
-        sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+        sysarg_t sram_paddr;
+        if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK)
+                return -1;
         
-        if (physmem_map((void *) sysinfo_value("sram.address.physical"),
-            (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE) != 0)
+        sysarg_t sram_size;
+        if (sysinfo_get_value("sram.area.size", &sram_size) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK)
+                sram_buffer_offset = 0;
+        
+        sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size);
+        
+        if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr,
+            sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0)
                 return -1;
         
         serial_console_init(sgcn_putc, WIDTH, HEIGHT);
-        
-        sram_buffer_offset = sysinfo_value("sram.buffer.offset");
         
         async_set_client_connection(serial_client_connection);