git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
isa
/
gus
/
gus_volume.c
diff --git
a/sound/isa/gus/gus_volume.c
b/sound/isa/gus/gus_volume.c
index
b72bcfb
..
dbbc0a6
100644
(file)
--- a/
sound/isa/gus/gus_volume.c
+++ b/
sound/isa/gus/gus_volume.c
@@
-55,6
+55,8
@@
unsigned short snd_gf1_lvol_to_gvol_raw(unsigned int vol)
return (e << 8) | m;
}
return (e << 8) | m;
}
+#if 0
+
unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol)
{
unsigned int rvol;
unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol)
{
unsigned int rvol;
@@
-70,7
+72,7
@@
unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol)
return rvol | (m >> (8 - e));
}
return rvol | (m >> (8 - e));
}
-unsigned int snd_gf1_calc_ramp_rate(s
nd_gus_card_t
* gus,
+unsigned int snd_gf1_calc_ramp_rate(s
truct snd_gus_card
* gus,
unsigned short start,
unsigned short end,
unsigned int us)
unsigned short start,
unsigned short end,
unsigned int us)
@@
-108,18
+110,22
@@
unsigned int snd_gf1_calc_ramp_rate(snd_gus_card_t * gus,
return (range << 6) | (increment & 0x3f);
}
return (range << 6) | (increment & 0x3f);
}
-unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq16)
+#endif /* 0 */
+
+unsigned short snd_gf1_translate_freq(struct snd_gus_card * gus, unsigned int freq16)
{
freq16 >>= 3;
if (freq16 < 50)
freq16 = 50;
if (freq16 & 0xf8000000) {
freq16 = ~0xf8000000;
{
freq16 >>= 3;
if (freq16 < 50)
freq16 = 50;
if (freq16 & 0xf8000000) {
freq16 = ~0xf8000000;
- snd_printk("snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16);
+ snd_printk(
KERN_ERR
"snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16);
}
return ((freq16 << 9) + (gus->gf1.playback_freq >> 1)) / gus->gf1.playback_freq;
}
}
return ((freq16 << 9) + (gus->gf1.playback_freq >> 1)) / gus->gf1.playback_freq;
}
+#if 0
+
short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)
{
static short vibrato_table[] =
short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)
{
static short vibrato_table[] =
@@
-197,14
+203,16
@@
unsigned short snd_gf1_compute_freq(unsigned int freq,
fc = (freq << 10) / rate;
if (fc > 97391L) {
fc = 97391;
fc = (freq << 10) / rate;
if (fc > 97391L) {
fc = 97391;
- snd_printk("patch: (1) fc frequency overflow - %u\n", fc);
+ snd_printk(
KERN_ERR
"patch: (1) fc frequency overflow - %u\n", fc);
}
fc = (fc * 44100UL) / mix_rate;
while (scale--)
fc <<= 1;
if (fc > 65535L) {
fc = 65535;
}
fc = (fc * 44100UL) / mix_rate;
while (scale--)
fc <<= 1;
if (fc > 65535L) {
fc = 65535;
- snd_printk("patch: (2) fc frequency overflow - %u\n", fc);
+ snd_printk(
KERN_ERR
"patch: (2) fc frequency overflow - %u\n", fc);
}
return (unsigned short) fc;
}
}
return (unsigned short) fc;
}
+
+#endif /* 0 */