Changeset 705b4149 in mainline


Ignore:
Timestamp:
2005-12-09T18:36:06Z (19 years ago)
Author:
Ondrej Palkovsky <ondrap@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
973be64e
Parents:
939dfd7
Message:

Merged msim & gxemul native keyboards.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • arch/mips32/include/drivers/keyboard.h

    r939dfd7 r705b4149  
    3434
    3535/** Address of 'keyboard' device. */
    36 #define KEYBOARD_ADDRESS                0xB0000004
     36#define KEYBOARD_ADDRESS                0xB0000000
    3737
    3838extern void keyboard_init(void);

  • arch/mips32/include/interrupt.h

    r939dfd7 r705b4149  
    3232#include <arch/exception.h>
    3333
     34#define IRQ2    2
    3435#define IRQ3    3
    3536#define IRQ7    7
    3637
    37 #define KEYBOARD_IRQ    IRQ3
     38#define KEYBOARD_IRQ    IRQ2
    3839#define TIMER_IRQ       IRQ7
    3940

  • arch/mips32/src/drivers/keyboard.c

    r939dfd7 r705b4149  
    7676
    7777        ch = *((char *) KEYBOARD_ADDRESS);
     78        if (ch =='\r')
     79                ch = '\n';
    7880        chardev_push_character(&kbrd, ch);
    7981}

  • arch/mips32/src/interrupt.c

    r939dfd7 r705b4149  
    111111                                        cp0_cause_write(cp0_cause_read() & ~(1 << 9)); /* clear SW1 interrupt */
    112112                                        break;
    113                                 case 2: /* IRQ0 */
    114113                                case KEYBOARD_IRQ:
    115114                                        keyboard();
    116115                                        break;
     116                                case 3:
    117117                                case 4: /* IRQ2 */
    118118                                case 5: /* IRQ3 */

  • contrib/conf/msim.conf

    r939dfd7 r705b4149  
    1111
    1212add dprinter printer 0x10000000
    13 add dkeyboard keyboard 0x10000004 3
     13add dkeyboard keyboard 0x10000000 2
Note: See TracChangeset for help on using the changeset viewer.