diff options
author | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2013-11-01 18:59:53 +0400 |
---|---|---|
committer | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2013-11-05 09:59:45 +0400 |
commit | a170c99170589488531f7f576ad5e248b1c7c589 (patch) | |
tree | 77d4c63663dac283e978cdaa1d8e0b4df565da78 /firmware | |
parent | d602717735b09cdd39e4e8c75d69ce8c5e2d957d (diff) | |
download | rockbox-a170c99170589488531f7f576ad5e248b1c7c589.tar.gz rockbox-a170c99170589488531f7f576ad5e248b1c7c589.zip |
ma9: Slightly change df1704 driver API.
This change should be done for easier integration of ma8 port.
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/audio/df1704.c | 6 | ||||
-rw-r--r-- | firmware/export/df1704.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/ma/audio-ma.c | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/firmware/drivers/audio/df1704.c b/firmware/drivers/audio/df1704.c index ec8d56b955..917cecb767 100644 --- a/firmware/drivers/audio/df1704.c +++ b/firmware/drivers/audio/df1704.c | |||
@@ -67,7 +67,7 @@ static int vol_tenthdb2hw(const int tdb) | |||
67 | } | 67 | } |
68 | 68 | ||
69 | 69 | ||
70 | void df1704_init(void) | 70 | void audiohw_init(void) |
71 | { | 71 | { |
72 | df1704_write_reg(DF1704_MODE(2), | 72 | df1704_write_reg(DF1704_MODE(2), |
73 | DF1704_OW_24 | | 73 | DF1704_OW_24 | |
@@ -81,7 +81,7 @@ void df1704_init(void) | |||
81 | DF1704_I2S_ON); | 81 | DF1704_I2S_ON); |
82 | } | 82 | } |
83 | 83 | ||
84 | void df1704_mute(void) | 84 | void audiohw_mute(void) |
85 | { | 85 | { |
86 | df1704_write_reg(DF1704_MODE(2), | 86 | df1704_write_reg(DF1704_MODE(2), |
87 | DF1704_OW_24 | | 87 | DF1704_OW_24 | |
@@ -90,7 +90,7 @@ void df1704_mute(void) | |||
90 | DF1704_MUTE_ON); | 90 | DF1704_MUTE_ON); |
91 | } | 91 | } |
92 | 92 | ||
93 | void df1704_unmute(void) | 93 | void audiohw_unmute(void) |
94 | { | 94 | { |
95 | df1704_write_reg(DF1704_MODE(2), | 95 | df1704_write_reg(DF1704_MODE(2), |
96 | DF1704_OW_24 | | 96 | DF1704_OW_24 | |
diff --git a/firmware/export/df1704.h b/firmware/export/df1704.h index 4a0bdfd8ba..81848d8c6f 100644 --- a/firmware/export/df1704.h +++ b/firmware/export/df1704.h | |||
@@ -87,8 +87,7 @@ AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 1, 0) | |||
87 | #define DF1704_SF_32 (3<<6) | 87 | #define DF1704_SF_32 (3<<6) |
88 | #define DF1704_SF_48 (2<<6) | 88 | #define DF1704_SF_48 (2<<6) |
89 | 89 | ||
90 | void df1704_init(void); | 90 | void audiohw_mute(void); |
91 | void df1704_mute(void); | ||
92 | void df1704_set_ml(const int); | 91 | void df1704_set_ml(const int); |
93 | void df1704_set_mc(const int); | 92 | void df1704_set_mc(const int); |
94 | void df1704_set_md(const int); | 93 | void df1704_set_md(const int); |
diff --git a/firmware/target/arm/rk27xx/ma/audio-ma.c b/firmware/target/arm/rk27xx/ma/audio-ma.c index c870ca09b8..92cea307b2 100644 --- a/firmware/target/arm/rk27xx/ma/audio-ma.c +++ b/firmware/target/arm/rk27xx/ma/audio-ma.c | |||
@@ -55,7 +55,7 @@ static void amp_enable(const int val) | |||
55 | pca9555_write_output(val<<3, 1<<3); | 55 | pca9555_write_output(val<<3, 1<<3); |
56 | } | 56 | } |
57 | 57 | ||
58 | static void df1704_enable(const int val) | 58 | static void dac_enable(const int val) |
59 | { | 59 | { |
60 | pca9555_write_output(val<<4, 1<<4); | 60 | pca9555_write_output(val<<4, 1<<4); |
61 | } | 61 | } |
@@ -65,21 +65,21 @@ void audiohw_postinit(void) | |||
65 | { | 65 | { |
66 | pop_ctrl(0); | 66 | pop_ctrl(0); |
67 | sleep(HZ/4); | 67 | sleep(HZ/4); |
68 | df1704_enable(1); | 68 | dac_enable(1); |
69 | amp_enable(1); | 69 | amp_enable(1); |
70 | sleep(HZ/100); | 70 | sleep(HZ/100); |
71 | df1704_init(); | 71 | audiohw_init(); |
72 | sleep(HZ/4); | 72 | sleep(HZ/4); |
73 | pop_ctrl(1); | 73 | pop_ctrl(1); |
74 | } | 74 | } |
75 | 75 | ||
76 | void audiohw_close(void) | 76 | void audiohw_close(void) |
77 | { | 77 | { |
78 | df1704_mute(); | 78 | audiohw_mute(); |
79 | pop_ctrl(0); | 79 | pop_ctrl(0); |
80 | sleep(HZ/5); | 80 | sleep(HZ/5); |
81 | amp_enable(0); | 81 | amp_enable(0); |
82 | df1704_enable(0); | 82 | dac_enable(0); |
83 | sleep(HZ/5); | 83 | sleep(HZ/5); |
84 | pop_ctrl(1); | 84 | pop_ctrl(1); |
85 | } | 85 | } |