Skip to content

Commit 4e72a1e

Browse files
committed
solo5: Remove some PC-stuff
1 parent 4217fd6 commit 4e72a1e

5 files changed

Lines changed: 4 additions & 145 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ build_x86_64/
4747
CMakeFiles*
4848
CMakeCache*
4949
cmake_install.cmake
50+
51+
dummy.disk

src/platform/x86_solo5/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11

22
set(PLATFORM_OBJECTS
3-
../x86_pc/acpi.cpp
4-
../x86_pc/apic.cpp
5-
../x86_pc/apic_timer.cpp
6-
../x86_pc/ioapic.cpp
7-
pit.cpp
8-
../x86_pc/cpu_freq_sampling.cpp
93
os.cpp
104
serial1.cpp
115
start.asm

src/platform/x86_solo5/pit.cpp

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/platform/x86_solo5/pit.hpp

Lines changed: 0 additions & 83 deletions
This file was deleted.

src/platform/x86_solo5/platform.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
#include <os>
2-
#include "../x86_pc/acpi.hpp"
3-
#include "../x86_pc/pit.hpp"
4-
#include "../x86_pc/apic.hpp"
5-
#include "../x86_pc/apic_timer.hpp"
6-
#include "../x86_pc/ioapic.hpp"
71
#include <kernel/os.hpp>
8-
9-
using namespace x86;
10-
using namespace std::chrono;
11-
12-
extern "C" uint16_t _cpu_sampling_freq_divider_;
2+
#include <smp>
133

144
void __arch_poweroff()
155
{
16-
__asm__ __volatile__("cli; hlt");
17-
for(;;);
6+
while (true) asm ("cli; hlt");
187
}
198

209
void __platform_init(){
@@ -25,7 +14,6 @@ void __arch_reboot(){}
2514
void __arch_enable_legacy_irq(unsigned char){}
2615
void __arch_disable_legacy_irq(unsigned char){}
2716

28-
2917
void SMP::global_lock() noexcept {}
3018
void SMP::global_unlock() noexcept {}
3119
int SMP::cpu_id() noexcept { return 0; }

0 commit comments

Comments
 (0)