Changeset f245145 in mainline for kernel/arch/ia32


Ignore:
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/ia32
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia32/Makefile.inc

    r44ff4fb rf245145  
    111111DEFS += -DCONFIG_I8042
    112112
     113## Compile with EGA support
     114#
     115
     116CONFIG_EGA = y
     117DEFS += -DCONFIG_EGA
     118
    113119## Accepted configuration directives
    114120#
    … …  
    156162        arch/$(ARCH)/src/drivers/i8254.c \
    157163        arch/$(ARCH)/src/drivers/i8259.c \
    158         arch/$(ARCH)/src/drivers/ega.c \
    159164        arch/$(ARCH)/src/drivers/vesa.c \
    160165        arch/$(ARCH)/src/boot/boot.S \

  • kernel/arch/ia32/include/drivers/ega.h

    r44ff4fb rf245145  
    11/*
    2  * Copyright (c) 2001-2004 Jakub Jermar
     2 * Copyright (c) 2008 Jakub Jermar
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup ia32   
     29/** @addtogroup ia32
    3030 * @{
    3131 */
    … …  
    3333 */
    3434
    35 #ifndef KERN_ia32_EGA_H_
    36 #define KERN_ia32_EGA_H_
     35#ifndef KERN_ia32_EGA_H
     36#define KERN_ia32_EGA_H
    3737
    38 #define VIDEORAM        0xb8000
    39 #define ROW             80
    40 #define ROWS            25
    41 #define SCREEN          (ROW * ROWS)
    42 
    43 extern void ega_redraw(void);
    44 extern void ega_init(void);
     38#define EGA_VIDEORAM    0xb8000
     39#define EGA_BASE        0x3d4
    4540
    4641#endif

  • kernel/arch/ia32/include/types.h

    r44ff4fb rf245145  
    5858typedef int32_t native_t;
    5959
     60typedef uintptr_t ioport_t;
     61
    6062#define PRIp "x"        /**< Format for uintptr_t. */
    6163#define PRIs "u"        /**< Format for size_t. */

  • kernel/arch/ia32/src/ia32.c

    r44ff4fb rf245145  
    4040
    4141#include <arch/drivers/ega.h>
     42#include <genarch/drivers/ega/ega.h>
    4243#include <arch/drivers/vesa.h>
    4344#include <genarch/kbd/i8042.h>
    … …  
    9495                else
    9596#endif
    96                         ega_init(); /* video */
     97                        ega_init(EGA_BASE, EGA_VIDEORAM);       /* video */
    9798               
    9899                /* Enable debugger */
Note: See TracChangeset for help on using the changeset viewer.