Changeset a70bda4 in mainline


Ignore:
Timestamp:
2010-02-16T18:07:34Z (14 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
80ce111
Parents:
827d73f
Message:
  • use standardized interrupt definition
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r827d73f ra70bda4  
    514514! NETWORKING (choice)
    515515
     516% DP8390 (NE2k) network interface
     517! [NETWORKING=modular|NETWORKING=module] CONFIG_NETIF_DP8390 (y/n)
     518

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

    r827d73f ra70bda4  
    5454#define IRQ_PIC_SPUR            7
    5555#define IRQ_MOUSE               12
     56#define IRQ_DP8390              9
    5657
    5758/* this one must have four least significant bits set to ones */

  • kernel/arch/amd64/src/amd64.c

    r827d73f ra70bda4  
    228228            (uintptr_t) I8042_BASE);
    229229#endif
     230
     231#ifdef CONFIG_NETIF_DP8390
     232        trap_virtual_enable_irqs(1 << IRQ_DP8390);
     233        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     234#endif
    230235}
    231236

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

    r827d73f ra70bda4  
    5454#define IRQ_PIC_SPUR    7
    5555#define IRQ_MOUSE       12
     56#define IRQ_DP8390      9
    5657
    5758/* this one must have four least significant bits set to ones */

  • kernel/arch/ia32/src/ia32.c

    r827d73f ra70bda4  
    186186            (uintptr_t) I8042_BASE);
    187187#endif
     188
     189#ifdef CONFIG_NETIF_DP8390
     190        trap_virtual_enable_irqs(1 << IRQ_DP8390);
     191        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     192#endif
    188193}
    189194

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

    r827d73f ra70bda4  
    6161#define IRQ_KBD    (0x01 + LEGACY_INTERRUPT_BASE)
    6262#define IRQ_MOUSE  (0x0c + LEGACY_INTERRUPT_BASE)
     63#define IRQ_DP8390 (0x09 + LEGACY_INTERRUPT_BASE)
    6364
    6465/** General Exception codes. */

  • kernel/arch/ia64/src/ia64.c

    r827d73f ra70bda4  
    212212            (uintptr_t) I8042_BASE);
    213213#endif
    214        
     214
     215#ifdef CONFIG_NETIF_DP8390
     216        trap_virtual_enable_irqs(1 << IRQ_DP8390);
     217        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     218#endif
     219
    215220        sysinfo_set_item_val("ia64_iospace", NULL, true);
    216221        sysinfo_set_item_val("ia64_iospace.address", NULL, true);

  • kernel/generic/src/ipc/irq.c

    r827d73f ra70bda4  
    202202       
    203203        interrupts_restore(ipl);
    204 //      explicitly enable irq
    205         trap_virtual_enable_irqs( 1 << irq->inr );
    206204        return EOK;
    207205}
Note: See TracChangeset for help on using the changeset viewer.