Changeset ae318d3 in mainline for uspace

Timestamp:

2009-02-16T18:50:48Z (16 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

Files:

• fb/ega.c (modified) (2 diffs)
• fb/fb.c (modified) (1 diff)
• fb/msim.c (modified) (1 diff)
• fb/sgcn.c (modified) (1 diff)
• kbd/arch/sparc64/src/sgcn.c (modified) (1 diff)
• ns/ns.c (modified) (3 diffs)
• rd/rd.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);

uspace/srv/kbd/arch/sparc64/src/sgcn.c

@@ -98 +98 @@
 void 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) {
+        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)
                 printf("SGCN: uspace driver could not map physical memory.");
-        }
         
         sram_buffer_offset = sysinfo_value("sram.buffer.offset");

uspace/srv/ns/ns.c

@@ -109 +109 @@
 }
 
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name,
-    void **addr)
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
 {
         void *ph_addr;
-
+        
         if (!*addr) {
                 ph_addr = (void *) sysinfo_value(name);
@@ -121 +120 @@
                 }
                 *addr = as_get_mappable_page(PAGE_SIZE);
-                physmem_map(ph_addr, *addr, 1,
-                    AS_AREA_READ | AS_AREA_CACHEABLE);
+                if (physmem_map(ph_addr, *addr, 1,
+                    AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
+                        ipc_answer_0(callid, ENOENT);
+                        return;
+                }
         }
         ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
@@ -151 +153 @@
                         switch (IPC_GET_ARG3(call)) {
                         case SERVICE_MEM_REALTIME:
-                                get_as_area(callid, &call, "clock.faddr",
-                                    &clockaddr);
+                                get_as_area(callid, &call, "clock.faddr", &clockaddr);
                                 break;
                         case SERVICE_MEM_KLOG:
-                                get_as_area(callid, &call, "klog.faddr",
-                                    &klogaddr);
+                                get_as_area(callid, &call, "klog.faddr", &klogaddr);
                                 break;
                         default:

uspace/srv/rd/rd.c

@@ -258 +258 @@
         int retval = physmem_map(rd_ph_addr, rd_addr,
             ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
-
+        
         if (retval < 0) {
                 printf(NAME ": Error mapping RAM disk\n");