Changeset 51dbadf3 in mainline for ns/ns.c

Timestamp:

2006-06-06T07:42:20Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

1890e312

Parents:

e9073f2

Message:

Added basic klog.
Added ipc tester.
TODO add serializing functions to psthread, so that the lines in klog won't intermix.

File:

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

ns/ns.c

@@ -34 +34 @@
 #include <ipc/ipc.h>
 #include <ipc/ns.h>
+#include <ipc/services.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -77 +78 @@
 int static ping_phone;
 
-static void get_realtime_as(ipc_callid_t callid, ipc_call_t *call)
-{
-        static void *addr = NULL;
+static void *clockaddr = NULL;
+static void *klogaddr = NULL;
+
+static void get_as(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
+{
         void *ph_addr;
 
-        if (!addr) {
-                ph_addr = (void *)sysinfo_value("clock.faddr");
+        if (!*addr) {
+                ph_addr = (void *)sysinfo_value(name);
                 if (!ph_addr) {
                         ipc_answer_fast(callid, ENOENT, 0, 0);
                         return;
                 }
-                addr = as_get_mappable_page(PAGE_SIZE);
-                map_physmem(ph_addr, addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
-        }
-        ipc_answer_fast(callid, 0, (ipcarg_t)addr, AS_AREA_READ);
+                *addr = as_get_mappable_page(PAGE_SIZE);
+                map_physmem(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
+        }
+        ipc_answer_fast(callid, 0, (ipcarg_t)*addr, AS_AREA_READ);
 }
 
@@ -110 +113 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_AS_AREA_RECV:
-                        get_realtime_as(callid, &call);
+                        switch (IPC_GET_ARG3(call)) {
+                        case SERVICE_MEM_REALTIME:
+                                get_as(callid, &call, "clock.faddr", &clockaddr);
+                                break;
+                        case SERVICE_MEM_KLOG:
+                                get_as(callid, &call, "klog.faddr", &klogaddr);
+                                break;
+                        default:
+                                ipc_answer_fast(callid, ENOENT, 0, 0);
+                        }
                         continue;
                 case IPC_M_PHONE_HUNGUP: