Changeset 7c34b28f in mainline for kernel/arch/amd64/src

Timestamp:

2011-01-07T15:10:52Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

61bfc370

Parents:

3d5e190 (diff), acc7ce4 (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 small NE2000 and interrupt handling improvements

• introduce new uspace interrupt controller drivers
  • i8259
  • APIC (only a non-functional stub yet)
• do not pre-enable NE2000's IRQ in kernel, but use the above drivers (solves the "spurious interrupt" issue, but breaks SMP functionality because of the non-functional APIC driver)

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (1 diff)
• interrupt.c (modified) (1 diff)

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)