Index: kernel/arch/amd64/src/amd64.c =================================================================== --- kernel/arch/amd64/src/amd64.c (revision 45448840d542ead240f5fefb8c8e9d8f889335c9) +++ kernel/arch/amd64/src/amd64.c (revision 91825d906871fb7aacdd0e8161dca09a9de0ef6e) @@ -40,5 +40,5 @@ #include -#include +#include #include #include Index: rnel/arch/ia32/include/drivers/ega.h =================================================================== --- kernel/arch/ia32/include/drivers/ega.h (revision 45448840d542ead240f5fefb8c8e9d8f889335c9) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2008 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ia32 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia32_EGA_H -#define KERN_ia32_EGA_H - -#define EGA_VIDEORAM 0xb8000 -#define EGA_BASE ((ioport8_t *)0x3d4) - -#endif - -/** @} - */ Index: kernel/arch/ia32/src/ia32.c =================================================================== --- kernel/arch/ia32/src/ia32.c (revision 45448840d542ead240f5fefb8c8e9d8f889335c9) +++ kernel/arch/ia32/src/ia32.c (revision 91825d906871fb7aacdd0e8161dca09a9de0ef6e) @@ -39,5 +39,5 @@ #include -#include +#include #include #include Index: rnel/arch/ia64/include/drivers/ega.h =================================================================== --- kernel/arch/ia64/include/drivers/ega.h (revision 45448840d542ead240f5fefb8c8e9d8f889335c9) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2008 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ia64 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia64_EGA_H -#define KERN_ia64_EGA_H - -#define EGA_VIDEORAM 0xb8000 -#define EGA_BASE ((ioport8_t *)0x3d4) - -#endif - -/** @} - */ Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision 45448840d542ead240f5fefb8c8e9d8f889335c9) +++ kernel/arch/ia64/src/ia64.c (revision 91825d906871fb7aacdd0e8161dca09a9de0ef6e) @@ -53,5 +53,5 @@ #include #include -#include +#include #include #include Index: kernel/genarch/include/drivers/legacy/ia32/io.h =================================================================== --- kernel/genarch/include/drivers/legacy/ia32/io.h (revision 91825d906871fb7aacdd0e8161dca09a9de0ef6e) +++ kernel/genarch/include/drivers/legacy/ia32/io.h (revision 91825d906871fb7aacdd0e8161dca09a9de0ef6e) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2009 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ia32 + * @{ + */ +/** @file + * @brief This file contains definitions used by architectures with the + * ia32 legacy I/O space (i.e. ia32, amd64 and ia64). + */ + +#ifndef KERN_LEGACY_IA32_IO_H +#define KERN_LEGACY_IA32_IO_H + +#include + +#define i8042_BASE ((ioport8_t *)0x60) + +#define EGA_VIDEORAM 0xb8000 +#define EGA_BASE ((ioport8_t *)0x3d4) + +#endif + +/** @} + */ Index: kernel/genarch/src/kbd/i8042.c =================================================================== --- kernel/genarch/src/kbd/i8042.c (revision 45448840d542ead240f5fefb8c8e9d8f889335c9) +++ kernel/genarch/src/kbd/i8042.c (revision 91825d906871fb7aacdd0e8161dca09a9de0ef6e) @@ -42,4 +42,5 @@ #include #include +#include #include #include @@ -52,5 +53,5 @@ i8042_instance_t lgcy_i8042_instance = { - .i8042 = (i8042_t *) 0x60, + .i8042 = (i8042_t *) i8042_BASE, };