Changeset 153cc76a in mainline for uspace/app

Timestamp:

2011-12-23T16:42:22Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7e1b130

Parents:

4291215 (diff), 2f0dd2a (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:

Mainline changes.

Location:

uspace/app

Files:

• klog/klog.c (modified) (1 diff)
• tester/mm/common.c (modified) (1 diff)
• tester/mm/mapping1.c (modified) (2 diffs)
• trace/syscalls.c (modified) (1 diff)
• websrv/websrv.c (modified) (1 diff)

uspace/app/klog/klog.c

@@ -205 +205 @@
         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;
-        }
-        
-        rc = physmem_map((void *) faddr, (void *) klog, pages,
-            AS_AREA_READ | AS_AREA_CACHEABLE);
+        rc = physmem_map((void *) faddr, pages,
+            AS_AREA_READ | AS_AREA_CACHEABLE, (void *) &klog);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to map klog\n", NAME);

uspace/app/tester/mm/common.c

@@ -342 +342 @@
         link_initialize(&area->link);
         
-        /* Map the memory area */
-        void *addr = as_get_mappable_page(size);
-        if (addr == NULL) {
+        area->addr = as_area_create((void *) -1, size,
+            AS_AREA_WRITE | AS_AREA_READ);
+        if (area->addr == (void *) -1) {
                 free(area);
                 check_consistency("map_area (a)");
-                return NULL;
-        }
-        
-        area->addr = as_area_create(addr, size, AS_AREA_WRITE | AS_AREA_READ);
-        if (area->addr == (void *) -1) {
-                free(area);
-                check_consistency("map_area (b)");
                 return NULL;
         }

uspace/app/tester/mm/mapping1.c

@@ -35 +35 @@
 #include "../tester.h"
 
-#define BUFFER1_PAGES 4
-#define BUFFER2_PAGES 2
+#define BUFFER1_PAGES  4
+#define BUFFER2_PAGES  2
 
 static void *create_as_area(size_t size)
 {
-        void *result = as_get_mappable_page(size);
         TPRINTF("Creating AS area...\n");
-        if (as_area_create(result, size,
-            AS_AREA_READ | AS_AREA_WRITE) != result) {
+        
+        void *result = as_area_create((void *) -1, size,
+            AS_AREA_READ | AS_AREA_WRITE);
+        if (result == (void *) -1)
                 return NULL;
-        }
+        
         return result;
 }
@@ -71 +72 @@
         int i;
         for (i = 0; i < page_count; i++) {
-                void *page_start = ((char *)area) + PAGE_SIZE * i;
+                void *page_start = ((char *) area) + PAGE_SIZE * i;
                 int rc = as_get_physical_mapping(page_start, NULL);
                 if (rc != expected_rc) {

uspace/app/trace/syscalls.c

@@ -72 +72 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
-    [SYS_REGISTER_IRQ] = { "register_irq",      4,      V_ERRNO },
-    [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
+    [SYS_IRQ_REGISTER] = { "irq_register",      4,      V_ERRNO },
+    [SYS_IRQ_UNREGISTER] = { "irq_unregister",  2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",              2,      V_INTEGER },

uspace/app/websrv/websrv.c

@@ -304 +304 @@
                 if (rc != EOK) {
                         printf("Error closing connection socket: %d\n", rc);
+                        closesocket(listen_sd);
                         return 1;
                 }