Bring the PIC code back..

04b24182 · Silas Boyd-Wickizer · ab043853 · 04b24182 · 04b24182 · 04b24182
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ OBJS = \
 	memide.o \
 	mp.o \
 	ns.o \
+	picirq.o \
 	pipe.o \
 	proc.o \
 	rcu.o \

--- a/main.c
+++ b/main.c
@@ -4,6 +4,7 @@
 #include "kernel.h"
 #include "cpu.h"

+extern void initpic(void);
 extern void inituart(void);
 extern void initcga(void);
 extern void initconsole(void);
@@ -76,6 +77,7 @@ cmain(void)
 {
  extern pml4e_t kpml4[];

+  initpic();       // interrupt controller
  inituart();
  initcga();
  initconsole();

--- a/picirq.c
+++ b/picirq.c
@@ -12,10 +12,10 @@

 // Current IRQ mask.
 // Initial IRQ mask has interrupt 2 enabled (for slave 8259A).
-static ushort irqmask = 0xFFFF & ~(1<<IRQ_SLAVE);
+static u16 irqmask = 0xFFFF & ~(1<<IRQ_SLAVE);

 static void
-picsetmask(ushort mask)
+picsetmask(u16 mask)
 {
  irqmask = mask;
  outb(IO_PIC1+1, mask);
@@ -30,7 +30,7 @@ picenable(int irq)

 // Initialize the 8259A interrupt controllers.
 void
-picinit(void)
+initpic(void)
 {
  // mask all interrupts
  outb(IO_PIC1+1, 0xFF);