From 7f2156661ce72bc7241217f1477f5989f5ac8c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 8 Jan 2012 00:39:29 +0000 Subject: [PATCH] adc-target.h: cleanup move adc_close() prototype to adc.h don't duplicate prototypes of adc.h remove license header and guards for a single include of another file or for empty content git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31623 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/adc.h | 2 ++ firmware/target/arm/as3525/adc-target.h | 25 ----------------- .../arm/at91sam/lyre_proto1/adc-target.h | 28 ------------------- .../target/arm/philips/sa9200/adc-target.h | 25 ----------------- firmware/target/arm/sandisk/adc-target.h | 25 ----------------- .../arm/tms320dm320/mrobe-500/adc-target.h | 25 ----------------- .../tms320dm320/sansa-connect/adc-target.h | 25 ----------------- .../target/coldfire/iaudio/m3/adc-target.h | 1 - .../target/hosted/android/app/adc-target.h | 25 ----------------- firmware/target/hosted/sdl/app/adc-target.h | 25 ----------------- firmware/target/hosted/ypr0/adc-target.h | 25 ----------------- .../ingenic_jz47xx/onda_vx747/adc-target.h | 2 -- 12 files changed, 2 insertions(+), 231 deletions(-) diff --git a/firmware/export/adc.h b/firmware/export/adc.h index 4a0d384aba..623d1675c9 100644 --- a/firmware/export/adc.h +++ b/firmware/export/adc.h @@ -29,6 +29,8 @@ void adc_init(void) INIT_ATTR; #ifndef NEED_ADC_CLOSE #define adc_close() +#else +void adc_close(void); #endif #endif /* _ADC_H_ */ diff --git a/firmware/target/arm/as3525/adc-target.h b/firmware/target/arm/as3525/adc-target.h index 007a11af10..69af3a3261 100644 --- a/firmware/target/arm/as3525/adc-target.h +++ b/firmware/target/arm/as3525/adc-target.h @@ -1,27 +1,2 @@ -/*************************************************************************** - * __________ __ ___. - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - /* The ADC sources and channels are common to all targets with AS3514 */ #include "as3514.h" - -#endif diff --git a/firmware/target/arm/at91sam/lyre_proto1/adc-target.h b/firmware/target/arm/at91sam/lyre_proto1/adc-target.h index 3712e476ea..e69de29bb2 100644 --- a/firmware/target/arm/at91sam/lyre_proto1/adc-target.h +++ b/firmware/target/arm/at91sam/lyre_proto1/adc-target.h @@ -1,28 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * - * Copyright (C) 2009 by Jorge Pinto - * - * 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. - * - ****************************************************************************/ - -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -void adc_init(void); -inline unsigned short adc_read(int channel); - -#endif diff --git a/firmware/target/arm/philips/sa9200/adc-target.h b/firmware/target/arm/philips/sa9200/adc-target.h index 007a11af10..69af3a3261 100644 --- a/firmware/target/arm/philips/sa9200/adc-target.h +++ b/firmware/target/arm/philips/sa9200/adc-target.h @@ -1,27 +1,2 @@ -/*************************************************************************** - * __________ __ ___. - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - /* The ADC sources and channels are common to all targets with AS3514 */ #include "as3514.h" - -#endif diff --git a/firmware/target/arm/sandisk/adc-target.h b/firmware/target/arm/sandisk/adc-target.h index 007a11af10..69af3a3261 100644 --- a/firmware/target/arm/sandisk/adc-target.h +++ b/firmware/target/arm/sandisk/adc-target.h @@ -1,27 +1,2 @@ -/*************************************************************************** - * __________ __ ___. - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - /* The ADC sources and channels are common to all targets with AS3514 */ #include "as3514.h" - -#endif diff --git a/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h b/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h index 45e646cbb3..e69de29bb2 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h +++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-target.h @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 by Karl Kurbjun - * - * 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. - * - ****************************************************************************/ - -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#endif diff --git a/firmware/target/arm/tms320dm320/sansa-connect/adc-target.h b/firmware/target/arm/tms320dm320/sansa-connect/adc-target.h index 49244b4c3b..e69de29bb2 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/adc-target.h +++ b/firmware/target/arm/tms320dm320/sansa-connect/adc-target.h @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: $ - * - * Copyright (C) 2011 by Tomasz Moń - * - * 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. - * - ****************************************************************************/ - -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#endif diff --git a/firmware/target/coldfire/iaudio/m3/adc-target.h b/firmware/target/coldfire/iaudio/m3/adc-target.h index ea4f84ba7a..ec35c31e89 100644 --- a/firmware/target/coldfire/iaudio/m3/adc-target.h +++ b/firmware/target/coldfire/iaudio/m3/adc-target.h @@ -29,6 +29,5 @@ #define ADC_REMOTE 2 #define NEED_ADC_CLOSE -void adc_close(void); #endif /* _ADC_TARGET_H_ */ diff --git a/firmware/target/hosted/android/app/adc-target.h b/firmware/target/hosted/android/app/adc-target.h index f8069be6f5..e69de29bb2 100644 --- a/firmware/target/hosted/android/app/adc-target.h +++ b/firmware/target/hosted/android/app/adc-target.h @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 by Thomas Martitz - * - * 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. - * - ****************************************************************************/ - -#ifndef __ADC_TARGET_H__ -#define __ADC_TARGET_H__ - -#endif /* __ADC_TARGET_H__ */ diff --git a/firmware/target/hosted/sdl/app/adc-target.h b/firmware/target/hosted/sdl/app/adc-target.h index f8069be6f5..e69de29bb2 100644 --- a/firmware/target/hosted/sdl/app/adc-target.h +++ b/firmware/target/hosted/sdl/app/adc-target.h @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 by Thomas Martitz - * - * 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. - * - ****************************************************************************/ - -#ifndef __ADC_TARGET_H__ -#define __ADC_TARGET_H__ - -#endif /* __ADC_TARGET_H__ */ diff --git a/firmware/target/hosted/ypr0/adc-target.h b/firmware/target/hosted/ypr0/adc-target.h index bdbc4cfabd..e69de29bb2 100644 --- a/firmware/target/hosted/ypr0/adc-target.h +++ b/firmware/target/hosted/ypr0/adc-target.h @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: adc-target.h 29516 2011-03-05 15:31:52Z thomasjfox $ - * - * Copyright (C) 2011 by Lorenzo Miori - * - * 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. - * - ****************************************************************************/ - -#ifndef __ADC_TARGET_H__ -#define __ADC_TARGET_H__ - -#endif /* __ADC_TARGET_H__ */ diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h index c89ec0b0c4..e74f008a3e 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/adc-target.h @@ -25,6 +25,4 @@ #define ADC_BUTTONS 0 -void adc_close(void); - #endif /* _ADC_TARGET_H_ */