Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

M68K: drop the platform_type field, the enum is gone from OS.h

This commit is contained in:
François Revol 2016-07-20 20:13:27 +02:00
parent c094f04537
commit d26fd5f68d
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
headers/private/kernel/arch/m68k/arch_platform.h
View File

@ -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;
};

6
src/system/kernel/arch/m68k/arch_platform.cpp
View File

@ -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)
{
}

2
src/system/kernel/platform/atari_m68k/platform.cpp
View File

@ -288,7 +288,7 @@ M68KAtari::RTC::ReadReg(uint32 reg)
// constructor
M68KAtari::M68KAtari()
: M68KPlatform(B_ATARI_PLATFORM, M68K_PLATFORM_ATARI)
: M68KPlatform(M68K_PLATFORM_ATARI)
{
}