WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/arch/ Rev 3778 and /trunk/kernel/arch/ Rev 3779

Ignore whitespace Rev 3778 → Rev 3779

 /trunk/kernel/arch/sparc64/include/types.h
 ,11 → 54,11
 typedef uint64_t ipl_t;
-typedef uint64_t ioport_t;
 typedef uint64_t unative_t;
 typedef int64_t native_t;
+typedef uintptr_t ioport_t;
 /**< Formats for uintptr_t, size_t, count_t and index_t */
 #define PRIp "llx"
 #define PRIs "llu"

 /trunk/kernel/arch/ia64/include/types.h
 ,6 → 65,8
 typedef uint64_t unative_t;
 typedef int64_t native_t;
+typedef uintptr_t ioport_t;
 #define PRIp "lx"   /**< Format for uintptr_t. */
 #define PRIs "lu"   /**< Format for size_t. */
 #define PRIc "lu"   /**< Format for count_t. */

 /trunk/kernel/arch/ia64/include/asm.h
 ,8 → 39,6
 #include <arch/types.h>
 #include <arch/register.h>
-typedef uint64_t ioport_t;
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 static inline void  outb(ioport_t port, uint8_t v)

 /trunk/kernel/arch/ia64/include/drivers/ega.h
 ,6 → 1,5
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
- * 2007 Jakub Vana
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup ia32
+/** @addtogroup ia64
  * @{
  */
 /** @file
 ,14 → 35,9
 #ifndef KERN_ia64_EGA_H
 #define KERN_ia64_EGA_H
-#define VIDEORAM (0xe0020000000B8000LL)
+#define EGA_VIDEORAM    0xb8000
+#define EGA_BASE    0x3d4
-#define ROW     80
-#define ROWS        25
-#define SCREEN      (ROW * ROWS)
-extern void ega_init(void);
 #endif
 /** @}

 /trunk/kernel/arch/ia64/Makefile.inc
 ,7 → 59,6
 CONFIG_ASID = y
 CONFIG_ASID_FIFO = y
 ## Compile with support for software integer division.
 #
 ,9 → 91,9
 endif
 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

 /trunk/kernel/arch/ia64/src/asm.S
 ,6 → 128,10
 memsetb:
     br _memsetb
+.global memsetw
+memsetw:
+    br _memsetw
 .global cpu_halt
 cpu_halt:
     br cpu_halt

 /trunk/kernel/arch/ia64/src/ia64.c
 ,8 → 51,9
 #include <syscall/syscall.h>
 #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>
 #include <smp/smp.h>
 ,7 → 133,7
 #ifdef SKI
         ski_init_console();
 #else
-        ega_init();
+        ega_init(EGA_BASE, EGA_VIDEORAM);
 #endif
     }
     it_init();

/trunk/kernel/arch/ia64/src/drivers/ega.c
File deleted

 /trunk/kernel/arch/amd64/include/types.h
 ,6 → 57,8
 typedef uint64_t unative_t;
 typedef int64_t native_t;
+typedef uintptr_t ioport_t;
 /**< Formats for uintptr_t, size_t, count_t and index_t */
 #define PRIp "llx"
 #define PRIs "llu"

 /trunk/kernel/arch/amd64/Makefile.inc
 ,6 → 75,12
 CONFIG_I8042 = y
 DEFS += -DCONFIG_I8042
+## Compile with EGA support
+#
+CONFIG_EGA = y
+DEFS += -DCONFIG_EGA
 ## Accepted configuration directives
 #
 ,7 → 102,6
     arch/$(ARCH)/src/pm.c \
     arch/$(ARCH)/src/context.S \
     arch/$(ARCH)/src/ddi/ddi.c \
-    arch/$(ARCH)/src/drivers/ega.c \
     arch/$(ARCH)/src/drivers/vesa.c \
     arch/$(ARCH)/src/drivers/i8254.c \
     arch/$(ARCH)/src/drivers/i8259.c \

 /trunk/kernel/arch/amd64/src/amd64.c
 ,6 → 40,7
 #include <proc/thread.h>
 #include <arch/drivers/ega.h>
+#include <genarch/drivers/ega/ega.h>
 #include <arch/drivers/vesa.h>
 #include <genarch/kbd/i8042.h>
 #include <arch/drivers/i8254.h>
 ,7 → 140,7
             vesa_init();
         else
 #endif
-            ega_init(); /* video */
+            ega_init(EGA_BASE, EGA_VIDEORAM);   /* video */
         /* Enable debugger */
         debugger_init();

 /trunk/kernel/arch/ia32/include/types.h
 ,6 → 57,8
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uintptr_t ioport_t;
 #define PRIp "x"    /**< Format for uintptr_t. */
 #define PRIs "u"    /**< Format for size_t. */
 #define PRIc "u"    /**< Format for count_t. */

 /trunk/kernel/arch/ia32/include/drivers/ega.h
 ,5 → 1,5
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,23 → 26,18
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup ia32
+/** @addtogroup ia32
  * @{
  */
 /** @file
  */
-#ifndef KERN_ia32_EGA_H_
-#define KERN_ia32_EGA_H_
+#ifndef KERN_ia32_EGA_H
+#define KERN_ia32_EGA_H
-#define VIDEORAM    0xb8000
-#define ROW     80
-#define ROWS        25
-#define SCREEN      (ROW * ROWS)
+#define EGA_VIDEORAM    0xb8000
+#define EGA_BASE    0x3d4
-extern void ega_redraw(void);
-extern void ega_init(void);
 #endif
 /** @}

 /trunk/kernel/arch/ia32/Makefile.inc
 ,6 → 110,12
 CONFIG_I8042 = y
 DEFS += -DCONFIG_I8042
+## Compile with EGA support
+#
+CONFIG_EGA = y
+DEFS += -DCONFIG_EGA
 ## Accepted configuration directives
 #
 ,7 → 161,6
     arch/$(ARCH)/src/ddi/ddi.c \
     arch/$(ARCH)/src/drivers/i8254.c \
     arch/$(ARCH)/src/drivers/i8259.c \
-    arch/$(ARCH)/src/drivers/ega.c \
     arch/$(ARCH)/src/drivers/vesa.c \
     arch/$(ARCH)/src/boot/boot.S \
     arch/$(ARCH)/src/boot/memmap.c \

 /trunk/kernel/arch/ia32/src/ia32.c
 ,6 → 39,7
 #include <arch/pm.h>
 #include <arch/drivers/ega.h>
+#include <genarch/drivers/ega/ega.h>
 #include <arch/drivers/vesa.h>
 #include <genarch/kbd/i8042.h>
 #include <arch/drivers/i8254.h>
 ,7 → 94,7
             vesa_init();
         else
 #endif
-            ega_init(); /* video */
+            ega_init(EGA_BASE, EGA_VIDEORAM);   /* video */
         /* Enable debugger */
         debugger_init();