Changeset 5a8b2a2 in mainline

Timestamp:

2006-12-06T22:30:36Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9d8b8435

Parents:

d178208

Message:

Eliminate confusion between SYS_MAP_PHYSMEM and sys_physmem_map.
The syscall is to be called SYS_PHYSMEM_MAP from now on and the functions that participate in its implementation are
called *physmem_map().

Files:

• kernel/generic/include/ddi/ddi_arg.h (modified) (1 diff)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/ddi/ddi.c (modified) (1 diff)
• uspace/fb/ega.c (modified) (1 diff)
• uspace/fb/fb.c (modified) (1 diff)
• uspace/libc/generic/ddi.c (modified) (1 diff)
• uspace/libc/include/ddi.h (modified) (1 diff)
• uspace/ns/ns.c (modified) (1 diff)
• uspace/rd/rd.c (modified) (1 diff)

kernel/generic/include/ddi/ddi_arg.h

@@ -36 +36 @@
 #define KERN_DDI_ARG_H_
 
-/** Structure encapsulating arguments for SYS_MAP_PHYSMEM syscall. */
+/** Structure encapsulating arguments for SYS_PHYSMEM_MAP syscall. */
 typedef struct {
         unsigned long long task_id;     /** ID of the destination task. */

kernel/generic/include/syscall/syscall.h

@@ -60 +60 @@
         SYS_CAP_GRANT,
         SYS_CAP_REVOKE,
-        SYS_MAP_PHYSMEM,
+        SYS_PHYSMEM_MAP,
         SYS_IOSPACE_ENABLE,
         SYS_PREEMPT_CONTROL,

kernel/generic/src/ddi/ddi.c

@@ -152 +152 @@
 }
 
-/** Wrapper for SYS_MAP_PHYSMEM syscall.
+/** Wrapper for SYS_PHYSMEM_MAP syscall.
  *
  * @param phys_base Physical base address to map

uspace/fb/ega.c

@@ -314 +314 @@
         scr_addr = as_get_mappable_page(sz);
 
-        map_physmem(ega_ph_addr, scr_addr, ALIGN_UP(sz,PAGE_SIZE)>>PAGE_WIDTH,
+        physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >> PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE);
 

uspace/fb/fb.c

@@ -1285 +1285 @@
         fb_addr = as_get_mappable_page(asz);
         
-        map_physmem(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH,
+        physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE);
 

uspace/libc/generic/ddi.c

@@ -51 +51 @@
  *         was some problem in creating address space area.
  */
-int map_physmem(void *pf, void *vp, unsigned long pages, int flags)
+int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-        return __SYSCALL4(SYS_MAP_PHYSMEM, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
+        return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
 }
 

uspace/libc/include/ddi.h

@@ -38 +38 @@
 #include <task.h>
 
-extern int map_physmem(void *pf, void *vp, unsigned long pages, int flags);
+extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags);
 extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
 extern int preemption_control(int enable);

uspace/ns/ns.c

@@ -95 +95 @@
                 }
                 *addr = as_get_mappable_page(PAGE_SIZE);
-                map_physmem(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
-        }
-        ipc_answer_fast(callid, 0, (ipcarg_t)*addr, AS_AREA_READ);
+                physmem_map(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
+        }
+        ipc_answer_fast(callid, 0, (ipcarg_t) *addr, AS_AREA_READ);
 }
 

uspace/rd/rd.c

@@ -80 +80 @@
         void * rd_addr = as_get_mappable_page(rd_size);
         
-        map_physmem(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
         
         return true;