Changeset 72f5866d in mainline

Timestamp:

2005-12-10T15:08:51Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bb20ec

Parents:

6e716a59

Message:

Fix IA-64 so that it compiles again.
Characters are not recognised correctly.

Location:

arch/ia64

Files:

• Makefile.inc (modified) (2 diffs)
• include/ski/ski.h (modified) (2 diffs)
• src/interrupt.c (modified) (1 diff)
• src/putchar.c (modified) (1 diff)
• src/ski/ski.c (modified) (4 diffs)

arch/ia64/Makefile.inc

@@ -47 +47 @@
         arch/$(ARCH)/src/asm.S \
         arch/$(ARCH)/src/dummy.s \
-        arch/$(ARCH)/src/putchar.c \
         arch/$(ARCH)/src/ia64.c \
         arch/$(ARCH)/src/fpu_context.c \
@@ -57 +56 @@
         arch/$(ARCH)/src/fmath.c \
         arch/$(ARCH)/src/mm/frame.c \
-        arch/$(ARCH)/src/drivers/it.c \
-        arch/$(ARCH)/src/drivers/keyboard.c
+        arch/$(ARCH)/src/drivers/it.c

arch/ia64/include/ski/ski.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-
 #define SKI_INIT_CONSOLE        20
 #define SKI_GETCHAR             21
@@ -39 +38 @@
 extern void ski_init_console(void);
 extern void poll_keyboard(void);
-        
+
 #endif

arch/ia64/src/interrupt.c

@@ -32 +32 @@
 #include <panic.h>
 #include <print.h>
+#include <console/console.h>
 #include <arch/types.h>
 #include <arch/asm.h>

arch/ia64/src/putchar.c

@@ -32 +32 @@
 void putchar(const char ch)
 {
-        ski_putchar(ch);
+        ski_write(ch);
 }

arch/ia64/src/ski/ski.c

@@ -34 +34 @@
 static bool kb_disable;
 
+static void ski_write(chardev_t *d, const char ch);
+static __s32 ski_getchar(void);
+
 /** Display character on debug console
  *
@@ -39 +42 @@
  * display character on debug console.
  *
- * @param ch   Character to be printed.
+ * @param d Character device.
+ * @param ch Character to be printed.
  */
 void ski_write(chardev_t *d, const char ch)
@@ -52 +56 @@
         );
         
-        if (ch == '\n') ski_putchar('\r');
+        if (ch == '\n')
+                ski_write(d, '\r');
 }
 
@@ -97 +102 @@
 
 /* Called from getc(). */
-static void ski_kb_enable(chardev_t *)
+static void ski_kb_enable(chardev_t *d)
 {
         kb_disable = false;