summaryrefslogtreecommitdiff
path: root/x86.h
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-07-05 20:00:14 +0000
committerkaashoek <kaashoek>2006-07-05 20:00:14 +0000
commitb22d898297a2496ba4cfd31d445769fbebc0a46d (patch)
tree99a08718f78c6836be1a245650e48c9f20333fb9 /x86.h
parent8b4e2a08febc8b957b44732dbc7da831479a0005 (diff)
downloadxv6-labs-b22d898297a2496ba4cfd31d445769fbebc0a46d.tar.gz
xv6-labs-b22d898297a2496ba4cfd31d445769fbebc0a46d.tar.bz2
xv6-labs-b22d898297a2496ba4cfd31d445769fbebc0a46d.zip
timer interrupts
disk interrupts (assuming bochs has a bug)
Diffstat (limited to 'x86.h')
-rw-r--r--x86.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/x86.h b/x86.h
index 7bc677f..0063826 100644
--- a/x86.h
+++ b/x86.h
@@ -352,11 +352,6 @@ struct Trapframe {
#define MAX_IRQS 16 // Number of IRQs
-// I/O Addresses of the two 8259A programmable interrupt controllers
-#define IO_PIC1 0x20 // Master (IRQs 0-7)
-#define IO_PIC2 0xA0 // Slave (IRQs 8-15)
-
-#define IRQ_SLAVE 2 // IRQ at which slave connects to master
#define IRQ_OFFSET 32 // IRQ 0 corresponds to int IRQ_OFFSET
#define IRQ_ERROR 19