Changeset 82 for trunk/hal/x86_64/core/hal_apic.h

Timestamp:

Jun 28, 2017, 1:23:51 PM (7 years ago)

Author:

max@…

Message:

Rename a certain number of things, and improve the APIC support.

File:

• trunk/hal/x86_64/core/hal_apic.h (moved) (moved from trunk/hal/x86_64/core/hal_lapic.h) (3 diffs)

trunk/hal/x86_64/core/hal_apic.h

@@ -1 +1 @@
 /*
- * hal_lapic.h - Local APIC values
- * 
+ * hal_apic.h - APIC values (for LAPIC and IOAPIC)
+ *
  * Copyright (c) 2017 Maxime Villard
- * 
+ *
  * This file is part of ALMOS-MKH.
  *
@@ -21 +21 @@
 
 uint32_t hal_lapic_gid();
-void hal_lapic_init();
+void hal_apic_init();
 
 #define LAPIC_SPURIOUS_VECTOR   LAPICVEC_MIN
@@ -103 +103 @@
 #define LAPIC_ICRHI     0x310           /* Int. cmd. RW */
 
-#define LAPIC_LVTT      0x320           /* Loc.vec.(timer) RW */
-#       define LAPIC_LVTT_VEC_MASK      0x000000ff
-#       define LAPIC_LVTT_DS            0x00001000
-#       define LAPIC_LVTT_M             0x00010000
-#       define LAPIC_LVTT_TM            0x00020000
+#define LAPIC_LVT_TMR   0x320           /* Loc.vec.(timer) RW */
+#       define LAPIC_TMR_VEC_MASK       0x000000ff
+#       define LAPIC_TMR_DS             0x00001000
+#       define LAPIC_TMR_M              0x00010000
+#       define LAPIC_TMR_TM             0x00020000
 
-#define LAPIC_TMINT     0x330           /* Loc.vec (Thermal) RW */
-#define LAPIC_PCINT     0x340           /* Loc.vec (Perf Mon) RW */
-#define LAPIC_LVINT0    0x350           /* Loc.vec (LINT0) RW */
-#       define LAPIC_LVT_DM_MASK        0x00000700
-#       define LAPIC_LVT_DM_FIXED       0x00000000
-#       define LAPIC_LVT_DM_SMI         0x00000200
-#       define LAPIC_LVT_DM_NMI         0x00000400
-#       define LAPIC_LVT_DM_INIT        0x00000500
-#       define LAPIC_LVT_DM_EXTINT      0x00000700
-#       define LAPIC_LVT_MASKED         0x00010000
-#       define LAPIC_LVT_LEVTRIG        0x00008000
-#       define LAPIC_LVT_REMOTE_IRR     0x00004000
-#       define LAPIC_INP_POL            0x00002000
-#       define LAPIC_PEND_SEND          0x00001000
+#define LAPIC_LVT_THM   0x330           /* Loc.vec (Thermal) RW */
+#       define LAPIC_THM_MT_MASK        0x00000700
+#       define LAPIC_THM_MT_FIXED       0x00000000
+#       define LAPIC_THM_MT_SMI         0x00000200
+#       define LAPIC_THM_MT_NMI         0x00000400
+#       define LAPIC_THM_MT_INIT        0x00000500
+#       define LAPIC_THM_MT_EXTINT      0x00000700
+#       define LAPIC_THM_DS             0x00001000
+#       define LAPIC_THM_M              0x00010000
 
-#define LAPIC_LVINT1    0x360           /* Loc.vec (LINT1) RW */
-#define LAPIC_LVERR     0x370           /* Loc.vec (ERROR) RW */
+#define LAPIC_LVT_PMC   0x340           /* Loc.vec (Perf Mon) RW */
+#       define LAPIC_PMC_MT_MASK        0x00000700
+#       define LAPIC_PMC_MT_FIXED       0x00000000
+#       define LAPIC_PMC_MT_SMI         0x00000200
+#       define LAPIC_PMC_MT_NMI         0x00000400
+#       define LAPIC_PMC_MT_INIT        0x00000500
+#       define LAPIC_PMC_MT_EXTINT      0x00000700
+#       define LAPIC_PMC_DS             0x00001000
+#       define LAPIC_PMC_M              0x00010000
+
+#define LAPIC_LVT_LINT0 0x350           /* Loc.vec (LINT0) RW */
+#define LAPIC_LVT_LINT1 0x360           /* Loc.vec (LINT1) RW */
+#       define LAPIC_LINT_MT_MASK       0x00000700
+#       define LAPIC_LINT_MT_FIXED      0x00000000
+#       define LAPIC_LINT_MT_SMI        0x00000200
+#       define LAPIC_LINT_MT_NMI        0x00000400
+#       define LAPIC_LINT_MT_INIT       0x00000500
+#       define LAPIC_LINT_MT_EXTINT     0x00000700
+#       define LAPIC_LINT_DS            0x00001000
+#       define LAPIC_LINT_RIR           0x00004000
+#       define LAPIC_LINT_TGM           0x00008000
+#       define LAPIC_LINT_M             0x00010000
+
+#define LAPIC_LVT_ERR   0x370           /* Loc.vec (ERROR) RW */
+#       define LAPIC_ERR_MT_MASK        0x00000700
+#       define LAPIC_ERR_MT_FIXED       0x00000000
+#       define LAPIC_ERR_MT_SMI         0x00000200
+#       define LAPIC_ERR_MT_NMI         0x00000400
+#       define LAPIC_ERR_MT_INIT        0x00000500
+#       define LAPIC_ERR_MT_EXTINT      0x00000700
+#       define LAPIC_ERR_DS             0x00001000
+#       define LAPIC_ERR_M              0x00010000
+
 #define LAPIC_ICR_TIMER 0x380           /* Initial count RW */
 #define LAPIC_CCR_TIMER 0x390           /* Current count RO */