Changeset 91825d90 in mainline

Timestamp:

2009-02-19T22:21:58Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d1eece6

Parents:

4544884

Message:

Kill arch/drivers/ega.h. Provide one-stop shopping
place for architectures with ia32 legacy I/O space.

Location:

kernel

Files:

• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia64/include/drivers/ega.h (deleted)
• arch/ia64/src/ia64.c (modified) (1 diff)
• genarch/include/drivers/legacy/ia32/io.h (moved) (moved from kernel/arch/ia32/include/drivers/ega.h ) (2 diffs)
• genarch/src/kbd/i8042.c (modified) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -40 +40 @@
 
 #include <proc/thread.h>
-#include <arch/drivers/ega.h>
+#include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
 #include <arch/drivers/vesa.h>

kernel/arch/ia32/src/ia32.c

@@ -39 +39 @@
 #include <arch/pm.h>
 
-#include <arch/drivers/ega.h>
+#include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
 #include <arch/drivers/vesa.h>

kernel/arch/ia64/src/ia64.c

@@ -53 +53 @@
 #include <ddi/device.h>
 #include <arch/bootinfo.h>
-#include <arch/drivers/ega.h>
+#include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/kbd/i8042.h>

kernel/genarch/include/drivers/legacy/ia32/io.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Jakub Jermar 
+ * Copyright (c) 2009 Jakub Jermar 
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
+ * @brief       This file contains definitions used by architectures with the
+ *              ia32 legacy I/O space (i.e. ia32, amd64 and ia64). 
  */
 
-#ifndef KERN_ia32_EGA_H
-#define KERN_ia32_EGA_H
+#ifndef KERN_LEGACY_IA32_IO_H
+#define KERN_LEGACY_IA32_IO_H
+
+#include <arch/types.h>
+
+#define i8042_BASE      ((ioport8_t *)0x60)
 
 #define EGA_VIDEORAM    0xb8000

kernel/genarch/src/kbd/i8042.c

@@ -42 +42 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_pc.h>
+#include <genarch/drivers/legacy/ia32/io.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -52 +53 @@
 
 i8042_instance_t lgcy_i8042_instance = {
-        .i8042 = (i8042_t *) 0x60,
+        .i8042 = (i8042_t *) i8042_BASE,
 };