From 81b87fe13d6b5f0e8bafd0810f5f8aca2a57bde3 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 12 Jun 2009 18:53:44 +0000 Subject: Add iAudio M5 FM radio mod to the advanced build options. * Unify iAudio audio driver, fmradio i2c driver, and power driver (M5 + X5 only). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21264 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 17 +-- firmware/export/config-iaudiom5.h | 10 ++ firmware/target/coldfire/iaudio/audio-iaudio.c | 138 +++++++++++++++++++++ .../target/coldfire/iaudio/fmradio_i2c-iaudio.c | 40 ++++++ firmware/target/coldfire/iaudio/m3/audio-m3.c | 116 ----------------- .../target/coldfire/iaudio/m3/fmradio_i2c-m3.c | 40 ------ firmware/target/coldfire/iaudio/m5/audio-m5.c | 84 ------------- firmware/target/coldfire/iaudio/m5/power-m5.c | 67 ---------- firmware/target/coldfire/iaudio/power-x5m5.c | 75 +++++++++++ firmware/target/coldfire/iaudio/x5/audio-x5.c | 115 ----------------- .../target/coldfire/iaudio/x5/fmradio_i2c-x5.c | 39 ------ firmware/target/coldfire/iaudio/x5/power-x5.c | 73 ----------- tools/configure | 43 ++++--- 13 files changed, 302 insertions(+), 555 deletions(-) create mode 100644 firmware/target/coldfire/iaudio/audio-iaudio.c create mode 100644 firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c delete mode 100644 firmware/target/coldfire/iaudio/m3/audio-m3.c delete mode 100644 firmware/target/coldfire/iaudio/m3/fmradio_i2c-m3.c delete mode 100644 firmware/target/coldfire/iaudio/m5/audio-m5.c delete mode 100644 firmware/target/coldfire/iaudio/m5/power-m5.c create mode 100644 firmware/target/coldfire/iaudio/power-x5m5.c delete mode 100644 firmware/target/coldfire/iaudio/x5/audio-x5.c delete mode 100644 firmware/target/coldfire/iaudio/x5/fmradio_i2c-x5.c delete mode 100644 firmware/target/coldfire/iaudio/x5/power-x5.c diff --git a/firmware/SOURCES b/firmware/SOURCES index da85a7123a..48e4c77760 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -588,22 +588,22 @@ target/coldfire/ata-as-coldfire.S target/coldfire/pcf50606-coldfire.c target/coldfire/iaudio/adc-iaudio.c target/coldfire/iaudio/ata-iaudio.c +target/coldfire/iaudio/fmradio_i2c-iaudio.c target/coldfire/iaudio/lcd-remote-as-iaudio.S target/coldfire/iaudio/lcd-remote-iaudio.c target/coldfire/iaudio/pcf50606-iaudio.c +target/coldfire/iaudio/power-x5m5.c target/coldfire/iaudio/powermgmt-iaudio.c target/coldfire/iaudio/system-iaudio.c target/coldfire/iaudio/usb-iaudio.c target/coldfire/iaudio/x5/backlight-x5.c target/coldfire/iaudio/x5/button-x5.c target/coldfire/iaudio/x5/ds2411-x5.c -target/coldfire/iaudio/x5/fmradio_i2c-x5.c target/coldfire/iaudio/x5/lcd-as-x5.S target/coldfire/iaudio/x5/lcd-x5.c target/coldfire/iaudio/x5/m5636-x5.c -target/coldfire/iaudio/x5/power-x5.c #ifndef BOOTLOADER -target/coldfire/iaudio/x5/audio-x5.c +target/coldfire/iaudio/audio-iaudio.c #endif #endif /* SIMULATOR */ #endif /* IAUDIO_X5 */ @@ -614,19 +614,22 @@ target/coldfire/ata-as-coldfire.S target/coldfire/pcf50606-coldfire.c target/coldfire/iaudio/adc-iaudio.c target/coldfire/iaudio/ata-iaudio.c +#ifdef HAVE_FMRADIO_IN /* FM radio mod */ +target/coldfire/iaudio/fmradio_i2c-iaudio.c +#endif target/coldfire/iaudio/lcd-remote-as-iaudio.S target/coldfire/iaudio/lcd-remote-iaudio.c target/coldfire/iaudio/m5/backlight-m5.c target/coldfire/iaudio/m5/button-m5.c target/coldfire/iaudio/m5/lcd-as-m5.S target/coldfire/iaudio/m5/lcd-m5.c -target/coldfire/iaudio/m5/power-m5.c target/coldfire/iaudio/pcf50606-iaudio.c +target/coldfire/iaudio/power-x5m5.c target/coldfire/iaudio/powermgmt-iaudio.c target/coldfire/iaudio/system-iaudio.c target/coldfire/iaudio/usb-iaudio.c #ifndef BOOTLOADER -target/coldfire/iaudio/m5/audio-m5.c +target/coldfire/iaudio/audio-iaudio.c #endif #endif /* SIMULATOR */ #endif /* IAUDIO_M5 */ @@ -634,11 +637,11 @@ target/coldfire/iaudio/m5/audio-m5.c #ifdef IAUDIO_M3 #ifndef SIMULATOR target/coldfire/ata-as-coldfire.S +target/coldfire/iaudio/fmradio_i2c-iaudio.c target/coldfire/iaudio/m3/adc-m3.c target/coldfire/iaudio/m3/ata-m3.c target/coldfire/iaudio/m3/backlight-m3.c target/coldfire/iaudio/m3/button-m3.c -target/coldfire/iaudio/m3/fmradio_i2c-m3.c target/coldfire/iaudio/m3/lcd-m3.c target/coldfire/iaudio/m3/lcd-as-m3.S target/coldfire/iaudio/m3/power-m3.c @@ -646,7 +649,7 @@ target/coldfire/iaudio/m3/powermgmt-m3.c target/coldfire/iaudio/m3/system-m3.c target/coldfire/iaudio/m3/usb-m3.c #ifndef BOOTLOADER -target/coldfire/iaudio/m3/audio-m3.c +target/coldfire/iaudio/audio-iaudio.c #endif #endif /* SIMULATOR */ #endif /* IAUDIO_M3 */ diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index 0df8414fe9..5d86087d44 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -16,7 +16,11 @@ /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ +#ifdef HAVE_FMRADIO_IN /* FM modded M5 */ +#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) +#else /* stock M5 */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) +#endif /* define the bitmask of hardware sample rates */ #define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) @@ -109,6 +113,12 @@ /* The number of bytes reserved for loadable plugins */ #define PLUGIN_BUFFER_SIZE 0x80000 +#ifdef HAVE_FMRADIO_IN /* FM modded M5 */ +/* FM Tuner */ +#define CONFIG_TUNER TEA5767 +#define CONFIG_TUNER_XTAL 32768 +#endif + #define HAVE_TLV320 /* TLV320 has no tone controls, so we use the software ones */ diff --git a/firmware/target/coldfire/iaudio/audio-iaudio.c b/firmware/target/coldfire/iaudio/audio-iaudio.c new file mode 100644 index 0000000000..ed3a926d72 --- /dev/null +++ b/firmware/target/coldfire/iaudio/audio-iaudio.c @@ -0,0 +1,138 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Michael Sevakis + * + * 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 "config.h" +#include "system.h" +#include "cpu.h" +#include "audio.h" +#include "sound.h" + +void audio_set_output_source(int source) +{ + int level = set_irq_level(DMA_IRQ_LEVEL); + unsigned long txsrc; + + if ((unsigned)source >= AUDIO_NUM_SOURCES) + txsrc = (3 << 8); /* playback, PDOR3 */ + else + txsrc = (4 << 8); /* recording, iis1RcvData */ + + IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; + restore_irq(level); +} /* audio_set_output_source */ + +void audio_input_mux(int source, unsigned flags) +{ + /* Prevent pops from unneeded switching */ + static int last_source = AUDIO_SRC_PLAYBACK; +#ifdef HAVE_FMRADIO_IN + static bool last_recording = false; + + bool recording = flags & SRCF_RECORDING; +#else + (void)flags; +#endif + + switch (source) + { + default: /* playback - no recording */ + source = AUDIO_SRC_PLAYBACK; + case AUDIO_SRC_PLAYBACK: + if (source != last_source) + { + audiohw_disable_recording(); + audiohw_set_monitor(false); + coldfire_set_dataincontrol(0); + } + break; + + case AUDIO_SRC_MIC: /* recording only */ + if (source != last_source) + { + audiohw_enable_recording(true); /* source mic */ + /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ + coldfire_set_dataincontrol((3 << 14) | (4 << 3)); + } + break; + + case AUDIO_SRC_LINEIN: /* recording only */ + if (source != last_source) + { + audiohw_enable_recording(false); /* source line */ + /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ + coldfire_set_dataincontrol((3 << 14) | (4 << 3)); + } + break; + +#ifdef HAVE_FMRADIO_IN + case AUDIO_SRC_FMRADIO: /* recording and playback */ + if (!recording) + audiohw_set_recvol(23, 23, AUDIO_GAIN_LINEIN); + + /* I2S recording and analog playback */ + if (source == last_source && recording == last_recording) + break; + + last_recording = recording; + + if (recording) + { + /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ + coldfire_set_dataincontrol((3 << 14) | (4 << 3)); + audiohw_enable_recording(false); /* source line */ + } + else + { + audiohw_disable_recording(); + audiohw_set_monitor(true); /* analog bypass */ + coldfire_set_dataincontrol(0); + } + break; +#endif /* HAVE_FMRADIO_IN */ + } /* end switch */ + + /* set line multiplexer */ +#ifdef IAUDIO_M3 +#ifdef HAVE_FMRADIO_IN + if (source == AUDIO_SRC_FMRADIO) + and_l(~(1 << 25), &GPIO1_OUT); /* FM radio */ + else +#endif + or_l((1 << 25), &GPIO1_OUT); /* Line In */ + + or_l((1 << 25), &GPIO1_ENABLE); + or_l((1 << 25), &GPIO1_FUNCTION); + +#else /* iAudio M5, X5 */ +#ifdef HAVE_FMRADIO_IN + if (source == AUDIO_SRC_FMRADIO) + and_l(~(1 << 29), &GPIO_OUT); /* FM radio */ + else +#endif + or_l((1 << 29), &GPIO_OUT); /* Line In */ + + or_l((1 << 29), &GPIO_ENABLE); + or_l((1 << 29), &GPIO_FUNCTION); + +#endif /* iAudio M5, X5 */ + + last_source = source; +} /* audio_input_mux */ + diff --git a/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c b/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c new file mode 100644 index 0000000000..8bc6fb8445 --- /dev/null +++ b/firmware/target/coldfire/iaudio/fmradio_i2c-iaudio.c @@ -0,0 +1,40 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * Physical interface of the Philips TEA5767 in iAudio M3 + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * 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 "config.h" + +#if (CONFIG_TUNER & TEA5767) + +#include "i2c-coldfire.h" +#include "fmradio_i2c.h" + +int fmradio_i2c_write(unsigned char address, const unsigned char* buf, + int count) +{ + return i2c_write(I2C_IFACE_0, address, buf, count); +} + +int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) +{ + return i2c_read(I2C_IFACE_0, address, buf, count); +} + +#endif diff --git a/firmware/target/coldfire/iaudio/m3/audio-m3.c b/firmware/target/coldfire/iaudio/m3/audio-m3.c deleted file mode 100644 index ea401cc40e..0000000000 --- a/firmware/target/coldfire/iaudio/m3/audio-m3.c +++ /dev/null @@ -1,116 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Michael Sevakis - * - * 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 "system.h" -#include "cpu.h" -#include "audio.h" -#include "sound.h" - -void audio_set_output_source(int source) -{ - int level = set_irq_level(DMA_IRQ_LEVEL); - unsigned long txsrc; - - if ((unsigned)source >= AUDIO_NUM_SOURCES) - txsrc = (3 << 8); /* playback, PDOR3 */ - else - txsrc = (4 << 8); /* recording, iis1RcvData */ - - IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; - restore_irq(level); -} /* audio_set_output_source */ - -void audio_input_mux(int source, unsigned flags) -{ - /* Prevent pops from unneeded switching */ - static int last_source = AUDIO_SRC_PLAYBACK; - static bool last_recording = false; - - bool recording = flags & SRCF_RECORDING; - - switch (source) - { - default: /* playback - no recording */ - source = AUDIO_SRC_PLAYBACK; - case AUDIO_SRC_PLAYBACK: - if (source != last_source) - { - audiohw_disable_recording(); - audiohw_set_monitor(false); - coldfire_set_dataincontrol(0); - } - break; - - case AUDIO_SRC_MIC: /* recording only */ - if (source != last_source) - { - audiohw_enable_recording(true); /* source mic */ - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - } - break; - - case AUDIO_SRC_LINEIN: /* recording only */ - if (source != last_source) - { - audiohw_enable_recording(false); /* source line */ - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - } - break; - - case AUDIO_SRC_FMRADIO: /* recording and playback */ - if (!recording) - audiohw_set_recvol(23, 23, AUDIO_GAIN_LINEIN); - - /* I2S recording and analog playback */ - if (source == last_source && recording == last_recording) - break; - - last_recording = recording; - - if (recording) - { - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - audiohw_enable_recording(false); /* source line */ - } - else - { - audiohw_disable_recording(); - audiohw_set_monitor(true); /* analog bypass */ - coldfire_set_dataincontrol(0); - } - break; - } /* end switch */ - - /* set line multiplexer */ - if (source == AUDIO_SRC_FMRADIO) - and_l(~(1 << 25), &GPIO1_OUT); /* FM radio */ - else - or_l((1 << 25), &GPIO1_OUT); /* Line In */ - - or_l((1 << 25), &GPIO1_ENABLE); - or_l((1 << 25), &GPIO1_FUNCTION); - - last_source = source; -} /* audio_input_mux */ - diff --git a/firmware/target/coldfire/iaudio/m3/fmradio_i2c-m3.c b/firmware/target/coldfire/iaudio/m3/fmradio_i2c-m3.c deleted file mode 100644 index 8bc6fb8445..0000000000 --- a/firmware/target/coldfire/iaudio/m3/fmradio_i2c-m3.c +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * Physical interface of the Philips TEA5767 in iAudio M3 - * - * Copyright (C) 2002 by Linus Nielsen Feltzing - * - * 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 "config.h" - -#if (CONFIG_TUNER & TEA5767) - -#include "i2c-coldfire.h" -#include "fmradio_i2c.h" - -int fmradio_i2c_write(unsigned char address, const unsigned char* buf, - int count) -{ - return i2c_write(I2C_IFACE_0, address, buf, count); -} - -int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) -{ - return i2c_read(I2C_IFACE_0, address, buf, count); -} - -#endif diff --git a/firmware/target/coldfire/iaudio/m5/audio-m5.c b/firmware/target/coldfire/iaudio/m5/audio-m5.c deleted file mode 100644 index 728f9be063..0000000000 --- a/firmware/target/coldfire/iaudio/m5/audio-m5.c +++ /dev/null @@ -1,84 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Michael Sevakis - * - * 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 "system.h" -#include "cpu.h" -#include "audio.h" -#include "sound.h" - -void audio_set_output_source(int source) -{ - int level = set_irq_level(DMA_IRQ_LEVEL); - unsigned long txsrc; - - if ((unsigned)source >= AUDIO_NUM_SOURCES) - txsrc = (3 << 8); /* playback, PDOR3 */ - else - txsrc = (4 << 8); /* recording, iis1RcvData */ - - IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; - restore_irq(level); -} /* audio_set_output_source */ - -void audio_input_mux(int source, unsigned flags) -{ - /* Prevent pops from unneeded switching */ - static int last_source = AUDIO_SRC_PLAYBACK; - - (void)flags; - - switch (source) - { - default: /* playback - no recording */ - source = AUDIO_SRC_PLAYBACK; - case AUDIO_SRC_PLAYBACK: - if (source != last_source) - { - audiohw_disable_recording(); - audiohw_set_monitor(false); - coldfire_set_dataincontrol(0); - } - break; - - case AUDIO_SRC_MIC: /* recording only */ - if (source != last_source) - { - audiohw_enable_recording(true); /* source mic */ - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - } - break; - - case AUDIO_SRC_LINEIN: /* recording only */ - if (source != last_source) - { - audiohw_enable_recording(false); /* source line */ - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - } - break; - } /* end switch */ - - or_l((1 << 29), &GPIO_OUT); /* Line In */ - or_l((1 << 29), &GPIO_ENABLE); - or_l((1 << 29), &GPIO_FUNCTION); - - last_source = source; -} /* audio_input_mux */ diff --git a/firmware/target/coldfire/iaudio/m5/power-m5.c b/firmware/target/coldfire/iaudio/m5/power-m5.c deleted file mode 100644 index 8bb36c663d..0000000000 --- a/firmware/target/coldfire/iaudio/m5/power-m5.c +++ /dev/null @@ -1,67 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Linus Nielsen Feltzing - * - * 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 "config.h" -#include "cpu.h" -#include -#include "kernel.h" -#include "system.h" -#include "power.h" -#include "pcf50606.h" -#include "lcd-remote-target.h" - -void power_init(void) -{ - /* Charger detect */ - and_l(~0x01000000, &GPIO1_ENABLE); - or_l(0x01000000, &GPIO1_FUNCTION); - - pcf50606_init(); -} - -unsigned int power_input_status(void) -{ - return (GPIO1_READ & 0x01000000) ? - POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; -} - -void ide_power_enable(bool on) -{ - /* GPOOD3 */ - int level = disable_irq_save(); - pcf50606_write(0x3c, on ? 0x07 : 0x00); - restore_irq(level); -} - -bool ide_powered(void) -{ - int level = disable_irq_save(); - int value = pcf50606_read(0x3c); - restore_irq(level); - return (value & 0x07) != 0; -} - -void power_off(void) -{ - lcd_remote_poweroff(); - set_irq_level(DISABLE_INTERRUPTS); - and_l(~0x00000008, &GPIO_OUT); /* Set KEEPACT low */ - asm("halt"); -} diff --git a/firmware/target/coldfire/iaudio/power-x5m5.c b/firmware/target/coldfire/iaudio/power-x5m5.c new file mode 100644 index 0000000000..e9bdde16ec --- /dev/null +++ b/firmware/target/coldfire/iaudio/power-x5m5.c @@ -0,0 +1,75 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Linus Nielsen Feltzing + * + * 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 "config.h" +#include "cpu.h" +#include +#include "kernel.h" +#include "system.h" +#include "power.h" +#include "pcf50606.h" +#include "lcd-remote-target.h" + +void power_init(void) +{ + /* Charger detect */ + and_l(~0x01000000, &GPIO1_ENABLE); + or_l(0x01000000, &GPIO1_FUNCTION); + + pcf50606_init(); +} + +unsigned int power_input_status(void) +{ + return (GPIO1_READ & 0x01000000) ? + POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; +} + +void ide_power_enable(bool on) +{ + /* GPOOD3 */ + int level = disable_irq_save(); + pcf50606_write(0x3c, on ? 0x07 : 0x00); + restore_irq(level); +} + +bool ide_powered(void) +{ + int level = disable_irq_save(); + int value = pcf50606_read(0x3c); + restore_irq(level); + return (value & 0x07) != 0; +} + +void power_off(void) +{ + lcd_remote_poweroff(); + set_irq_level(DISABLE_INTERRUPTS); + and_l(~0x00000008, &GPIO_OUT); /* Set KEEPACT low */ + asm("halt"); +} + +#if (CONFIG_TUNER & TEA5767) +bool tuner_power(bool status) +{ + (void)status; + return true; +} +#endif diff --git a/firmware/target/coldfire/iaudio/x5/audio-x5.c b/firmware/target/coldfire/iaudio/x5/audio-x5.c deleted file mode 100644 index eb74eaf3b6..0000000000 --- a/firmware/target/coldfire/iaudio/x5/audio-x5.c +++ /dev/null @@ -1,115 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Michael Sevakis - * - * 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 "system.h" -#include "cpu.h" -#include "audio.h" -#include "sound.h" - -void audio_set_output_source(int source) -{ - int level = set_irq_level(DMA_IRQ_LEVEL); - unsigned long txsrc; - - if ((unsigned)source >= AUDIO_NUM_SOURCES) - txsrc = (3 << 8); /* playback, PDOR3 */ - else - txsrc = (4 << 8); /* recording, iis1RcvData */ - - IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; - restore_irq(level); -} /* audio_set_output_source */ - -void audio_input_mux(int source, unsigned flags) -{ - /* Prevent pops from unneeded switching */ - static int last_source = AUDIO_SRC_PLAYBACK; - static bool last_recording = false; - - bool recording = flags & SRCF_RECORDING; - - switch (source) - { - default: /* playback - no recording */ - source = AUDIO_SRC_PLAYBACK; - case AUDIO_SRC_PLAYBACK: - if (source != last_source) - { - audiohw_disable_recording(); - audiohw_set_monitor(false); - coldfire_set_dataincontrol(0); - } - break; - - case AUDIO_SRC_MIC: /* recording only */ - if (source != last_source) - { - audiohw_enable_recording(true); /* source mic */ - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - } - break; - - case AUDIO_SRC_LINEIN: /* recording only */ - if (source != last_source) - { - audiohw_enable_recording(false); /* source line */ - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - } - break; - - case AUDIO_SRC_FMRADIO: /* recording and playback */ - if (!recording) - audiohw_set_recvol(23, 23, AUDIO_GAIN_LINEIN); - - /* I2S recording and analog playback */ - if (source == last_source && recording == last_recording) - break; - - last_recording = recording; - - if (recording) - { - /* Int. when 6 samples in FIFO, PDIR2 src = iis1RcvData */ - coldfire_set_dataincontrol((3 << 14) | (4 << 3)); - audiohw_enable_recording(false); /* source line */ - } - else - { - audiohw_disable_recording(); - audiohw_set_monitor(true); /* analog bypass */ - coldfire_set_dataincontrol(0); - } - break; - } /* end switch */ - - /* set line multiplexer */ - if (source == AUDIO_SRC_FMRADIO) - and_l(~(1 << 29), &GPIO_OUT); /* FM radio */ - else - or_l((1 << 29), &GPIO_OUT); /* Line In */ - - or_l((1 << 29), &GPIO_ENABLE); - or_l((1 << 29), &GPIO_FUNCTION); - - last_source = source; -} /* audio_input_mux */ - diff --git a/firmware/target/coldfire/iaudio/x5/fmradio_i2c-x5.c b/firmware/target/coldfire/iaudio/x5/fmradio_i2c-x5.c deleted file mode 100644 index 68baed9bb3..0000000000 --- a/firmware/target/coldfire/iaudio/x5/fmradio_i2c-x5.c +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * Physical interface of the Philips TEA5767 in iAudio x5 - * - * Copyright (C) 2002 by Linus Nielsen Feltzing - * - * 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 "config.h" - -#if (CONFIG_TUNER & TEA5767) - -#include "i2c-coldfire.h" - -int fmradio_i2c_write(unsigned char address, const unsigned char* buf, - int count) -{ - return i2c_write(I2C_IFACE_0, address, buf, count); -} - -int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) -{ - return i2c_read(I2C_IFACE_0, address, buf, count); -} - -#endif diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c deleted file mode 100644 index 4feb9c15d0..0000000000 --- a/firmware/target/coldfire/iaudio/x5/power-x5.c +++ /dev/null @@ -1,73 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Linus Nielsen Feltzing - * - * 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 "config.h" -#include "cpu.h" -#include -#include "kernel.h" -#include "system.h" -#include "power.h" -#include "pcf50606.h" -#include "lcd-remote-target.h" - -void power_init(void) -{ - /* Charger detect */ - and_l(~0x01000000, &GPIO1_ENABLE); - or_l(0x01000000, &GPIO1_FUNCTION); - - pcf50606_init(); -} - -unsigned int power_input_status(void) -{ - return (GPIO1_READ & 0x01000000) ? - POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; -} - -void ide_power_enable(bool on) -{ - /* GPOOD3 */ - int level = disable_irq_save(); - pcf50606_write(0x3c, on ? 0x07 : 0x00); - restore_irq(level); -} - -bool ide_powered(void) -{ - int level = disable_irq_save(); - int value = pcf50606_read(0x3c); - restore_irq(level); - return (value & 0x07) != 0; -} - -void power_off(void) -{ - lcd_remote_poweroff(); - set_irq_level(DISABLE_INTERRUPTS); - and_l(~0x00000008, &GPIO_OUT); /* Set KEEPACT low */ - asm("halt"); -} - -bool tuner_power(bool status) -{ - (void)status; - return true; -} diff --git a/tools/configure b/tools/configure index f081b8ba72..50091a5da3 100755 --- a/tools/configure +++ b/tools/configure @@ -321,12 +321,15 @@ whichadvanced () { if [ "$memory" = "2" ]; then printf ", (8)MB MOD" fi - if [ "$modelname" = "h120" ]; then - printf ", (R)TC MOD" - fi if [ "$t_model" = "ondio" ]; then printf ", (B)acklight MOD" fi + if [ "$modelname" = "m5" ]; then + printf ", (F)M radio MOD" + fi + if [ "$modelname" = "h120" ]; then + printf ", (R)TC MOD" + fi echo "" cont=1 @@ -372,6 +375,22 @@ whichadvanced () { cont=0 fi ;; + [Bb]) + if [ "$t_model" = "ondio" ]; then + have_backlight="#define HAVE_BACKLIGHT" + echo "Backlight functions enabled" + else + cont=0 + fi + ;; + [Ff]) + if [ "$modelname" = "m5" ]; then + have_fmradio_in="#define HAVE_FMRADIO_IN" + echo "FM radio functions enabled" + else + cont=0 + fi + ;; [Rr]) if [ "$modelname" = "h120" ]; then config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" @@ -381,14 +400,6 @@ whichadvanced () { cont=0 fi ;; - [Bb]) - if [ "$t_model" = "ondio" ]; then - have_backlight="#define HAVE_BACKLIGHT" - echo "Backlight functions enabled" - else - cont=0 - fi - ;; *) cont=0 ;; @@ -2516,6 +2527,7 @@ sed > autoconf.h \ -e "s,@have_rtc_alarm@,$have_rtc_alarm,g" \ -e "s,@RBDIR@,${rbdir},g" \ -e "s,@have_backlight@,$have_backlight,g" \ + -e "s,@have_fmradio_in@,$have_fmradio_in,g" \ < autoconf.h \ /* Define this if you build rockbox to support the logf logging and display */ #undef ROCKBOX_HAS_LOGF +/* optional define for a backlight modded Ondio */ +@have_backlight@ + +/* optional define for FM radio mod for iAudio M5 */ +@have_fmradio_in@ + /* optional defines for RTC mod for h1x0 */ @config_rtc@ @have_rtc_alarm@ -/* optional define for a backlight modded Ondio */ -@have_backlight@ - /* root of Rockbox */ #define ROCKBOX_DIR "/@RBDIR@" -- cgit v1.2.3