Changeset 02f441c0 in mainline for arch/amd64

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/amd64

Files:

• Makefile.inc (modified) (2 diffs)
• src/amd64.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 */
 }