Changeset d3f2cad in mainline for fb/ega.c

Timestamp:

2006-06-07T10:06:00Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

e8d77a4

Parents:

9e951acb

Message:

Better colors for ega.
Small updates to initialization code to use only async api.

File:

• fb/ega.c (modified) (4 diffs)

fb/ega.c

@@ -56 +56 @@
 #define EGA_IO_SIZE 2
 
+#define NORMAL_COLOR       0x0f
+#define INVERTED_COLOR     0xf0
+
+#define EGA_STYLE(fg,bg) ((fg) > (bg) ? NORMAL_COLOR : INVERTED_COLOR)
+
 typedef unsigned char u8;
 typedef unsigned short u16;
@@ -68 +73 @@
 static char *scr_addr;
 
-static unsigned int style = 0x1e;
+static unsigned int style = NORMAL_COLOR;
 
 static inline void outb(u16 port, u8 b)
@@ -181 +186 @@
         for (i=0; i < scr_width*scr_height; i++) {
                 scr_addr[i*2] = data[i].character;
-                if (data[i].style.fg_color > data[i].style.bg_color)
-                        scr_addr[i*2+1] = 0x1e;
-                else
-                        scr_addr[i*2+1] = 0xe1;
+                scr_addr[i*2+1] = EGA_STYLE(data[i].style.fg_color, data[i].style.bg_color);
         }
 }
@@ -301 +303 @@
                         fgcolor = IPC_GET_ARG1(call);
                         bgcolor = IPC_GET_ARG2(call);
-                        if (fgcolor > bgcolor)
-                                style = 0x1e;
-                        else
-                                style = 0xe1;
+                        style = EGA_STYLE(fgcolor, bgcolor);
                         break;
                 case FB_VP_DRAW_PIXMAP: