Changeset 1d4024cf in mainline for uspace/app

Timestamp:

2012-06-13T16:19:01Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

49c94a3

Parents:

33f9670 (diff), 2902e1bb (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 with mainline

Location:

uspace/app/tester/mm

Files:

• common.c (modified) (1 diff)
• mapping1.c (modified) (1 diff)

uspace/app/tester/mm/common.c

@@ -342 +342 @@
         link_initialize(&area->link);
         
-        area->addr = as_area_create((void *) -1, size,
+        area->addr = as_area_create(AS_AREA_ANY, size,
             AS_AREA_WRITE | AS_AREA_READ);
-        if (area->addr == (void *) -1) {
+        if (area->addr == AS_MAP_FAILED) {
                 free(area);
                 check_consistency("map_area (a)");

uspace/app/tester/mm/mapping1.c

@@ -42 +42 @@
         TPRINTF("Creating AS area...\n");
         
-        void *result = as_area_create((void *) -1, size,
+        void *result = as_area_create(AS_AREA_ANY, size,
             AS_AREA_READ | AS_AREA_WRITE);
-        if (result == (void *) -1)
+        if (result == AS_MAP_FAILED)
                 return NULL;