diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-19 20:39:10 +0000 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-19 20:39:10 +0000 |
commit | 446f352abda2dbc9de90c35a02100ed5e9aad77c (patch) | |
tree | 7ee2b4dae98376e0380b0b8bc44e1e688d10ede2 /firmware/target/arm/imx233/sony-nwz | |
parent | c2c2274e0adacc1a0c5bdb57fa1367badb7b047f (diff) | |
download | rockbox-446f352abda2dbc9de90c35a02100ed5e9aad77c.tar.gz rockbox-446f352abda2dbc9de90c35a02100ed5e9aad77c.zip |
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
Diffstat (limited to 'firmware/target/arm/imx233/sony-nwz')
-rw-r--r-- | firmware/target/arm/imx233/sony-nwz/fmradio-i2c-nwz.c | 40 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sony-nwz/fmradio-target.h (renamed from firmware/target/arm/imx233/sony-nwz/power-nwz.c) | 24 |
2 files changed, 5 insertions, 59 deletions
diff --git a/firmware/target/arm/imx233/sony-nwz/fmradio-i2c-nwz.c b/firmware/target/arm/imx233/sony-nwz/fmradio-i2c-nwz.c deleted file mode 100644 index a1377ce1f2..0000000000 --- a/firmware/target/arm/imx233/sony-nwz/fmradio-i2c-nwz.c +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2013 by Amaury Pouly | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #include "config.h" | ||
23 | #include "system.h" | ||
24 | #include "fmradio_i2c.h" | ||
25 | #include "pinctrl-imx233.h" | ||
26 | #include "i2c.h" | ||
27 | |||
28 | void fmradio_i2c_init(void) | ||
29 | { | ||
30 | } | ||
31 | |||
32 | int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) | ||
33 | { | ||
34 | return i2c_write(address, buf, count); | ||
35 | } | ||
36 | |||
37 | int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) | ||
38 | { | ||
39 | return i2c_read(address, buf, count); | ||
40 | } | ||
diff --git a/firmware/target/arm/imx233/sony-nwz/power-nwz.c b/firmware/target/arm/imx233/sony-nwz/fmradio-target.h index 88644919ad..e6869dc2a5 100644 --- a/firmware/target/arm/imx233/sony-nwz/power-nwz.c +++ b/firmware/target/arm/imx233/sony-nwz/fmradio-target.h | |||
@@ -18,25 +18,11 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifndef _FMRADIO_TARGET_H_ | ||
22 | #define _FMRADIO_TARGET_H_ | ||
21 | 23 | ||
22 | #include "system.h" | 24 | #define IMX233_FMRADIO_I2C FMI_HW |
23 | #include "power.h" | ||
24 | #include "tuner.h" | ||
25 | #include "fmradio_i2c.h" | ||
26 | #include "pinctrl-imx233.h" | ||
27 | 25 | ||
28 | static bool tuner_enable = false; | 26 | #define IMX233_FMRADIO_POWER FMP_NONE |
29 | 27 | ||
30 | bool tuner_power(bool enable) | 28 | #endif /* _FMRADIO_TARGET_H_ */ |
31 | { | ||
32 | if(enable != tuner_enable) | ||
33 | { | ||
34 | tuner_enable = enable; | ||
35 | } | ||
36 | return tuner_enable; | ||
37 | } | ||
38 | |||
39 | bool tuner_powered(void) | ||
40 | { | ||
41 | return tuner_enable; | ||
42 | } | ||