Changeset ef042e0 in mainline


Ignore:
Timestamp:
2007-09-09T21:10:57Z (17 years ago)
Author:
Jakub Vana <jakub.vana@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
68f93b9
Parents:
2a06e2f
Message:

IA64 rest of neaded changes to work with simics keyboard

Location:
kernel
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/_link.ld.in

    r2a06e2f ref042e0  
    1010
    1111SECTIONS {
    12         .image 0xe000000000100000: AT (0x0000000000100000) {
     12        .image 0xe000000004404000: AT (0x0000000004404000) {
    1313                ktext_start = .;
    1414                *(K_TEXT_START);
    … …  
    4040        _hardcoded_ktext_size = ktext_end - ktext_start;
    4141        _hardcoded_kdata_size = kdata_end - kdata_start;
    42         _hardcoded_load_address = 0xe000000000100000;
     42        _hardcoded_load_address = 0xe000000004404000;
    4343
    4444}

  • kernel/arch/ia64/include/interrupt.h

    r2a06e2f ref042e0  
    5252/** External Interrupt vectors. */
    5353#define INTERRUPT_TIMER         255
     54#define IRQ_KBD                 241
     55#define IRQ_MOUSE               252
    5456#define INTERRUPT_SPURIOUS      15
    5557

  • kernel/genarch/src/kbd/i8042.c

    r2a06e2f ref042e0  
    169169        i8042_mouse_irq.handler = i8042_irq_handler;
    170170        irq_register(&i8042_mouse_irq);
    171        
     171#ifndef ia64   
    172172        trap_virtual_enable_irqs(1 << kbd_inr);
    173173        trap_virtual_enable_irqs(1 << mouse_inr);
    174        
     174#endif 
    175175        /*
    176176         * Clear input buffer.

  • kernel/kernel.config

    r2a06e2f ref042e0  
    6161! [ARCH=arm32] MACHINE (choice)
    6262
    63 # Machine type
    64 @ "ski" Ski ia64 simulator
    65 @ "i460GX" i460GX chipset machine
    66 ! [ARCH=ia64] MACHINE (choice)
    6763
    6864# Framebuffer support
Note: See TracChangeset for help on using the changeset viewer.