mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

caps: Use enum classes and check struct sizes on compile time

Browse source
This commit is contained in:
Morph 2020-06-25 01:59:16 -04:00
parent 02a33feef4
commit 3017be7855
1 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/core/hle/service/caps/caps.h
View file

@ -12,73 +12,79 @@ class ServiceManager;
namespace Service::Capture { namespace Service::Capture {
enum AlbumImageOrientation { enum class AlbumImageOrientation {
Orientation0 = 0, Orientation0 = 0,
Orientation1 = 1, Orientation1 = 1,
Orientation2 = 2, Orientation2 = 2,
Orientation3 = 3, Orientation3 = 3,
}; };
enum AlbumReportOption { enum class AlbumReportOption {
Disable = 0, Disable = 0,
Enable = 1, Enable = 1,
}; };
enum ContentType : u8 { enum class ContentType : u8 {
Screenshot = 0, Screenshot = 0,
Movie = 1, Movie = 1,
ExtraMovie = 3, ExtraMovie = 3,
}; };
enum AlbumStorage : u8 { enum class AlbumStorage : u8 {
NAND = 0, NAND = 0,
SD = 1, SD = 1,
}; };
struct AlbumFileDateTime { struct AlbumFileDateTime {
u16 year; s16 year{};
u8 month; s8 month{};
u8 day; s8 day{};
u8 hour; s8 hour{};
u8 minute; s8 minute{};
u8 second; s8 second{};
u8 uid; s8 uid{};
}; };
static_assert(sizeof(AlbumFileDateTime) == 0x8, "AlbumFileDateTime has incorrect size.");
struct AlbumEntry { struct AlbumEntry {
u64 size; u64 size{};
u64 application_id; u64 application_id{};
AlbumFileDateTime datetime; AlbumFileDateTime datetime{};
AlbumStorage storage; AlbumStorage storage{};
ContentType content; ContentType content{};
u8 padding[6]; INSERT_PADDING_BYTES(6);
}; };
static_assert(sizeof(AlbumEntry) == 0x20, "AlbumEntry has incorrect size.");
struct AlbumFileEntry { struct AlbumFileEntry {
u64 size; u64 size{}; // Size of the entry
u64 hash; u64 hash{}; // AES256 with hardcoded key over AlbumEntry
AlbumFileDateTime datetime; AlbumFileDateTime datetime{};
AlbumStorage storage; AlbumStorage storage{};
ContentType content; ContentType content{};
u8 padding[5]; INSERT_PADDING_BYTES(5);
u8 unknown; u8 unknown{1}; // Set to 1 on official SW
}; };
static_assert(sizeof(AlbumFileEntry) == 0x20, "AlbumFileEntry has incorrect size.");
struct ApplicationAlbumEntry { struct ApplicationAlbumEntry {
u64 size; u64 size{}; // Size of the entry
u64 hash; u64 hash{}; // AES256 with hardcoded key over AlbumEntry
AlbumFileDateTime datetime; AlbumFileDateTime datetime{};
AlbumStorage storage; AlbumStorage storage{};
ContentType content; ContentType content{};
u8 padding[5]; INSERT_PADDING_BYTES(5);
u8 unknown; u8 unknown{1}; // Set to 1 on official SW
}; };
static_assert(sizeof(ApplicationAlbumEntry) == 0x20, "ApplicationAlbumEntry has incorrect size.");
struct ApplicationAlbumFileEntry { struct ApplicationAlbumFileEntry {
ApplicationAlbumEntry entry; ApplicationAlbumEntry entry{};
AlbumFileDateTime datetime; AlbumFileDateTime datetime{};
u64 unknown; u64 unknown{};
}; };
static_assert(sizeof(ApplicationAlbumFileEntry) == 0x30,
"ApplicationAlbumFileEntry has incorrect size.");
/// Registers all Capture services with the specified service manager. /// Registers all Capture services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& sm); void InstallInterfaces(SM::ServiceManager& sm);