get rid of audiohw_reset
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15720 a1c6a512-1295-4272-9138-f99709370657
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index f88cafe..2dc1513 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -125,8 +125,6 @@
return result;
}
-void audiohw_reset(void);
-
/*
* Initialise the PP I2C and I2S.
*/
diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c
index d57bef9..3059b5a 100644
--- a/firmware/drivers/audio/tlv320.c
+++ b/firmware/drivers/audio/tlv320.c
@@ -118,14 +118,6 @@
}
/**
- * Resets tlv320 to default values
- */
-void audiohw_reset(void)
-{
- tlv320_write_reg(REG_RR, RR_RESET);
-}
-
-/**
* Sets internal sample rate for DAC and ADC relative to MCLK
* Selection for frequency:
* Fs: tlv: with:
diff --git a/firmware/drivers/audio/uda1380.c b/firmware/drivers/audio/uda1380.c
index f5b637e..e5481a5 100644
--- a/firmware/drivers/audio/uda1380.c
+++ b/firmware/drivers/audio/uda1380.c
@@ -201,7 +201,7 @@
}
}
-void audiohw_reset(void)
+static void reset(void)
{
#ifdef IRIVER_H300_SERIES
int mask = set_irq_level(HIGHEST_IRQ_LEVEL);
@@ -261,7 +261,7 @@
recgain_mic = 0;
recgain_line = 0;
- audiohw_reset();
+ reset();
if (audiohw_set_regs() == -1)
{
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c
index 6358484..138f3c3 100644
--- a/firmware/drivers/audio/wm8751.c
+++ b/firmware/drivers/audio/wm8751.c
@@ -104,9 +104,6 @@
}
#endif
-
-void audiohw_reset(void);
-
/* Reset and power up the WM8751 */
void audiohw_preinit(void)
{
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index 30740d5..1cfac7c 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -74,8 +74,6 @@
return -db * 2 / 5;
}
-void audiohw_reset(void);
-
#define IPOD_PCM_LEVEL 0x65 /* -6dB */
//#define BASSCTRL 0x
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index a069d15..7732c39 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -70,9 +70,6 @@
return 0;
}
-
-void audiohw_reset(void);
-
#define IPOD_PCM_LEVEL 0x65 /* -6dB */
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 82be135..088d551 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -24,7 +24,6 @@
extern int tenthdb2master(int db);
-extern void audiohw_reset(void);
extern void audiohw_enable_output(bool enable);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 94c51aa..87b29dd 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -27,7 +27,6 @@
/*** definitions ***/
-extern void audiohw_reset(void);
/**
* Sets internal sample rate for DAC and ADC relative to MCLK
* Selection for frequency:
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index 2f35b29..28da424 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -27,7 +27,6 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
-extern void audiohw_reset(void);
extern void audiohw_enable_output(bool enable);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_mixer_vol(int channel1, int channel2);
diff --git a/firmware/export/wm8721.h b/firmware/export/wm8721.h
index bb4c8b0..25338af 100644
--- a/firmware/export/wm8721.h
+++ b/firmware/export/wm8721.h
@@ -27,7 +27,6 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
-extern void audiohw_reset(void);
extern void audiohw_enable_output(bool enable);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_nsorder(int order);
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h
index 3dc82b6..1ee6166 100644
--- a/firmware/export/wm8731.h
+++ b/firmware/export/wm8731.h
@@ -27,7 +27,6 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
-extern void audiohw_reset(void);
extern void audiohw_preinit(void);
extern void audiohw_postinit(void);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index 23966fd..5ad0a01 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -26,7 +26,6 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
-extern void audiohw_reset(void);
extern void audiohw_preinit(void);
extern void audiohw_enable_output(bool enable);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index 62fb04a..6d3220a 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -27,7 +27,6 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
-extern void audiohw_reset(void);
extern void audiohw_enable_output(bool enable);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index ab162fc..d77d61e 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -27,7 +27,6 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
-extern void audiohw_reset(void);
extern void audiohw_enable_output(bool enable);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);