From 4fc27c16ae88ab3096084cd46065820df35db721 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sun, 8 Jan 2012 02:33:43 +0000 Subject: adc-as3514.c : move to drivers git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31629 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 4 +-- firmware/drivers/adc-as3514.c | 67 ++++++++++++++++++++++++++++++++++++++++ firmware/target/arm/adc-as3514.c | 67 ---------------------------------------- 3 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 firmware/drivers/adc-as3514.c delete mode 100644 firmware/target/arm/adc-as3514.c diff --git a/firmware/SOURCES b/firmware/SOURCES index 2c3f9ca0a7..4d0d71222f 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -64,7 +64,7 @@ target/hosted/sdl/app/button-application.c #endif #ifdef SAMSUNG_YPR0 -target/arm/adc-as3514.c +drivers/adc-as3514.c #if (CONFIG_RTC == RTC_AS3514) drivers/rtc/rtc_as3514.c #else @@ -748,7 +748,7 @@ drivers/audio/tsc2100.c target/arm/pp/ascodec-pp.c # endif # if !defined(BOOTLOADER) || defined(CPU_PP) -target/arm/adc-as3514.c +drivers/adc-as3514.c # if !defined(SANSA_M200V4) && !defined(SAMSUNG_YPR0) target/arm/powermgmt-ascodec.c # endif diff --git a/firmware/drivers/adc-as3514.c b/firmware/drivers/adc-as3514.c new file mode 100644 index 0000000000..8c661eb133 --- /dev/null +++ b/firmware/drivers/adc-as3514.c @@ -0,0 +1,67 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Barry Wardell + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "adc.h" +#include "kernel.h" +#include "ascodec.h" +#include "as3514.h" + +/* Read 10-bit channel data */ +unsigned short adc_read(int channel) +{ + unsigned short data = 0; + + if ((unsigned)channel >= NUM_ADC_CHANNELS) + return 0; + + ascodec_lock(); + + /* Select channel */ + if (ascodec_write(AS3514_ADC_0, (channel << 4)) >= 0) + { + unsigned char buf[2]; + + /* + * The AS3514 ADC will trigger an interrupt when the conversion + * is finished, if the corresponding enable bit in IRQ_ENRD2 + * is set. + * Previously the code did not wait and this apparently did + * not pose any problems, but this should be more correct. + * Without the wait the data read back may be completely or + * partially (first one of the two bytes) stale. + */ + ascodec_wait_adc_finished(); + + + /* Read data */ + if (ascodec_readbytes(AS3514_ADC_0, 2, buf) >= 0) + { + data = (((buf[0] & 0x3) << 8) | buf[1]); + } + } + + ascodec_unlock(); + + return data; +} + +void adc_init(void) +{ +} diff --git a/firmware/target/arm/adc-as3514.c b/firmware/target/arm/adc-as3514.c deleted file mode 100644 index 8c661eb133..0000000000 --- a/firmware/target/arm/adc-as3514.c +++ /dev/null @@ -1,67 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "adc.h" -#include "kernel.h" -#include "ascodec.h" -#include "as3514.h" - -/* Read 10-bit channel data */ -unsigned short adc_read(int channel) -{ - unsigned short data = 0; - - if ((unsigned)channel >= NUM_ADC_CHANNELS) - return 0; - - ascodec_lock(); - - /* Select channel */ - if (ascodec_write(AS3514_ADC_0, (channel << 4)) >= 0) - { - unsigned char buf[2]; - - /* - * The AS3514 ADC will trigger an interrupt when the conversion - * is finished, if the corresponding enable bit in IRQ_ENRD2 - * is set. - * Previously the code did not wait and this apparently did - * not pose any problems, but this should be more correct. - * Without the wait the data read back may be completely or - * partially (first one of the two bytes) stale. - */ - ascodec_wait_adc_finished(); - - - /* Read data */ - if (ascodec_readbytes(AS3514_ADC_0, 2, buf) >= 0) - { - data = (((buf[0] & 0x3) << 8) | buf[1]); - } - } - - ascodec_unlock(); - - return data; -} - -void adc_init(void) -{ -} -- cgit v1.2.3