Changeset 8c84448 in mainline


Ignore:
Timestamp:
2006-10-27T09:00:38Z (18 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cea12e9
Parents:
8440473
Message:

timer_fnc → virtual_timer_fnc

Location:
kernel/arch/mips32
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r8440473 r8c84448  
    4141#define IVT_FIRST 0
    4242
    43 extern function timer_fnc;
     43extern function virtual_timer_fnc;
    4444
    4545extern void interrupt_init(void);

  • kernel/arch/mips32/src/drivers/arc.c

    r8440473 r8c84448  
    359359       
    360360        chardev_initialize("arc_console", &console, &arc_ops);
    361         timer_fnc = &arc_keyboard_poll;
     361        virtual_timer_fnc = &arc_keyboard_poll;
    362362        stdin = &console;
    363363        stdout = &console;

  • kernel/arch/mips32/src/drivers/serial.c

    r8440473 r8c84448  
    150150         * don't work on simics
    151151         */
    152         timer_fnc = &serial_handler;
     152        virtual_timer_fnc = &serial_handler;
    153153       
    154154        stdin = &console;

  • kernel/arch/mips32/src/interrupt.c

    r8440473 r8c84448  
    4747#define TIMER_IRQ 7
    4848
    49 function timer_fnc = NULL;
     49function virtual_timer_fnc = NULL;
    5050static irq_t timer_irq;
    5151
    … …  
    117117        clock();
    118118       
    119         if (timer_fnc != NULL)
    120                 timer_fnc();
     119        if (virtual_timer_fnc != NULL)
     120                virtual_timer_fnc();
    121121}
    122122
Note: See TracChangeset for help on using the changeset viewer.