Changeset 46 for trunk/hal/x86_64/hal_lapic.c

Timestamp:

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

Author:

max@…

Message:

Start implementing TLS.

File:

• trunk/hal/x86_64/hal_lapic.c (modified) (1 diff)

trunk/hal/x86_64/hal_lapic.c

@@ -37 +37 @@
 vaddr_t lapic_va __in_kdata = 0;
 
-void lapic_write(uint32_t reg, uint32_t val)
+void hal_lapic_write(uint32_t reg, uint32_t val)
 {
         *((volatile uint32_t *)(lapic_va + reg)) = val;
 }
 
-uint32_t lapic_read(uint32_t reg)
+uint32_t hal_lapic_read(uint32_t reg)
 {
         return *((volatile uint32_t *)(lapic_va + reg));
 }
 
-void hal_init_lapic()
+uint32_t hal_lapic_gid()
 {
-        uint32_t id;
+        return hal_lapic_read(LAPIC_ID) >> LAPIC_ID_SHIFT;
+}
 
+void hal_lapic_init()
+{
         lapic_va = hal_gpt_bootstrap_valloc(1); // XXX: should be shared
 
         hal_gpt_enter(lapic_va, lapic_pa);
 
-        lapic_write(LAPIC_TPR, 0);
-        lapic_write(LAPIC_SVR, LAPIC_SVR_ENABLE|LAPIC_SPURIOUS_VECTOR);
-
-        id = lapic_read(LAPIC_ID) >> LAPIC_ID_SHIFT;
-
-        x86_printf("-> LAPIC id: %d\n", id);
+        hal_lapic_write(LAPIC_TPR, 0);
+        hal_lapic_write(LAPIC_SVR, LAPIC_SVR_ENABLE|LAPIC_SPURIOUS_VECTOR);
 }