summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2007-06-13 06:33:40 +0000
committerChristian Gmeiner <christian.gmeiner@gmail.com>2007-06-13 06:33:40 +0000
commitd1178d2d769fd52dbd9e872ff7cb5a7a4d2b234c (patch)
tree8a743d9e5b4265e61e044658947d43a13f9fdc7e /firmware/export
parent2f1a262a60a8c4bd6cce861dd407945aa440cdfe (diff)
downloadrockbox-d1178d2d769fd52dbd9e872ff7cb5a7a4d2b234c.tar.gz
rockbox-d1178d2d769fd52dbd9e872ff7cb5a7a4d2b234c.zip
* changed pararmeter of audiohw_mute from int to bool
* unification of init and close NOTE: audiohw_init is a void function now, because it never (can) fail okay from JdGordon@irc git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13622 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/as3514.h2
-rw-r--r--firmware/export/audiohw.h17
-rw-r--r--firmware/export/tlv320.h2
-rw-r--r--firmware/export/uda1380.h3
-rw-r--r--firmware/export/wm8731l.h2
-rw-r--r--firmware/export/wm8751.h2
-rw-r--r--firmware/export/wm8758.h2
-rw-r--r--firmware/export/wm8975.h2
8 files changed, 17 insertions, 15 deletions
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 98656c701d..c01790f082 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -25,11 +25,9 @@
25extern int tenthdb2master(int db); 25extern int tenthdb2master(int db);
26 26
27extern void audiohw_reset(void); 27extern void audiohw_reset(void);
28extern int audiohw_init(void);
29extern void audiohw_enable_output(bool enable); 28extern void audiohw_enable_output(bool enable);
30extern int audiohw_set_master_vol(int vol_l, int vol_r); 29extern int audiohw_set_master_vol(int vol_l, int vol_r);
31extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 30extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
32extern void audiohw_close(void);
33extern void audiohw_set_sample_rate(int sampling_control); 31extern void audiohw_set_sample_rate(int sampling_control);
34 32
35extern void audiohw_enable_recording(bool source_mic); 33extern void audiohw_enable_recording(bool source_mic);
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index b266868be2..df155e2256 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -21,6 +21,7 @@
21#define _AUDIOHW_H_ 21#define _AUDIOHW_H_
22 22
23#include "config.h" 23#include "config.h"
24#include <stdbool.h>
24 25
25#ifdef HAVE_UDA1380 26#ifdef HAVE_UDA1380
26#include "uda1380.h" 27#include "uda1380.h"
@@ -94,6 +95,20 @@ extern const struct sound_settings_info audiohw_settings[];
94 * .h file suitable defines are added. 95 * .h file suitable defines are added.
95 */ 96 */
96 97
97void audiohw_mute(int mute); 98/**
99 * Initialize audio codec to a well defined state.
100 */
101void audiohw_init(void);
102
103/**
104 * Close audio codec.
105 */
106void audiohw_close(void);
107
108/**
109 * Mute or enable sound.
110 * @param mute true or false
111 */
112void audiohw_mute(bool mute);
98 113
99#endif /* _AUDIOHW_H_ */ 114#endif /* _AUDIOHW_H_ */
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 15ac794cca..af9b36262f 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -27,7 +27,6 @@ extern int tenthdb2master(int db);
27 27
28/*** definitions ***/ 28/*** definitions ***/
29 29
30extern void audiohw_init(void);
31extern void audiohw_reset(void); 30extern void audiohw_reset(void);
32/** 31/**
33 * Sets internal sample rate for DAC and ADC relative to MCLK 32 * Sets internal sample rate for DAC and ADC relative to MCLK
@@ -42,7 +41,6 @@ extern void audiohw_set_frequency(unsigned fsel);
42extern void audiohw_enable_output(bool enable); 41extern void audiohw_enable_output(bool enable);
43extern void audiohw_set_headphone_vol(int vol_l, int vol_r); 42extern void audiohw_set_headphone_vol(int vol_l, int vol_r);
44extern void audiohw_set_recvol(int left, int right, int type); 43extern void audiohw_set_recvol(int left, int right, int type);
45extern void audiohw_close(void);
46extern void audiohw_enable_recording(bool source_mic); 44extern void audiohw_enable_recording(bool source_mic);
47extern void audiohw_disable_recording(void); 45extern void audiohw_disable_recording(void);
48extern void audiohw_set_monitor(bool enable); 46extern void audiohw_set_monitor(bool enable);
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index fd1b838b04..b4b83d1ee9 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -28,13 +28,12 @@ extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_reset(void); 30extern void audiohw_reset(void);
31extern int audiohw_init(void);
32extern void audiohw_enable_output(bool enable); 31extern void audiohw_enable_output(bool enable);
33extern int audiohw_set_master_vol(int vol_l, int vol_r); 32extern int audiohw_set_master_vol(int vol_l, int vol_r);
34extern int audiohw_set_mixer_vol(int channel1, int channel2); 33extern int audiohw_set_mixer_vol(int channel1, int channel2);
35extern void audiohw_set_bass(int value); 34extern void audiohw_set_bass(int value);
36extern void audiohw_set_treble(int value); 35extern void audiohw_set_treble(int value);
37extern void audiohw_close(void); 36
38/** 37/**
39 * Sets frequency settings for DAC and ADC relative to MCLK 38 * Sets frequency settings for DAC and ADC relative to MCLK
40 * 39 *
diff --git a/firmware/export/wm8731l.h b/firmware/export/wm8731l.h
index 74e41a73d7..f0f63c909a 100644
--- a/firmware/export/wm8731l.h
+++ b/firmware/export/wm8731l.h
@@ -28,13 +28,11 @@ extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_reset(void); 30extern void audiohw_reset(void);
31extern int audiohw_init(void);
32extern void audiohw_enable_output(bool enable); 31extern void audiohw_enable_output(bool enable);
33extern int audiohw_set_master_vol(int vol_l, int vol_r); 32extern int audiohw_set_master_vol(int vol_l, int vol_r);
34extern int audiohw_set_mixer_vol(int channel1, int channel2); 33extern int audiohw_set_mixer_vol(int channel1, int channel2);
35extern void audiohw_set_bass(int value); 34extern void audiohw_set_bass(int value);
36extern void audiohw_set_treble(int value); 35extern void audiohw_set_treble(int value);
37extern void audiohw_close(void);
38extern void audiohw_set_nsorder(int order); 36extern void audiohw_set_nsorder(int order);
39extern void audiohw_set_sample_rate(int sampling_control); 37extern void audiohw_set_sample_rate(int sampling_control);
40 38
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index 89d2c6b21c..782027433a 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -27,7 +27,6 @@ extern int tenthdb2master(int db);
27extern int tenthdb2mixer(int db); 27extern int tenthdb2mixer(int db);
28 28
29extern void audiohw_reset(void); 29extern void audiohw_reset(void);
30extern int audiohw_init(void);
31extern void audiohw_preinit(void); 30extern void audiohw_preinit(void);
32extern void audiohw_enable_output(bool enable); 31extern void audiohw_enable_output(bool enable);
33extern int audiohw_set_master_vol(int vol_l, int vol_r); 32extern int audiohw_set_master_vol(int vol_l, int vol_r);
@@ -35,7 +34,6 @@ extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
35extern int audiohw_set_mixer_vol(int channel1, int channel2); 34extern int audiohw_set_mixer_vol(int channel1, int channel2);
36extern void audiohw_set_bass(int value); 35extern void audiohw_set_bass(int value);
37extern void audiohw_set_treble(int value); 36extern void audiohw_set_treble(int value);
38extern void audiohw_close(void);
39extern void audiohw_set_frequency(int fsel); 37extern void audiohw_set_frequency(int fsel);
40 38
41/* Register addresses and bits */ 39/* Register addresses and bits */
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index e86af87f51..8a3c61910c 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -28,14 +28,12 @@ extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_reset(void); 30extern void audiohw_reset(void);
31extern int audiohw_init(void);
32extern void audiohw_enable_output(bool enable); 31extern void audiohw_enable_output(bool enable);
33extern int audiohw_set_master_vol(int vol_l, int vol_r); 32extern int audiohw_set_master_vol(int vol_l, int vol_r);
34extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 33extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
35extern int audiohw_set_mixer_vol(int channel1, int channel2); 34extern int audiohw_set_mixer_vol(int channel1, int channel2);
36extern void audiohw_set_bass(int value); 35extern void audiohw_set_bass(int value);
37extern void audiohw_set_treble(int value); 36extern void audiohw_set_treble(int value);
38extern void audiohw_close(void);
39extern void audiohw_set_nsorder(int order); 37extern void audiohw_set_nsorder(int order);
40extern void audiohw_set_sample_rate(int sampling_control); 38extern void audiohw_set_sample_rate(int sampling_control);
41 39
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index 609e05c622..e97497ee02 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -28,14 +28,12 @@ extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_reset(void); 30extern void audiohw_reset(void);
31extern int audiohw_init(void);
32extern void audiohw_enable_output(bool enable); 31extern void audiohw_enable_output(bool enable);
33extern int audiohw_set_master_vol(int vol_l, int vol_r); 32extern int audiohw_set_master_vol(int vol_l, int vol_r);
34extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 33extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
35extern int audiohw_set_mixer_vol(int channel1, int channel2); 34extern int audiohw_set_mixer_vol(int channel1, int channel2);
36extern void audiohw_set_bass(int value); 35extern void audiohw_set_bass(int value);
37extern void audiohw_set_treble(int value); 36extern void audiohw_set_treble(int value);
38extern void audiohw_close(void);
39extern void audiohw_set_nsorder(int order); 37extern void audiohw_set_nsorder(int order);
40extern void audiohw_set_sample_rate(int sampling_control); 38extern void audiohw_set_sample_rate(int sampling_control);
41 39