xv6

commit 366189214ea663b20a0323b65661987a7de6f56d
parent c8b29f6d038090a5b5b6272406afbadcf31e9809
Author: kaashoek <kaashoek>
Date:   Fri,  4 Aug 2006 18:23:23 +0000

nit

Diffstat:
M
defs.h
 | 
2
--
M
picirq.c
 | 
36
++++++++++++++++++------------------

2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/defs.h b/defs.h
@@ -40,8 +40,6 @@ int strncmp(const char *p, const char *q, uint n);
 void syscall(void);
 
 // picirq.c
-extern ushort irq_mask_8259A;
-void irq_setmask_8259A(ushort mask);
 void pic_init(void);
 
 // mp.c
diff --git a/picirq.c b/picirq.c
@@ -12,7 +12,24 @@
 
 // Current IRQ mask.
 // Initial IRQ mask has interrupt 2 enabled (for slave 8259A).
-ushort irq_mask_8259A = 0xFFFF & ~(1<<IRQ_SLAVE);
+static ushort irq_mask_8259A = 0xFFFF & ~(1<<IRQ_SLAVE);
+
+static void
+irq_setmask_8259A(ushort mask)
+{
+  int i;
+  irq_mask_8259A = mask;
+
+  outb(IO_PIC1+1, (char)mask);
+  outb(IO_PIC2+1, (char)(mask >> 8));
+
+  cprintf("%d: enabled interrupts:", cpu());
+
+  for (i = 0; i < 16; i++)
+    if (~mask & (1<<i))
+      cprintf(" %d", i);
+  cprintf("\n");
+}
 
 /* Initialize the 8259A interrupt controllers. */
 void
@@ -68,20 +85,3 @@ pic_init(void)
   if (irq_mask_8259A != 0xFFFF)
     irq_setmask_8259A(irq_mask_8259A);
 }
-
-void
-irq_setmask_8259A(ushort mask)
-{
-  int i;
-  irq_mask_8259A = mask;
-
-  outb(IO_PIC1+1, (char)mask);
-  outb(IO_PIC2+1, (char)(mask >> 8));
-
-  cprintf("%d: enabled interrupts:", cpu());
-
-  for (i = 0; i < 16; i++)
-    if (~mask & (1<<i))
-      cprintf(" %d", i);
-  cprintf("\n");
-}