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

Timestamp:

2006-12-09T20:20:50Z (19 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/ega.c (modified) (4 diffs)

uspace/fb/ega.c

@@ -35 +35 @@
  */
 
-
 #include <stdlib.h>
 #include <unistd.h>
@@ -63 +62 @@
 saved_screen saved_screens[MAX_SAVED_SCREENS];
 
-
 #define EGA_IO_ADDRESS 0x3d4
 #define EGA_IO_SIZE 2
@@ -127 +125 @@
         int i;
         if (rows > 0) {
-                memcpy (scr_addr,((char *)scr_addr) + rows * scr_width * 2, scr_width * scr_height * 2 - rows * scr_width * 2);
+                memcpy (scr_addr,((char *)scr_addr) + rows * scr_width * 2,
+                        scr_width * scr_height * 2 - rows * scr_width * 2);
                 for (i = 0; i < rows * scr_width ; i ++)
-                        (((short *)scr_addr) + scr_width * scr_height - rows * scr_width) [i] = ((style << 8) + ' ');
+                        (((short *)scr_addr) + scr_width * scr_height - rows *
+                                scr_width) [i] = ((style << 8) + ' ');
         } else if (rows < 0) {
-
-                memcpy (((char *)scr_addr) - rows * scr_width * 2 ,scr_addr ,scr_width * scr_height * 2 + rows * scr_width * 2);
+                memcpy (((char *)scr_addr) - rows * scr_width * 2, scr_addr,
+                        scr_width * scr_height * 2 + rows * scr_width * 2);
                 for (i = 0; i < - rows * scr_width ; i++)
                         ((short *)scr_addr) [i] = ((style << 8 ) + ' ');
@@ -309 +309 @@
         scr_width=sysinfo_value("fb.width");
         scr_height=sysinfo_value("fb.height");
-        iospace_enable(task_get_id(),(void *)EGA_IO_ADDRESS,2);
-
-        sz = scr_width*scr_height*2;
-        scr_addr = as_get_mappable_page(sz);
-
-        physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >> PAGE_WIDTH,
-                    AS_AREA_READ | AS_AREA_WRITE);
+        iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2);
+
+        sz = scr_width * scr_height * 2;
+        scr_addr = as_get_mappable_page(sz, (int)
+                sysinfo_value("fb.address.color"));
+
+        physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
+                PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
 
         async_set_client_connection(ega_client_connection);