Changeset f8ddd17 in mainline for uspace/fb/fb.c

Timestamp:

2006-12-09T20:20:50Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b82a13c

Parents:

9ab9c2ec

Message:

Rework support for virtually indexed cache.
Instead of repeatedly flushing the data cache, which was a huge overkill, refuse to create an illegal address alias
in the kernel (again) and allocate appropriate page color in userspace instead. Extend the detection also to
SYS_PHYSMEM_MAP syscall.

Add support for tracking physical memory areas mappable by SYS_PHYSMEM_MAP.

Lots of coding style changes.

File:

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

uspace/fb/fb.c

@@ -705 +705 @@
                 /* We accept one area for data interchange */
                 if (IPC_GET_ARG1(*call) == shm_id) {
-                        void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
+                        void *dest = as_get_mappable_page(IPC_GET_ARG2(*call),
+                                PAGE_COLOR(IPC_GET_ARG1(*call)));
                         shm_size = IPC_GET_ARG2(*call);
-                        if (!ipc_answer_fast(callid, 0, (sysarg_t)dest, 0)) 
+                        if (!ipc_answer_fast(callid, 0, (sysarg_t) dest, 0)) 
                                 shm = dest;
                         else
@@ -717 +718 @@
                 } else {
                         intersize = IPC_GET_ARG2(*call);
-                        receive_comm_area(callid,call,(void *)&interbuffer);
+                        receive_comm_area(callid, call, (void *) &interbuffer);
                 }
                 return 1;
@@ -1283 +1284 @@
 
         asz = fb_scanline * fb_height;
-        fb_addr = as_get_mappable_page(asz);
+        fb_addr = as_get_mappable_page(asz, (int) sysinfo_value("fb.address.color"));
         
         physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE);
 
-        if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual, fb_invert_colors))
+        if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual,
+                fb_invert_colors))
                 return 0;