Changeset 209faf9 in mainline for kernel

Timestamp:

2010-02-16T20:13:01Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8b901f9

Parents:

76ecb300 (diff), 01a9ef5 (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 as it is.
Does not compile at the moment.

Location:

kernel

Files:

• arch/amd64/include/interrupt.h (modified) (1 diff)
• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/ia32/include/interrupt.h (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia64/include/interrupt.h (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (1 diff)
• generic/include/ipc/ipc.h (modified) (1 diff)
• generic/include/time/clock.h (modified) (1 diff)

kernel/arch/amd64/include/interrupt.h

@@ -54 +54 @@
 #define IRQ_PIC_SPUR            7
 #define IRQ_MOUSE               12
+#define IRQ_DP8390              9
 
 /* this one must have four least significant bits set to ones */

kernel/arch/amd64/src/amd64.c

@@ -228 +228 @@
             (uintptr_t) I8042_BASE);
 #endif
+
+#ifdef CONFIG_NETIF_DP8390
+        trap_virtual_enable_irqs(1 << IRQ_DP8390);
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+#endif
 }
 

kernel/arch/ia32/include/interrupt.h

@@ -54 +54 @@
 #define IRQ_PIC_SPUR    7
 #define IRQ_MOUSE       12
+#define IRQ_DP8390      9
 
 /* this one must have four least significant bits set to ones */

kernel/arch/ia32/src/ia32.c

@@ -186 +186 @@
             (uintptr_t) I8042_BASE);
 #endif
+
+#ifdef CONFIG_NETIF_DP8390
+        trap_virtual_enable_irqs(1 << IRQ_DP8390);
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+#endif
 }
 

kernel/arch/ia64/include/interrupt.h

@@ -61 +61 @@
 #define IRQ_KBD    (0x01 + LEGACY_INTERRUPT_BASE)
 #define IRQ_MOUSE  (0x0c + LEGACY_INTERRUPT_BASE)
+#define IRQ_DP8390 (0x09 + LEGACY_INTERRUPT_BASE)
 
 /** General Exception codes. */

kernel/arch/ia64/src/ia64.c

@@ -212 +212 @@
             (uintptr_t) I8042_BASE);
 #endif
-        
+
+#ifdef CONFIG_NETIF_DP8390
+        trap_virtual_enable_irqs(1 << IRQ_DP8390);
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+#endif
+
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);

kernel/generic/include/ipc/ipc.h

@@ -227 +227 @@
 #ifdef KERNEL
 
-#define IPC_MAX_PHONES  16
+#define IPC_MAX_PHONES  32
 
 #include <synch/spinlock.h>

kernel/generic/include/time/clock.h

@@ -38 +38 @@
 #include <arch/types.h>
 
-#define HZ              100
+#define HZ              1000
 
 /** Uptime structure */