diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 01:43:16 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 01:43:16 +0000 |
commit | 85528242844b71ac45e5331363a48a2956c38275 (patch) | |
tree | 10d8af9068c4f12b2f8f673f3a835bb3211c2f0e /firmware/target/hosted/ypr0 | |
parent | 2737a66471a640d83aba07578bd67b811a340034 (diff) | |
download | rockbox-85528242844b71ac45e5331363a48a2956c38275.tar.gz rockbox-85528242844b71ac45e5331363a48a2956c38275.zip |
ascodec-target.h: remove
move prototypes to ascodec.h
move code to ascodec*.c
YPR0: use adc-as3514.c instead of duplicating it
TODO: merge as3514.h and ascodec.h ?
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31626 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/hosted/ypr0')
-rw-r--r-- | firmware/target/hosted/ypr0/ascodec-target.h | 80 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/ascodec-ypr0.c | 37 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/backlight-ypr0.c | 3 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/gpio_ypr0.c | 3 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/gpio_ypr0.h | 3 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/powermgmt-ypr0.c | 1 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/system-ypr0.c | 2 |
7 files changed, 26 insertions, 103 deletions
diff --git a/firmware/target/hosted/ypr0/ascodec-target.h b/firmware/target/hosted/ypr0/ascodec-target.h deleted file mode 100644 index 2274d5f073..0000000000 --- a/firmware/target/hosted/ypr0/ascodec-target.h +++ /dev/null @@ -1,80 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: ascodec-target.h 26116 2010-05-17 20:53:25Z funman $ - * - * Module wrapper for AS3543 audio codec, using /dev/afe (afe.ko) of Samsung YP-R0 - * - * Copyright (c) 2011 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 _ASCODEC_TARGET_H -#define _ASCODEC_TARGET_H - -#include "as3514.h" -#include "kernel.h" -#include "adc.h" -#include "ascodec.h" - -int ascodec_init(void); -void ascodec_close(void); -int ascodec_write(unsigned int reg, unsigned int value); -int ascodec_read(unsigned int reg); -void ascodec_write_pmu(unsigned int index, unsigned int subreg, unsigned int value); -int ascodec_read_pmu(unsigned int index, unsigned int subreg); -int ascodec_readbytes(unsigned int index, unsigned int len, unsigned char *data); -unsigned short adc_read(int channel); -void ascodec_lock(void); -void ascodec_unlock(void); - -static inline bool ascodec_chg_status(void) -{ - return ascodec_read(AS3514_IRQ_ENRD0) & CHG_STATUS; -} - -static inline bool ascodec_endofch(void) -{ - return ascodec_read(AS3514_IRQ_ENRD0) & CHG_ENDOFCH; -} - -static inline void ascodec_monitor_endofch(void) -{ - ascodec_write(AS3514_IRQ_ENRD0, IRQ_ENDOFCH); -} - -static inline void ascodec_wait_adc_finished(void) -{ - /* - * FIXME: not implemented - * - * If irqs are not available on the target platform, - * this should be most likely implemented by polling - * AS3514_IRQ_ENRD2 in the same way powermgmt-ascodec.c - * is polling IRQ_ENDOFCH. - */ -} - -static inline void ascodec_write_charger(int value) -{ - ascodec_write_pmu(AS3543_CHARGER, 1, value); -} - -static inline int ascodec_read_charger(void) -{ - return ascodec_read_pmu(AS3543_CHARGER, 1); -} - -#endif /* !_ASCODEC_TARGET_H */ diff --git a/firmware/target/hosted/ypr0/ascodec-ypr0.c b/firmware/target/hosted/ypr0/ascodec-ypr0.c index ec5568554b..954b4d95ef 100644 --- a/firmware/target/hosted/ypr0/ascodec-ypr0.c +++ b/firmware/target/hosted/ypr0/ascodec-ypr0.c @@ -5,7 +5,6 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: ascodec-target.h 26116 2010-05-17 20:53:25Z funman $ * * Module wrapper for AS3543 audio codec, using /dev/afe (afe.ko) of Samsung YP-R0 * @@ -28,7 +27,7 @@ #include "sys/ioctl.h" #include "stdlib.h" -#include "ascodec-target.h" +#include "ascodec.h" int afe_dev = -1; @@ -134,24 +133,32 @@ void ascodec_unlock(void) { } -/* Read 10-bit channel data */ -unsigned short adc_read(int channel) +bool ascodec_chg_status(void) { - if ((unsigned)channel >= NUM_ADC_CHANNELS) - return 0; + return ascodec_read(AS3514_IRQ_ENRD0) & CHG_STATUS; +} - /* Select channel */ - ascodec_write(AS3514_ADC_0, (channel << 4)); - unsigned char buf[2]; +bool ascodec_endofch(void) +{ + return ascodec_read(AS3514_IRQ_ENRD0) & CHG_ENDOFCH; +} + +void ascodec_monitor_endofch(void) +{ + ascodec_write(AS3514_IRQ_ENRD0, IRQ_ENDOFCH); +} - /* Read data */ - if (ascodec_readbytes(AS3514_ADC_0, 2, buf) < 0) - return 0; - /* decode to 10-bit and return */ - return (((buf[0] & 0x3) << 8) | buf[1]); +void ascodec_write_charger(int value) +{ + ascodec_write_pmu(AS3543_CHARGER, 1, value); +} + +int ascodec_read_charger(void) +{ + return ascodec_read_pmu(AS3543_CHARGER, 1); } -void adc_init(void) +void ascodec_wait_adc_finished(void) { } diff --git a/firmware/target/hosted/ypr0/backlight-ypr0.c b/firmware/target/hosted/ypr0/backlight-ypr0.c index 930b56be2e..551b386f19 100644 --- a/firmware/target/hosted/ypr0/backlight-ypr0.c +++ b/firmware/target/hosted/ypr0/backlight-ypr0.c @@ -5,7 +5,6 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: backlight-gigabeat-s.c 25800 2010-05-04 10:07:53Z jethead71 $ * * Copyright (C) 2011 by Lorenzo Miori * @@ -24,7 +23,7 @@ #include "backlight-target.h" #include "lcd.h" #include "as3514.h" -#include "ascodec-target.h" +#include "ascodec.h" #include <fcntl.h> #include "unistd.h" diff --git a/firmware/target/hosted/ypr0/gpio_ypr0.c b/firmware/target/hosted/ypr0/gpio_ypr0.c index 9c3f186a6b..3ee371d562 100644 --- a/firmware/target/hosted/ypr0/gpio_ypr0.c +++ b/firmware/target/hosted/ypr0/gpio_ypr0.c @@ -5,7 +5,6 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: ascodec-target.h 26116 2010-05-17 20:53:25Z funman $ * * Module wrapper for GPIO, using /dev/r0GPIO (r0Gpio.ko) of Samsung YP-R0 * @@ -51,4 +50,4 @@ int gpio_control(int request, int num, int mode, int val) { R0GPIOInfo r = { .num = num, .mode = mode, .val = val, }; return ioctl(r0_gpio_dev, request, &r); -}
\ No newline at end of file +} diff --git a/firmware/target/hosted/ypr0/gpio_ypr0.h b/firmware/target/hosted/ypr0/gpio_ypr0.h index 9fc7444887..ddf7100b2f 100644 --- a/firmware/target/hosted/ypr0/gpio_ypr0.h +++ b/firmware/target/hosted/ypr0/gpio_ypr0.h @@ -5,7 +5,6 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: ascodec-target.h 26116 2010-05-17 20:53:25Z funman $ * * Module wrapper for GPIO, using /dev/r0GPIO (r0Gpio.ko) of Samsung YP-R0 * @@ -39,4 +38,4 @@ void gpio_close(void); int gpio_control_struct(int request, R0GPIOInfo pin); int gpio_control(int request, int num, int mode, int val); -#endif
\ No newline at end of file +#endif diff --git a/firmware/target/hosted/ypr0/powermgmt-ypr0.c b/firmware/target/hosted/ypr0/powermgmt-ypr0.c index 9c90f7ea02..6aba9c7ef5 100644 --- a/firmware/target/hosted/ypr0/powermgmt-ypr0.c +++ b/firmware/target/hosted/ypr0/powermgmt-ypr0.c @@ -22,7 +22,6 @@ #include "powermgmt.h" #include "power.h" #include "file.h" -#include "ascodec-target.h" #include "as3514.h" #include "sc900776.h" diff --git a/firmware/target/hosted/ypr0/system-ypr0.c b/firmware/target/hosted/ypr0/system-ypr0.c index 784b4fe48e..11275c7809 100644 --- a/firmware/target/hosted/ypr0/system-ypr0.c +++ b/firmware/target/hosted/ypr0/system-ypr0.c @@ -30,7 +30,7 @@ #include <SDL.h> #endif -#include "ascodec-target.h" +#include "ascodec.h" #include "gpio_ypr0.h" void power_off(void) |