Changeset 4f42d52 in mainline for kernel/arch/ia32/src/boot/boot.S

Timestamp:

2007-05-04T17:35:16Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5c8ba05

Parents:

07bd231e

Message:

force VGA palette to 3:2:3 palette on 8 bpp modes
(this fixes ticket #33)

File:

• kernel/arch/ia32/src/boot/boot.S (modified) (7 diffs)

kernel/arch/ia32/src/boot/boot.S

@@ -354 +354 @@
 #define VESA_INFO_SIZE 1024
 
+#define VESA_MODE_ATTRIBUTES_OFFSET 0
 #define VESA_MODE_LIST_PTR_OFFSET 14
+#define VESA_MODE_SCANLINE_OFFSET 16
 #define VESA_MODE_WIDTH_OFFSET 18
 #define VESA_MODE_HEIGHT_OFFSET 20
 #define VESA_MODE_BPP_OFFSET 25
-#define VESA_MODE_SCANLINE_OFFSET 16
 #define VESA_MODE_PHADDR_OFFSET 40
 
@@ -368 +369 @@
 #define VESA_GET_MODE_INFO 0x4f01
 #define VESA_SET_MODE 0x4f02
-
-#define CONFIG_VESA_BPP_a 255
+#define VESA_SET_PALETTE 0x4f09
 
 #if CONFIG_VESA_BPP == 24
-#undef CONFIG_VESA_BPP_a
-#define CONFIG_VESA_BPP_a 32
+#define CONFIG_VESA_BPP_VARIANT 32
 #endif
 
@@ -414 +413 @@
         jnz 1b
         
-        mov $CONFIG_VESA_HEIGHT,%ax
+        mov $CONFIG_VESA_HEIGHT, %ax
         cmp VESA_MODE_HEIGHT_OFFSET(%di), %ax
         jnz 1b
@@ -420 +419 @@
         mov $CONFIG_VESA_BPP, %al
         cmp VESA_MODE_BPP_OFFSET(%di), %al
+
+#ifdef CONFIG_VESA_BPP_VARIANT
         jz 2f
         
-        mov $CONFIG_VESA_BPP_a, %al
+        mov $CONFIG_VESA_BPP_VARIANT, %al
         cmp VESA_MODE_BPP_OFFSET(%di), %al
+#endif
         jnz 1b
-        
+
 2:
         
@@ -437 +439 @@
         cmp $VESA_OK, %al
         jnz 0f
+
+#if CONFIG_VESA_BPP == 8
+        
+        # Set 3:2:3 VGA palette
+        
+        mov VESA_MODE_ATTRIBUTES_OFFSET(%di), %ax
+        push %di
+        mov $vga323 - vesa_init, %di
+        mov $0x100, %ecx
+        
+        bt $5, %ax                                                      # Test if VGA compatible registers are present
+        jnc vga_compat
+                
+                # Try VESA routine to set palette
+                
+                mov $VESA_SET_PALETTE, %ax
+                xor %bl, %bl
+                xor %dx, %dx
+                int $0x10
+                
+                jmp vga_not_compat
+        
+        vga_compat:
+                
+                # Try VGA registers to set palette
+                
+                movw $0x3c6, %dx                                                # Set palette mask
+                movb $0xff, %al
+                outb %al, %dx
+                
+                movw $0x3c8, %dx                                                # First index to set
+                xor %al, %al
+                outb %al, %dx
+                
+                movw $0x3c9, %dx                                                # Data port
+                vga_loop:
+                        movb %es:2(%di), %al
+                        outb %al, %dx
+                        
+                        movb %es:1(%di), %al
+                        outb %al, %dx
+                        
+                        movb %es:(%di), %al
+                        outb %al, %dx
+                        
+                        addw $4, %di
+                        loop vga_loop
+                
+        vga_not_compat:
+        
+        pop %di
+        
+#endif
         
         mov VESA_MODE_PHADDR_OFFSET(%di), %esi
@@ -478 +533 @@
         xor %ax, %ax
         jz 8b                                           # Force relative jump
-        
+
+vga323:
+#include "vga323.pal"
 
 .code32
@@ -510 +567 @@
 
 pse_msg:
-        .ascii "Page Size Extension not supported. System halted.\0"
+        .asciz "Page Size Extension not supported. System halted."