Changeset ae318d3 in mainline for uspace/srv/fb

Timestamp:

2009-02-16T18:50:48Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

06da55b

Parents:

17f168e

Message:

overhaul pareas: use one single physical area for the physical address space not belonging to physical memory

Location:

uspace/srv/fb

Files:

• ega.c (modified) (2 diffs)
• fb.c (modified) (1 diff)
• msim.c (modified) (1 diff)
• sgcn.c (modified) (1 diff)

uspace/srv/fb/ega.c

@@ -374 +374 @@
         scr_height = sysinfo_value("fb.height");
 
-        if(sysinfo_value("fb.blinking")) {
+        if (sysinfo_value("fb.blinking")) {
                 ega_normal_color &= 0x77;
                 ega_inverted_color &= 0x77;
@@ -386 +386 @@
         scr_addr = as_get_mappable_page(sz);
 
-        physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
-            PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        if (physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
+            PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+                return -1;
 
         async_set_client_connection(ega_client_connection);

uspace/srv/fb/fb.c

@@ -1672 +1672 @@
         void *fb_addr = as_get_mappable_page(fbsize);
         
-        physmem_map(fb_ph_addr + fb_offset, fb_addr,
-            ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
+            ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+                return -1;
         
         if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))

uspace/srv/fb/msim.c

@@ -60 +60 @@
         virt_addr = (char *) as_get_mappable_page(1);
         
-        physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE);
+        if (physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE) != 0)
+                return -1;
         
         serial_console_init(msim_putc, WIDTH, HEIGHT);

uspace/srv/fb/sgcn.c

@@ -122 +122 @@
 int sgcn_init(void)
 {
-        sram_virt_addr = (uintptr_t) as_get_mappable_page(
-                sysinfo_value("sram.area.size"));
-        int result = 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
-                );
-        if (result != 0) {
-                printf("SGCN: uspace driver couldn't map physical memory: %d\n",
-                        result);
-        }
+        sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+        
+        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)
+                return -1;
         
         serial_console_init(sgcn_putc, WIDTH, HEIGHT);