From 5377b39f365633961857d99dc9664c2d8ac8edbb Mon Sep 17 00:00:00 2001 From: Johannes Kasberger Date: Tue, 15 Apr 2014 09:19:19 +0200 Subject: [PATCH] removed feature from driver --- src/drv_system.c | 6 ++---- src/drv_system.h | 2 +- src/main.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/drv_system.c b/src/drv_system.c index 805f96b84c..f7f1f713f9 100755 --- a/src/drv_system.c +++ b/src/drv_system.c @@ -6,8 +6,6 @@ static volatile uint32_t usTicks = 0; static volatile uint32_t sysTickUptime = 0; // from system_stm32f10x.c void SetSysClock(bool overclock); -// from config.h -bool feature(uint32_t mask); #ifdef BUZZER void systemBeep(bool onoff); static void beepRev4(bool onoff); @@ -45,7 +43,7 @@ uint32_t millis(void) return sysTickUptime; } -void systemInit(void) +void systemInit(bool overclock) { struct { GPIO_TypeDef *gpio; @@ -77,7 +75,7 @@ void systemInit(void) // Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers // Configure the Flash Latency cycles and enable prefetch buffer - SetSysClock(feature(FEATURE_OVERCLOCK)); + SetSysClock(overclock); // Turn on clocks for stuff we use RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2 | RCC_APB1Periph_TIM3 | RCC_APB1Periph_TIM4 | RCC_APB1Periph_I2C2, ENABLE); diff --git a/src/drv_system.h b/src/drv_system.h index ca2871a5d4..7501d3087c 100755 --- a/src/drv_system.h +++ b/src/drv_system.h @@ -1,6 +1,6 @@ #pragma once -void systemInit(void); +void systemInit(bool overclock); void delayMicroseconds(uint32_t us); void delay(uint32_t ms); diff --git a/src/main.c b/src/main.c index cb35559a8c..a3285a5063 100755 --- a/src/main.c +++ b/src/main.c @@ -38,7 +38,7 @@ int main(void) #endif checkFirstTime(false); readEEPROM(); - systemInit(); + systemInit(feature(FEATURE_OVERCLOCK)); #ifdef USE_LAME_PRINTF init_printf(NULL, _putc); #endif