Changeset df688cd in mainline for fb

Timestamp:

2006-06-02T00:26:44Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

10569b1

Parents:

46bd593f

Message:

Added support ega framebuffer.
Removed taskid parameter from map_physmem. The same effect
can (and should) be performed using IPC.

Location:

fb

Files:

• Makefile (modified) (1 diff)
• ega.c (added)
• ega.h (added)
• fb.c (modified) (1 diff)
• main.c (modified) (2 diffs)

fb/Makefile

@@ -49 +49 @@
         font-8x16.c \
         main.c \
-        sysio.c
+        sysio.c \
+        ega.c
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

fb/fb.c

@@ -565 +565 @@
         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,
+        map_physmem((void *)((__address)fb_ph_addr),(void *)fb_addr,
                     (fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);

fb/main.c

@@ -34 +34 @@
 #include "fb.h"
 #include "sysio.h"
+#include "ega.h"
 
 int main(int argc, char *argv[])
@@ -43 +44 @@
                 if (fb_init() == 0)
                         initialized = 1;
+        } else if (sysinfo_value("fb.kind") == 2) {
+                if (ega_init() == 0)
+                        initialized = 1;
         }
+        
         if (!initialized)
                 sysio_init();