Index: rnel/arch/ia32/include/drivers/i8042.h =================================================================== --- kernel/arch/ia32/include/drivers/i8042.h (revision c852b948487828f2999f9394d236b1369615a759) +++ (revision ) @@ -1,71 +1,0 @@ -/* - * Copyright (c) 2006 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 - */ - -/** - * This file implements ia32 specific access to i8042 registers. - */ - -#ifndef KERN_ia32_I8042_H_ -#define KERN_ia32_I8042_H_ - -#include -#include - -#define i8042_DATA 0x60 -#define i8042_STATUS 0x64 - -static inline void i8042_data_write(uint8_t data) -{ - pio_write_8(i8042_DATA, data); -} - -static inline uint8_t i8042_data_read(void) -{ - return pio_read_8(i8042_DATA); -} - -static inline uint8_t i8042_status_read(void) -{ - return pio_read_8(i8042_STATUS); -} - -static inline void i8042_command_write(uint8_t command) -{ - pio_write_8(i8042_STATUS, command); -} - -#endif - -/** @} - */ Index: rnel/arch/ia64/include/drivers/i8042.h =================================================================== --- kernel/arch/ia64/include/drivers/i8042.h (revision c852b948487828f2999f9394d236b1369615a759) +++ (revision ) @@ -1,71 +1,0 @@ -/* - * Copyright (c) 2006 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 - */ - -/** - * This file implements ia32 specific access to i8042 registers. - */ - -#ifndef KERN_ia64_I8042_H_ -#define KERN_ia64_I8042_H_ - -#include -#include - -#define i8042_DATA 0x60 -#define i8042_STATUS 0x64 - -static inline void i8042_data_write(uint8_t data) -{ - pio_write_8(i8042_DATA, data); -} - -static inline uint8_t i8042_data_read(void) -{ - return pio_read_8(i8042_DATA); -} - -static inline uint8_t i8042_status_read(void) -{ - return pio_read_8(i8042_STATUS); -} - -static inline void i8042_command_write(uint8_t command) -{ - pio_write_8(i8042_STATUS, command); -} - -#endif - -/** @} - */ Index: kernel/genarch/src/kbd/i8042.c =================================================================== --- kernel/genarch/src/kbd/i8042.c (revision c852b948487828f2999f9394d236b1369615a759) +++ kernel/genarch/src/kbd/i8042.c (revision 4b44099d821552a64452274b994f2cf5cb8adbaf) @@ -42,5 +42,4 @@ #include #include -#include #include #include @@ -51,4 +50,7 @@ #include #include + +#define i8042_DATA 0x60 +#define i8042_STATUS 0x64 /* Keyboard commands. */ @@ -137,6 +139,7 @@ uint8_t status; - while (((status = i8042_status_read()) & i8042_BUFFER_FULL_MASK)) { - data = i8042_data_read(); + while (((status = pio_read_8(i8042_STATUS)) & + i8042_BUFFER_FULL_MASK)) { + data = pio_read_8(i8042_DATA); if ((status & i8042_MOUSE_DATA)) @@ -152,5 +155,7 @@ /** Initialize i8042. */ -void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr) +void +i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, + inr_t mouse_inr) { chardev_initialize("i8042_kbd", &kbrd, &ops); @@ -179,6 +184,7 @@ */ int i; - for (i = 0; (i8042_status_read() & i8042_BUFFER_FULL_MASK) && i < 100; i++) { - i8042_data_read(); + for (i = 0; (pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK) && + i < 100; i++) { + (void) pio_read_8(i8042_DATA); } @@ -213,7 +219,8 @@ uint8_t x; - while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK)); + while (!(pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK)) + ; - x = i8042_data_read(); + x = pio_read_8(i8042_STATUS); if (x & KEY_RELEASE) key_released(x ^ KEY_RELEASE);