mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-22 18:26:39 +00:00
Code Issues Releases Activity

Minor header fixes.

Browse source
This commit is contained in:
Pablo Curiel 2021-08-12 01:04:46 -04:00
parent 5a0543ef68
commit 4bea23b758
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/core/npdm.h
View file

@ -39,6 +39,14 @@ extern "C" {
#define NPDM_SYSTEM_RESOURCE_MAX_SIZE 0x1FE00000
#define NPDM_MAIN_THREAD_STACK_SIZE_ALIGNMENT 0x1000
/// 'NpdmAcidSignatureKeyGeneration_Current' will always point to the last known key generation value.
typedef enum {
NpdmAcidSignatureKeyGeneration_Since100NUP = 0, ///< 1.0.0 - 8.1.1.
NpdmAcidSignatureKeyGeneration_Since900NUP = 1, ///< 9.0.0 - 12.1.0.
NpdmAcidSignatureKeyGeneration_Current = NpdmAcidSignatureKeyGeneration_Since900NUP,
NpdmAcidSignatureKeyGeneration_Max = (NpdmAcidSignatureKeyGeneration_Current + 1)
} NpdmAcidSignatureKeyGeneration;
typedef enum {
NpdmProcessAddressSpace_AddressSpace32Bit = 0,
NpdmProcessAddressSpace_AddressSpace64BitOld = 1,
@ -60,7 +68,7 @@ NXDT_ASSERT(NpdmMetaFlags, 0x1);
/// This is followed by ACID and ACI0 sections, both with variable offsets and sizes.
typedef struct {
u32 magic; ///< "NPDM".
u8 acid_signature_key_generation;
u8 acid_signature_key_generation; ///< NpdmAcidSignatureKeyGeneration.
u8 reserved_1[0x7];
NpdmMetaFlags flags;
u8 reserved_2;
@ -193,7 +201,7 @@ typedef struct {
u8 content_owner_id_count;
u8 save_data_owner_id_count;
u8 reserved;
u64 flags;
u64 flags; ///< NpdmFsAccessControlFlags.
u64 content_owner_id_min;
u64 content_owner_id_max;
u64 save_data_owner_id_min;
@ -212,7 +220,7 @@ NXDT_ASSERT(NpdmFsAccessControlDescriptor, 0x2C);
typedef struct {
u8 version;
u8 reserved_1[0x3];
u64 flags;
u64 flags; ///< NpdmFsAccessControlFlags.
u32 content_owner_info_offset; ///< Relative to the start of this block. Only valid if 'content_owner_info_size' is greater than 0.
u32 content_owner_info_size;
u32 save_data_owner_info_offset; ///< Relative to the start of this block. Only valid if 'save_data_owner_info_size' is greater than 0.

8
include/core/tik.h
View file

@ -71,11 +71,11 @@ typedef struct {
char issuer[0x40];
u8 titlekey_block[0x100];
u8 format_version;
u8 titlekey_type; ///< TikTitleKeyType.
u8 titlekey_type; ///< TikTitleKeyType.
u16 ticket_version;
u8 license_type; ///< TikLicenseType.
u8 key_generation;
u16 property_mask; ///< TikPropertyMask.
u8 license_type; ///< TikLicenseType.
u8 key_generation; ///< NcaKeyGeneration.
u16 property_mask; ///< TikPropertyMask.
u8 reserved[0x8];
u64 ticket_id;
u64 device_id;