Changeset 973be64e in mainline for arch/mips32/include

Timestamp:

2005-12-10T00:19:57Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fcfac420

Parents:

705b4149

Message:

Added generic exc_register/exc_dispatch functions,
copied from ia32 architecture. Currently only mips32 uses them.

The chardev_t can now be both input & output device (was
needed for serial driver).

Broken other architectures - ia64, sparc, powerpc will not compile.

Mips32 supports input on all msim, gxemul, indy(tested emulation
in gxemul, loses characters), simics. Simics serial line
is done using polling, I was unable to make it produce
an interrupt when the key was pressed.

Location:

arch/mips32/include

Files:

• console.h (modified) (1 diff)
• drivers/arc.h (modified) (2 diffs)
• drivers/msim.h (moved) (moved from arch/mips32/include/drivers/keyboard.h ) (2 diffs)
• drivers/serial.h (added)
• interrupt.h (modified) (1 diff)

arch/mips32/include/console.h

@@ -31 +31 @@
 
 
-#define VIDEORAM        0xB0000000
-
-#define SERIAL_PORT_BASE        ((char *) 0xB80003f8 )
-#define SERIAL_LSR              ((char *) (SERIAL_PORT_BASE + 5))
-#define TRANSMIT_EMPTY_BIT      5          
-
 void console_init(void);
 

arch/mips32/include/drivers/arc.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <console/chardev.h>
 
 #define ARC_BASE_ADDR 0x1000;
@@ -213 +214 @@
 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

arch/mips32/include/drivers/msim.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Jakub Jermar
+ * Copyright (C) 2005 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef __mips32_KEYBOARD_H__
-#define __mips32_KEYBOARD_H__
+#ifndef _MSIM_H_
+#define _MSIM_H_
 
-#include <arch/types.h>
-#include <arch/interrupt.h>
+#include <console/chardev.h>
 
+#define MSIM_VIDEORAM            0xB0000000
 /** Address of 'keyboard' device. */
-#define KEYBOARD_ADDRESS                0xB0000000
+#define MSIM_KBD_ADDRESS                0xB0000000
+#define MSIM_KBD_IRQ    2
 
-extern void keyboard_init(void);
-extern void keyboard(void);
-extern void keyboard_poll(void);
+chardev_t * msim_console(void);
 
 #endif

arch/mips32/include/interrupt.h

@@ -32 +32 @@
 #include <arch/exception.h>
 
+#define IVT_ITEMS   32
+
 #define IRQ2    2
 #define IRQ3    3
 #define IRQ7    7
 
-#define KEYBOARD_IRQ    IRQ2
 #define TIMER_IRQ       IRQ7
 
 extern void interrupt(struct exception_regdump *pstate);
+extern void interrupt_init(void);
 
 #endif