Index: arch/mips32/include/drivers/arc.h =================================================================== --- arch/mips32/include/drivers/arc.h (revision 705b4149822f194ae48b3897b40aa114729244e1) +++ arch/mips32/include/drivers/arc.h (revision 91c78c9c94e66242e7a59d1070420b5347b9eaee) @@ -31,4 +31,5 @@ #include +#include #define ARC_BASE_ADDR 0x1000; @@ -213,8 +214,7 @@ extern void arc_print_memory_map(void); extern int arc_enabled(void); -extern void arc_putchar(char ch); extern void arc_print_devices(void); -extern int arc_getchar(void); void arc_frame_init(void); +chardev_t * arc_console(void); #endif Index: arch/mips32/include/drivers/keyboard.h =================================================================== --- arch/mips32/include/drivers/keyboard.h (revision 705b4149822f194ae48b3897b40aa114729244e1) +++ (revision ) @@ -1,42 +1,0 @@ -/* - * Copyright (C) 2005 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. - */ - -#ifndef __mips32_KEYBOARD_H__ -#define __mips32_KEYBOARD_H__ - -#include -#include - -/** Address of 'keyboard' device. */ -#define KEYBOARD_ADDRESS 0xB0000000 - -extern void keyboard_init(void); -extern void keyboard(void); -extern void keyboard_poll(void); - -#endif Index: arch/mips32/include/drivers/msim.h =================================================================== --- arch/mips32/include/drivers/msim.h (revision 91c78c9c94e66242e7a59d1070420b5347b9eaee) +++ arch/mips32/include/drivers/msim.h (revision 91c78c9c94e66242e7a59d1070420b5347b9eaee) @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2005 Ondrej Palkovsky + * 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. + */ + +#ifndef _MSIM_H_ +#define _MSIM_H_ + +#include + +#define MSIM_VIDEORAM 0xB0000000 +/** Address of 'keyboard' device. */ +#define MSIM_KBD_ADDRESS 0xB0000000 +#define MSIM_KBD_IRQ 2 + +chardev_t * msim_console(void); + +#endif Index: arch/mips32/include/drivers/serial.h =================================================================== --- arch/mips32/include/drivers/serial.h (revision 91c78c9c94e66242e7a59d1070420b5347b9eaee) +++ arch/mips32/include/drivers/serial.h (revision 91c78c9c94e66242e7a59d1070420b5347b9eaee) @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2005 Ondrej Palkovsky + * 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. + */ + +#ifndef __DRV_SERIAL_H__ +#define __DRV_SERIAL_H__ + +#include + +#define SERIAL_MAX 4 +#define SERIAL_COM1 0x3f8 +#define SERIAL_COM1_IRQ 4 +#define SERIAL_COM2 0x2f8 +#define SERIAL_COM2_IRQ 3 + +#define P_WRITEB(where,what) (*((volatile char *) (0xB8000000+where))=what) +#define P_READB(where) (*((volatile char *)(0xB8000000+where))) + +#define SERIAL_READ(x) P_READB(x) +#define SERIAL_WRITE(x,c) P_WRITEB(x,c) +/* Interrupt enable register */ +#define SERIAL_READ_IER(x) (P_READB((x) + 1)) +#define SERIAL_WRITE_IER(x,c) (P_WRITEB((x)+1,c)) +/* Interrupt identification register */ +#define SERIAL_READ_IIR(x) (P_READB((x) + 2)) +/* Line status register */ +#define SERIAL_READ_LSR(x) (P_READB((x) + 5)) +#define TRANSMIT_EMPTY_BIT 5 + +typedef struct { + int port; + int irq; +}serial_t; + +chardev_t * serial_console(void); +int serial_init(void); + +#endif