From d26fd5f68d118a1eb7c752a2682c6f0c0b8ced15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 20 Jul 2016 20:13:27 +0200 Subject: [PATCH] M68K: drop the platform_type field, the enum is gone from OS.h --- headers/private/kernel/arch/m68k/arch_platform.h | 8 +++----- src/system/kernel/arch/m68k/arch_platform.cpp | 6 ++---- src/system/kernel/platform/atari_m68k/platform.cpp | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/headers/private/kernel/arch/m68k/arch_platform.h b/headers/private/kernel/arch/m68k/arch_platform.h index 7c47183ba9..2abb472553 100644 --- a/headers/private/kernel/arch/m68k/arch_platform.h +++ b/headers/private/kernel/arch/m68k/arch_platform.h @@ -23,13 +23,12 @@ namespace BPrivate { class M68KPlatform { public: - M68KPlatform(platform_type platformType, m68k_platform_type m68kPlatformType); + M68KPlatform(m68k_platform_type platformType); virtual ~M68KPlatform(); static M68KPlatform *Default(); - inline platform_type PlatformType() const { return fPlatformType; } - inline m68k_platform_type M68KPlatformType() const { return fM68KPlatformType; } + inline m68k_platform_type PlatformType() const { return fPlatformType; } virtual status_t Init(struct kernel_args *kernelArgs) = 0; virtual status_t InitSerialDebug(struct kernel_args *kernelArgs) = 0; @@ -60,8 +59,7 @@ public: virtual void ShutDown(bool reboot) = 0; private: - m68k_platform_type fM68KPlatformType; - platform_type fPlatformType; + m68k_platform_type fPlatformType; }; diff --git a/src/system/kernel/arch/m68k/arch_platform.cpp b/src/system/kernel/arch/m68k/arch_platform.cpp index 2f62c8c5a2..bf5003b256 100644 --- a/src/system/kernel/arch/m68k/arch_platform.cpp +++ b/src/system/kernel/arch/m68k/arch_platform.cpp @@ -22,10 +22,8 @@ static M68KPlatform *sM68KPlatform; // constructor -M68KPlatform::M68KPlatform(platform_type platformType, - m68k_platform_type m68kPlatformType) - : fPlatformType(platformType), - fM68KPlatformType(m68kPlatformType) +M68KPlatform::M68KPlatform(m68k_platform_type platformType) + : fPlatformType(platformType) { } diff --git a/src/system/kernel/platform/atari_m68k/platform.cpp b/src/system/kernel/platform/atari_m68k/platform.cpp index ace2f81ca1..fe6599c49e 100644 --- a/src/system/kernel/platform/atari_m68k/platform.cpp +++ b/src/system/kernel/platform/atari_m68k/platform.cpp @@ -288,7 +288,7 @@ M68KAtari::RTC::ReadReg(uint32 reg) // constructor M68KAtari::M68KAtari() - : M68KPlatform(B_ATARI_PLATFORM, M68K_PLATFORM_ATARI) + : M68KPlatform(M68K_PLATFORM_ATARI) { }