Changeset 92574f4 in mainline for uspace/app/klog/klog.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/app/klog/klog.c (modified) (3 diffs)

uspace/app/klog/klog.c

@@ -36 +36 @@
 
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <async.h>
-#include <ipc/services.h>
 #include <as.h>
-#include <sysinfo.h>
+#include <ddi.h>
 #include <event.h>
 #include <errno.h>
 #include <str_error.h>
 #include <io/klog.h>
+#include <sysinfo.h>
 
 #define NAME       "klog"
@@ -79 +78 @@
 int main(int argc, char *argv[])
 {
-        size_t klog_pages;
-        if (sysinfo_get_value("klog.pages", &klog_pages) != EOK) {
-                printf("%s: Error getting klog address\n", NAME);
-                return -1;
+        size_t pages;
+        int rc = sysinfo_get_value("klog.pages", &pages);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to get number of klog pages\n",
+                    NAME);
+                return rc;
         }
         
-        size_t klog_size = klog_pages * PAGE_SIZE;
-        klog_length = klog_size / sizeof(wchar_t);
-        
-        klog = (wchar_t *) as_get_mappable_page(klog_size);
-        if (klog == NULL) {
-                printf("%s: Error allocating memory area\n", NAME);
-                return -1;
+        uintptr_t faddr;
+        rc = sysinfo_get_value("klog.faddr", &faddr);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to get klog physical address\n",
+                    NAME);
+                return rc;
         }
         
-        int res = async_share_in_start_1_0(PHONE_NS, (void *) klog,
-            klog_size, SERVICE_MEM_KLOG);
-        if (res != EOK) {
-                printf("%s: Error initializing memory area\n", NAME);
-                return -1;
+        size_t size = pages * PAGE_SIZE;
+        klog_length = size / sizeof(wchar_t);
+        
+        klog = (wchar_t *) as_get_mappable_page(size);
+        if (klog == NULL) {
+                fprintf(stderr, "%s: Unable to allocate virtual memory area\n",
+                    NAME);
+                return ENOMEM;
         }
         
-        if (event_subscribe(EVENT_KLOG, 0) != EOK) {
-                printf("%s: Error registering klog notifications\n", NAME);
-                return -1;
+        rc = physmem_map((void *) faddr, (void *) klog, pages,
+            AS_AREA_READ | AS_AREA_CACHEABLE);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to map klog\n", NAME);
+                return rc;
+        }
+        
+        rc = event_subscribe(EVENT_KLOG, 0);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to register klog notifications\n",
+                    NAME);
+                return rc;
         }
         
@@ -109 +121 @@
          * Mode "a" would be definitively much better here, but it is
          * not well supported by the FAT driver.
-         *
          */
         log = fopen(LOG_FNAME, "w");