From 1dd806bb2800b82980978c0b2f8e2d87dfdbc1cf Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 7 Feb 2017 10:56:33 +0100 Subject: [PATCH] cpu/lpc2387: remove (unused) legacy ADC driver --- cpu/lpc2387/include/lpc2387-adc.h | 54 ------------ cpu/lpc2387/lpc2387-adc.c | 140 ------------------------------ drivers/include/adc_legacy.h | 52 ----------- 3 files changed, 246 deletions(-) delete mode 100644 cpu/lpc2387/include/lpc2387-adc.h delete mode 100644 cpu/lpc2387/lpc2387-adc.c delete mode 100644 drivers/include/adc_legacy.h diff --git a/cpu/lpc2387/include/lpc2387-adc.h b/cpu/lpc2387/include/lpc2387-adc.h deleted file mode 100644 index 4eb0ca2f37..0000000000 --- a/cpu/lpc2387/include/lpc2387-adc.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved. - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -#ifndef LPC2387ADC_H -#define LPC2387ADC_H - -/** - * @defgroup lpc2387_adc LPC2387 ADC - * @ingroup lpc2387 - * - * @{ - */ - -/** - * @file - * @brief LPC2387 ADC - * - * @author Thomas Hillebrandt - * @version $Revision: 3249 $ - * - * @note $Id: lpc2387-adc.h 3249 2011-03-11 09:44:46Z schmittb $ - */ - -#include -#include "adc_legacy.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define ADC_NUM (6) -#define ADC_OFFSET (0x10) -#define ADC_INDEX (4) - -#define ADC_DONE (0x80000000) -#define ADC_OVERRUN (0x40000000) - -/** - * @brief Initialize ADC. - */ -void adc_init_1(void); -void adc_init_2(void); - -#ifdef __cplusplus -} -#endif - -/** @} */ -#endif /* LPC2387ADC_H */ diff --git a/cpu/lpc2387/lpc2387-adc.c b/cpu/lpc2387/lpc2387-adc.c deleted file mode 100644 index f06c04e65e..0000000000 --- a/cpu/lpc2387/lpc2387-adc.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved. - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @file - * @ingroup lpc2387_adc - * @brief LPC2387 ADC - * - * @author Thomas Hillebrandt - * @version $Revision: 3250 $ - * - * @note $Id: lpc2387-adc.c 3250 2011-03-11 09:45:44Z schmittb $ - */ - -// cpu -#include "lpc2387.h" -#include "lpc23xx.h" -#include "lpc2387-adc.h" - -#define ENABLE_DEBUG (0) -#include "debug.h" -#if ENABLE_DEBUG -#include "xtimer.h" -#endif - -/*---------------------------------------------------------------------------*/ -void -adc_init(void) -{ - // enable clock /Power for ADC - PCONP |= BIT12; - - // peripheral Clock Selection for ADC - PCLKSEL0 |= 0x03000000; // pclock = cclock/8 - - // set A/D control register AD0CR - AD0CR = (0x01 << 0) | /* SEL=1, select channel 0~7 on ADC0 */ - (0xff << 8) | /* CLKDIV = 1, ADC_CLK = PCLK/10 = 0.45 MHz */ - (0 << 16) | /* BURST = 0, no BURST, software controlled */ - (0 << 17) | /* CLKS = 0, 11 clocks/10 bits */ - (1 << 21) | /* PDN = 1, normal operation */ - (0 << 22) | /* TEST1:0 = 00 */ - (0 << 24) | /* START = 0 A/D conversion stops */ - (0 << 27); /* EDGE = 0 (CAP/MAT signal falling,trigger A/D conversion) */ -} -/*---------------------------------------------------------------------------*/ -void -adc_init_1(void) -{ - // enable clock /Power for ADC - PCONP |= BIT12; - - //PIN0.24 function select AD0.1 - PINSEL1 |= BIT16; - - // peripheral Clock Selection for ADC - PCLKSEL0 |= 0x03000000; // pclock = cclock/8 - - // set A/D control register AD0CR - AD0CR = (0x01 << 0) | /* SEL=1, select channel 0~7 on ADC0 */ - (0x00 << 8) | /* CLKDIV = 1, ADC_CLK = PCLK/1 = 4.5 MHz */ - (0 << 16) | /* BURST = 0, no BURST, software controlled */ - (0 << 17) | /* CLKS = 0, 11 clocks/10 bits */ - (1 << 21) | /* PDN = 1, normal operation */ - (0 << 22) | /* TEST1:0 = 00 */ - (0 << 24) | /* START = 0 A/D conversion stops */ - (0 << 27); /* EDGE = 0 (CAP/MAT signal falling,trigger A/D conversion) */ -} -/*---------------------------------------------------------------------------*/ -void adc_init_2(void) -{ - // enable clock /Power for ADC - PCONP |= BIT12; - - // PIN0.23 function select to AD0.0 - PINSEL1 |= BIT14; - - // peripheral Clock Selection for ADC - PCLKSEL0 |= 0x03000000; // pclock = cclock/8 - - // set A/D control register AD0CR - AD0CR = (0x01 << 0) | /* SEL=1, select channel 0 on ADC0 */ - (0x00 << 8) | /* CLKDIV = 1, ADC_CLK = PCLK/1 = 4.5 MHz */ - (0 << 16) | /* BURST = 0, no BURST */ - (0 << 17) | /* CLKS = 0, 11 clocks/10 bits */ - (1 << 21) | /* PDN = 1, normal operation */ - (0 << 22) | /* TEST1:0 = 00 */ - (0 << 24) | /* START = 0 A/D conversion stops */ - (0 << 27); /* EDGE = 0 (CAP/MAT signal falling,trigger A/D conversion) */ -} -/*---------------------------------------------------------------------------*/ -uint16_t adc_read(uint8_t channel) -{ -#if ENABLE_DEBUG - uint32_t t1, t2; -#endif - uint32_t regVal, adc_data; - - /* channel number is 0 through 7 */ - if (channel >= ADC_NUM) { - channel = 0; /* reset channel number to 0 */ - } - - /* switch channel, start A/D convert */ - AD0CR &= 0xFFFFFF00; -#if ENABLE_DEBUG - t1 = _xtimer_now(); -#endif - AD0CR |= (1 << 24) | (1 << channel); - -#if ENABLE_DEBUG - t2 = _xtimer_now(); -#endif - - while (1) { - /* read result of A/D conversion */ - regVal = *(volatile unsigned long *)(AD0_BASE_ADDR + ADC_OFFSET + ADC_INDEX * channel); - - /* wait until end of A/D convert */ - if (regVal & ADC_DONE) { - break; - } - } - - AD0CR &= 0xF8FFFFFF; /* stop ADC now */ - - if (regVal & ADC_OVERRUN) { /* save data when it's not overrun, otherwise, return zero */ - return 0; - } - - adc_data = (regVal >> 6) & 0x3FF; - DEBUG("%s, %d: %lu\n", RIOT_FILE_RELATIVE, __LINE__, t1); - DEBUG("%s, %d: %lu\n", RIOT_FILE_RELATIVE, __LINE__, t2); - return (uint16_t) adc_data; /* return A/D conversion value */ -} diff --git a/drivers/include/adc_legacy.h b/drivers/include/adc_legacy.h deleted file mode 100644 index 45f4a02390..0000000000 --- a/drivers/include/adc_legacy.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2012 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @defgroup drivers_adc ADC - * @ingroup drivers - * @brief Generic interface for ADC drivers - * - * @deprecated This interface is obsolete. Use the @ref drivers_periph_adc - * interface in @ref drivers_periph instead. - * @{ - * - * @file - * @brief Legacy ADC driver interface - * - * @author Oliver Hahm - */ - -#ifndef ADC_LEGACY_H -#define ADC_LEGACY_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Initialize ADC. - */ -void adc_init(void); - -/** - * @brief Read ADC value of selected channel. - * - * Valid channel numbers are from 0 to 2. - * - * @return ADC value of selected channel. - */ -uint16_t adc_read(uint8_t channel); - -#ifdef __cplusplus -} -#endif - -#endif /* ADC_LEGACY_H */ -/** @} */