mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-09-20 07:49:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix build issues

Browse source
This commit is contained in:
TuxSH 2018-11-02 23:03:19 +01:00 committed by Michael Scire
parent b492096aed
commit 6166262b5c
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mesosphere/include/mesosphere/core/Result.hpp
View file

@ -5,7 +5,8 @@
namespace mesosphere namespace mesosphere
{ {
struct Result { class Result {
public:
enum class Module : uint { enum class Module : uint {
None = 0, None = 0,
Kernel = 1, Kernel = 1,
@ -44,7 +45,7 @@ struct Result {
AlreadyExists = 122, AlreadyExists = 122,
ConnectionClosed = 123, ConnectionClosed = 123,
UnhandledUserInterrupt = 124, UnhandledUserInterrupt = 124,
NotPermitted = 125, InvalidState = 125,
ReservedValue = 126, ReservedValue = 126,
InvalidHwBreakpoint = 127, InvalidHwBreakpoint = 127,
FatalUserException = 128, FatalUserException = 128,
@ -58,15 +59,21 @@ struct Result {
NotDebugged = 520, NotDebugged = 520,
}; };
Module module : 9; Result() : module{(uint)Module::None}, description{(uint)Description::None} {}
Description description : 23; Result(Description description, Module module = Module::Kernel) : module{(uint)module}, description{(uint)description} {}
Result() : module{Module::None}, description{Description::None} {} constexpr bool IsSuccess() const { return module == (uint)Module::None && description == (uint)Description::None; }
Result(Description description, Module module = Module::Kernel) : description{description}, module{module} {}
constexpr bool IsSuccess() const { return module == Module::None && description == Description::None; }
constexpr bool operator==(const Result &other) const { return module == other.module && description == other.description; } constexpr bool operator==(const Result &other) const { return module == other.module && description == other.description; }
constexpr bool operator!=(const Result &other) const { return !(*this == other); } constexpr bool operator!=(const Result &other) const { return !(*this == other); }
constexpr Module GetModule() const { return (Module)module; }
constexpr Description GetDescription() const { return (Description)module; }
void SetModule(Module module) { this->module = (uint)module; }
void SetDescription(Description description) { this->description = (uint)description;}
private:
uint module : 9;
uint description : 13;
}; };
} }

3
mesosphere/include/mesosphere/threading/KThread.hpp
View file

@ -3,6 +3,7 @@
#include <atomic> #include <atomic>
#include <boost/intrusive/list.hpp> #include <boost/intrusive/list.hpp>
#include <mesosphere/core/util.hpp> #include <mesosphere/core/util.hpp>
#include <mesosphere/core/Result.hpp>
#include <mesosphere/processes/KProcess.hpp> #include <mesosphere/processes/KProcess.hpp>
#include <mesosphere/interfaces/IAlarmable.hpp> #include <mesosphere/interfaces/IAlarmable.hpp>
#include <mesosphere/interfaces/ILimitedResource.hpp> #include <mesosphere/interfaces/ILimitedResource.hpp>
@ -243,7 +244,7 @@ private:
size_t numKernelMutexWaiters = 0; size_t numKernelMutexWaiters = 0;
Handle syncResultHandle{}; Handle syncResultHandle{};
Result syncResult = 0; Result syncResult{};
u64 lastScheduledTime = 0; u64 lastScheduledTime = 0;
}; };