mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-05-27 21:24:11 -04:00
Merge branch 'master' of https://github.com/Atmosphere-NX/Atmosphere
This commit is contained in:
commit
d8451eb804
27 changed files with 430 additions and 151 deletions
|
@ -138,9 +138,9 @@ void bootconfig_get_package2_hash_for_recovery(uint64_t *out_hash) {
|
|||
}
|
||||
|
||||
bool bootconfig_is_recovery_boot(void) {
|
||||
return (g_boot_reason.is_recovery_boot != 0);
|
||||
return ((g_boot_reason.bootloader_attribute & 0x01) != 0);
|
||||
}
|
||||
|
||||
uint64_t bootconfig_get_boot_reason(void) {
|
||||
return ((uint64_t)g_boot_reason.boot_reason_high << 24) | (g_boot_reason.boot_reason_low & 0xFFFFFF);
|
||||
return ((uint64_t)g_boot_reason.boot_reason_state << 24) | (g_boot_reason.boot_reason_value & 0xFFFFFF);
|
||||
}
|
||||
|
|
|
@ -34,11 +34,12 @@ static inline bootconfig_t *get_loaded_bootconfig(void) {
|
|||
}
|
||||
|
||||
typedef struct {
|
||||
uint64_t _0x00;
|
||||
uint32_t _0x08;
|
||||
uint32_t is_recovery_boot;
|
||||
uint32_t boot_reason_low;
|
||||
uint32_t boot_reason_high;
|
||||
uint32_t bootloader_version;
|
||||
uint32_t bootloader_start_block;
|
||||
uint32_t bootloader_start_page;
|
||||
uint32_t bootloader_attribute;
|
||||
uint32_t boot_reason_value;
|
||||
uint32_t boot_reason_state;
|
||||
} boot_reason_t;
|
||||
|
||||
void bootconfig_load_and_verify(const bootconfig_t *bootconfig);
|
||||
|
|
|
@ -9,9 +9,25 @@
|
|||
|
||||
#define SYSCTR0_BASE (MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_SYSCTR0))
|
||||
|
||||
|
||||
#define MAKE_SYSCTR0_REG(n) MAKE_REG32(SYSCTR0_BASE + n)
|
||||
|
||||
|
||||
#define SYSCTR0_CNTCR_0 MAKE_SYSCTR0_REG(0x00)
|
||||
#define SYSCTR0_CNTSR_0 MAKE_SYSCTR0_REG(0x04)
|
||||
#define SYSCTR0_CNTCV0_0 MAKE_SYSCTR0_REG(0x08)
|
||||
#define SYSCTR0_CNTCV1_0 MAKE_SYSCTR0_REG(0x0C)
|
||||
#define SYSCTR0_CNTFID0_0 MAKE_SYSCTR0_REG(0x20)
|
||||
#define SYSCTR0_CNTFID1_0 MAKE_SYSCTR0_REG(0x24)
|
||||
#define SYSCTR0_COUNTERID4_0 MAKE_SYSCTR0_REG(0xFD0)
|
||||
#define SYSCTR0_COUNTERID5_0 MAKE_SYSCTR0_REG(0xFD4)
|
||||
#define SYSCTR0_COUNTERID6_0 MAKE_SYSCTR0_REG(0xFD8)
|
||||
#define SYSCTR0_COUNTERID7_0 MAKE_SYSCTR0_REG(0xFDC)
|
||||
#define SYSCTR0_COUNTERID0_0 MAKE_SYSCTR0_REG(0xFE0)
|
||||
#define SYSCTR0_COUNTERID1_0 MAKE_SYSCTR0_REG(0xFE4)
|
||||
#define SYSCTR0_COUNTERID2_0 MAKE_SYSCTR0_REG(0xFE8)
|
||||
#define SYSCTR0_COUNTERID3_0 MAKE_SYSCTR0_REG(0xFEC)
|
||||
#define SYSCTR0_COUNTERID8_0 MAKE_SYSCTR0_REG(0xFF0)
|
||||
#define SYSCTR0_COUNTERID9_0 MAKE_SYSCTR0_REG(0xFF4)
|
||||
#define SYSCTR0_COUNTERID10_0 MAKE_SYSCTR0_REG(0xFF8)
|
||||
#define SYSCTR0_COUNTERID11_0 MAKE_SYSCTR0_REG(0xFFC)
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue