Changeset 46c20c8 in mainline for uspace/srv/ns/ns.c

Timestamp:

2010-11-26T20:08:10Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/ns/ns.c

@@ -55 +55 @@
 static void *klogaddr = NULL;
 
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *ph_addr,
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *faddr,
     size_t pages, void **addr)
 {
-        if (ph_addr == NULL) {
+        if ((faddr == NULL) || (pages == 0)) {
                 ipc_answer_0(callid, ENOENT);
                 return;
@@ -71 +71 @@
                 }
                 
-                if (physmem_map(ph_addr, *addr, pages,
+                if (physmem_map(faddr, *addr, pages,
                     AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
                         ipc_answer_0(callid, ENOENT);
@@ -81 +81 @@
 }
 
+static void setup_clock_area(ipc_callid_t callid, ipc_call_t *call, void **addr)
+{
+        uintptr_t faddr;
+        int err = sysinfo_get_value("clock.faddr", &faddr);
+        
+        if (err != EOK)
+                ipc_answer_0(callid, err);
+        
+        get_as_area(callid, call, (void *) faddr, 1, addr);
+}
+
+static void setup_klog_area(ipc_callid_t callid, ipc_call_t *call, void **addr)
+{
+        uintptr_t faddr;
+        int err = sysinfo_get_value("klog.faddr", &faddr);
+        
+        if (err != EOK)
+                ipc_answer_0(callid, err);
+        
+        size_t pages;
+        err = sysinfo_get_value("klog.pages", &pages);
+        
+        if (err != EOK)
+                ipc_answer_0(callid, err);
+        
+        get_as_area(callid, call, (void *) faddr, pages, addr);
+}
+
 int main(int argc, char **argv)
 {
@@ -97 +125 @@
                 return rc;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
         
         while (true) {
@@ -113 +141 @@
                         switch (IPC_GET_ARG3(call)) {
                         case SERVICE_MEM_REALTIME:
-                                get_as_area(callid, &call,
-                                    (void *) sysinfo_value("clock.faddr"),
-                                    1, &clockaddr);
+                                setup_clock_area(callid, &call, &clockaddr);
                                 break;
                         case SERVICE_MEM_KLOG:
-                                get_as_area(callid, &call,
-                                    (void *) sysinfo_value("klog.faddr"),
-                                    sysinfo_value("klog.pages"), &klogaddr);
+                                setup_klog_area(callid, &call, &klogaddr);
                                 break;
                         default: