Changeset 26f48570 in mainline for fb/main.c

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.

File:

• fb/main.c (modified) (2 diffs)

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();