Changeset faba839 in mainline for uspace/lib

Timestamp:

2012-06-13T13:16:19Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2902e1bb

Parents:

32d19f7

Message:

use symbolic values for address space constants

Location:

uspace/lib

Files:

• c/generic/as.c (modified) (1 diff)
• c/generic/elf/elf_load.c (modified) (1 diff)
• c/generic/malloc.c (modified) (1 diff)
• c/generic/mman.c (modified) (1 diff)
• c/include/as.h (modified) (1 diff)
• c/include/sys/mman.h (modified) (1 diff)
• fb/imgmap.c (modified) (1 diff)
• fb/screenbuffer.c (modified) (1 diff)
• fs/libfs.c (modified) (1 diff)

uspace/lib/c/generic/as.c

@@ -46 +46 @@
  *
  * @param base  Starting virtual address of the area.
- *              If set to (void *) -1, the kernel finds
- *              a mappable area.
+ *              If set to AS_AREA_ANY ((void *) -1),
+ *              the kernel finds a mappable area.
  * @param size  Size of the area.
  * @param flags Flags describing type of the area.
  *
  * @return Starting virtual address of the created area on success.
- * @return (void *) -1 otherwise.
+ * @return AS_MAP_FAILED ((void *) -1) otherwise.
  *
  */

uspace/lib/c/generic/elf/elf_load.c

@@ -366 +366 @@
         a = as_area_create((uint8_t *) base + bias, mem_sz,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-        if (a == (void *) -1) {
+        if (a == AS_MAP_FAILED) {
                 DPRINTF("memory mapping failed (0x%x, %d)\n",
                     base + bias, mem_sz);

uspace/lib/c/generic/malloc.c

@@ -285 +285 @@
         /* Align the heap area size on page boundary */
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
-        void *astart = as_area_create((void *) -1, asize,
+        void *astart = as_area_create(AS_AREA_ANY, asize,
             AS_AREA_WRITE | AS_AREA_READ);
-        if (astart == (void *) -1)
+        if (astart == AS_MAP_FAILED)
                 return false;
         

uspace/lib/c/generic/mman.c

@@ -42 +42 @@
 {
         if (!start)
-                start = (void *) -1;
+                start = AS_AREA_ANY;
         
 //      if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))

uspace/lib/c/include/as.h

@@ -41 +41 @@
 #include <libarch/config.h>
 
+#define AS_AREA_ANY    ((void *) -1)
+#define AS_MAP_FAILED  ((void *) -1)
+
 static inline size_t SIZE2PAGES(size_t size)
 {

uspace/lib/c/include/sys/mman.h

@@ -39 +39 @@
 #include <sys/types.h>
 
-#define MAP_FAILED  ((void *) -1)
+#define MAP_FAILED  AS_MAP_FAILED
 
 #define MAP_SHARED     (1 << 0)

uspace/lib/fb/imgmap.c

@@ -420 +420 @@
         
         if ((flags & IMGMAP_FLAG_SHARED) == IMGMAP_FLAG_SHARED) {
-                imgmap = (imgmap_t *) as_area_create((void *) -1, size,
+                imgmap = (imgmap_t *) as_area_create(AS_AREA_ANY, size,
                     AS_AREA_READ | AS_AREA_WRITE);
-                if (imgmap == (void *) -1)
+                if (imgmap == AS_MAP_FAILED)
                         return NULL;
         } else {

uspace/lib/fb/screenbuffer.c

@@ -79 +79 @@
         
         if ((flags & SCREENBUFFER_FLAG_SHARED) == SCREENBUFFER_FLAG_SHARED) {
-                scrbuf = (screenbuffer_t *) as_area_create((void *) -1, size,
+                scrbuf = (screenbuffer_t *) as_area_create(AS_AREA_ANY, size,
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-                if (scrbuf == (void *) -1)
+                if (scrbuf == AS_MAP_FAILED)
                         return NULL;
         } else {

uspace/lib/fs/libfs.c

@@ -339 +339 @@
          */
         rc = async_share_in_start_0_0(exch, PLB_SIZE, (void *) &reg.plb_ro);
-        if (reg.plb_ro == (void *) -1) {
+        if (reg.plb_ro == AS_MAP_FAILED) {
                 async_exchange_end(exch);
                 async_forget(req);