1 files changed, 4 insertions, 3 deletions
diff --git a/demos/ARMCM3-STM32F103-GCC/board.c b/demos/ARMCM3-STM32F103-GCC/board.c
index 7bfa42133..6a13c126b 100644
--- a/demos/ARMCM3-STM32F103-GCC/board.c
+++ b/demos/ARMCM3-STM32F103-GCC/board.c
@@ -90,12 +90,13 @@ void hwinit1(void) {
    * NVIC/SCB initialization.
    */
   SCB_AIRCR = AIRCR_VECTKEY | AIRCR_PRIGROUP(0x3); // PRIGROUP 4:0 (4:4).
-  SCB_SHPR(2) = 0xF0 << 16;     // PendSV at lowest priority.
+  NVICSetSystemHandlerPriority(HANDLER_SVCALL, PRIORITY_SVCALL);
+  NVICSetSystemHandlerPriority(HANDLER_SYSTICK, PRIORITY_SYSTICK);
+  NVICSetSystemHandlerPriority(HANDLER_PENDSV, PRIORITY_PENDSV);
 
   /*
    * SysTick initialization.
    */
-  SCB_SHPR(2) |= 0x40 << 24;    // SysTick at priority 4:0.
   ST_RVR = SYSCLK / (8000000 / CH_FREQUENCY) - 1;
   ST_CVR = 0;
   ST_CSR = ENABLE_ON_BITS | TICKINT_ENABLED_BITS | CLKSOURCE_EXT_BITS;
@@ -103,7 +104,7 @@ void hwinit1(void) {
   /*
    * Other subsystems initialization.
    */
-  InitSerial(0x80, 0x80, 0x80);
+  InitSerial(0xC0, 0xC0, 0xC0);
 
   /*
    * ChibiOS/RT initialization.