Changeset 203 for trunk/hal/x86_64/core/hal_apic.c

Timestamp:

Jul 13, 2017, 3:24:38 PM (7 years ago)

Author:

max@…

Message:

start moving the APIC code into the PIC driver

File:

• trunk/hal/x86_64/core/hal_apic.c (modified) (3 diffs)

trunk/hal/x86_64/core/hal_apic.c

@@ -268 +268 @@
 }
 
-void hal_ioapic_disable_entry(uint8_t index)
-{
-        const uint64_t data = IOREDTBL_MSK;
-
-        hal_ioapic_write(IOREDTBL + index * 2, (uint32_t)(data & 0xFFFFFFFF));
-        hal_ioapic_write(IOREDTBL + index * 2 + 1, (uint32_t)(data >> 32));
-}
-
-void hal_ioapic_set_entry(uint8_t index, uint8_t vec, uint8_t dest)
+void hal_ioapic_bind_irq(uint8_t irq, uint8_t vec, uint8_t dest)
 {
         const uint64_t data = ((uint64_t)dest << IOREDTBL_DES_SHIFT) |
-            IOREDTBL_DEM_PHYS | IOREDTBL_DEL_FIXED | vec;
-
-        hal_ioapic_write(IOREDTBL + index * 2, (uint32_t)(data & 0xFFFFFFFF));
-        hal_ioapic_write(IOREDTBL + index * 2 + 1, (uint32_t)(data >> 32));
+            IOREDTBL_DEM_PHYS | IOREDTBL_DEL_FIXED | IOREDTBL_MSK | vec;
+
+        hal_ioapic_write(IOREDTBL + irq * 2, (uint32_t)(data & 0xFFFFFFFF));
+        hal_ioapic_write(IOREDTBL + irq * 2 + 1, (uint32_t)(data >> 32));
+}
+
+void hal_ioapic_enable_irq(uint8_t irq)
+{
+        uint32_t data[2];
+
+        data[0] = hal_ioapic_read(IOREDTBL + irq * 2);
+        data[1] = hal_ioapic_read(IOREDTBL + irq * 2 + 1);
+
+        data[0] &= ~IOREDTBL_MSK;
+
+        hal_ioapic_write(IOREDTBL + irq * 2, data[0]);
+        hal_ioapic_write(IOREDTBL + irq * 2 + 1, data[1]);
+}
+
+void hal_ioapic_disable_irq(uint8_t irq)
+{
+        uint32_t data[2];
+
+        data[0] = hal_ioapic_read(IOREDTBL + irq * 2);
+        data[1] = hal_ioapic_read(IOREDTBL + irq * 2 + 1);
+
+        data[0] |= IOREDTBL_MSK;
+
+        hal_ioapic_write(IOREDTBL + irq * 2, data[0]);
+        hal_ioapic_write(IOREDTBL + irq * 2 + 1, data[1]);
 }
 
@@ -295 +313 @@
         /* Explicitly disable (mask) each vector */
         for (i = 0; i < ioapic_pins; i++) {
-                hal_ioapic_disable_entry(i);
+                hal_ioapic_disable_irq(i);
         }
 
@@ -301 +319 @@
 
         /* Now, enable the com1 port and the keyboard */
-        hal_ioapic_set_entry(IRQ_COM1, IOAPIC_COM1_VECTOR, 0);
-        hal_ioapic_set_entry(IRQ_KEYBOARD, IOAPIC_KEYBOARD_VECTOR, 0);
+        hal_ioapic_bind_irq(IRQ_COM1, IOAPIC_COM1_VECTOR, 0);
+        hal_ioapic_enable_irq(IRQ_COM1);
+        hal_ioapic_bind_irq(IRQ_KEYBOARD, IOAPIC_KEYBOARD_VECTOR, 0);
+        hal_ioapic_enable_irq(IRQ_KEYBOARD);
 }