Changeset ce87a8aa in mainline

Timestamp:

2009-04-01T15:41:51Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b4c4666

Parents:

e1813cf

Message:

fix compilation on sparc64

Location:

kernel/arch/sparc64

Files:

• include/memstr.h (modified) (1 diff)
• src/asm.S (modified) (1 diff)
• src/drivers/sgcn.c (modified) (2 diffs)

kernel/arch/sparc64/include/memstr.h

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64 
+/** @addtogroup sparc64
  * @{
  */

kernel/arch/sparc64/src/asm.S

@@ -229 +229 @@
         nop
 
+.global memsetw
+memsetw:
+        b _memsetw
+        nop
+
 
 .macro WRITE_ALTERNATE_REGISTER reg, bit

kernel/arch/sparc64/src/drivers/sgcn.c

@@ -131 +131 @@
 
 /* functions referenced from definitions of I/O operations structures */
-static void sgcn_putchar(outdev_t *, const char, bool);
+static void sgcn_putchar(outdev_t *, const wchar_t, bool);
 
 /** SGCN output device operations */
@@ -269 +269 @@
  * written straight away. 
  */
-static void sgcn_putchar(outdev_t *od, const char c, bool silent)
+static void sgcn_putchar(outdev_t *od, const wchar_t ch, bool silent)
 {
         if (!silent) {
                 spinlock_lock(&sgcn_output_lock);
                 
-                sgcn_do_putchar(c);
-                if (c == '\n')
-                        sgcn_do_putchar('\r');
+                if (ascii_check(ch)) {
+                        sgcn_do_putchar(ch);
+                        if (ch == '\n')
+                                sgcn_do_putchar('\r');
+                } else
+                        sgcn_do_putchar(invalch);
                 
                 spinlock_unlock(&sgcn_output_lock);