Changeset 02f441c0 in mainline for arch

Timestamp:

2006-02-27T17:10:04Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

30ab05f

Parents:

481c520

Message:

Move i8042 driver to genarch as it might be used by more architectures.

Location:

arch

Files:

• amd64/Makefile.inc (modified) (2 diffs)
• amd64/src/amd64.c (modified) (2 diffs)
• ia32/Makefile.inc (modified) (2 diffs)
• ia32/include/drivers/i8042.h (added)
• ia32/src/ia32.c (modified) (1 diff)
• sparc64/include/drivers/keyboard.h (added)
• sparc64/src/console.c (modified) (1 diff)
• sparc64/src/mm/tlb.c (modified) (2 diffs)

arch/amd64/Makefile.inc

@@ -64 +64 @@
 CONFIG_PAGE_PT = y
 
+## Compile with i8042 support.
+#
+
+CONFIG_I8042 = y
+
 ## Accepted configuration directives
 #
@@ -85 +90 @@
         arch/$(ARCH)/src/context.S \
         arch/$(ARCH)/src/drivers/ega.c \
-        arch/$(ARCH)/src/drivers/i8042.c \
         arch/$(ARCH)/src/drivers/i8254.c \
         arch/$(ARCH)/src/drivers/i8259.c \

arch/amd64/src/amd64.c

@@ -34 +34 @@
 
 #include <arch/ega.h>
-#include <arch/i8042.h>
+#include <genarch/i8042/i8042.h>
 #include <arch/i8254.h>
 #include <arch/i8259.h>
@@ -149 +149 @@
 void arch_post_smp_init(void)
 {
-                i8042_init();   /* keyboard controller */
+        i8042_init();   /* keyboard controller */
 }
 

arch/ia32/Makefile.inc

@@ -83 +83 @@
 CONFIG_PAGE_PT = y
 
+## Compile with i8042 controller support
+#
+
+CONFIG_I8042 = y
+
+
 ## Accepted configuration directives
 #
@@ -119 +125 @@
         arch/$(ARCH)/src/mm/page.c \
         arch/$(ARCH)/src/mm/tlb.c \
-        arch/$(ARCH)/src/drivers/i8042.c \
         arch/$(ARCH)/src/drivers/i8254.c \
         arch/$(ARCH)/src/drivers/i8259.c \

arch/ia32/src/ia32.c

@@ -35 +35 @@
 
 #include <arch/ega.h>
-#include <arch/i8042.h>
+#include <genarch/i8042/i8042.h>
 #include <arch/i8254.h>
 #include <arch/i8259.h>

arch/sparc64/src/console.c

@@ -32 +32 @@
 #include <genarch/fb/fb.h>
 #include <arch/drivers/fb.h>
+#include <arch/drivers/keyboard.h>
 #include <genarch/ofw/ofw.h>
 #include <console/chardev.h>

arch/sparc64/src/mm/tlb.c

@@ -41 +41 @@
 #include <arch/asm.h>
 #include <symtab.h>
+
 #include <arch/drivers/fb.h>
+#include <arch/drivers/keyboard.h>
 
 char *context_encoding[] = {
@@ -123 +125 @@
         data.v = true;
         data.size = PAGESIZE_4M;
+        data.pfn = fr.pfn;
+        data.l = true;
+        data.cp = 0;
+        data.cv = 0;
+        data.p = true;
+        data.w = true;
+        data.g = true;
+
+        dtlb_data_in_write(data.value);
+        
+        /*
+         * Quick hack: map keyboard
+         */
+        fr.address = KBD_PHYS_ADDRESS;
+        pg.address = KBD_VIRT_ADDRESS;
+
+        tag.value = ASID_KERNEL;
+        tag.vpn = pg.vpn;
+
+        dtlb_tag_access_write(tag.value);
+
+        data.value = 0;
+        data.v = true;
+        data.size = PAGESIZE_8K;
         data.pfn = fr.pfn;
         data.l = true;