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

Timestamp:

2009-04-06T19:32:58Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2845930

Parents:

13a638d

Message:

make klog more generic

File:

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

uspace/srv/ns/ns.c

@@ -121 +121 @@
 }
 
-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);
-                if (!ph_addr) {
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *ph_addr, count_t pages, void **addr)
+{
+        if (ph_addr == NULL) {
+                ipc_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        if (*addr == NULL) {
+                *addr = as_get_mappable_page(pages * PAGE_SIZE);
+                
+                if (*addr == NULL) {
                         ipc_answer_0(callid, ENOENT);
                         return;
                 }
-                *addr = as_get_mappable_page(PAGE_SIZE);
-                if (physmem_map(ph_addr, *addr, 1,
+                
+                if (physmem_map(ph_addr, *addr, pages,
                     AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
                         ipc_answer_0(callid, ENOENT);
@@ -138 +142 @@
                 }
         }
+        
         ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
 }
@@ -198 +203 @@
                         switch (IPC_GET_ARG3(call)) {
                         case SERVICE_MEM_REALTIME:
-                                get_as_area(callid, &call, "clock.faddr", &clockaddr);
+                                get_as_area(callid, &call, sysinfo_value("clock.faddr"), 1, &clockaddr);
                                 break;
                         case SERVICE_MEM_KLOG:
-                                get_as_area(callid, &call, "klog.faddr", &klogaddr);
+                                get_as_area(callid, &call, sysinfo_value("klog.faddr"), sysinfo_value("klog.pages"), &klogaddr);
                                 break;
                         default: