From cca9d4b1c42b07ee8494d5c01b5978fab23cc10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Vejpustek?= <ondrej.vejpustek@satoshilabs.com>
Date: Mon, 14 Jun 2021 16:28:13 +0200
Subject: [PATCH] refactor(core): rename shutdown to shutdown_privileged

---
 core/embed/boardloader/startup.s     | 2 +-
 core/embed/bootloader/startup.s      | 2 +-
 core/embed/bootloader_ci/startup.s   | 2 +-
 core/embed/firmware/startup.S        | 2 +-
 core/embed/prodtest/startup.s        | 2 +-
 core/embed/reflash/startup.s         | 2 +-
 core/embed/trezorhal/common.c        | 6 +++---
 core/embed/trezorhal/random_delays.c | 6 +++---
 core/embed/trezorhal/stm32.c         | 4 ++--
 core/embed/trezorhal/util.s          | 6 +++---
 core/embed/trezorhal/vectortable.s   | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/embed/boardloader/startup.s b/core/embed/boardloader/startup.s
index ae74f8a34..9533d932f 100644
--- a/core/embed/boardloader/startup.s
+++ b/core/embed/boardloader/startup.s
@@ -55,6 +55,6 @@ reset_handler:
   // enter the application code
   bl main
 
-  b shutdown
+  b shutdown_privileged
 
   .end
diff --git a/core/embed/bootloader/startup.s b/core/embed/bootloader/startup.s
index cbcfb67bd..5104f0db9 100644
--- a/core/embed/bootloader/startup.s
+++ b/core/embed/bootloader/startup.s
@@ -36,6 +36,6 @@ reset_handler:
   // enter the application code
   bl main
 
-  b shutdown
+  b shutdown_privileged
 
   .end
diff --git a/core/embed/bootloader_ci/startup.s b/core/embed/bootloader_ci/startup.s
index cbcfb67bd..5104f0db9 100644
--- a/core/embed/bootloader_ci/startup.s
+++ b/core/embed/bootloader_ci/startup.s
@@ -36,6 +36,6 @@ reset_handler:
   // enter the application code
   bl main
 
-  b shutdown
+  b shutdown_privileged
 
   .end
diff --git a/core/embed/firmware/startup.S b/core/embed/firmware/startup.S
index 62f01d6f2..a64bbf650 100644
--- a/core/embed/firmware/startup.S
+++ b/core/embed/firmware/startup.S
@@ -52,6 +52,6 @@ reset_handler:
   // enter the application code
   bl main
 
-  b shutdown
+  b shutdown_privileged
 
   .end
diff --git a/core/embed/prodtest/startup.s b/core/embed/prodtest/startup.s
index cbcfb67bd..5104f0db9 100644
--- a/core/embed/prodtest/startup.s
+++ b/core/embed/prodtest/startup.s
@@ -36,6 +36,6 @@ reset_handler:
   // enter the application code
   bl main
 
-  b shutdown
+  b shutdown_privileged
 
   .end
diff --git a/core/embed/reflash/startup.s b/core/embed/reflash/startup.s
index cbcfb67bd..5104f0db9 100644
--- a/core/embed/reflash/startup.s
+++ b/core/embed/reflash/startup.s
@@ -36,6 +36,6 @@ reset_handler:
   // enter the application code
   bl main
 
-  b shutdown
+  b shutdown_privileged
 
   .end
diff --git a/core/embed/trezorhal/common.c b/core/embed/trezorhal/common.c
index 55f9f9005..d224762d7 100644
--- a/core/embed/trezorhal/common.c
+++ b/core/embed/trezorhal/common.c
@@ -29,7 +29,7 @@
 #include "stm32f4xx_ll_utils.h"
 
 // from util.s
-extern void shutdown(void);
+extern void shutdown_privileged(void);
 
 #define COLOR_FATAL_ERROR RGB16(0x7F, 0x00, 0x00)
 
@@ -58,7 +58,7 @@ __fatal_error(const char *expr, const char *msg, const char *file, int line,
                  rev[4]);
 #endif
   display_printf("\nPlease contact Trezor support.\n");
-  shutdown();
+  shutdown_privileged();
   for (;;)
     ;
 }
@@ -107,7 +107,7 @@ error_shutdown(const char *line1, const char *line2, const char *line3,
   display_printf("\nPlease unplug the device.\n");
 #endif
   display_backlight(255);
-  shutdown();
+  shutdown_privileged();
   for (;;)
     ;
 }
diff --git a/core/embed/trezorhal/random_delays.c b/core/embed/trezorhal/random_delays.c
index d5df09f23..f83be9ba8 100644
--- a/core/embed/trezorhal/random_delays.c
+++ b/core/embed/trezorhal/random_delays.c
@@ -45,7 +45,7 @@ https://link.springer.com/content/pdf/10.1007%2F978-3-540-72354-7_3.pdf
 #include "rand.h"
 
 // from util.s
-extern void shutdown(void);
+extern void shutdown_privileged(void);
 
 #define DRBG_RESEED_INTERVAL_CALLS 1000
 #define DRBG_TRNG_ENTROPY_LENGTH 50
@@ -197,13 +197,13 @@ void wait_random(void) {
   volatile int j = wait;
   while (i < wait) {
     if (i + j != wait) {
-      shutdown();
+      shutdown_privileged();
     }
     ++i;
     --j;
   }
   // Double-check loop completion.
   if (i != wait || j != 0) {
-    shutdown();
+    shutdown_privileged();
   }
 }
diff --git a/core/embed/trezorhal/stm32.c b/core/embed/trezorhal/stm32.c
index 200f64167..5a458b900 100644
--- a/core/embed/trezorhal/stm32.c
+++ b/core/embed/trezorhal/stm32.c
@@ -87,9 +87,9 @@ void SystemInit(void) {
 }
 
 // from util.s
-extern void shutdown(void);
+extern void shutdown_privileged(void);
 
 void PVD_IRQHandler(void) {
   TIM1->CCR1 = 0;  // turn off display backlight
-  shutdown();
+  shutdown_privileged();
 }
diff --git a/core/embed/trezorhal/util.s b/core/embed/trezorhal/util.s
index 02f487510..f21fcc093 100644
--- a/core/embed/trezorhal/util.s
+++ b/core/embed/trezorhal/util.s
@@ -121,9 +121,9 @@ jump_to_unprivileged:
   // jump
   bx lr
 
-  .global shutdown
-  .type shutdown, STT_FUNC
-shutdown:
+  .global shutdown_privileged
+  .type shutdown_privileged, STT_FUNC
+shutdown_privileged:
   cpsid f
   ldr r0, =0
   mov r1, r0
diff --git a/core/embed/trezorhal/vectortable.s b/core/embed/trezorhal/vectortable.s
index 9aac3e4b4..08b34f99f 100644
--- a/core/embed/trezorhal/vectortable.s
+++ b/core/embed/trezorhal/vectortable.s
@@ -5,7 +5,7 @@
   .global default_handler
   .type default_handler, STT_FUNC
 default_handler:
-  b shutdown
+  b shutdown_privileged
 
   .macro add_handler symbol_name:req
     .word \symbol_name