Index: kernel/arch/mips32/include/arch/drivers/msim.h =================================================================== --- kernel/arch/mips32/include/arch/drivers/msim.h (revision 68d873626159ee46816ad04fc6e4763eebe6eb12) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * 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. - */ - -/** @addtogroup kernel_mips32 - * @{ - */ -/** @file - */ - -#ifndef KERN_mips32_MSIM_H_ -#define KERN_mips32_MSIM_H_ - -/** Address of devices. */ -#define MSIM_VIDEORAM 0x90000000 -#define MSIM_KBD_ADDRESS 0x90000000 - -#define MSIM_KBD_IRQ 2 -#define MSIM_DDISK_IRQ 6 - -#endif - -/** @} - */ Index: kernel/arch/mips32/include/arch/mach/msim/dorder.h =================================================================== --- kernel/arch/mips32/include/arch/mach/msim/dorder.h (revision f27e21ddaafbb7195a9fa323a76c7813b7d6b41b) +++ kernel/arch/mips32/include/arch/mach/msim/dorder.h (revision f27e21ddaafbb7195a9fa323a76c7813b7d6b41b) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2007 Martin Decky + * 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 kernel_mips32 + * @{ + */ +/** @file + */ + +#ifndef KERN_mips32_DORDER_H_ +#define KERN_mips32_DORDER_H_ + +#include + +extern void dorder_init(void); +extern uint32_t dorder_cpuid(void); +extern void dorder_ipi_ack(uint32_t); + +#endif + +/** @} + */ Index: kernel/arch/mips32/include/arch/mach/msim/msim.h =================================================================== --- kernel/arch/mips32/include/arch/mach/msim/msim.h (revision 68d873626159ee46816ad04fc6e4763eebe6eb12) +++ kernel/arch/mips32/include/arch/mach/msim/msim.h (revision f27e21ddaafbb7195a9fa323a76c7813b7d6b41b) @@ -38,4 +38,14 @@ #include +#include + +/** Address of devices. */ +#define MSIM_VIDEORAM PA2KSEG1(0x10000000) +#define MSIM_KBD_ADDRESS PA2KSEG1(0x10000000) +#define MSIM_DORDER_ADDRESS PA2KSEG1(0x10000100) + +#define MSIM_KBD_IRQ 2 +#define MSIM_DORDER_IRQ 5 +#define MSIM_DDISK_IRQ 6 extern struct mips32_machine_ops msim_machine_ops; Index: kernel/arch/mips32/include/arch/mm/page.h =================================================================== --- kernel/arch/mips32/include/arch/mm/page.h (revision 68d873626159ee46816ad04fc6e4763eebe6eb12) +++ kernel/arch/mips32/include/arch/mm/page.h (revision f27e21ddaafbb7195a9fa323a76c7813b7d6b41b) @@ -43,4 +43,5 @@ #ifndef __ASSEMBLER__ +# define KSEG12PA(x) (((uintptr_t) (x)) - 0xa0000000) # define PA2KSEG1(x) (((uintptr_t) (x)) + 0xa0000000) # define KA2PA(x) (((uintptr_t) (x)) - 0x80000000) Index: kernel/arch/mips32/include/arch/smp/dorder.h =================================================================== --- kernel/arch/mips32/include/arch/smp/dorder.h (revision 68d873626159ee46816ad04fc6e4763eebe6eb12) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2007 Martin Decky - * 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 kernel_mips32 - * @{ - */ -/** @file - */ - -#ifndef KERN_mips32_DORDER_H_ -#define KERN_mips32_DORDER_H_ - -#include - -extern uint32_t dorder_cpuid(void); -extern void dorder_ipi_ack(uint32_t); - -#endif - -/** @} - */