From 13a1c5ca3964a6fe170223f6ec414edbe55c23b6 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Tue, 2 Sep 2014 10:14:26 +0200
Subject: [PATCH] const APBAHBPrescTable const splash_lbm removed
 fnSwitchDuration

---
 radio/src/opentx.cpp                                        | 6 +-----
 .../STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c          | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 9f1d6600e..e53281de1 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -82,7 +82,7 @@ const pm_uchar splashdata[] PROGMEM = { 'S','P','S',0,
 #include "bitmaps/splash_9x.lbm"
 #endif
 	'S','P','E',0};
-const pm_uchar * splash_lbm = splashdata+4;
+const pm_uchar * const splash_lbm = splashdata+4;
 #endif
 
 #if LCD_W >= 212
@@ -1884,7 +1884,6 @@ uint8_t mSwitchDuration[1+NUM_ROTARY_ENCODERS] = { 0 };
 uint8_t currentSpeakerVolume = 255;
 uint8_t requiredSpeakerVolume;
 getvalue_t requiredSpeakerVolumeRawLast = 1024 + 1; //initial value must be outside normal range
-uint8_t fnSwitchDuration[NUM_CFN] = { 0 };
 
 inline void playCustomFunctionFile(CustomFnData *sd, uint8_t id)
 {
@@ -2181,9 +2180,6 @@ void evalFunctions()
       }
       else {
         lastFunctionTime[i] = 0;
-#if defined(CPUARM)
-        fnSwitchDuration[i] = 0;
-#endif
       }
     }
   }
diff --git a/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c b/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c
index a668c5a37..c5b26daf8 100644
--- a/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c
+++ b/radio/src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c
@@ -130,7 +130,7 @@
 
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
-static __I uint8_t APBAHBPrescTable[16] = {0, 0, 0, 0, 1, 2, 3, 4, 1, 2, 3, 4, 6, 7, 8, 9};
+static const uint8_t APBAHBPrescTable[16] = {0, 0, 0, 0, 1, 2, 3, 4, 1, 2, 3, 4, 6, 7, 8, 9};
 
 /* Private function prototypes -----------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/