From bd78dc7693743e35a854d3a615a20474a7a450b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Tue, 20 Jul 2010 06:26:39 +0000 Subject: The new Fuzev2 use the same FM chip than some Clip+ git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27502 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 3 +- firmware/export/config/sansafuzev2.h | 2 +- .../arm/as3525/sansa-clipplus/tuner-clipplus.c | 38 ---------------------- firmware/target/arm/as3525/tuner-as3525v2.c | 38 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 firmware/target/arm/as3525/sansa-clipplus/tuner-clipplus.c create mode 100644 firmware/target/arm/as3525/tuner-as3525v2.c diff --git a/firmware/SOURCES b/firmware/SOURCES index 926891e..b4f5301 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1278,7 +1278,7 @@ target/arm/as3525/sansa-clipplus/backlight-clip.c target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S -target/arm/as3525/sansa-clipplus/tuner-clipplus.c +target/arm/as3525/tuner-as3525v2.c #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_CLIPPLUS */ @@ -1364,6 +1364,7 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S #ifdef SANSA_FUZEV2 #ifndef SIMULATOR +target/arm/as3525/tuner-as3525v2.c target/arm/as3525/lcd-fuze.c target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 78d5b3b..78c2f6b 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h @@ -121,7 +121,7 @@ #define AB_REPEAT_ENABLE /* FM Tuner - suspected to be the SI4702 */ -#define CONFIG_TUNER SI4700 +#define CONFIG_TUNER (SI4700|RDA5802) /* #define HAVE_TUNER_PWR_CTRL */ /* Define this for LCD backlight available */ diff --git a/firmware/target/arm/as3525/sansa-clipplus/tuner-clipplus.c b/firmware/target/arm/as3525/sansa-clipplus/tuner-clipplus.c deleted file mode 100644 index 3e911c2..0000000 --- a/firmware/target/arm/as3525/sansa-clipplus/tuner-clipplus.c +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Multi-tuner detection module to select between the Si4700 and the RDA5802 - * - * Copyright (C) 2010 Bertrik Sikken - * - * 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 -#include "tuner.h" - -/* return the detected tuner type */ -int tuner_detect_type(void) -{ - if (si4700_detect()) { - return SI4700; - } - if (rda5802_detect()) { - return RDA5802; - } - return 0; -} - diff --git a/firmware/target/arm/as3525/tuner-as3525v2.c b/firmware/target/arm/as3525/tuner-as3525v2.c new file mode 100644 index 0000000..3e911c2 --- /dev/null +++ b/firmware/target/arm/as3525/tuner-as3525v2.c @@ -0,0 +1,38 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Multi-tuner detection module to select between the Si4700 and the RDA5802 + * + * Copyright (C) 2010 Bertrik Sikken + * + * 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 +#include "tuner.h" + +/* return the detected tuner type */ +int tuner_detect_type(void) +{ + if (si4700_detect()) { + return SI4700; + } + if (rda5802_detect()) { + return RDA5802; + } + return 0; +} + -- cgit v1.1