Changeset 287920f in mainline for kernel/arch/sparc64

Timestamp:

2006-08-09T13:27:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d46c6ecd

Parents:

da74747

Message:

i8042 and z8530 separated, the tree compiles again.
Now there is some duplicated code in i8042.c and z8530.c,
but that can be eliminated in slower pace.

Location:

kernel/arch/sparc64

Files:

• Makefile.inc (modified) (1 diff)
• include/drivers/kbd.h (added)
• include/drivers/z8530.h (modified) (3 diffs)
• src/console.c (modified) (2 diffs)
• src/drivers/kbd.c (modified) (3 diffs)
• src/mm/tlb.c (modified) (2 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -65 +65 @@
 
 CONFIG_Z8530 = y
-CONFIG_KBD_SUN = y
-DEFS += -DCONFIG_KBD_SUN
+DEFS += -DCONFIG_Z8530
 
 ARCH_SOURCES = \

kernel/arch/sparc64/include/drivers/z8530.h

@@ -37 +37 @@
 
 #include <arch/types.h>
+#include <arch/drivers/kbd.h>
 
 #define STATUS_REG      4
@@ -43 +44 @@
 
 #define LAST_REG        DATA_REG
-
-extern volatile uint8_t *kbd_virt_address;
 
 static inline void z8530_data_write(uint8_t data)
@@ -66 +65 @@
 }
 
-extern void kbd_init(void);
-
 #endif
 

kernel/arch/sparc64/src/console.c

@@ -38 +38 @@
 #include <genarch/fb/fb.h>
 #include <arch/drivers/fb.h>
-#include <arch/drivers/i8042.h>
-#include <genarch/i8042/i8042.h>
+
+#include <arch/drivers/kbd.h>
+#ifdef CONFIG_Z8530
+#include <genarch/kbd/z8530.h>
+#endif
+#ifdef CONFIG_16550A
+#include <genarch/kbd/16550a.h>
+#endif
+
 #include <console/chardev.h>
 #include <console/console.h>
@@ -72 +79 @@
                 
         while (1) {
-                i8042_poll();           
+#ifdef CONFIG_Z8530
+                z8530_poll();
+#endif
+#ifdef CONFIG_16550A
+                16550a_poll();
+#endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);
         }

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

@@ -33 +33 @@
  */
 
+#include <arch/drivers/kbd.h>
 #ifdef CONFIG_Z8530
 #include <genarch/kbd/z8530.h>
@@ -39 +40 @@
 #include <genarch/kbd/16650a.h>
 #endif
+
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
 #include <typedefs.h>
+#include <align.h>
 
 volatile uint8_t *kbd_virt_address = NULL;
@@ -50 +53 @@
         size_t offset;
         uintptr_t aligned_addr;
+
+        /* FIXME: supply value read from OpenFirmware */
+        bootinfo.keyboard.size = 8;
 
         /*

kernel/arch/sparc64/src/mm/tlb.c

@@ -48 +48 @@
 #include <symtab.h>
 
-#include <arch/drivers/fb.h>
-#include <arch/drivers/i8042.h>
-
 char *context_encoding[] = {
         "Primary",
@@ -61 +58 @@
 {
         /*
-         * TLBs are actually initialized by
-         * take_over_tlb_and_tt() early
+         * TLBs are actually initialized early
          * in start.S.
          */