Changeset bbf5657 in mainline

Timestamp:

2006-02-13T23:22:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

fe050b7

Parents:

d7d6385

Message:

Added support for 24-bit framebuffer.

Files:

• Makefile (modified) (1 diff)
• arch/mips32/src/console.c (modified) (2 diffs)
• arch/mips32/src/mm/frame.c (modified) (1 diff)
• arch/ppc32/src/mm/frame.c (modified) (1 diff)
• contrib/conf/gxemul.sh (modified) (1 diff)
• generic/include/fb/fb.h (added)
• generic/src/fb/fb.c (added)
• kernel.config (modified) (1 diff)

Makefile

@@ -133 +133 @@
         generic/src/synch/semaphore.c \
         generic/src/synch/waitq.c \
-        generic/src/smp/ipi.c \
-        generic/src/fb/font-8x16.c
+        generic/src/smp/ipi.c
+
+## Framebuffer
+ifeq ($(CONFIG_FB),y)
+        GENERIC_SOURCES += \
+                generic/src/fb/font-8x16.c \
+                generic/src/fb/fb.c
+        DEFS += -DCONFIG_FB
+endif
 
 ## Test sources

arch/mips32/src/console.c

@@ -32 +32 @@
 #include <arch/drivers/serial.h>
 #include <arch/drivers/msim.h>
+#include <fb/fb.h>
 
 void console_init(void)
@@ -41 +42 @@
         } else
                 msim_console();
+#ifdef CONFIG_FB
+        fb_init(0xb2000000, 640, 480);
+#endif
 }

arch/mips32/src/mm/frame.c

@@ -43 +43 @@
                 arc_frame_init();
         else {
-                zone_create(1, (config.memory_size >> FRAME_WIDTH)-1,1,0);
+                zone_create(0, ADDR2PFN(config.memory_size), 1, 0);
+                /*
+                 * Blacklist interrupt vektor
+                 */
+                frame_mark_unavailable(0, 1);
         }
 }

arch/ppc32/src/mm/frame.c

@@ -34 +34 @@
 void frame_arch_init(void)
 {
-        zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
+        /* First page is exception vector, 
+         * second is 'implementation specific', evade it too
+         */
+        zone_create(0, SIZE2FRAMES(config.memory_size), 2, 0);
+        frame_mark_unavailable(0, 2);
 }

contrib/conf/gxemul.sh

@@ -2 +2 @@
 # Uspace addresses outside of normal memory (kernel has std. 8 or 16MB)
 # we place the pages at 24M
-gxemul -E testmips 0x81800000:init kernel.bin
+        gxemul -E testmips -X 0x81800000:init kernel.bin

kernel.config

@@ -45 +45 @@
 ! [ARCH=mips32] MIPS_MACHINE (choice)
 
+# Framebuffer support
+! [ARCH=mips32&MIPS_MACHINE=lgxemul] CONFIG_FB (y/n)
+
 # Support for SMP
 ! [ARCH=ia32|ARCH=amd64] CONFIG_SMP (y/n)