Changeset 8442d10 in mainline for uspace/lib/c

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/lib/c

Files:

• generic/ddi.c (modified) (4 diffs)
• generic/time.c (modified) (1 diff)
• include/ddi.h (modified) (1 diff)

uspace/lib/c/generic/ddi.c

@@ -76 +76 @@
  *
  */
-int physmem_map(void *phys, size_t pages, unsigned int flags, void **virt)
+int physmem_map(uintptr_t phys, size_t pages, unsigned int flags, void **virt)
 {
         return __SYSCALL5(SYS_PHYSMEM_MAP, (sysarg_t) phys,
@@ -83 +83 @@
 
 int dmamem_map(void *virt, size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys)
+    unsigned int flags, uintptr_t *phys)
 {
         return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
@@ -90 +90 @@
 }
 
-int dmamem_map_anonymous(size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys, void **virt)
-{
+int dmamem_map_anonymous(size_t size, uintptr_t constraint,
+    unsigned int map_flags, unsigned int flags, uintptr_t *phys, void **virt)
+{
+        *phys = constraint;
+        
         return (int) __SYSCALL6(SYS_DMAMEM_MAP, (sysarg_t) size,
             (sysarg_t) map_flags, (sysarg_t) flags | DMAMEM_FLAGS_ANONYMOUS,
@@ -158 +160 @@
         if (!virt)
                 return EINVAL;
-
-        void *phys_frame =
-            (void *) ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
-        size_t offset = pio_addr - phys_frame;
+        
+        uintptr_t phys_frame =
+            ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
+        size_t offset = (uintptr_t) pio_addr - phys_frame;
         size_t pages = SIZE2PAGES(offset + size);
         

uspace/lib/c/generic/time.c

@@ -556 +556 @@
                 
                 void *addr;
-                rc = physmem_map((void *) faddr, 1,
-                    AS_AREA_READ | AS_AREA_CACHEABLE, &addr);
+                rc = physmem_map(faddr, 1, AS_AREA_READ | AS_AREA_CACHEABLE,
+                    &addr);
                 if (rc != EOK) {
                         as_area_destroy(addr);

uspace/lib/c/include/ddi.h

@@ -42 +42 @@
 #include <task.h>
 
+#define DMAMEM_16MiB  ((uintptr_t) UINT64_C(0xffffffffff000000))
+#define DMAMEM_4GiB   ((uintptr_t) UINT64_C(0xffffffff00000000))
+
 extern int device_assign_devno(void);
 
-extern int physmem_map(void *, size_t, unsigned int, void **);
+extern int physmem_map(uintptr_t, size_t, unsigned int, void **);
 
-extern int dmamem_map(void *, size_t, unsigned int, unsigned int, void **);
-extern int dmamem_map_anonymous(size_t, unsigned int, unsigned int, void **,
-    void **);
+extern int dmamem_map(void *, size_t, unsigned int, unsigned int, uintptr_t *);
+extern int dmamem_map_anonymous(size_t, uintptr_t, unsigned int, unsigned int,
+    uintptr_t *, void **);
 extern int dmamem_unmap(void *, size_t);
 extern int dmamem_unmap_anonymous(void *);