nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fusee: do PMC reboots, not CAR reboots.

Browse source
This commit is contained in:
Michael Scire 2018-11-30 06:34:20 -08:00
parent be5b58d033
commit 33b7e227d4
4 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fusee/fusee-primary/src/utils.c
View file

@ -59,21 +59,12 @@ __attribute__((noreturn)) void pmc_reboot(uint32_t scratch0) {
} }
} }
__attribute__((noreturn)) void car_reboot(void) {
/* Reset the processor. */
car_get_regs()->rst_dev_l |= 1<<2;
while (true) {
/* Wait for reboot. */
}
}
__attribute__((noreturn)) void wait_for_button_and_reboot(void) { __attribute__((noreturn)) void wait_for_button_and_reboot(void) {
uint32_t button; uint32_t button;
while (true) { while (true) {
button = btn_read(); button = btn_read();
if (button & BTN_POWER) { if (button & BTN_POWER) {
car_reboot(); pmc_reboot(1 << 1);
} }
} }
} }

1
fusee/fusee-primary/src/utils.h
View file

@ -121,7 +121,6 @@ void hexdump(const void* data, size_t size, uintptr_t addrbase);
__attribute__((noreturn)) void watchdog_reboot(void); __attribute__((noreturn)) void watchdog_reboot(void);
__attribute__((noreturn)) void pmc_reboot(uint32_t scratch0); __attribute__((noreturn)) void pmc_reboot(uint32_t scratch0);
__attribute__((noreturn)) void car_reboot(void);
__attribute__((noreturn)) void wait_for_button_and_reboot(void); __attribute__((noreturn)) void wait_for_button_and_reboot(void);
__attribute__((noreturn)) void generic_panic(void); __attribute__((noreturn)) void generic_panic(void);

11
fusee/fusee-secondary/src/utils.c
View file

@ -58,21 +58,12 @@ __attribute__((noreturn)) void pmc_reboot(uint32_t scratch0) {
} }
} }
__attribute__((noreturn)) void car_reboot(void) {
/* Reset the processor. */
car_get_regs()->rst_dev_l |= 1<<2;
while (true) {
/* Wait for reboot. */
}
}
__attribute__((noreturn)) void wait_for_button_and_reboot(void) { __attribute__((noreturn)) void wait_for_button_and_reboot(void) {
uint32_t button; uint32_t button;
while (true) { while (true) {
button = btn_read(); button = btn_read();
if (button & BTN_POWER) { if (button & BTN_POWER) {
car_reboot(); pmc_reboot(1 << 1);
} }
} }
} }

1
fusee/fusee-secondary/src/utils.h
View file

@ -122,7 +122,6 @@ void hexdump(const void* data, size_t size, uintptr_t addrbase);
__attribute__((noreturn)) void watchdog_reboot(void); __attribute__((noreturn)) void watchdog_reboot(void);
__attribute__((noreturn)) void pmc_reboot(uint32_t scratch0); __attribute__((noreturn)) void pmc_reboot(uint32_t scratch0);
__attribute__((noreturn)) void car_reboot(void);
__attribute__((noreturn)) void wait_for_button_and_reboot(void); __attribute__((noreturn)) void wait_for_button_and_reboot(void);
void wait_for_button(void); void wait_for_button(void);