Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/Makefile.inc (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -57,18 +57,4 @@ # -ifeq ($(MACHINE),indy) - # GCC 4.0.1 compiled for mipsEL has problems compiling in - # BigEndian mode with the swl/swr/lwl/lwr instructions. - # We have to compile it with mips-sgi-irix5 to get it right. - - BFD_NAME = elf32-bigmips - BFD = ecoff-bigmips --impure - TARGET = mips-sgi-irix5 - TOOLCHAIN_DIR = /usr/local/mips/bin - KERNEL_LOAD_ADDRESS = 0x88002000 - GCC_CFLAGS += -EB -DBIG_ENDIAN -DARCH_HAS_FPU -march=r4600 - INIT_ADDRESS = 0 - INIT_SIZE = 0 -endif ifeq ($(MACHINE),lgxemul) BFD_NAME = elf32-tradlittlemips @@ -124,5 +110,4 @@ arch/$(ARCH)/src/fpu_context.c \ arch/$(ARCH)/src/ddi/ddi.c \ - arch/$(ARCH)/src/drivers/arc.c \ arch/$(ARCH)/src/drivers/msim.c \ arch/$(ARCH)/src/drivers/serial.c \ Index: kernel/arch/mips32/include/drivers/arc.h =================================================================== --- kernel/arch/mips32/include/drivers/arc.h (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ (revision ) @@ -1,267 +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 mips32 - * @{ - */ -/** @file - */ - -#ifndef KERN_mips32_ARC_H_ -#define KERN_mips32_ARC_H_ - -#include -#include - -#define ARC_BASE_ADDR 0x1000; -#define ARC_MAGIC 0x53435241 -/* Frame size used by ARC */ -#define ARC_FRAME 4096 - -typedef enum { - CmResourceTypeNull = 0, - CmResourceTypePort, - CmResourceTypeInterrupt, - CmResourceTypeMemory, - CmResourceTypeDma, - CmResourceTypeDeviceSpecific, - CmResourceTypeVendor, - CmResourceTypeProductName, - CmResourceTypeSerialNumber -} cm_resource_type; - -typedef struct { - uint8_t type; - uint8_t sharedisposition; - uint16_t flags; - union { - struct { - long long start; /* 64-bit phys address */ - unsigned long length; - }port; - struct { - unsigned long level; - unsigned long vector; - unsigned long reserved1; - }interrupt; - struct { - long long start; /* 64-bit phys address */ - unsigned long length; - }memory; - }u; -} __attribute__ ((packed)) cm_resource_descriptor; - -typedef struct { - uint16_t version; - uint16_t revision; - unsigned long count; - cm_resource_descriptor descr[1]; -} __attribute__ ((packed)) cm_resource_list; - -typedef enum { - SystemClass = 0, - ProcessorClass, - CacheClass, - AdapterClass, - ControllerClass, - PeripheralClass, - MemoryClass -} arc_component_class; - -typedef enum { - ARC_type = 0, - CPU_type, - FPU_type, - PrimaryICache, - PrimaryDCache, - SecondaryICache, - SecondaryDCache, - SecondaryCache, - Memory, /* Not in NT PROM */ - EISAAdapter, - TCAdapter, - SCSIAdapter, - DTIAdapter, - MultiFunctionAdapter, - DiskController, - TapeController, - CDROMController, - WORMController, - SerialController, - NetworkController, - DisplayController, - ParallelController, - PointerController, - KeyboardController, - AudioController, - OtherController, - DiskPeripheral, - FloppyDiskPeripheral, - TapePeripheral, - ModemPeripheral, - MonitorPeripheral, - PrinterPeripheral, - PointerPeripheral, - KeyboardPeripheral, - TerminalPeripheral, - LinePeripheral, - NetworkPeripheral, - OtherPeripheral, - XTalkAdapter, - PCIAdapter, - GIOAdapter, - TPUAdapter, - Anonymous -} arc_component_type; - -typedef enum { - Failed = 1, - ReadOnly = 2, - Removable = 4, - ConsoleIn = 8, - ConsoleOut = 16, - Input = 32, - Output = 64 -} arc_component_flags; - -typedef struct { - arc_component_class class; - arc_component_type type; - arc_component_flags flags; - uint16_t revision; - uint16_t version; - uint32_t key; - uint32_t affinitymask; - uint32_t configdatasize; - uint32_t identifier_len; - char *identifier; -} __attribute__ ((packed)) arc_component; - -typedef struct { - uint16_t year; - uint16_t month; - uint16_t day; - uint16_t hour; - uint16_t minutes; - uint16_t seconds; - uint16_t mseconds; -} __attribute__ ((packed)) arc_timeinfo; - -/* This is the SGI block structure, WinNT has it different */ -typedef enum { - ExceptionBlock, - SystemParameterBlock, - FreeContiguous, - FreeMemory, - BadMemory, - LoadedProgram, - FirmwareTemporary, - FirmwarePermanent -} arc_memorytype_t; - -typedef struct { - arc_memorytype_t type; - uint32_t basepage; /* *4096 = baseaddr */ - uint32_t basecount; -} arc_memdescriptor_t; - -typedef struct { - char vendorid[8]; - char prodid[8]; -} arc_sysid_t; - -typedef struct { - long (*load)(void); /* ... */ - long (*invoke)(uint32_t eaddr,uint32_t saddr,uint32_t argc,char **argv, - char **envp); - long (*execute)(char *path,uint32_t argc,char **argv,char **envp); - void (*halt)(void); - void (*powerdown)(void); - void (*restart)(void); - void (*reboot)(void); - void (*enterinteractivemode)(void); - long (*reserved)(void); -/* 10 */ - arc_component * (*getpeer)(arc_component *c); - arc_component * (*getchild)(arc_component *c); - arc_component * (*getparent)(arc_component *c); - long (*getconfigurationdata)(void *configdata, arc_component *c); - long (*addchild)(arc_component *c, arc_component *template, - void *configdata); - long (*deletecomponet)(arc_component *current); - long (*getcomponent)(char *path); - long (*saveconfiguration)(void); - arc_sysid_t (*getsystemid)(void); - arc_memdescriptor_t * (*getmemorydescriptor)(arc_memdescriptor_t *cur); -/* 20 */ - long (*reserved2)(void); - arc_timeinfo * (*gettime)(void); - uint32_t (*getrelativetime)(void); - long (*getdirectoryentry)(); - long (*open)(void); /* ... */ - long (*close)(uint32_t fileid); - long (*read)(uint32_t fileid,void *buf,uint32_t n,uint32_t *cnt); - long (*getreadstatus)(uint32_t fileid); - long (*write)(uint32_t fileid, void *buf,uint32_t n,uint32_t *cnt); - long (*seek)(void); /* ... */ -/* 30 */ - long (*mount)(void); /* ... */ - char * (*getenvironmentvariable)(char *name); - char * (*setenvironmentvariable)(char *name, char *value); - long (*getfileinformation)(void); /* ... */ - long (*setfileinformation)(uint32_t fileid,uint32_t attflags,uint32_t attmask); - void (*flushallcaches)(void); - long (*testunicodecharacter)(void); /* ... */ - long (*getdisplaystatus)(void); /* ... */ -} arc_func_vector_t; - -typedef struct { - uint32_t signature; - uint32_t length; - uint16_t version; - uint16_t revision; - void *restartblock; - void *debugblock; - void *gevector; - void *utlbmissvector; - uint32_t firmwarevectorlen; - arc_func_vector_t *firmwarevector; - uint32_t privvectorlen; - void *privvector; - uint32_t adaptercount; -} __attribute__ ((packed)) arc_sbp; - -extern int arc_init(void); -extern int arc_reboot(void); -extern int arc_frame_init(void); -extern int arc_console(void); - -#endif - - /** @} - */ Index: kernel/arch/mips32/include/drivers/msim.h =================================================================== --- kernel/arch/mips32/include/drivers/msim.h (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/include/drivers/msim.h (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -36,4 +36,9 @@ #define KERN_mips32_MSIM_H_ +/** Address of devices. */ +#define MSIM_VIDEORAM 0xB0000000 +#define MSIM_KBD_ADDRESS 0xB0000000 +#define MSIM_KBD_IRQ 2 + #include Index: kernel/arch/mips32/include/drivers/serial.h =================================================================== --- kernel/arch/mips32/include/drivers/serial.h (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/include/drivers/serial.h (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -38,4 +38,6 @@ #include +#define SERIAL_ADDRESS 0xB8000000 + #define SERIAL_MAX 4 #define SERIAL_COM1 0x3f8 @@ -44,14 +46,17 @@ #define SERIAL_COM2_IRQ 3 -#define P_WRITEB(where,what) (*((volatile char *) (0xB8000000+where))=what) -#define P_READB(where) (*((volatile char *)(0xB8000000+where))) +#define P_WRITEB(where, what) (*((volatile char *) (SERIAL_ADDRESS + where)) = what) +#define P_READB(where) (*((volatile char *) (SERIAL_ADDRESS + where))) -#define SERIAL_READ(x) P_READB(x) -#define SERIAL_WRITE(x,c) P_WRITEB(x,c) +#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)) +#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)) Index: kernel/arch/mips32/include/mm/as.h =================================================================== --- kernel/arch/mips32/include/mm/as.h (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/include/mm/as.h (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -39,5 +39,5 @@ #define KERNEL_ADDRESS_SPACE_START_ARCH (unsigned long) 0x80000000 -#define KERNEL_ADDRESS_SPACE_END_ARCH (unsigned long) 0xffffffff +#define KERNEL_ADDRESS_SPACE_END_ARCH (unsigned long) 0x9fffffff #define USER_ADDRESS_SPACE_START_ARCH (unsigned long) 0x00000000 #define USER_ADDRESS_SPACE_END_ARCH (unsigned long) 0x7fffffff Index: kernel/arch/mips32/include/mm/tlb.h =================================================================== --- kernel/arch/mips32/include/mm/tlb.h (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/include/mm/tlb.h (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -36,4 +36,7 @@ #define KERN_mips32_TLB_H_ +#include +#include +#include #include @@ -47,5 +50,5 @@ #define TLB_KSTACK_WIRED_INDEX 0 -#define TLB_PAGE_MASK_16K (0x3<<13) +#define TLB_PAGE_MASK_16K (0x3 << 13) #define PAGE_UNCACHED 2 @@ -160,4 +163,6 @@ extern void tlb_refill(istate_t *istate); extern void tlb_modified(istate_t *istate); +extern void tlb_prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, bool cacheable, uintptr_t pfn); +extern void tlb_prepare_entry_hi(entry_hi_t *hi, asid_t asid, uintptr_t addr); #endif Index: kernel/arch/mips32/src/console.c =================================================================== --- kernel/arch/mips32/src/console.c (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/src/console.c (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -35,5 +35,4 @@ #include #include -#include #include #include @@ -41,10 +40,8 @@ void console_init(devno_t devno) { - if (!arc_console()) { - if (serial_init()) - serial_console(devno); - else - msim_console(devno); - } + if (serial_init()) + serial_console(devno); + else + msim_console(devno); } Index: kernel/arch/mips32/src/drivers/arc.c =================================================================== --- kernel/arch/mips32/src/drivers/arc.c (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ (revision ) @@ -1,394 +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 mips32 - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* This is a good joke, SGI HAS different types than NT bioses... */ -/* Here is the SGI type */ -static char *basetypes[] = { - "ExceptionBlock", - "SystemParameterBlock", - "FreeContiguous", - "FreeMemory", - "BadMemory", - "LoadedProgram", - "FirmwareTemporary", - "FirmwarePermanent" -}; - -static char *ctypes[] = { - "ARC_type", - "CPU_type", - "FPU_type", - "PrimaryICache", - "PrimaryDCache", - "SecondaryICache", - "SecondaryDCache", - "SecondaryCache", - "Memory", - "EISAAdapter", - "TCAdapter", - "SCSIAdapter", - "DTIAdapter", - "MultiFunctionAdapter", - "DiskController", - "TapeController", - "CDROMController", - "WORMController", - "SerialController", - "NetworkController", - "DisplayController", - "ParallelController", - "PointerController", - "KeyboardController", - "AudioController", - "OtherController", - "DiskPeripheral", - "FloppyDiskPeripheral", - "TapePeripheral", - "ModemPeripheral", - "MonitorPeripheral", - "PrinterPeripheral", - "PointerPeripheral", - "KeyboardPeripheral", - "TerminalPeripheral", - "OtherPeripheral", - "LinePeripheral", - "NetworkPeripheral" - "OtherPeripheral", - "XTalkAdapter", - "PCIAdapter", - "GIOAdapter", - "TPUAdapter", - "Anonymous" -}; - -static arc_sbp *sbp = (arc_sbp *) PA2KA(0x1000); -static arc_func_vector_t *arc_entry; - - -/** Return true if ARC is available */ -#define arc_enabled() (sbp != NULL) - - -/** Print configuration data that ARC reports about component */ -static void arc_print_confdata(arc_component *c) -{ - cm_resource_list *configdata; - unsigned int i; - - if (!c->configdatasize) - return; /* No configuration data */ - - configdata = malloc(c->configdatasize, 0); - - if (arc_entry->getconfigurationdata(configdata, c)) { - free(configdata); - return; - } - /* Does not seem to return meaningful data, don't use now */ - free(configdata); - return; - - for (i = 0; i < configdata->count; i++) { - switch (configdata->descr[i].type) { - case CmResourceTypePort: - printf("Port: %p-size:%d ", - (uintptr_t) configdata->descr[i].u.port.start, - configdata->descr[i].u.port.length); - break; - case CmResourceTypeInterrupt: - printf("Irq: level(%d) vector(%d) ", - configdata->descr[i].u.interrupt.level, - configdata->descr[i].u.interrupt.vector); - break; - case CmResourceTypeMemory: - printf("Memory: %p-size:%d ", - (uintptr_t)configdata->descr[i].u.port.start, - configdata->descr[i].u.port.length); - break; - default: - break; - } - } - - free(configdata); -} - -/** Print information about component */ -static void arc_print_component(arc_component *c) -{ - unsigned int i; - - printf("%s: ",ctypes[c->type]); - for (i = 0; i < c->identifier_len; i++) - printf("%c", c->identifier[i]); - - printf(" "); - arc_print_confdata(c); - printf("\n"); -} - -/** - * Read from ARC bios configuration data and print it - */ -static int cmd_arc_print_devices(cmd_arg_t *argv) -{ - arc_component *c, *next; - - c = arc_entry->getchild(NULL); - while (c) { - arc_print_component(c); - next = arc_entry->getchild(c); - while (!next) { - next = arc_entry->getpeer(c); - if (!next) - c = arc_entry->getparent(c); - if (!c) - return 0; - } - c = next; - } - return 1; -} -static cmd_info_t devlist_info = { - .name = "arcdevlist", - .description = "Print arc device list", - .func = cmd_arc_print_devices, - .argc = 0 -}; - - -/** Read from arc bios memory map and print it - * - */ -void physmem_print(void) -{ - printf("Base Size Type\n"); - printf("---------- ---------- ---------\n"); - - if (arc_enabled()) { - arc_memdescriptor_t *desc = arc_entry->getmemorydescriptor(NULL); - - while (desc) { - printf("%#10x %#10x %s\n", - desc->basepage * ARC_FRAME, desc->basecount * ARC_FRAME, - basetypes[desc->type]); - desc = arc_entry->getmemorydescriptor(desc); - } - } else - printf("%#10x %#10x free\n", 0, CONFIG_MEMORY_SIZE); -} - -/** Print charactor to console */ -static void arc_putchar(char ch) -{ - uint32_t cnt; - ipl_t ipl; - - /* TODO: Should be spinlock? */ - ipl = interrupts_disable(); - arc_entry->write(1, &ch, 1, &cnt); - interrupts_restore(ipl); -} - - -/** Initialize ARC structure - * - * @return 0 - ARC OK, -1 - ARC does not exist - */ -int arc_init(void) -{ - if (sbp->signature != ARC_MAGIC) { - sbp = NULL; - return -1; - } - arc_entry = sbp->firmwarevector; - - arc_putchar('A'); - arc_putchar('R'); - arc_putchar('C'); - arc_putchar('\n'); - - /* Add command for resetting the computer */ - cmd_initialize(&devlist_info); - cmd_register(&devlist_info); - - return 0; -} - -int arc_reboot(void) -{ - if (arc_enabled()) { - arc_entry->reboot(); - return true; - } - - return false; -} - - -static bool kbd_polling_enabled; -static chardev_t console; - -/** Try to get character, return character or -1 if not available */ -static void arc_keyboard_poll(void) -{ - char ch; - uint32_t count; - long result; - - if (!kbd_polling_enabled) - return; - - if (arc_entry->getreadstatus(0)) - return; - result = arc_entry->read(0, &ch, 1, &count); - if ((result) || (count != 1)) { - return; - } - if (ch == '\r') - ch = '\n'; - if (ch == 0x7f) - ch = '\b'; - - chardev_push_character(&console, ch); -} - -static char arc_read(chardev_t *dev) -{ - char ch; - uint32_t count; - long result; - - result = arc_entry->read(0, &ch, 1, &count); - if ((result) || (count != 1)) { - printf("Error reading from ARC keyboard.\n"); - cpu_halt(); - } - if (ch == '\r') - return '\n'; - if (ch == 0x7f) - return '\b'; - return ch; -} - -static void arc_write(chardev_t *dev, const char ch) -{ - arc_putchar(ch); -} - -static void arc_enable(chardev_t *dev) -{ - kbd_polling_enabled = true; -} - -static void arc_disable(chardev_t *dev) -{ - kbd_polling_enabled = false; -} - -static chardev_operations_t arc_ops = { - .resume = arc_enable, - .suspend = arc_disable, - .write = arc_write, - .read = arc_read -}; - -int arc_console(void) -{ - if (arc_enabled()) { - kbd_polling_enabled = true; - - chardev_initialize("arc_console", &console, &arc_ops); - virtual_timer_fnc = &arc_keyboard_poll; - stdin = &console; - stdout = &console; - - return true; - } - - return false; -} - -/* Initialize frame zones from ARC firmware. - * In the future we may use even the FirmwareTemporary regions, - * currently we use the FreeMemory (what about the LoadedProgram?) - */ -int arc_frame_init(void) -{ - if (arc_enabled()) { - arc_memdescriptor_t *desc; - uintptr_t base; - size_t basesize; - - desc = arc_entry->getmemorydescriptor(NULL); - while (desc) { - if ((desc->type == FreeMemory) || - (desc->type == FreeContiguous)) { - base = desc->basepage*ARC_FRAME; - basesize = desc->basecount*ARC_FRAME; - - if (base % FRAME_SIZE ) { - basesize -= FRAME_SIZE - (base % FRAME_SIZE); - base = ALIGN_UP(base, FRAME_SIZE); - } - basesize = ALIGN_DOWN(basesize, FRAME_SIZE); - - zone_create(ADDR2PFN(base), SIZE2FRAMES(basesize), - ADDR2PFN(base), 0); - } - desc = arc_entry->getmemorydescriptor(desc); - } - - return true; - } - - return false; -} - -/** @} - */ Index: kernel/arch/mips32/src/drivers/msim.c =================================================================== --- kernel/arch/mips32/src/drivers/msim.c (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/src/drivers/msim.c (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -40,9 +40,4 @@ #include #include - -/** Address of devices. */ -#define MSIM_VIDEORAM 0xB0000000 -#define MSIM_KBD_ADDRESS 0xB0000000 -#define MSIM_KBD_IRQ 2 static chardev_t console; Index: kernel/arch/mips32/src/interrupt.c =================================================================== --- kernel/arch/mips32/src/interrupt.c (revision 5e8ddf5690a75f99176a2b7d8083393b9361e06b) +++ kernel/arch/mips32/src/interrupt.c (revision edebc15c65ded52ed661523a687334ecc04a7578) @@ -39,5 +39,4 @@ #include #include