UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 22:00:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[bootloader] Small fixes

Browse Source
This commit is contained in:
Laury
2022-04-27 21:59:33 +02:00
parent 7f8e6a6b87
commit 7d61e236df
19 changed files with 112 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bootloader/boot.cpp
View File

@@ -39,7 +39,7 @@ void Boot::setMode(BootMode mode) {
void Boot::busError() {
Ion::Device::Flash::ClearInternalFlashErrors();
asm("mov r12, lr");
if (config()->isBooting()) {
if (config()->isBooting()) { // Bus error is normal if we are booting, it's triggered when we lock OPTCR
asm("mov lr, r12");
asm("bx lr");
}
@@ -122,7 +122,7 @@ void Boot::bootSlot(Bootloader::Slot s) {
void Boot::bootSelectedSlot() {
lockInternal();
config()->setBooting(true);
Ion::Device::Flash::EnableInternalSessionLock();
Ion::Device::Flash::LockInternalFlashForSession();
config()->slot()->boot();
}
@@ -133,8 +133,8 @@ __attribute__((noreturn)) void Boot::boot() {
Boot::config()->setBooting(false);
while (true) {
HomeMenu menu = HomeMenu();
menu.open(true);
HomeMenu menu = HomeMenu();
menu.open(true);
}
// Achievement unlocked: How Did We Get Here?
@@ -169,7 +169,7 @@ void Boot::bootloader() {
}
void Boot::jumpToInternalBootloader() {
Ion::Device::Board::jumpToInternalBootloader();
Ion::Device::Board::jumpToInternalBootloader();
}
void Boot::lockInternal() {
@@ -181,7 +181,7 @@ void Boot::lockInternal() {
Ion::Device::Flash::EnableInternalProtection();
}
void Boot::enableFlashIntr() {
void Boot::EnableInternalFlashInterrupt() {
Ion::Device::Flash::EnableInternalFlashInterrupt();
}