From 446f352abda2dbc9de90c35a02100ed5e9aad77c Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 19 Nov 2013 20:39:10 +0000 Subject: imx233: factor fmradio i2c and tuner power code Choices are limited for those: i2c is either generic software or imx233 hardware and power is either none or with a gpio. So factor ever possible combination in a single common file and use fmradio-target.h to supply the required parameters. This will remove a bunch of duplicate code. Change-Id: If12faeb2e371631cd39cc18a4c1d859812007934 --- .../imx233/creative-zenxfi2/fmradio-i2c-zenxfi2.c | 40 --------------------- .../arm/imx233/creative-zenxfi2/fmradio-target.h | 28 +++++++++++++++ .../arm/imx233/creative-zenxfi2/power-zenxfi2.c | 42 ---------------------- 3 files changed, 28 insertions(+), 82 deletions(-) delete mode 100644 firmware/target/arm/imx233/creative-zenxfi2/fmradio-i2c-zenxfi2.c create mode 100644 firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h delete mode 100644 firmware/target/arm/imx233/creative-zenxfi2/power-zenxfi2.c (limited to 'firmware/target/arm/imx233/creative-zenxfi2') diff --git a/firmware/target/arm/imx233/creative-zenxfi2/fmradio-i2c-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/fmradio-i2c-zenxfi2.c deleted file mode 100644 index 58ac8e6a08..0000000000 --- a/firmware/target/arm/imx233/creative-zenxfi2/fmradio-i2c-zenxfi2.c +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2012 by Amaury Pouly - * - * 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 "fmradio_i2c.h" -#include "pinctrl-imx233.h" -#include "i2c.h" - -void fmradio_i2c_init(void) -{ -} - -int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) -{ - return i2c_write(address, buf, count); -} - -int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) -{ - return i2c_read(address, buf, count); -} diff --git a/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h b/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h new file mode 100644 index 0000000000..e6869dc2a5 --- /dev/null +++ b/firmware/target/arm/imx233/creative-zenxfi2/fmradio-target.h @@ -0,0 +1,28 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2013 by Amaury Pouly + * + * 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 _FMRADIO_TARGET_H_ +#define _FMRADIO_TARGET_H_ + +#define IMX233_FMRADIO_I2C FMI_HW + +#define IMX233_FMRADIO_POWER FMP_NONE + +#endif /* _FMRADIO_TARGET_H_ */ diff --git a/firmware/target/arm/imx233/creative-zenxfi2/power-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/power-zenxfi2.c deleted file mode 100644 index 180b7f9d4c..0000000000 --- a/firmware/target/arm/imx233/creative-zenxfi2/power-zenxfi2.c +++ /dev/null @@ -1,42 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2011 by Amaury Pouly - * - * 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 "power.h" -#include "tuner.h" -#include "fmradio_i2c.h" -#include "pinctrl-imx233.h" - -static bool tuner_enable = false; - -bool tuner_power(bool enable) -{ - if(enable != tuner_enable) - { - tuner_enable = enable; - } - return tuner_enable; -} - -bool tuner_powered(void) -{ - return tuner_enable; -} -- cgit