Minor - introduce numeric defines for the IVT offset of hw irqs.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/pic.c b/src/pic.c
index 669d6707f214421d1f4aa51a54339622eefd9144..3e96bb3d5ff962a5e9497a0274dad1cfa2e3f467 100644 (file)
--- a/src/pic.c
+++ b/src/pic.c
@@ -33,7 +33,7 @@ void
 pic_setup(void)
 {
     dprintf(3, "init pic\n");
-    set_pics(0x08, 0x70);
+    set_pics(BIOS_HWIRQ0_VECTOR, BIOS_HWIRQ8_VECTOR);
 }
 
 // Handler for otherwise unused hardware irqs.

diff --git a/src/pic.h b/src/pic.h
index 0ea56226bdfdc2b9977031dedaedbdb3c5da9b6b..92cb870109c0b89248e0e2d05d88ae53f41db72f 100644 (file)
--- a/src/pic.h
+++ b/src/pic.h
@@ -22,6 +22,9 @@
 #define PIC2_IRQ13 (1<<5)
 #define PIC2_IRQ14 (1<<6)
 
+#define BIOS_HWIRQ0_VECTOR 0x08
+#define BIOS_HWIRQ8_VECTOR 0x70
+
 static inline void
 eoi_pic1(void)
 {
@@ -83,10 +86,10 @@ enable_hwirq(int hwirq, struct segoff_s func)
     int vector;
     if (hwirq < 8) {
         unmask_pic1(1 << hwirq);
-        vector = 0x08 + hwirq;
+        vector = BIOS_HWIRQ0_VECTOR + hwirq;
     } else {
         unmask_pic2(1 << (hwirq - 8));
-        vector = 0x70 + hwirq - 8;
+        vector = BIOS_HWIRQ8_VECTOR + hwirq - 8;
     }
     SET_IVT(vector, func);
 }

diff --git a/src/post.c b/src/post.c
index 44bb0b0f71950470e01f1808105d04f47aa1fb9f..4d3262fc71561fd2c4e853306e242a73194571c7 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -47,9 +47,9 @@ ivt_init(void)
         SET_IVT(i, FUNC16(entry_iret_official));
 
     // Initialize all hw vectors to a default hw handler.
-    for (i=0x08; i<=0x0f; i++)
+    for (i=BIOS_HWIRQ0_VECTOR; i<BIOS_HWIRQ0_VECTOR+8; i++)
         SET_IVT(i, FUNC16(entry_hwpic1));
-    for (i=0x70; i<=0x77; i++)
+    for (i=BIOS_HWIRQ8_VECTOR; i<BIOS_HWIRQ8_VECTOR+8; i++)
         SET_IVT(i, FUNC16(entry_hwpic2));
 
     // Initialize software handlers.