Changeset 7f5b37a in mainline for fb/fb.c

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.

File:

• fb/fb.c (modified) (4 diffs)

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,