moved code to pic header file

student-distrib/i8259.c

@@ -3,15 +3,6 @@
  */
 
 #include "i8259.h"
-#include "lib.h"
-
-/* Interrupt masks to determine which interrupts are enabled and disabled */
-uint8_t master_mask; /* IRQs 0-7  */
-uint8_t slave_mask;  /* IRQs 8-15 */
-#define Master_Max	8
-#define Slave_Max	16
-#define Slave_on_Master_port 2
-
 
 /* i8259_init
  * Inputs: void

student-distrib/i8259.h

@@ -7,11 +7,16 @@
 #define _I8259_H
 
 #include "types.h"
+#include "lib.h"
 
 /* Ports that each PIC sits on */
 #define MASTER_8259_PORT    0x20
 #define SLAVE_8259_PORT     0xA0
 
+#define Master_Max  8
+#define Slave_Max   16
+#define Slave_on_Master_port 2
+
 /* Initialization control words to init each PIC.
  * See the Intel manuals for details on the meaning
  * of each word */
@@ -27,6 +32,10 @@
  * to declare the interrupt finished */
 #define EOI                 0x60
 
+/* Interrupt masks to determine which interrupts are enabled and disabled */
+uint8_t master_mask; /* IRQs 0-7  */
+uint8_t slave_mask;  /* IRQs 8-15 */
+
 /* Externally-visible functions */
 
 /* Initialize both PICs */