Changeset bf9afa07 in mainline for fb/fb.c

Timestamp:

2006-06-02T11:35:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2d22049

Parents:

49d072e

Message:

Allocation function for allocating free areas for mmap, map_physmem etc.

File:

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

fb/fb.c

@@ -360 +360 @@
  *
  */
-static void screen_init(__address addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
+static void screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
 {
         switch (bpp) {
@@ -598 +598 @@
 int fb_init(void)
 {
-        __address fb_ph_addr;
+        void *fb_ph_addr;
         unsigned int fb_width;
         unsigned int fb_height;
         unsigned int fb_bpp;
         unsigned int fb_scanline;
-        __address fb_addr;
+        void *fb_addr;
+        size_t asz;
 
         async_set_client_connection(fb_client_connection);
 
-        fb_ph_addr=sysinfo_value("fb.address.physical");
+        fb_ph_addr=(void *)sysinfo_value("fb.address.physical");
         fb_width=sysinfo_value("fb.width");
         fb_height=sysinfo_value("fb.height");
@@ -613 +614 @@
         fb_scanline=sysinfo_value("fb.scanline");
 
-        fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
+        asz = fb_scanline*fb_height;
+        fb_addr = as_get_mappable_page(asz);
         
-        map_physmem((void *)((__address)fb_ph_addr),(void *)fb_addr,
-                    (fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH,
+        map_physmem(fb_ph_addr, fb_addr, ALIGN_UP(asz,PAGE_SIZE) >>PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);