apic: make msr-related function names consistent with the overall style
This commit is contained in:
+3
-3
@@ -44,12 +44,12 @@ void cpu_set_apic_base(uintptr_t apic) {
|
||||
edx = (apic >> 32) & 0x0f;
|
||||
#endif
|
||||
|
||||
cpuSetMSR(IA32_APIC_BASE_MSR, eax, edx);
|
||||
cpu_set_msr(IA32_APIC_BASE_MSR, eax, edx);
|
||||
}
|
||||
|
||||
uintptr_t cpu_get_apic_base() {
|
||||
uint32_t eax, edx;
|
||||
cpuGetMSR(IA32_APIC_BASE_MSR, &eax, &edx);
|
||||
cpu_get_msr(IA32_APIC_BASE_MSR, &eax, &edx);
|
||||
|
||||
#ifdef __PHYSICAL_MEMORY_EXTENSION__
|
||||
return (eax & 0xfffff000) | ((edx & 0x0f) << 32);
|
||||
@@ -82,7 +82,7 @@ uint32_t lapic_read(uint32_t offset) {
|
||||
}
|
||||
|
||||
void lapic_eoi() {
|
||||
lapic_write(LAPIC_EOI_REG, 0);
|
||||
lapic_write(LAPIC_EOI_REG, 0);
|
||||
}
|
||||
|
||||
void ioapic_init()
|
||||
|
||||
+2
-2
@@ -46,12 +46,12 @@ void kmain(unsigned int magic, unsigned int info)
|
||||
|
||||
isr_install();
|
||||
|
||||
if(cpuHasMSR())
|
||||
if(cpu_has_msr())
|
||||
{
|
||||
printf("CPU has MSR\n");
|
||||
}
|
||||
|
||||
if(check_apic() && cpuHasMSR())
|
||||
if(check_apic() && cpu_has_msr())
|
||||
{
|
||||
printf("APIC is present\n");
|
||||
lapic_enabled = true;
|
||||
|
||||
Reference in New Issue
Block a user