Refactorings

This commit is contained in:
Baptiste Wicht 2013-10-31 16:09:13 +01:00
parent 9c1bc277be
commit 5ddb73fce6
3 changed files with 21 additions and 19 deletions

View File

@ -13,5 +13,6 @@ void load_memory_map();
bool mmap_failed();
std::size_t mmap_entry_count();
const mmapentry& mmap_entry(std::size_t i);
const char* str_e820_type(std::size_t type);
#endif

View File

@ -24,7 +24,7 @@ void mmap_query(std::size_t cmd, std::size_t* result){
*result = tmp;
}
}
} //end of anonymous namespace //end of anonymous namespace
void load_memory_map(){
mmap_query(0, &e820_failed);
@ -57,3 +57,22 @@ bool mmap_failed(){
const mmapentry& mmap_entry(std::size_t i){
return e820_mmap[i];
}
const char* str_e820_type(std::size_t type){
switch(type){
case 1:
return "Free";
case 2:
return "Reserved";
case 3:
case 4:
return "ACPI";
case 5:
return "Unusable";
case 6:
return "Disabled";
default:
return "Unknown";
}
}

View File

@ -222,24 +222,6 @@ void echo_command(const char* params){
k_print_line(params + 5);
}
const char* str_e820_type(std::size_t type){
switch(type){
case 1:
return "Free";
case 2:
return "Reserved";
case 3:
case 4:
return "ACPI";
case 5:
return "Unusable";
case 6:
return "Disabled";
default:
return "Unknown";
}
}
void memory_command(const char*){
if(mmap_failed()){
k_print_line("The mmap was not correctly loaded from e820");