Changeset dd641e3 in mainline for fb

Timestamp:

2006-06-04T12:22:54Z (20 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

26f48570

Parents:

67ec84b

Message:

fb make changes neaded by ega driver and console switching by function keys

Location:

fb

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (2 diffs)

fb/Makefile

@@ -46 +46 @@
 OUTPUT = fb
 SOURCES = \
-        fb.c \
-        font-8x16.c \
         main.c \
         sysio.c \
-        ega.c \
         ppm.c
+
+ifeq ($(ARCH), ia32)
+        SOURCES +=      fb.c \
+        font-8x16.c \
+        ega.c 
+endif
+ifeq ($(ARCH), amd64)
+        SORCES +=       fb.c \
+        font-8x16.c \
+        ega.c 
+endif
+
+CFLAGS += -D$(ARCH)
+
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

fb/main.c

@@ -57 +57 @@
         int initialized = 0;
 
+#ifdef ia32
         if (sysinfo_value("fb.kind") == 1) {
                 if (fb_init() == 0)
@@ -64 +65 @@
                         initialized = 1;
         }
+#endif
+
+#ifdef amd64 
+        if (sysinfo_value("fb.kind") == 1) {
+                if (fb_init() == 0)
+                        initialized = 1;
+        } else if (sysinfo_value("fb.kind") == 2) {
+                if (ega_init() == 0)
+                        initialized = 1;
+        }
+#endif
+
+
         
         if (!initialized)