From 84b2255ce2a72221ff18d14e06fd00bfda7f95ed Mon Sep 17 00:00:00 2001 From: tkuyucu Date: Mon, 3 Feb 2014 16:36:23 +0100 Subject: [PATCH] Reformatting --- .../TARGET_nRF51822/system_nRF51822.c | 16 +--------------- .../TARGET_NORDIC/TARGET_nRF51822/analogin_api.c | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.c b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.c index b8bc885228..3bf5809223 100644 --- a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.c +++ b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.c @@ -19,8 +19,6 @@ #include #include "nrf51822.h" #include "system_nrf51822.h" -#include "nrf_sdm.h" -/*lint ++flb "Enter library region" */ #define __SYSTEM_CLOCK (16000000UL) /*!< nRF51 devices use a fixed System Clock Frequency of 16MHz */ @@ -37,12 +35,6 @@ static bool is_disabled_in_debug_needed(void); uint32_t SystemCoreClock __attribute__((used)) = __SYSTEM_CLOCK; #endif -//static void softdevice_assertion_handler(uint32_t pc, uint16_t line_num, const uint8_t * file_name) -//{ - // UNUSED_PARAMETER(pc); - // assert_nrf_callback(line_num, file_name); -//} - void SystemCoreClockUpdate(void) { @@ -81,12 +73,7 @@ void SystemInit(void) while (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) { // Do nothing. - } -} - -void EnableSoftDevice(void) -{ -// sd_softdevice_enable(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, softdevice_assertion_handler); + } } static bool is_manual_peripheral_setup_needed(void) @@ -123,4 +110,3 @@ static bool is_disabled_in_debug_needed(void) return false; } -/*lint --flb "Leave library region" */ diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/analogin_api.c index ae06437bba..74c848d4e2 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/analogin_api.c @@ -36,7 +36,7 @@ void analogin_init(analogin_t *obj, PinName pin) { int analogInputPin=0; const PinMap *map = PinMap_ADC; - obj->adc = (ADCName)((NRF_ADC_Type *)pinmap_peripheral(pin, PinMap_ADC)); + obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); //(NRF_ADC_Type *) if (obj->adc == (ADCName)NC) { error("ADC pin mapping failed"); }