Changeset acc7ce4 in mainline for kernel/arch/amd64

Timestamp:

2011-01-07T14:57:40Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7c34b28f

Parents:

b404a98

Message:

uspace interrupt controller drivers for i8259 and APIC (non-functional yet)
convert NE2000 driver to use these drivers (not enabling the IRQ in kernel), this solves the "spurious interrupt" issue
(however, on SMP machines this renders the driver unusable for now since the APIC driver does not do anything yet)

Location:

kernel/arch/amd64

Files:

• include/interrupt.h (modified) (1 diff)
• src/amd64.c (modified) (1 diff)
• src/interrupt.c (modified) (1 diff)

kernel/arch/amd64/include/interrupt.h

@@ -74 +74 @@
 extern void (* enable_irqs_function)(uint16_t);
 extern void (* eoi_function)(void);
+extern const char *irqs_info;
 
 extern void interrupt_init(void);

kernel/arch/amd64/src/amd64.c

@@ -235 +235 @@
 #endif
         
-        /*
-         * This nasty hack should also go away ASAP.
-         */
-        trap_virtual_enable_irqs(1 << IRQ_DP8390);
+        if (irqs_info != NULL)
+                sysinfo_set_item_val(irqs_info, NULL, true);
+        
         sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
 }

kernel/arch/amd64/src/interrupt.c

@@ -62 +62 @@
 void (* enable_irqs_function)(uint16_t irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
+const char *irqs_info = NULL;
 
 void istate_decode(istate_t *istate)