Changeset 119b46e in mainline for kernel/arch/mips32/src/interrupt.c


Ignore:
Timestamp:
2013-03-22T17:25:04Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
59fb782, 8f9d70b, b183ce0a
Parents:
fa33ac4 (diff), 8fe2c9bd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from lp:~jakub/helenos/mips-malta.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/mips32/src/interrupt.c

    rfa33ac4 r119b46e  
    4545#define IRQ_COUNT   8
    4646#define TIMER_IRQ   7
     47
     48#ifdef MACHINE_msim
    4749#define DORDER_IRQ  5
     50#endif
    4851
    4952function virtual_timer_fnc = NULL;
    5053static irq_t timer_irq;
     54
     55#ifdef MACHINE_msim
    5156static irq_t dorder_irq;
     57#endif
    5258
    5359// TODO: This is SMP unsafe!!!
     
    151157}
    152158
     159#ifdef MACHINE_msim
    153160static irq_ownership_t dorder_claim(irq_t *irq)
    154161{
     
    160167        dorder_ipi_ack(1 << dorder_cpuid());
    161168}
     169#endif
    162170
    163171/* Initialize basic tables for exception dispatching */
     
    176184        cp0_unmask_int(TIMER_IRQ);
    177185       
     186#ifdef MACHINE_msim
    178187        irq_initialize(&dorder_irq);
    179188        dorder_irq.devno = device_assign_devno();
     
    184193       
    185194        cp0_unmask_int(DORDER_IRQ);
     195#endif
    186196}
    187197
Note: See TracChangeset for help on using the changeset viewer.