Changeset aa85487 in mainline for kernel/arch/sparc64/src/drivers/niagara.c

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (3 diffs)

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

@@ -104 +104 @@
 static inline void do_putchar(const char c) {
         /* repeat until the buffer is non-full */
-        while (__hypercall_fast1(CONS_PUTCHAR, c) == EWOULDBLOCK)
+        while (__hypercall_fast1(CONS_PUTCHAR, c) == HV_EWOULDBLOCK)
                 ;
 }
@@ -111 +111 @@
 static void niagara_putchar(outdev_t *dev, const wchar_t ch, bool silent)
 {
+        if (silent)
+            return;
+
         do_putchar(ch);
         if (ch == '\n')
@@ -136 +139 @@
 
         /* read character from keyboard, send it to upper layers of HelenOS */
-        if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == EOK) {
+        if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == HV_EOK) {
                 if (!silent) {
                         /* kconsole active, send the character to kernel */