From dd192787a70a973f2474720aea49af3f6ddabb7a Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 26 Jan 2024 19:17:00 +0100 Subject: h-core: Breaking kernel changes, IDevice becomes DeviceInterface, the UPT is Read Only by default. DebugManager allocates space for users by default (for a debug message) Update PEF enum kPefArch. Move Seeker into the /Services directory. Complete merge of SupportKit to KernelKit. Signed-off-by: Amlal El Mahrouss --- Source/CodeManager.cxx | 8 ++++---- Source/KMain.cxx | 2 +- Source/Network/NetworkDevice.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Source') diff --git a/Source/CodeManager.cxx b/Source/CodeManager.cxx index 8b0689c0..ba117346 100644 --- a/Source/CodeManager.cxx +++ b/Source/CodeManager.cxx @@ -20,11 +20,11 @@ namespace hCore { namespace Detail { - UInt32 rt_get_pef_platform(void) + UInt32 rt_get_pef_platform(void) noexcept { -#ifdef __powerpc - return kPefArchPOWER; -#elif defined(__arc__) +#ifdef __32x0__ + return kPefArch32x0; +#elif defined(__64x0__) return kPefArch64x0; #elif defined(__x86_64__) return kPefArchAMD64; diff --git a/Source/KMain.cxx b/Source/KMain.cxx index 8a96aee0..f6a4f54c 100644 --- a/Source/KMain.cxx +++ b/Source/KMain.cxx @@ -16,7 +16,7 @@ extern "C" void Main(hCore::VoidPtr this_image) MUST_PASS(hCore::initialize_hardware_components()); hCore::IFilesystemManager::Mount(new hCore::NewFilesystemManager()); - hCore::PEFLoader img("/System/Seeker"); + hCore::PEFLoader img("/System/Seeker.out"); if (!hCore::Utils::execute_from_image(img)) { diff --git a/Source/Network/NetworkDevice.cpp b/Source/Network/NetworkDevice.cpp index e20aeaac..766e1f2e 100644 --- a/Source/Network/NetworkDevice.cpp +++ b/Source/Network/NetworkDevice.cpp @@ -15,7 +15,7 @@ namespace hCore { NetworkDevice::NetworkDevice(void (*out)(NetworkDeviceCommand), void (*in)(NetworkDeviceCommand), void(*on_cleanup)(void)) - : IDevice(out, in), fCleanup(on_cleanup) + : DeviceInterface(out, in), fCleanup(on_cleanup) { #ifdef __DEBUG__ kcout << "NetworkDevice init.\r\n"; -- cgit v1.2.3