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

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/sparc64/src/drivers/niagara.c (modified) (2 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)
                 ;
 }
@@ -139 +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 */