HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/trunk @ 573

  → /kernel/trunk @ 574

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 573 → Rev 574

/kernel/trunk/contrib/conf/msim.conf
10,4 → 10,4
add rwm init 0x00110000 64k load "init"
add dprinter printer 0x10000000
add dkeyboard keyboard 0x10000004 3
add dkeyboard keyboard 0x10000000 2

/kernel/trunk/arch/mips32/include/interrupt.h
31,10 → 31,11
#include <arch/exception.h>
#define IRQ2 2
#define IRQ3 3
#define IRQ7 7
#define KEYBOARD_IRQ IRQ3
#define KEYBOARD_IRQ IRQ2
#define TIMER_IRQ IRQ7
extern void interrupt(struct exception_regdump *pstate);

/kernel/trunk/arch/mips32/include/drivers/keyboard.h
33,7 → 33,7
#include <arch/interrupt.h>
/** Address of 'keyboard' device. */
#define KEYBOARD_ADDRESS 0xB0000004
#define KEYBOARD_ADDRESS 0xB0000000
extern void keyboard_init(void);
extern void keyboard(void);

/kernel/trunk/arch/mips32/src/interrupt.c
110,10 → 110,10
case 1: /* SW1 - Software interrupt 1 */
cp0_cause_write(cp0_cause_read() & ~(1 << 9)); /* clear SW1 interrupt */
break;
case 2: /* IRQ0 */
case KEYBOARD_IRQ:
keyboard();
break;
case 3:
case 4: /* IRQ2 */
case 5: /* IRQ3 */
case 6: /* IRQ4 */

/kernel/trunk/arch/mips32/src/drivers/keyboard.c
75,6 → 75,8
char ch;
ch = *((char *) KEYBOARD_ADDRESS);
if (ch =='\r')
ch = '\n';
chardev_push_character(&kbrd, ch);
}