summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2021-03-28 23:26:07 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2021-03-28 23:26:07 +0200
commit89dbc9815f6372e33402ad52e5c1c905c6bfd3b0 (patch)
treef00ea6bbf65b75ab527822205f3dcbc85a5f650b
parent32cda7d7e9374b805ccd5b00ef9e1a28a3f68532 (diff)
pic: Move to interrupts 0x20-0x2f
* i386/i386/pic.h (PICM_VECTBASE): Set to 0x20. * i386/i386at/idt.h (IDTSZ): Set to 0x20 + 0x10. (PIC_INT_BASE): Set to 0x20.
-rw-r--r--i386/i386/pic.h2
-rw-r--r--i386/i386at/idt.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/i386/i386/pic.h b/i386/i386/pic.h
index 6434bf08..b3365ed9 100644
--- a/i386/i386/pic.h
+++ b/i386/i386/pic.h
@@ -96,7 +96,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#if defined(AT386) || defined(ATX86_64)
-#define PICM_VECTBASE 0x40
+#define PICM_VECTBASE 0x20
#define PICS_VECTBASE PICM_VECTBASE + 0x08
#endif /* defined(AT386) */
diff --git a/i386/i386at/idt.h b/i386/i386at/idt.h
index 56e6296c..fd2f62d8 100644
--- a/i386/i386at/idt.h
+++ b/i386/i386at/idt.h
@@ -26,11 +26,9 @@
/* On a standard PC, we only need 16 interrupt vectors,
because that's all the PIC hardware supports. */
-/* XX But for some reason we program the PIC
- to use vectors 0x40-0x4f rather than 0x20-0x2f. Fix. */
-#define IDTSZ (0x20+0x20+0x10)
+#define IDTSZ (0x20+0x10)
-#define PIC_INT_BASE 0x40
+#define PIC_INT_BASE 0x20
#include <i386/idt-gen.h>