nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

strat: use util::FourCC where relevant

Browse source
This commit is contained in:
Michael Scire 2020-01-02 01:52:13 -08:00
parent 145ee8fcc8
commit 38f942adf5
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/include/stratosphere/ams/ams_types.hpp
View file

@ -74,7 +74,7 @@ namespace ams {
static constexpr u64 StdAbortMagicValue = 0xA55AF00DDEADCAFEul; static constexpr u64 StdAbortMagicValue = 0xA55AF00DDEADCAFEul;
static constexpr u32 StdAbortErrorDesc = 0xFFE; static constexpr u32 StdAbortErrorDesc = 0xFFE;
static constexpr u32 DataAbortErrorDesc = 0x101; static constexpr u32 DataAbortErrorDesc = 0x101;
static constexpr u32 Magic = 0x31454641; static constexpr u32 Magic = util::FourCC<'A', 'F', 'E', '1'>::Code;
u32 magic; u32 magic;
u32 error_desc; u32 error_desc;

8
libraries/libstratosphere/include/stratosphere/ldr/ldr_types.hpp
View file

@ -77,7 +77,7 @@ namespace ams::ldr {
/* NSO types. */ /* NSO types. */
struct NsoHeader { struct NsoHeader {
static constexpr u32 Magic = 0x304F534E; static constexpr u32 Magic = util::FourCC<'N','S','O','0'>::Code;
enum Segment : size_t { enum Segment : size_t {
Segment_Text = 0, Segment_Text = 0,
Segment_Ro = 1, Segment_Ro = 1,
@ -145,7 +145,7 @@ namespace ams::ldr {
/* NPDM types. */ /* NPDM types. */
struct Aci { struct Aci {
static constexpr u32 Magic = 0x30494341; static constexpr u32 Magic = util::FourCC<'A','C','I','0'>::Code;
u32 magic; u32 magic;
u8 reserved_04[0xC]; u8 reserved_04[0xC];
@ -162,7 +162,7 @@ namespace ams::ldr {
static_assert(sizeof(Aci) == 0x40 && std::is_pod<Aci>::value, "Aci definition!"); static_assert(sizeof(Aci) == 0x40 && std::is_pod<Aci>::value, "Aci definition!");
struct Acid { struct Acid {
static constexpr u32 Magic = 0x44494341; static constexpr u32 Magic = util::FourCC<'A','C','I','D'>::Code;
enum AcidFlag { enum AcidFlag {
AcidFlag_Production = (1 << 0), AcidFlag_Production = (1 << 0),
@ -201,7 +201,7 @@ namespace ams::ldr {
static_assert(sizeof(Acid) == 0x240 && std::is_pod<Acid>::value, "Acid definition!"); static_assert(sizeof(Acid) == 0x240 && std::is_pod<Acid>::value, "Acid definition!");
struct Npdm { struct Npdm {
static constexpr u32 Magic = 0x4154454D; static constexpr u32 Magic = util::FourCC<'M','E','T','A'>::Code;
enum MetaFlag { enum MetaFlag {
MetaFlag_Is64Bit = (1 << 0), MetaFlag_Is64Bit = (1 << 0),

4
libraries/libstratosphere/include/stratosphere/ro/ro_types.hpp
View file

@ -33,7 +33,7 @@ namespace ams::ro {
class NrrHeader { class NrrHeader {
public: public:
static constexpr u32 Magic = 0x3052524E; static constexpr u32 Magic = util::FourCC<'N','R','R','0'>::Code;
private: private:
u32 magic; u32 magic;
u8 reserved_04[0xC]; u8 reserved_04[0xC];
@ -85,7 +85,7 @@ namespace ams::ro {
class NroHeader { class NroHeader {
public: public:
static constexpr u32 Magic = 0x304F524E; static constexpr u32 Magic = util::FourCC<'N','R','O','0'>::Code;
private: private:
u32 entrypoint_insn; u32 entrypoint_insn;
u32 mod_offset; u32 mod_offset;

2
libraries/libstratosphere/source/ams/ams_emummc_api.cpp
View file

@ -21,7 +21,7 @@ namespace ams::emummc {
namespace { namespace {
/* Convenience Definitions. */ /* Convenience Definitions. */
constexpr u32 StorageMagic = 0x30534645; /* EFS0 */ constexpr u32 StorageMagic = util::FourCC<'E','F','S','0'>::Code;
constexpr size_t MaxDirLen = 0x7F; constexpr size_t MaxDirLen = 0x7F;
/* Types. */ /* Types. */

4
stratosphere/creport/source/creport_threads.cpp
View file

@ -21,8 +21,8 @@ namespace ams::creport {
namespace { namespace {
/* Convenience definitions. */ /* Convenience definitions. */
constexpr u32 LibnxThreadVarMagic = 0x21545624; /* !TV$ */ constexpr u32 LibnxThreadVarMagic = util::FourCC<'!','T','V','$'>::Code;
constexpr u32 DumpedThreadInfoMagic = 0x32495444; /* DTI2 */ constexpr u32 DumpedThreadInfoMagic = util::FourCC<'D','T','I','2'>::Code;
/* Types. */ /* Types. */
template<typename T> template<typename T>