Changeset 26e7d6d in mainline for kernel/arch/ia64/src/drivers/ski.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/ia64/src/drivers/ski.c (modified) (5 diffs)

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

@@ -57 +57 @@
 };
 
-static void ski_putchar(outdev_t *, const wchar_t, bool);
+static void ski_putchar(outdev_t *, const wchar_t);
 
 static outdev_operations_t skidev_ops = {
@@ -99 +99 @@
 static void poll_keyboard(ski_instance_t *instance)
 {
-        if (silent)
-                return;
-        
         int count = POLL_LIMIT;
         
@@ -121 +118 @@
         
         while (true) {
-                if (!silent)
+                // TODO FIXME:
+                // This currently breaks the kernel console
+                // before we get the override from uspace.
+                if (console_override)
                         poll_keyboard(instance);
                 
@@ -182 +182 @@
  * @param dev    Character device.
  * @param ch     Character to be printed.
- * @param silent Whether the output should be silenced.
- *
- */
-static void ski_putchar(outdev_t *dev, const wchar_t ch, bool silent)
-{
-        if (!silent) {
+ *
+ */
+static void ski_putchar(outdev_t *dev, const wchar_t ch)
+{
+        // TODO FIXME:
+        // This currently breaks the kernel console
+        // before we get the override from uspace.
+        if (console_override) {
                 if (ascii_check(ch)) {
                         if (ch == '\n')
@@ -213 +215 @@
         if (!fb_exported) {
                 /*
-                 * This is the necessary evil until the userspace driver is entirely
+                 * This is the necessary evil until
+                 * the userspace driver is entirely
                  * self-sufficient.
                  */