Changeset 7f5b37a in mainline

Timestamp:

2006-05-28T10:05:03Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0b99e40

Parents:

01ff41c

Message:

Sync with kernel.
Make map_physmem() pass address space area flags instead of boolean switch.

Try to map fb memory with caching enabled.

Files:

• fb/fb.c (modified) (4 diffs)
• libc/generic/ddi.c (modified) (3 diffs)
• libc/include/ddi.h (modified) (1 diff)

fb/fb.c

@@ -29 +29 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 #include <ddi.h>
 #include <task.h>
-#include <stdlib.h>
-#include <ddi.h>
 #include <sysinfo.h>
 #include <align.h>
 #include <as.h>
 #include <ipc/fb.h>
-
-
 #include <ipc/ipc.h>
+#include <ipc/ns.h>
 #include <ipc/services.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <ipc/ns.h>
-
 #include <kernel/errno.h>
 #include <async.h>
-
-
 #include "font-8x16.h"
-#include <string.h>
-
 #include "helenos.xbm"
 #include "fb.h"
@@ -69 +61 @@
 #define H_NO_VFBS 3
 #define V_NO_VFBS 3
-
 
 static void fb_putchar(int item,char ch);
@@ -77 +68 @@
         unsigned int BGCOLOR,unsigned int FGCOLOR,unsigned int LOGOCOLOR);
 
-
 unsigned int mod_col(unsigned int col,int mod);
-
-
 
 static int init_fb(void)
@@ -102 +90 @@
 
         fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
-
-
         
         map_physmem(task_get_id(),(void *)((__address)fb_ph_addr),(void *)fb_addr,
-                    (fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH,1);
+                    (fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH,
+                    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         
         fb_init(0,fb_addr, fb_width, fb_height, fb_bpp, fb_scanline,

libc/generic/ddi.c

@@ -40 +40 @@
  * @param vp Virtual address of the sterting page.
  * @param pages Number of pages to map.
- * @param writable If true, the mapping will be created writable.
+ * @param flags Flags for the new address space area.
  *
  * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability,
@@ -46 +46 @@
  *         was some problem in creating address space area.
  */
-int map_physmem(task_id_t id, void *pf, void *vp, unsigned long pages, int writable)
+int map_physmem(task_id_t id, void *pf, void *vp, unsigned long pages, int flags)
 {
         task_id_t task_id;
@@ -55 +55 @@
         arg.virt_base = vp;
         arg.pages = pages;
-        arg.writable = writable;
+        arg.flags = flags;
 
         return __SYSCALL1(SYS_MAP_PHYSMEM, (sysarg_t) &arg);

libc/include/ddi.h

@@ -32 +32 @@
 #include <task.h>
 
-extern int map_physmem(task_id_t id, void *pf, void *vp, unsigned long pages, int writable);
+extern int map_physmem(task_id_t id, 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);