Changeset 432a269 in mainline for uspace/srv/hid/fb/port/ski.c

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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:

• uspace/srv/hid/fb/port/ski.c (moved) (moved from uspace/srv/hid/fb/ski.c ) (3 diffs)

uspace/srv/hid/fb/port/ski.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
- * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2008 Martin Decky
  * All rights reserved.
  *
@@ -28 +28 @@
  */
 
-/** @defgroup msimfb MSIM text console
- * @brief       HelenOS MSIM text console.
- * @ingroup fbs
- * @{
- */ 
 /** @file
  */
 
-#include <async.h>
-#include <libc.h>
+#include <sys/types.h>
+#include <errno.h>
 #include <sysinfo.h>
-#include <as.h>
-#include <ddi.h>
-
-#include "serial_console.h"
+#include "../ctl/serial.h"
 #include "ski.h"
 
-#define SKI_PUTCHAR             31
+#ifdef UARCH_ia64
 
-#define WIDTH 80
-#define HEIGHT 24
+#define SKI_PUTCHAR  31
 
 /** Display character on ski debug console
@@ -55 +46 @@
  * display character on debug console.
  *
- * @param ch Character to be printed.
+ * @param c Character to be printed.
+ *
  */
-static void ski_putc(const char ch)
+static void ski_putc(const char c)
 {
         asm volatile (
                 "mov r15 = %0\n"
-                "mov r32 = %1\n"        /* r32 is in0 */
-                "break 0x80000\n"       /* modifies r8 */
+                "mov r32 = %1\n"   /* r32 is in0 */
+                "break 0x80000\n"  /* modifies r8 */
                 :
-                : "i" (SKI_PUTCHAR), "r" (ch)
+                : "i" (SKI_PUTCHAR), "r" (c)
                 : "r15", "in0", "r8"
         );
         
-        if (ch == '\n')
+        if (c == '\n')
                 ski_putc('\r');
+}
+
+static void ski_putchar(wchar_t ch)
+{
+        if ((ch >= 0) && (ch < 128))
+                ski_putc(ch);
+        else
+                ski_putc('?');
+}
+
+static void ski_control_puts(const char *str)
+{
+        while (*str)
+                ski_putc(*(str++));
 }
 
 int ski_init(void)
 {
-        serial_console_init(ski_putc, WIDTH, HEIGHT);
+        sysarg_t present;
+        int rc = sysinfo_get_value("fb", &present);
+        if (rc != EOK)
+                present = false;
         
-        async_set_client_connection(serial_client_connection);
-        return 0;
+        if (!present)
+                return ENOENT;
+        
+        sysarg_t kind;
+        rc = sysinfo_get_value("fb.kind", &kind);
+        if (rc != EOK)
+                kind = (sysarg_t) -1;
+        
+        if (kind != 6)
+                return EINVAL;
+        
+        return serial_init(ski_putchar, ski_control_puts);
 }
 
-/** 
- * @}
+#else /* UARCH_ia64 */
+
+int ski_init(void)
+{
+        return ENOENT;
+}
+
+#endif
+
+/** @}
  */