Changeset f245145 in mainline for kernel/arch/ia64

Timestamp:

2009-01-04T14:07:27Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a45752d

Parents:

44ff4fb

Message:

Only one kernel EGA driver to rule them all.

Location:

kernel/arch/ia64

Files:

• Makefile.inc (modified) (2 diffs)
• include/asm.h (modified) (1 diff)
• include/drivers/ega.h (modified) (3 diffs)
• include/types.h (modified) (1 diff)
• src/asm.S (modified) (1 diff)
• src/drivers/ega.c (deleted)
• src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/Makefile.inc

@@ -60 +60 @@
 CONFIG_ASID_FIFO = y
 
-
 ## Compile with support for software integer division.
 #
@@ -93 +92 @@
 
 ifeq ($(MACHINE),i460GX)
-        ARCH_SOURCES += arch/$(ARCH)/src/drivers/ega.c
         CONFIG_I8042 = y
-        DEFS += -DI460GX -DCONFIG_I8042
+        CONFIG_EGA = y
+        DEFS += -DI460GX -DCONFIG_I8042 -DCONFIG_EGA
         BFD = binary
 endif

kernel/arch/ia64/include/asm.h

@@ -40 +40 @@
 #include <arch/register.h>
 
-typedef uint64_t ioport_t;
-
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 

kernel/arch/ia64/include/drivers/ega.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
- * 2007 Jakub Vana 
+ * Copyright (c) 2008 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia64
  * @{
  */
@@ -37 +36 @@
 #define KERN_ia64_EGA_H
 
-#define VIDEORAM (0xe0020000000B8000LL)
-
-#define ROW             80
-#define ROWS            25
-#define SCREEN          (ROW * ROWS)
-
-extern void ega_init(void);
+#define EGA_VIDEORAM    0xb8000
+#define EGA_BASE        0x3d4
 
 #endif

kernel/arch/ia64/include/types.h

@@ -66 +66 @@
 typedef int64_t native_t;
 
+typedef uintptr_t ioport_t;
+
 #define PRIp "lx"       /**< Format for uintptr_t. */
 #define PRIs "lu"       /**< Format for size_t. */

kernel/arch/ia64/src/asm.S

@@ -129 +129 @@
         br _memsetb
 
+.global memsetw
+memsetw:
+        br _memsetw
+
 .global cpu_halt
 cpu_halt:

kernel/arch/ia64/src/ia64.c

@@ -52 +52 @@
 #include <ddi/irq.h>
 #include <ddi/device.h>
+#include <arch/bootinfo.h>
 #include <arch/drivers/ega.h>
-#include <arch/bootinfo.h>
+#include <genarch/drivers/ega/ega.h>
 #include <genarch/kbd/i8042.h>
 #include <genarch/kbd/ns16550.h>
@@ -133 +134 @@
                 ski_init_console();
 #else   
-                ega_init();
+                ega_init(EGA_BASE, EGA_VIDEORAM);
 #endif  
         }