Changeset ae318d3 in mainline for uspace/srv/ns/ns.c

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

File:

• uspace/srv/ns/ns.c (modified) (3 diffs)

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: