devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Return value of audiohw_set_xxx_vol is never used and most of the time we have a return 0; --> kick it

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16300 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christian Gmeiner 2008-02-13 11:19:23 +00:00
parent c3213e40ad
commit 06971be8cd
16 changed files with 32 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/drivers/audio/as3514.c
View file

@ -218,7 +218,7 @@ void audiohw_enable_output(bool enable)
}
}
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
unsigned int hph_r = as3514.regs[HPH_OUT_R] & ~0x1f;
unsigned int hph_l = as3514.regs[HPH_OUT_L] & ~0x1f;
@ -262,16 +262,12 @@ int audiohw_set_master_vol(int vol_l, int vol_r)
as3514_write(mix_reg_l, mix_l);
as3514_write(HPH_OUT_R, hph_r);
as3514_write(HPH_OUT_L, hph_l);
return 0;
}
int audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_vol(int vol_l, int vol_r)
{
as3514_write(LINE_OUT_R, vol_r);
as3514_write(LINE_OUT_L, (1 << 6) | vol_l);
return 0;
}
void audiohw_mute(bool mute)

8
firmware/drivers/audio/uda1380.c
View file

@ -125,18 +125,18 @@ static int uda1380_write_reg(unsigned char reg, unsigned short value)
/**
* Sets left and right master volume (0(max) to 252(muted))
*/
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
return uda1380_write_reg(REG_MASTER_VOL,
uda1380_write_reg(REG_MASTER_VOL,
MASTER_VOL_LEFT(vol_l) | MASTER_VOL_RIGHT(vol_r));
}
/**
* Sets mixer volume for both channels (0(max) to 228(muted))
*/
int audiohw_set_mixer_vol(int channel1, int channel2)
void audiohw_set_mixer_vol(int channel1, int channel2)
{
return uda1380_write_reg(REG_MIX_VOL,
uda1380_write_reg(REG_MIX_VOL,
MIX_VOL_CH_1(channel1) | MIX_VOL_CH_2(channel2));
}

4
firmware/drivers/audio/wm8721.c
View file

@ -141,7 +141,7 @@ void audiohw_enable_output(bool enable)
}
}
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
/* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */
/* 1111111 == +6dB */
@ -150,8 +150,6 @@ int audiohw_set_master_vol(int vol_l, int vol_r)
/* 0101111 == mute (0x2f) */
wmcodec_write(LOUTVOL, VOLUME_ZC_WAIT | vol_l);
wmcodec_write(ROUTVOL, VOLUME_ZC_WAIT | vol_r);
return 0;
}
/* Nice shutdown of WM8721 codec */

3
firmware/drivers/audio/wm8731.c
View file

@ -188,7 +188,7 @@ void audiohw_postinit(void)
#endif
}
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
/* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */
/* 1111111 == +6dB */
@ -197,7 +197,6 @@ int audiohw_set_master_vol(int vol_l, int vol_r)
/* 0101111 == mute (0x2f) */
wm8731_write(LOUTVOL, LOUTVOL_LZCEN | (vol_l & LOUTVOL_LHPVOL_MASK));
wm8731_write(ROUTVOL, ROUTVOL_RZCEN | (vol_r & ROUTVOL_RHPVOL_MASK));
return 0;
}
/* Nice shutdown of WM8731 codec */

6
firmware/drivers/audio/wm8751.c
View file

@ -164,7 +164,7 @@ void audiohw_postinit(void)
#endif
}
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
/* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */
/* 1111111 == +6dB */
@ -174,15 +174,13 @@ int audiohw_set_master_vol(int vol_l, int vol_r)
wmcodec_write(LOUT1, LOUT1_BITS | LOUT1_LOUT1VOL(vol_l));
wmcodec_write(ROUT1, ROUT1_BITS | ROUT1_ROUT1VOL(vol_r));
return 0;
}
#ifndef MROBE_100
int audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_vol(int vol_l, int vol_r)
{
wmcodec_write(LOUT2, LOUT2_BITS | LOUT2_LOUT2VOL(vol_l));
wmcodec_write(ROUT2, ROUT2_BITS | ROUT2_ROUT2VOL(vol_r));
return 0;
}
#endif

12
firmware/drivers/audio/wm8758.c
View file

@ -118,30 +118,24 @@ void audiohw_enable_output(bool enable)
}
}
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
/* OUT1 */
wmcodec_write(LOUT1VOL, 0x080 | vol_l);
wmcodec_write(ROUT1VOL, 0x180 | vol_r);
return 0;
}
int audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_vol(int vol_l, int vol_r)
{
/* OUT2 */
wmcodec_write(LOUT2VOL, vol_l);
wmcodec_write(ROUT2VOL, 0x100 | vol_r);
return 0;
}
int audiohw_set_mixer_vol(int channel1, int channel2)
void audiohw_set_mixer_vol(int channel1, int channel2)
{
(void)channel1;
(void)channel2;
return 0;
}
void audiohw_set_bass(int value)

8
firmware/drivers/audio/wm8975.c
View file

@ -124,7 +124,7 @@ void audiohw_enable_output(bool enable)
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
/* +6 to -73dB 1dB steps (plus mute == 80levels) 7bits */
/* 1111111 == +6dB */
@ -135,17 +135,13 @@ int audiohw_set_master_vol(int vol_l, int vol_r)
/* OUT1 */
wmcodec_write(LOUT1VOL, VOLUME_ZC_WAIT | vol_l);
wmcodec_write(ROUT1VOL, VOLUME_ZC_WAIT | 0x100 | vol_r);
return 0;
}
int audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_vol(int vol_l, int vol_r)
{
/* OUT2 */
wmcodec_write(LOUT2VOL, VOLUME_ZC_WAIT | vol_l);
wmcodec_write(ROUT2VOL, VOLUME_ZC_WAIT | 0x100 | vol_r);
return 0;
}
void audiohw_set_bass(int value)

6
firmware/drivers/audio/wm8985.c
View file

@ -55,22 +55,20 @@ void audiohw_enable_output(bool enable)
(void)enable;
}
int audiohw_set_master_vol(int vol_l, int vol_r)
void audiohw_set_master_vol(int vol_l, int vol_r)
{
#warning function not implemented
(void)vol_l;
(void)vol_r;
return 0;
}
int audiohw_set_lineout_vol(int vol_l, int vol_r)
void audiohw_set_lineout_vol(int vol_l, int vol_r)
{
#warning function not implemented
(void)vol_l;
(void)vol_r;
return 0;
}
void audiohw_set_bass(int value)

4
firmware/export/as3514.h
View file

@ -24,8 +24,8 @@
extern int tenthdb2master(int db);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_sample_rate(int sampling_control);
/* Register Descriptions */

4
firmware/export/uda1380.h
View file

@ -27,8 +27,8 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_mixer_vol(int channel1, int channel2);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_mixer_vol(int channel1, int channel2);
extern void audiohw_set_bass(int value);
extern void audiohw_set_treble(int value);

2
firmware/export/wm8721.h
View file

@ -27,7 +27,7 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_nsorder(int order);
extern void audiohw_set_sample_rate(int sampling_control);

2
firmware/export/wm8731.h
View file

@ -28,7 +28,7 @@ extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
extern void audiohw_preinit(void);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_nsorder(int order);
extern void audiohw_set_sample_rate(int sampling_control);

4
firmware/export/wm8751.h
View file

@ -26,8 +26,8 @@
extern int tenthdb2master(int db);
extern void audiohw_preinit(void);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_bass(int value);
extern void audiohw_set_treble(int value);
extern void audiohw_set_frequency(int fsel);

6
firmware/export/wm8758.h
View file

@ -27,9 +27,9 @@
extern int tenthdb2master(int db);
extern int tenthdb2mixer(int db);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
extern int audiohw_set_mixer_vol(int channel1, int channel2);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_mixer_vol(int channel1, int channel2);
extern void audiohw_set_bass(int value);
extern void audiohw_set_bass_cutoff(int value);
extern void audiohw_set_treble(int value);

4
firmware/export/wm8975.h
View file

@ -26,8 +26,8 @@
extern int tenthdb2master(int db);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_bass(int value);
extern void audiohw_set_treble(int value);
extern void audiohw_set_nsorder(int order);

4
firmware/export/wm8985.h
View file

@ -26,8 +26,8 @@
extern int tenthdb2master(int db);
extern int audiohw_set_master_vol(int vol_l, int vol_r);
extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_master_vol(int vol_l, int vol_r);
extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
extern void audiohw_set_bass(int value);
extern void audiohw_set_treble(int value);
extern void audiohw_set_nsorder(int order);