Changeset 61ee6df in mainline for kernel


Ignore:
Timestamp:
2010-02-16T22:16:33Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7fb2ce3
Parents:
76ecb300 (diff), b20e7c0 (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 the networking branch and necessary fixes.

Location:
kernel
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r76ecb300 r61ee6df  
    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

    r76ecb300 r61ee6df  
    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

    r76ecb300 r61ee6df  
    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

    r76ecb300 r61ee6df  
    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

    r76ecb300 r61ee6df  
    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

    r76ecb300 r61ee6df  
    212212            (uintptr_t) I8042_BASE);
    213213#endif
    214        
     214
     215#ifdef CONFIG_NETIF_DP8390
     216        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     217#endif
     218
    215219        sysinfo_set_item_val("ia64_iospace", NULL, true);
    216220        sysinfo_set_item_val("ia64_iospace.address", NULL, true);

  • kernel/generic/include/ipc/ipc.h

    r76ecb300 r61ee6df  
    227227#ifdef KERNEL
    228228
    229 #define IPC_MAX_PHONES  16
     229#define IPC_MAX_PHONES  32
    230230
    231231#include <synch/spinlock.h>
Note: See TracChangeset for help on using the changeset viewer.