diff options
| author | Charles.Forsyth <devnull@localhost> | 2008-06-11 14:21:44 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2008-06-11 14:21:44 +0000 |
| commit | 8a8c2d742b51525f66c2210e3c8a251de10022ff (patch) | |
| tree | 8282ce595e5fbe2e487dc20f54891d9e9e7cbf37 /os/boot/pc/trap.c | |
| parent | 31a18a6996a6b5927e39cc553696c167e6c88e3d (diff) | |
20080611-1520
Diffstat (limited to 'os/boot/pc/trap.c')
| -rw-r--r-- | os/boot/pc/trap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/os/boot/pc/trap.c b/os/boot/pc/trap.c index 503e03f4..e1030eec 100644 --- a/os/boot/pc/trap.c +++ b/os/boot/pc/trap.c @@ -182,7 +182,7 @@ trapinit(void) */ outb(Int0ctl, Icw1|0x01); /* ICW1 - edge triggered, master, ICW4 will be sent */ - outb(Int0aux, VectorPIC); /* ICW2 - interrupt vector offset */ + outb(Int0aux, VectorPIC); /* ICW2 - interrupt vector offset */ outb(Int0aux, 0x04); /* ICW3 - have slave on level 2 */ outb(Int0aux, 0x01); /* ICW4 - 8086 mode, not buffered */ @@ -194,7 +194,7 @@ trapinit(void) */ outb(Int1ctl, Icw1|0x01); /* ICW1 - edge triggered, master, ICW4 will be sent */ - outb(Int1aux, VectorPIC+8); /* ICW2 - interrupt vector offset */ + outb(Int1aux, VectorPIC+8); /* ICW2 - interrupt vector offset */ outb(Int1aux, 0x02); /* ICW3 - I am a slave on level 2 */ outb(Int1aux, 0x01); /* ICW4 - 8086 mode, not buffered */ outb(Int1aux, int1mask); @@ -315,13 +315,14 @@ trap(Ureg *ur) } while(h); } +extern void realmode0(void); /* in l.s */ + +extern int realmodeintr; +extern Ureg realmoderegs; + void realmode(int intr, Ureg *ureg) { - extern void realmode0(void); /* in l.s */ - extern int realmodeintr; - extern Ureg realmoderegs; - realmoderegs = *ureg; realmodeintr = intr; trapdisable(); |