TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-16 07:57:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Defer HPET loading to after ACPI

Browse Source
This commit is contained in:
Baptiste Wicht 2016-08-05 21:14:15 +02:00
parent 9b9f39ab58
commit f019c4664f
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/include/drivers/hpet.hpp
View File

@ -11,6 +11,7 @@
namespace hpet { namespace hpet {
bool install(); bool install();
void late_install();
} //end of namespace hpet } //end of namespace hpet

7
kernel/src/acpi.cpp
View File

@ -16,6 +16,8 @@
#include "arch.hpp" #include "arch.hpp"
#include "assert.hpp" #include "assert.hpp"
#include "drivers/hpet.hpp"
namespace { namespace {
// This is copied from acexcep.h // This is copied from acexcep.h
@ -104,6 +106,11 @@ void initialize_acpica(){
acpi_initialized = true; acpi_initialized = true;
logging::logf(logging::log_level::DEBUG, "acpi:: Finished initialization of ACPICA\n"); logging::logf(logging::log_level::DEBUG, "acpi:: Finished initialization of ACPICA\n");
// Here we initialize the drivers that need ACPI
// TODO This is not good coupling: Find a better solution
hpet::late_install();
} }
uint64_t acpi_read(const ACPI_GENERIC_ADDRESS& address){ uint64_t acpi_read(const ACPI_GENERIC_ADDRESS& address){

10
kernel/src/drivers/hpet.cpp
View File

@ -25,5 +25,13 @@ bool hpet::install(){
logging::logf(logging::log_level::TRACE, "hpet: Found ACPI HPET table\n"); logging::logf(logging::log_level::TRACE, "hpet: Found ACPI HPET table\n");
return false; return true;
}
void hpet::late_install(){
if(hpet::install()){
logging::logf(logging::log_level::TRACE, "hpet: Late install suceeded\n");
//TODO Register the timer to the timer system
}
} }