Changeset 36251c6 in mainline

Timestamp:

2008-12-19T09:30:55Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

bcb47fa

Parents:

d99b3f2

Message:

Ski framebuffer driver.

Files:

• kernel/arch/ia64/src/ski/ski.c (modified) (1 diff)
• uspace/srv/fb/Makefile (modified) (1 diff)
• uspace/srv/fb/main.c (modified) (2 diffs)
• uspace/srv/fb/ski.c (added)
• uspace/srv/fb/ski.h (added)

kernel/arch/ia64/src/ski/ski.c

@@ -230 +230 @@
         sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno);
         sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);
+
+        sysinfo_set_item_val("fb", NULL, false);
 }
 

uspace/srv/fb/Makefile

@@ -58 +58 @@
 endif
 ifeq ($(ARCH), ia64)
-        SOURCES += ega.c
+        SOURCES += ega.c \
+                   ski.c \
+                   serial_console.c
+        CFLAGS += -DSKI_ENABLED
         CFLAGS += -DEGA_ENABLED
 endif

uspace/srv/fb/main.c

@@ -39 +39 @@
 #include "ega.h"
 #include "msim.h"
+#include "ski.h"
 #include "sgcn.h"
 #include "main.h"
@@ -87 +88 @@
         }
 #endif
+#ifdef SKI_ENABLED
+        if ((!initialized) && (sysinfo_value("fb") != true)) {
+                if (ski_init() == 0)
+                        initialized = true;
+        }
+#endif
 
         if (!initialized)