Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3778 → Rev 3779

/trunk/kernel/arch/ia32/include/types.h
57,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
1,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
26,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
110,6 → 110,12
CONFIG_I8042 = y
DEFS += -DCONFIG_I8042
 
## Compile with EGA support
#
 
CONFIG_EGA = y
DEFS += -DCONFIG_EGA
 
## Accepted configuration directives
#
 
155,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
39,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>
93,7 → 94,7
vesa_init();
else
#endif
ega_init(); /* video */
ega_init(EGA_BASE, EGA_VIDEORAM); /* video */
/* Enable debugger */
debugger_init();
/trunk/kernel/arch/ia32/src/drivers/ega.c
File deleted