Changeset 8442d10 in mainline for uspace/srv

Timestamp:

2013-09-09T21:48:12Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c67dbd6

Parents:

2e2c18a1

Message:

improve the API of physmem_map(), dmamem_map() and dmamem_map_anonymous()
the "constraint" argument of dmamem_map_anonymous() should be used to specify bits disallowed in the physical frame address

Location:

uspace/srv

Files:

• bd/rd/rd.c (modified) (1 diff)
• hid/input/port/niagara.c (modified) (1 diff)
• hid/output/port/ega.c (modified) (1 diff)
• hid/output/port/kchar.c (modified) (1 diff)
• hid/output/port/niagara.c (modified) (1 diff)
• hw/irc/obio/obio.c (modified) (3 diffs)

uspace/srv/bd/rd/rd.c

@@ -165 +165 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
         
-        ret = physmem_map((void *) addr_phys,
+        ret = physmem_map(addr_phys,
             ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags, &rd_addr);
         if (ret != EOK) {

uspace/srv/hid/input/port/niagara.c

@@ -97 +97 @@
                 return -1;
         
-        int rc = physmem_map((void *) paddr, 1,
-            AS_AREA_READ | AS_AREA_WRITE, (void *) &input_buffer);
+        int rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
+            (void *) &input_buffer);
         if (rc != 0) {
                 printf("Niagara: uspace driver couldn't map physical memory: %d\n",

uspace/srv/hid/output/port/ega.c

@@ -216 +216 @@
         ega.size = (ega.cols * ega.rows) << 1;
         
-        rc = physmem_map((void *) paddr,
+        rc = physmem_map(paddr,
             ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH,
             AS_AREA_READ | AS_AREA_WRITE, (void *) &ega.addr);

uspace/srv/hid/output/port/kchar.c

@@ -84 +84 @@
                 return rc;
         
-        rc = physmem_map((void *) paddr,
+        rc = physmem_map(paddr,
             ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH,
             AS_AREA_READ | AS_AREA_WRITE, (void *) &kchar.addr);

uspace/srv/hid/output/port/niagara.c

@@ -104 +104 @@
                 return rc;
         
-        rc = physmem_map((void *) paddr, 1,
-            AS_AREA_READ | AS_AREA_WRITE, (void *) &niagara.fifo);
+        rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
+            (void *) &niagara.fifo);
         if (rc != EOK)
                 return rc;

uspace/srv/hw/irc/obio/obio.c

@@ -69 +69 @@
 #define INO_MASK        0x1f
 
-static void *base_phys;
+static uintptr_t base_phys;
 static volatile uint64_t *base_virt;
 
@@ -123 +123 @@
         }
         
-        base_phys = (void *) paddr;
+        base_phys = (uintptr_t) paddr;
         
         int flags = AS_AREA_READ | AS_AREA_WRITE;
@@ -135 +135 @@
         }
         
-        printf("%s: OBIO registers with base at %p\n", NAME, base_phys);
+        printf("%s: OBIO registers with base at %zu\n", NAME, base_phys);
         
         async_set_client_connection(obio_connection);