| /trunk/kernel/arch/ia64/include/types.h |
|---|
| 65,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 |
|---|
| 39,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 |
|---|
| 1,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 |
| 27,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup ia32 |
| /** @addtogroup ia64 |
| * @{ |
| */ |
| /** @file |
| 36,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 |
|---|
| 59,7 → 59,6 |
| CONFIG_ASID = y |
| CONFIG_ASID_FIFO = y |
| ## Compile with support for software integer division. |
| # |
| 92,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 |
|---|
| 128,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 |
|---|
| 51,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> |
| 132,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 |