Changeset 474afc9 in mainline for uspace/srv/ns/ns.c

Timestamp:

2011-02-04T22:40:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4d73d71

Parents:

89acf204 (diff), e29e09cf (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:

development branch changes

File:

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

uspace/srv/ns/ns.c

@@ -37 +37 @@
 
 #include <ipc/ipc.h>
-#include <ipc/services.h>
 #include <ipc/ns.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-#include <as.h>
-#include <ddi.h>
-#include <event.h>
 #include <macros.h>
-#include <sysinfo.h>
 #include "ns.h"
 #include "service.h"
 #include "clonable.h"
 #include "task.h"
-
-static void *clockaddr = NULL;
-static void *klogaddr = NULL;
-
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *faddr,
-    size_t pages, void **addr)
-{
-        if ((faddr == NULL) || (pages == 0)) {
-                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;
-                }
-                
-                if (physmem_map(faddr, *addr, pages,
-                    AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
-                        ipc_answer_0(callid, ENOENT);
-                        return;
-                }
-        }
-        
-        ipc_answer_2(callid, EOK, (sysarg_t) *addr, AS_AREA_READ);
-}
-
-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)
@@ -138 +75 @@
                 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_SHARE_IN:
-                        switch (IPC_GET_ARG3(call)) {
-                        case SERVICE_MEM_REALTIME:
-                                setup_clock_area(callid, &call, &clockaddr);
-                                break;
-                        case SERVICE_MEM_KLOG:
-                                setup_klog_area(callid, &call, &klogaddr);
-                                break;
-                        default:
-                                ipc_answer_0(callid, ENOENT);
-                        }
-                        continue;
                 case IPC_M_PHONE_HUNGUP:
                         retval = ns_task_disconnect(&call);