Changeset adb2ebf8 in mainline for arch

Timestamp:

2005-12-10T16:07:08Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f7f6f25

Parents:

91c78c9

Message:

Fix ppc32 and sparc64 to compile again.
Fix sparc64 to function again.

Location:

arch

Files:

• ia64/src/ski/ski.c (modified) (4 diffs)
• ppc32/include/console.h (added)
• ppc32/src/console.c (modified) (2 diffs)
• ppc32/src/ppc32.c (modified) (1 diff)
• sparc64/include/console.h (added)
• sparc64/src/console.c (modified) (2 diffs)
• sparc64/src/sparc64.c (modified) (1 diff)

arch/ia64/src/ski/ski.c

@@ -34 +34 @@
 static bool kb_disable;
 
-static void ski_write(chardev_t *d, const char ch);
+static void ski_putchar(chardev_t *d, const char ch);
 static __s32 ski_getchar(void);
 
@@ -45 +45 @@
  * @param ch Character to be printed.
  */
-void ski_write(chardev_t *d, const char ch)
+void ski_putchar(chardev_t *d, const char ch)
 {
         __asm__ (
@@ -57 +57 @@
         
         if (ch == '\n')
-                ski_write(d, '\r');
+                ski_putchar(d, '\r');
 }
 
@@ -117 +117 @@
         .resume = ski_kb_enable,
         .suspend = ski_kb_disable,
-        .write = ski_write
+        .write = ski_putchar
 };
 

arch/ppc32/src/console.c

@@ -27 +27 @@
  */
 
-#include <putchar.h>
+#include <arch/console.h>
 #include <genarch/ofw/ofw.h>
 #include <console/chardev.h>
@@ -36 +36 @@
  * @param ch Character to be printed.
  */
-static void ofw_write(chardev_t *d, const char ch)
+static void ofw_ppc32_putchar(chardev_t *d, const char ch)
 {
         ofw_putchar(ch);
 }
 
-chardev_t ofw_console;
-static chardev_operations_t ofw_ops = {
-        .write = ofw_write
+static chardev_t ofw_ppc32_console;
+static chardev_operations_t ofw_ppc32_console_ops = {
+        .write = ofw_ppc32_putchar
 };
 
 /** Initialize console to use ofw output */
-void console_init(void)
+void ofw_ppc32_console_init(void)
 {
-        chardev_initialize("ofw_out", &ofw_console, &ofw_ops);
-        stdout = &ofw_console;
+        chardev_initialize("ofw_out", &ofw_ppc32_console, &ofw_ppc32_console_ops);
+        stdout = &ofw_ppc32_console;
 }

arch/ppc32/src/ppc32.c

@@ -28 +28 @@
 
 #include <arch.h>
+#include <arch/console.h>
 
 void arch_pre_mm_init(void)
 {
+        ofw_ppc32_console_init();
 }
 

arch/sparc64/src/console.c

@@ -27 +27 @@
  */
 
-#include <putchar.h>
+#include <arch/console.h>
 #include <genarch/ofw/ofw.h>
+#include <console/chardev.h>
+#include <console/console.h>
+
+static void ofw_sparc64_putchar(chardev_t *d, const char ch);
+
+static chardev_t ofw_sparc64_console;
+static chardev_operations_t ofw_sparc64_console_ops = {
+        .write = ofw_sparc64_putchar
+};
+
+void ofw_sparc64_console_init(void)
+{
+        chardev_initialize("ofw_sparc64_console", &ofw_sparc64_console, &ofw_sparc64_console_ops);
+        stdout = &ofw_sparc64_console;
+}
 
 /** Print one character.
@@ -34 +49 @@
  * @param ch Character to be printed.
  */
-void putchar(const char ch)
+void ofw_sparc64_putchar(chardev_t *d, const char ch)
 {
         if (ch == '\n')

arch/sparc64/src/sparc64.c

@@ -32 +32 @@
 #include <memstr.h>
 #include <arch/trap_table.h>
+#include <arch/console.h>
 
 void arch_pre_mm_init(void)
 {
+        ofw_sparc64_console_init();
 }