X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fintr.c;h=2ec1f1b5eb311b02ddafe4281a01b7593e6dc3ad;hp=e04a1775a41c83095d841b6073368a32d117cb7b;hb=81c11bdd80190ec319a82b0402173cfb65fcbf72;hpb=41e4fa8d02a2ca85c871c8cc3a4c6c93331cdfb3
diff --git a/src/intr.c b/src/intr.c
index e04a177..2ec1f1b 100644
--- a/src/intr.c
+++ b/src/intr.c
@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
#include
+#include "config.h"
#include "intr.h"
#include "desc.h"
#include "segm.h"
@@ -54,7 +55,7 @@ along with this program. If not, see .
#define OCW2_EOI (1 << 5)
-static void init_pic(int offset);
+void init_pic(void);
static void gate_desc(desc_t *desc, uint16_t sel, uint32_t addr, int dpl, int type);
/* defined in intr_asm.S */
@@ -101,7 +102,7 @@ void init_intr(void)
/* initialize the programmable interrupt controller
* setting up the maping of IRQs [0, 15] to interrupts [32, 47]
*/
- init_pic(IRQ_OFFSET);
+ init_pic();
eoi_pending = 0;
}
@@ -149,14 +150,19 @@ void dispatch_intr(struct intr_frame frm)
}
}
-static void init_pic(int offset)
+void init_pic(void)
+{
+ prog_pic(IRQ_OFFSET);
+}
+
+void prog_pic(int offs)
{
/* send ICW1 saying we'll follow with ICW4 later on */
outb(ICW1_INIT | ICW1_ICW4_NEEDED, PIC1_CMD);
outb(ICW1_INIT | ICW1_ICW4_NEEDED, PIC2_CMD);
/* send ICW2 with IRQ remapping */
- outb(offset, PIC1_DATA);
- outb(offset + 8, PIC2_DATA);
+ outb(offs, PIC1_DATA);
+ outb(offs + 8, PIC2_DATA);
/* send ICW3 to setup the master/slave relationship */
/* ... set bit3 = 3rd interrupt input has a slave */
outb(4, PIC1_DATA);
@@ -197,6 +203,49 @@ void set_intr_entry(int num, void (*handler)(void))
gate_desc(idt + num, selector(SEGM_KCODE, 0), (uint32_t)handler, dpl, type);
}
+void set_pic_mask(int pic, unsigned char mask)
+{
+ outb(mask, pic > 0 ? PIC2_DATA : PIC1_DATA);
+}
+
+unsigned char get_pic_mask(int pic)
+{
+ return inb(pic > 0 ? PIC2_DATA : PIC1_DATA);
+}
+
+void mask_irq(int irq)
+{
+ int port;
+ unsigned char mask;
+
+ if(irq < 8) {
+ port = PIC1_DATA;
+ } else {
+ port = PIC2_DATA;
+ irq -= 8;
+ }
+
+ mask = inb(port) | (1 << irq);
+ outb(mask, port);
+}
+
+void unmask_irq(int irq)
+{
+ int port;
+ unsigned char mask;
+
+ if(irq < 8) {
+ port = PIC1_DATA;
+ } else {
+ port = PIC2_DATA;
+ irq -= 8;
+ }
+
+ mask = inb(port) & ~(1 << irq);
+ outb(mask, port);
+}
+
+
void end_of_irq(int irq)
{
int intr_state = get_intr_flag();
@@ -214,3 +263,10 @@ void end_of_irq(int irq)
set_intr_flag(intr_state);
}
+
+#ifdef ENABLE_GDB_STUB
+void exceptionHandler(int id, void (*func)())
+{
+ set_intr_entry(id, func);
+}
+#endif