Changeset 26f48570 in mainline

Timestamp:

2006-06-04T12:42:03Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

1160f8d

Parents:

dd641e3

Message:

Fixed incorrect compiling of fb for different archs.

Location:

fb

Files:

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

fb/Makefile

@@ -35 +35 @@
 
 CFLAGS += -I../libipc/include
-ifeq ($(ARCH), mips32)
-        CFLAGS += -DFB_BIG_ENDIAN
-endif
 
 LIBS =  $(LIBC_PREFIX)/libc.a
@@ -50 +47 @@
         ppm.c
 
+ifneq ($(ARCH), ia64)
+        SOURCES += fb.c \
+                font-8x16.c
+        CFLAGS += -DFB_ENABLED
+endif
+
 ifeq ($(ARCH), ia32)
-        SOURCES +=      fb.c \
-        font-8x16.c \
-        ega.c 
+        SOURCES += ega.c
+        CFLAGS += -DEGA_ENABLED
 endif
 ifeq ($(ARCH), amd64)
-        SORCES +=       fb.c \
-        font-8x16.c \
-        ega.c 
+        SOURCES += ega.c
+        CFLAGS += -DEGA_ENABLED
+endif
+ifeq ($(ARCH), mips32)
+        CFLAGS += -DFB_BIG_ENDIAN
 endif
 

fb/main.c

@@ -57 +57 @@
         int initialized = 0;
 
-#ifdef ia32
+#ifdef FB_ENABLED
         if (sysinfo_value("fb.kind") == 1) {
                 if (fb_init() == 0)
                         initialized = 1;
-        } else if (sysinfo_value("fb.kind") == 2) {
+        } 
+#endif
+#ifdef EGA_ENABLED
+        if (! initialized && sysinfo_value("fb.kind") == 2) {
                 if (ega_init() == 0)
                         initialized = 1;
@@ -67 +70 @@
 #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)
                 sysio_init();