You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[ALSA] Add missing KERN_* suffix to printk
Add missing KERN_* suffix to printk. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
committed by
Jaroslav Kysela
Jaroslav Kysela
parent
8a3fb4d0ce
commit
99b359ba10
+7
-7
@@ -75,7 +75,7 @@ int snd_cs8427_reg_write(snd_i2c_device_t *device, unsigned char reg, unsigned c
|
||||
buf[0] = reg & 0x7f;
|
||||
buf[1] = val;
|
||||
if ((err = snd_i2c_sendbytes(device, buf, 2)) != 2) {
|
||||
snd_printk("unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n", buf[0], buf[1], err);
|
||||
snd_printk(KERN_ERR "unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n", buf[0], buf[1], err);
|
||||
return err < 0 ? err : -EIO;
|
||||
}
|
||||
return 0;
|
||||
@@ -87,11 +87,11 @@ static int snd_cs8427_reg_read(snd_i2c_device_t *device, unsigned char reg)
|
||||
unsigned char buf;
|
||||
|
||||
if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) {
|
||||
snd_printk("unable to send register 0x%x byte to CS8427\n", reg);
|
||||
snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg);
|
||||
return err < 0 ? err : -EIO;
|
||||
}
|
||||
if ((err = snd_i2c_readbytes(device, &buf, 1)) != 1) {
|
||||
snd_printk("unable to read register 0x%x byte from CS8427\n", reg);
|
||||
snd_printk(KERN_ERR "unable to read register 0x%x byte from CS8427\n", reg);
|
||||
return err < 0 ? err : -EIO;
|
||||
}
|
||||
return buf;
|
||||
@@ -210,7 +210,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
|
||||
snd_i2c_lock(bus);
|
||||
if ((err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER)) != CS8427_VER8427A) {
|
||||
snd_i2c_unlock(bus);
|
||||
snd_printk("unable to find CS8427 signature (expected 0x%x, read 0x%x), initialization is not completed\n", CS8427_VER8427A, err);
|
||||
snd_printk(KERN_ERR "unable to find CS8427 signature (expected 0x%x, read 0x%x), initialization is not completed\n", CS8427_VER8427A, err);
|
||||
return -EFAULT;
|
||||
}
|
||||
/* turn off run bit while making changes to configuration */
|
||||
@@ -260,7 +260,7 @@ int snd_cs8427_create(snd_i2c_bus_t *bus,
|
||||
snd_i2c_sendbytes(device, buf, 1);
|
||||
snd_i2c_readbytes(device, buf, 127);
|
||||
for (xx = 0; xx < 127; xx++)
|
||||
printk("reg[0x%x] = 0x%x\n", xx+1, buf[xx]);
|
||||
printk(KERN_DEBUG "reg[0x%x] = 0x%x\n", xx+1, buf[xx]);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -354,12 +354,12 @@ static int snd_cs8427_qsubcode_get(snd_kcontrol_t *kcontrol,
|
||||
|
||||
snd_i2c_lock(device->bus);
|
||||
if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) {
|
||||
snd_printk("unable to send register 0x%x byte to CS8427\n", reg);
|
||||
snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg);
|
||||
snd_i2c_unlock(device->bus);
|
||||
return err < 0 ? err : -EIO;
|
||||
}
|
||||
if ((err = snd_i2c_readbytes(device, ucontrol->value.bytes.data, 10)) != 10) {
|
||||
snd_printk("unable to read Q-subcode bytes from CS8427\n");
|
||||
snd_printk(KERN_ERR "unable to read Q-subcode bytes from CS8427\n");
|
||||
snd_i2c_unlock(device->bus);
|
||||
return err < 0 ? err : -EIO;
|
||||
}
|
||||
|
||||
@@ -56,9 +56,9 @@ static void reg_dump(ak4114_t *ak4114)
|
||||
{
|
||||
int i;
|
||||
|
||||
printk("AK4114 REG DUMP:\n");
|
||||
printk(KERN_DEBUG "AK4114 REG DUMP:\n");
|
||||
for (i = 0; i < 0x20; i++)
|
||||
printk("reg[%02x] = %02x (%02x)\n", i, reg_read(ak4114, i), i < sizeof(ak4114->regmap) ? ak4114->regmap[i] : 0);
|
||||
printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4114, i), i < sizeof(ak4114->regmap) ? ak4114->regmap[i] : 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -552,7 +552,7 @@ int snd_ak4114_check_rate_and_errors(ak4114_t *ak4114, unsigned int flags)
|
||||
if (!(flags & AK4114_CHECK_NO_RATE) && runtime && runtime->rate != res) {
|
||||
snd_pcm_stream_lock_irqsave(ak4114->capture_substream, _flags);
|
||||
if (snd_pcm_running(ak4114->capture_substream)) {
|
||||
// printk("rate changed (%i <- %i)\n", runtime->rate, res);
|
||||
// printk(KERN_DEBUG "rate changed (%i <- %i)\n", runtime->rate, res);
|
||||
snd_pcm_stop(ak4114->capture_substream, SNDRV_PCM_STATE_DRAINING);
|
||||
res = 1;
|
||||
}
|
||||
|
||||
@@ -54,9 +54,9 @@ static void reg_dump(ak4117_t *ak4117)
|
||||
{
|
||||
int i;
|
||||
|
||||
printk("AK4117 REG DUMP:\n");
|
||||
printk(KERN_DEBUG "AK4117 REG DUMP:\n");
|
||||
for (i = 0; i < 0x1b; i++)
|
||||
printk("reg[%02x] = %02x (%02x)\n", i, reg_read(ak4117, i), i < sizeof(ak4117->regmap) ? ak4117->regmap[i] : 0);
|
||||
printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4117, i), i < sizeof(ak4117->regmap) ? ak4117->regmap[i] : 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -477,7 +477,7 @@ int snd_ak4117_check_rate_and_errors(ak4117_t *ak4117, unsigned int flags)
|
||||
goto __rate;
|
||||
rcs0 = reg_read(ak4117, AK4117_REG_RCS0);
|
||||
rcs2 = reg_read(ak4117, AK4117_REG_RCS2);
|
||||
// printk("AK IRQ: rcs0 = 0x%x, rcs1 = 0x%x, rcs2 = 0x%x\n", rcs0, rcs1, rcs2);
|
||||
// printk(KERN_DEBUG "AK IRQ: rcs0 = 0x%x, rcs1 = 0x%x, rcs2 = 0x%x\n", rcs0, rcs1, rcs2);
|
||||
spin_lock_irqsave(&ak4117->lock, _flags);
|
||||
if (rcs0 & AK4117_PAR)
|
||||
ak4117->parity_errors++;
|
||||
@@ -530,7 +530,7 @@ int snd_ak4117_check_rate_and_errors(ak4117_t *ak4117, unsigned int flags)
|
||||
if (!(flags & AK4117_CHECK_NO_RATE) && runtime && runtime->rate != res) {
|
||||
snd_pcm_stream_lock_irqsave(ak4117->substream, _flags);
|
||||
if (snd_pcm_running(ak4117->substream)) {
|
||||
// printk("rate changed (%i <- %i)\n", runtime->rate, res);
|
||||
// printk(KERN_DEBUG "rate changed (%i <- %i)\n", runtime->rate, res);
|
||||
snd_pcm_stop(ak4117->substream, SNDRV_PCM_STATE_DRAINING);
|
||||
wake_up(&runtime->sleep);
|
||||
res = 1;
|
||||
|
||||
@@ -58,7 +58,7 @@ static void snd_tea6330t_set(tea6330t_t *tea,
|
||||
unsigned char addr, unsigned char value)
|
||||
{
|
||||
#if 0
|
||||
printk("set - 0x%x/0x%x\n", addr, value);
|
||||
printk(KERN_DEBUG "set - 0x%x/0x%x\n", addr, value);
|
||||
#endif
|
||||
snd_i2c_write(tea->bus, TEA6330T_ADDR, addr, value, 1);
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ void snd_ad1848_out(ad1848_t *chip,
|
||||
udelay(100);
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
|
||||
snd_printk("auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
|
||||
snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
|
||||
#endif
|
||||
outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
|
||||
outb(chip->image[reg] = value, AD1848P(chip, REG));
|
||||
@@ -139,7 +139,7 @@ static unsigned char snd_ad1848_in(ad1848_t *chip, unsigned char reg)
|
||||
udelay(100);
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
|
||||
snd_printk("auto calibration time out - reg = 0x%x\n", reg);
|
||||
snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x\n", reg);
|
||||
#endif
|
||||
outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
|
||||
mb();
|
||||
@@ -185,13 +185,13 @@ static void snd_ad1848_mce_up(ad1848_t *chip)
|
||||
udelay(100);
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
|
||||
snd_printk("mce_up - auto calibration time out (0)\n");
|
||||
snd_printk(KERN_WARNING "mce_up - auto calibration time out (0)\n");
|
||||
#endif
|
||||
spin_lock_irqsave(&chip->reg_lock, flags);
|
||||
chip->mce_bit |= AD1848_MCE;
|
||||
timeout = inb(AD1848P(chip, REGSEL));
|
||||
if (timeout == 0x80)
|
||||
snd_printk("mce_up [0x%lx]: serious init problem - codec still busy\n", chip->port);
|
||||
snd_printk(KERN_WARNING "mce_up [0x%lx]: serious init problem - codec still busy\n", chip->port);
|
||||
if (!(timeout & AD1848_MCE))
|
||||
outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL));
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
@@ -214,13 +214,13 @@ static void snd_ad1848_mce_down(ad1848_t *chip)
|
||||
#endif
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
|
||||
snd_printk("mce_down [0x%lx] - auto calibration time out (0)\n", AD1848P(chip, REGSEL));
|
||||
snd_printk(KERN_WARNING "mce_down [0x%lx] - auto calibration time out (0)\n", AD1848P(chip, REGSEL));
|
||||
#endif
|
||||
chip->mce_bit &= ~AD1848_MCE;
|
||||
timeout = inb(AD1848P(chip, REGSEL));
|
||||
outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL));
|
||||
if (timeout == 0x80)
|
||||
snd_printk("mce_down [0x%lx]: serious init problem - codec still busy\n", chip->port);
|
||||
snd_printk(KERN_WARNING "mce_down [0x%lx]: serious init problem - codec still busy\n", chip->port);
|
||||
if ((timeout & AD1848_MCE) == 0) {
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
return;
|
||||
@@ -240,7 +240,7 @@ static void snd_ad1848_mce_down(ad1848_t *chip)
|
||||
while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) {
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
if (time <= 0) {
|
||||
snd_printk("mce_down - auto calibration time out (2)\n");
|
||||
snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
|
||||
return;
|
||||
}
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
@@ -254,7 +254,7 @@ static void snd_ad1848_mce_down(ad1848_t *chip)
|
||||
while (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) {
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
if (time <= 0) {
|
||||
snd_printk("mce_down - auto calibration time out (3)\n");
|
||||
snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
|
||||
return;
|
||||
}
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
|
||||
+19
-15
@@ -173,7 +173,7 @@ static int snd_es18xx_dsp_command(es18xx_t *chip, unsigned char val)
|
||||
outb(val, chip->port + 0x0C);
|
||||
return 0;
|
||||
}
|
||||
snd_printk("dsp_command: timeout (0x%x)\n", val);
|
||||
snd_printk(KERN_ERR "dsp_command: timeout (0x%x)\n", val);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -184,7 +184,8 @@ static int snd_es18xx_dsp_get_byte(es18xx_t *chip)
|
||||
for(i = MILLISECOND/10; i; i--)
|
||||
if (inb(chip->port + 0x0C) & 0x40)
|
||||
return inb(chip->port + 0x0A);
|
||||
snd_printk("dsp_get_byte failed: 0x%lx = 0x%x!!!\n", chip->port + 0x0A, inb(chip->port + 0x0A));
|
||||
snd_printk(KERN_ERR "dsp_get_byte failed: 0x%lx = 0x%x!!!\n",
|
||||
chip->port + 0x0A, inb(chip->port + 0x0A));
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -204,7 +205,7 @@ static int snd_es18xx_write(es18xx_t *chip,
|
||||
end:
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Reg %02x set to %02x\n", reg, data);
|
||||
snd_printk(KERN_DEBUG "Reg %02x set to %02x\n", reg, data);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
@@ -223,7 +224,7 @@ static int snd_es18xx_read(es18xx_t *chip, unsigned char reg)
|
||||
data = snd_es18xx_dsp_get_byte(chip);
|
||||
ret = data;
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Reg %02x now is %02x (%d)\n", reg, data, ret);
|
||||
snd_printk(KERN_DEBUG "Reg %02x now is %02x (%d)\n", reg, data, ret);
|
||||
#endif
|
||||
end:
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
@@ -259,7 +260,8 @@ static int snd_es18xx_bits(es18xx_t *chip, unsigned char reg,
|
||||
if (ret < 0)
|
||||
goto end;
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Reg %02x was %02x, set to %02x (%d)\n", reg, old, new, ret);
|
||||
snd_printk(KERN_DEBUG "Reg %02x was %02x, set to %02x (%d)\n",
|
||||
reg, old, new, ret);
|
||||
#endif
|
||||
}
|
||||
ret = oval;
|
||||
@@ -277,7 +279,7 @@ static inline void snd_es18xx_mixer_write(es18xx_t *chip,
|
||||
outb(data, chip->port + 0x05);
|
||||
spin_unlock_irqrestore(&chip->mixer_lock, flags);
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Mixer reg %02x set to %02x\n", reg, data);
|
||||
snd_printk(KERN_DEBUG "Mixer reg %02x set to %02x\n", reg, data);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -290,7 +292,7 @@ static inline int snd_es18xx_mixer_read(es18xx_t *chip, unsigned char reg)
|
||||
data = inb(chip->port + 0x05);
|
||||
spin_unlock_irqrestore(&chip->mixer_lock, flags);
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Mixer reg %02x now is %02x\n", reg, data);
|
||||
snd_printk(KERN_DEBUG "Mixer reg %02x now is %02x\n", reg, data);
|
||||
#endif
|
||||
return data;
|
||||
}
|
||||
@@ -309,7 +311,8 @@ static inline int snd_es18xx_mixer_bits(es18xx_t *chip, unsigned char reg,
|
||||
new = (old & ~mask) | (val & mask);
|
||||
outb(new, chip->port + 0x05);
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Mixer reg %02x was %02x, set to %02x\n", reg, old, new);
|
||||
snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x\n",
|
||||
reg, old, new);
|
||||
#endif
|
||||
}
|
||||
spin_unlock_irqrestore(&chip->mixer_lock, flags);
|
||||
@@ -329,7 +332,8 @@ static inline int snd_es18xx_mixer_writable(es18xx_t *chip, unsigned char reg,
|
||||
new = inb(chip->port + 0x05);
|
||||
spin_unlock_irqrestore(&chip->mixer_lock, flags);
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Mixer reg %02x was %02x, set to %02x, now is %02x\n", reg, old, expected, new);
|
||||
snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x, now is %02x\n",
|
||||
reg, old, expected, new);
|
||||
#endif
|
||||
return expected == new;
|
||||
}
|
||||
@@ -1281,7 +1285,7 @@ static void __devinit snd_es18xx_config_write(es18xx_t *chip,
|
||||
outb(reg, chip->ctrl_port);
|
||||
outb(data, chip->ctrl_port + 1);
|
||||
#ifdef REG_DEBUG
|
||||
snd_printk("Config reg %02x set to %02x\n", reg, data);
|
||||
snd_printk(KERN_DEBUG "Config reg %02x set to %02x\n", reg, data);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1346,7 +1350,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip)
|
||||
irqmask = 3;
|
||||
break;
|
||||
default:
|
||||
snd_printk("invalid irq %d\n", chip->irq);
|
||||
snd_printk(KERN_ERR "invalid irq %d\n", chip->irq);
|
||||
return -ENODEV;
|
||||
}
|
||||
switch (chip->dma1) {
|
||||
@@ -1360,7 +1364,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip)
|
||||
dma1mask = 3;
|
||||
break;
|
||||
default:
|
||||
snd_printk("invalid dma1 %d\n", chip->dma1);
|
||||
snd_printk(KERN_ERR "invalid dma1 %d\n", chip->dma1);
|
||||
return -ENODEV;
|
||||
}
|
||||
switch (chip->dma2) {
|
||||
@@ -1377,7 +1381,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip)
|
||||
dma2mask = 3;
|
||||
break;
|
||||
default:
|
||||
snd_printk("invalid dma2 %d\n", chip->dma2);
|
||||
snd_printk(KERN_ERR "invalid dma2 %d\n", chip->dma2);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -1440,7 +1444,7 @@ static int __devinit snd_es18xx_identify(es18xx_t *chip)
|
||||
|
||||
/* reset */
|
||||
if (snd_es18xx_reset(chip) < 0) {
|
||||
snd_printk("reset at 0x%lx failed!!!\n", chip->port);
|
||||
snd_printk(KERN_ERR "reset at 0x%lx failed!!!\n", chip->port);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -1527,7 +1531,7 @@ static int __devinit snd_es18xx_probe(es18xx_t *chip)
|
||||
chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_HWV;
|
||||
break;
|
||||
default:
|
||||
snd_printk("[0x%lx] unsupported chip ES%x\n",
|
||||
snd_printk(KERN_ERR "[0x%lx] unsupported chip ES%x\n",
|
||||
chip->port, chip->version);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ int snd_gf1_dma_transfer_block(snd_gus_card_t * gus,
|
||||
|
||||
block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
|
||||
if (block == NULL) {
|
||||
snd_printk("gf1: DMA transfer failure; not enough memory\n");
|
||||
snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
*block = *__block;
|
||||
|
||||
+47
-47
@@ -343,7 +343,7 @@ void snd_gf1_pokew(snd_gus_card_t * gus, unsigned int addr, unsigned short data)
|
||||
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (!gus->interwave)
|
||||
snd_printk("snd_gf1_pokew - GF1!!!\n");
|
||||
snd_printk(KERN_DEBUG "snd_gf1_pokew - GF1!!!\n");
|
||||
#endif
|
||||
spin_lock_irqsave(&gus->reg_lock, flags);
|
||||
outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus->gf1.reg_regsel);
|
||||
@@ -367,7 +367,7 @@ unsigned short snd_gf1_peekw(snd_gus_card_t * gus, unsigned int addr)
|
||||
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (!gus->interwave)
|
||||
snd_printk("snd_gf1_peekw - GF1!!!\n");
|
||||
snd_printk(KERN_DEBUG "snd_gf1_peekw - GF1!!!\n");
|
||||
#endif
|
||||
spin_lock_irqsave(&gus->reg_lock, flags);
|
||||
outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus->gf1.reg_regsel);
|
||||
@@ -393,7 +393,7 @@ void snd_gf1_dram_setmem(snd_gus_card_t * gus, unsigned int addr,
|
||||
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
if (!gus->interwave)
|
||||
snd_printk("snd_gf1_dram_setmem - GF1!!!\n");
|
||||
snd_printk(KERN_DEBUG "snd_gf1_dram_setmem - GF1!!!\n");
|
||||
#endif
|
||||
addr &= ~1;
|
||||
count >>= 1;
|
||||
@@ -449,30 +449,30 @@ void snd_gf1_print_voice_registers(snd_gus_card_t * gus)
|
||||
int voice, ctrl;
|
||||
|
||||
voice = gus->gf1.active_voice;
|
||||
printk(" -%i- GF1 voice ctrl, ramp ctrl = 0x%x, 0x%x\n", voice, ctrl = snd_gf1_i_read8(gus, 0), snd_gf1_i_read8(gus, 0x0d));
|
||||
printk(" -%i- GF1 frequency = 0x%x\n", voice, snd_gf1_i_read16(gus, 1));
|
||||
printk(" -%i- GF1 loop start, end = 0x%x (0x%x), 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 2, ctrl & 4), snd_gf1_i_read_addr(gus, 2, (ctrl & 4) ^ 4), snd_gf1_i_read_addr(gus, 4, ctrl & 4), snd_gf1_i_read_addr(gus, 4, (ctrl & 4) ^ 4));
|
||||
printk(" -%i- GF1 ramp start, end, rate = 0x%x, 0x%x, 0x%x\n", voice, snd_gf1_i_read8(gus, 7), snd_gf1_i_read8(gus, 8), snd_gf1_i_read8(gus, 6));
|
||||
printk(" -%i- GF1 volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 9));
|
||||
printk(" -%i- GF1 position = 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 0x0a, ctrl & 4), snd_gf1_i_read_addr(gus, 0x0a, (ctrl & 4) ^ 4));
|
||||
printk(KERN_INFO " -%i- GF1 voice ctrl, ramp ctrl = 0x%x, 0x%x\n", voice, ctrl = snd_gf1_i_read8(gus, 0), snd_gf1_i_read8(gus, 0x0d));
|
||||
printk(KERN_INFO " -%i- GF1 frequency = 0x%x\n", voice, snd_gf1_i_read16(gus, 1));
|
||||
printk(KERN_INFO " -%i- GF1 loop start, end = 0x%x (0x%x), 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 2, ctrl & 4), snd_gf1_i_read_addr(gus, 2, (ctrl & 4) ^ 4), snd_gf1_i_read_addr(gus, 4, ctrl & 4), snd_gf1_i_read_addr(gus, 4, (ctrl & 4) ^ 4));
|
||||
printk(KERN_INFO " -%i- GF1 ramp start, end, rate = 0x%x, 0x%x, 0x%x\n", voice, snd_gf1_i_read8(gus, 7), snd_gf1_i_read8(gus, 8), snd_gf1_i_read8(gus, 6));
|
||||
printk(KERN_INFO" -%i- GF1 volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 9));
|
||||
printk(KERN_INFO " -%i- GF1 position = 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 0x0a, ctrl & 4), snd_gf1_i_read_addr(gus, 0x0a, (ctrl & 4) ^ 4));
|
||||
if (gus->interwave && snd_gf1_i_read8(gus, 0x19) & 0x01) { /* enhanced mode */
|
||||
mode = snd_gf1_i_read8(gus, 0x15);
|
||||
printk(" -%i- GFA1 mode = 0x%x\n", voice, mode);
|
||||
printk(KERN_INFO " -%i- GFA1 mode = 0x%x\n", voice, mode);
|
||||
if (mode & 0x01) { /* Effect processor */
|
||||
printk(" -%i- GFA1 effect address = 0x%x\n", voice, snd_gf1_i_read_addr(gus, 0x11, ctrl & 4));
|
||||
printk(" -%i- GFA1 effect volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x16));
|
||||
printk(" -%i- GFA1 effect volume final = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x1d));
|
||||
printk(" -%i- GFA1 effect acumulator = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14));
|
||||
printk(KERN_INFO " -%i- GFA1 effect address = 0x%x\n", voice, snd_gf1_i_read_addr(gus, 0x11, ctrl & 4));
|
||||
printk(KERN_INFO " -%i- GFA1 effect volume = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x16));
|
||||
printk(KERN_INFO " -%i- GFA1 effect volume final = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x1d));
|
||||
printk(KERN_INFO " -%i- GFA1 effect acumulator = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14));
|
||||
}
|
||||
if (mode & 0x20) {
|
||||
printk(" -%i- GFA1 left offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x13), snd_gf1_i_read16(gus, 0x13) >> 4);
|
||||
printk(" -%i- GFA1 left offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1c), snd_gf1_i_read16(gus, 0x1c) >> 4);
|
||||
printk(" -%i- GFA1 right offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x0c), snd_gf1_i_read16(gus, 0x0c) >> 4);
|
||||
printk(" -%i- GFA1 right offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1b), snd_gf1_i_read16(gus, 0x1b) >> 4);
|
||||
printk(KERN_INFO " -%i- GFA1 left offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x13), snd_gf1_i_read16(gus, 0x13) >> 4);
|
||||
printk(KERN_INFO " -%i- GFA1 left offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1c), snd_gf1_i_read16(gus, 0x1c) >> 4);
|
||||
printk(KERN_INFO " -%i- GFA1 right offset = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x0c), snd_gf1_i_read16(gus, 0x0c) >> 4);
|
||||
printk(KERN_INFO " -%i- GFA1 right offset final = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1b), snd_gf1_i_read16(gus, 0x1b) >> 4);
|
||||
} else
|
||||
printk(" -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));
|
||||
printk(KERN_INFO " -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));
|
||||
} else
|
||||
printk(" -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));
|
||||
printk(KERN_INFO " -%i- GF1 pan = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));
|
||||
}
|
||||
|
||||
#if 0
|
||||
@@ -481,45 +481,45 @@ void snd_gf1_print_global_registers(snd_gus_card_t * gus)
|
||||
{
|
||||
unsigned char global_mode = 0x00;
|
||||
|
||||
printk(" -G- GF1 active voices = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ACTIVE_VOICES));
|
||||
printk(KERN_INFO " -G- GF1 active voices = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ACTIVE_VOICES));
|
||||
if (gus->interwave) {
|
||||
global_mode = snd_gf1_i_read8(gus, SNDRV_GF1_GB_GLOBAL_MODE);
|
||||
printk(" -G- GF1 global mode = 0x%x\n", global_mode);
|
||||
printk(KERN_INFO " -G- GF1 global mode = 0x%x\n", global_mode);
|
||||
}
|
||||
if (global_mode & 0x02) /* LFO enabled? */
|
||||
printk(" -G- GF1 LFO base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_LFO_BASE));
|
||||
printk(" -G- GF1 voices IRQ read = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VOICES_IRQ_READ));
|
||||
printk(" -G- GF1 DRAM DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL));
|
||||
printk(" -G- GF1 DRAM DMA high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW));
|
||||
printk(" -G- GF1 DRAM IO high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_IO_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_IO_LOW));
|
||||
printk(KERN_INFO " -G- GF1 LFO base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_LFO_BASE));
|
||||
printk(KERN_INFO " -G- GF1 voices IRQ read = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VOICES_IRQ_READ));
|
||||
printk(KERN_INFO " -G- GF1 DRAM DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL));
|
||||
printk(KERN_INFO " -G- GF1 DRAM DMA high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW));
|
||||
printk(KERN_INFO " -G- GF1 DRAM IO high/low = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_IO_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_IO_LOW));
|
||||
if (!gus->interwave)
|
||||
printk(" -G- GF1 record DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL));
|
||||
printk(" -G- GF1 DRAM IO 16 = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_DRAM_IO16));
|
||||
printk(KERN_INFO " -G- GF1 record DMA control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL));
|
||||
printk(KERN_INFO " -G- GF1 DRAM IO 16 = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_DRAM_IO16));
|
||||
if (gus->gf1.enh_mode) {
|
||||
printk(" -G- GFA1 memory config = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG));
|
||||
printk(" -G- GFA1 memory control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MEMORY_CONTROL));
|
||||
printk(" -G- GFA1 FIFO record base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_RECORD_BASE_ADDR));
|
||||
printk(" -G- GFA1 FIFO playback base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_PLAY_BASE_ADDR));
|
||||
printk(" -G- GFA1 interleave control = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_INTERLEAVE));
|
||||
printk(KERN_INFO " -G- GFA1 memory config = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG));
|
||||
printk(KERN_INFO " -G- GFA1 memory control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MEMORY_CONTROL));
|
||||
printk(KERN_INFO " -G- GFA1 FIFO record base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_RECORD_BASE_ADDR));
|
||||
printk(KERN_INFO " -G- GFA1 FIFO playback base = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_PLAY_BASE_ADDR));
|
||||
printk(KERN_INFO " -G- GFA1 interleave control = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_INTERLEAVE));
|
||||
}
|
||||
}
|
||||
|
||||
void snd_gf1_print_setup_registers(snd_gus_card_t * gus)
|
||||
{
|
||||
printk(" -S- mix control = 0x%x\n", inb(GUSP(gus, MIXCNTRLREG)));
|
||||
printk(" -S- IRQ status = 0x%x\n", inb(GUSP(gus, IRQSTAT)));
|
||||
printk(" -S- timer control = 0x%x\n", inb(GUSP(gus, TIMERCNTRL)));
|
||||
printk(" -S- timer data = 0x%x\n", inb(GUSP(gus, TIMERDATA)));
|
||||
printk(" -S- status read = 0x%x\n", inb(GUSP(gus, REGCNTRLS)));
|
||||
printk(" -S- Sound Blaster control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL));
|
||||
printk(" -S- AdLib timer 1/2 = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1), snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2));
|
||||
printk(" -S- reset = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET));
|
||||
printk(KERN_INFO " -S- mix control = 0x%x\n", inb(GUSP(gus, MIXCNTRLREG)));
|
||||
printk(KERN_INFO " -S- IRQ status = 0x%x\n", inb(GUSP(gus, IRQSTAT)));
|
||||
printk(KERN_INFO " -S- timer control = 0x%x\n", inb(GUSP(gus, TIMERCNTRL)));
|
||||
printk(KERN_INFO " -S- timer data = 0x%x\n", inb(GUSP(gus, TIMERDATA)));
|
||||
printk(KERN_INFO " -S- status read = 0x%x\n", inb(GUSP(gus, REGCNTRLS)));
|
||||
printk(KERN_INFO " -S- Sound Blaster control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL));
|
||||
printk(KERN_INFO " -S- AdLib timer 1/2 = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1), snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2));
|
||||
printk(KERN_INFO " -S- reset = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET));
|
||||
if (gus->interwave) {
|
||||
printk(" -S- compatibility = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_COMPATIBILITY));
|
||||
printk(" -S- decode control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DECODE_CONTROL));
|
||||
printk(" -S- version number = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER));
|
||||
printk(" -S- MPU-401 emul. control A/B = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A), snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B));
|
||||
printk(" -S- emulation IRQ = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_EMULATION_IRQ));
|
||||
printk(KERN_INFO " -S- compatibility = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_COMPATIBILITY));
|
||||
printk(KERN_INFO " -S- decode control = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DECODE_CONTROL));
|
||||
printk(KERN_INFO " -S- version number = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER));
|
||||
printk(KERN_INFO " -S- MPU-401 emul. control A/B = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A), snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B));
|
||||
printk(KERN_INFO " -S- emulation IRQ = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_EMULATION_IRQ));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@ static int snd_gus_detect_memory(snd_gus_card_t * gus)
|
||||
snd_gf1_poke(gus, 0L, 0xaa);
|
||||
snd_gf1_poke(gus, 1L, 0x55);
|
||||
if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) {
|
||||
snd_printk("plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port);
|
||||
snd_printk(KERN_ERR "plain GF1 card at 0x%lx without onboard DRAM?\n", gus->gf1.port);
|
||||
return -ENOMEM;
|
||||
}
|
||||
for (idx = 1, d = 0xab; idx < 4; idx++, d++) {
|
||||
@@ -299,20 +299,17 @@ static int snd_gus_init_dma_irq(snd_gus_card_t * gus, int latches)
|
||||
dma2 = gus->gf1.dma2;
|
||||
dma2 = dma2 < 0 ? -dma2 : dma2;
|
||||
dma2 = dmas[dma2 & 7];
|
||||
#if 0
|
||||
printk("dma1 = %i, dma2 = %i\n", gus->gf1.dma1, gus->gf1.dma2);
|
||||
#endif
|
||||
dma1 |= gus->equal_dma ? 0x40 : (dma2 << 3);
|
||||
|
||||
if ((dma1 & 7) == 0 || (dma2 & 7) == 0) {
|
||||
snd_printk("Error! DMA isn't defined.\n");
|
||||
snd_printk(KERN_ERR "Error! DMA isn't defined.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
irq = gus->gf1.irq;
|
||||
irq = irq < 0 ? -irq : irq;
|
||||
irq = irqs[irq & 0x0f];
|
||||
if (irq == 0) {
|
||||
snd_printk("Error! IRQ isn't defined.\n");
|
||||
snd_printk(KERN_ERR "Error! IRQ isn't defined.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
irq |= 0x40;
|
||||
@@ -400,8 +397,8 @@ static int snd_gus_check_version(snd_gus_card_t * gus)
|
||||
strcpy(card->longname, "Gravis UltraSound Extreme");
|
||||
gus->ess_flag = 1;
|
||||
} else {
|
||||
snd_printk("unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val);
|
||||
snd_printk(" please - report to <perex@suse.cz>\n");
|
||||
snd_printk(KERN_ERR "unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val);
|
||||
snd_printk(KERN_ERR " please - report to <perex@suse.cz>\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -425,7 +422,7 @@ int snd_gus_initialize(snd_gus_card_t *gus)
|
||||
|
||||
if (!gus->interwave) {
|
||||
if ((err = snd_gus_check_version(gus)) < 0) {
|
||||
snd_printk("version check failed\n");
|
||||
snd_printk(KERN_ERR "version check failed\n");
|
||||
return err;
|
||||
}
|
||||
if ((err = snd_gus_detect_memory(gus)) < 0)
|
||||
|
||||
@@ -198,7 +198,7 @@ snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,
|
||||
if (nblock != NULL) {
|
||||
if (size != (int)nblock->size) {
|
||||
/* TODO: remove in the future */
|
||||
snd_printk("snd_gf1_mem_alloc - share: sizes differ\n");
|
||||
snd_printk(KERN_ERR "snd_gf1_mem_alloc - share: sizes differ\n");
|
||||
goto __std;
|
||||
}
|
||||
nblock->share++;
|
||||
|
||||
@@ -698,7 +698,7 @@ static int snd_gf1_pcm_playback_close(snd_pcm_substream_t * substream)
|
||||
gus_pcm_private_t *pcmp = runtime->private_data;
|
||||
|
||||
if (!wait_event_timeout(pcmp->sleep, (atomic_read(&pcmp->dma_count) <= 0), 2*HZ))
|
||||
snd_printk("gf1 pcm - serious DMA problem\n");
|
||||
snd_printk(KERN_ERR "gf1 pcm - serious DMA problem\n");
|
||||
|
||||
snd_gf1_dma_done(gus);
|
||||
return 0;
|
||||
|
||||
@@ -134,7 +134,7 @@ void snd_gf1_smart_stop_voice(snd_gus_card_t * gus, unsigned short voice)
|
||||
spin_lock_irqsave(&gus->reg_lock, flags);
|
||||
snd_gf1_select_voice(gus, voice);
|
||||
#if 0
|
||||
printk(" -%i- smart stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));
|
||||
printk(KERN_DEBUG " -%i- smart stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));
|
||||
#endif
|
||||
snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL);
|
||||
snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);
|
||||
@@ -148,7 +148,7 @@ void snd_gf1_stop_voice(snd_gus_card_t * gus, unsigned short voice)
|
||||
spin_lock_irqsave(&gus->reg_lock, flags);
|
||||
snd_gf1_select_voice(gus, voice);
|
||||
#if 0
|
||||
printk(" -%i- stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));
|
||||
printk(KERN_DEBUG " -%i- stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));
|
||||
#endif
|
||||
snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL);
|
||||
snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);
|
||||
|
||||
@@ -136,7 +136,7 @@ static void do_volume_envelope(snd_gus_card_t *gus, snd_gus_voice_t *voice)
|
||||
snd_gf1_select_voice(gus, voice->number);
|
||||
snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);
|
||||
snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, voice->gf1_volume);
|
||||
printk("gf1_volume = 0x%x\n", voice->gf1_volume);
|
||||
/* printk("gf1_volume = 0x%x\n", voice->gf1_volume); */
|
||||
spin_unlock_irqrestore(&gus->reg_lock, flags);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ static int snd_gf1_uart_output_open(snd_rawmidi_substream_t * substream)
|
||||
gus->midi_substream_output = substream;
|
||||
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
|
||||
#if 0
|
||||
snd_printk("write init - cmd = 0x%x, stat = 0x%x\n", gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
|
||||
snd_printk(KERN_DEBUG "write init - cmd = 0x%x, stat = 0x%x\n", gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
@@ -126,7 +126,7 @@ static int snd_gf1_uart_input_open(snd_rawmidi_substream_t * substream)
|
||||
for (i = 0; i < 1000 && (snd_gf1_uart_stat(gus) & 0x01); i++)
|
||||
snd_gf1_uart_get(gus); /* clean Rx */
|
||||
if (i >= 1000)
|
||||
snd_printk("gus midi uart init read - cleanup error\n");
|
||||
snd_printk(KERN_ERR "gus midi uart init read - cleanup error\n");
|
||||
}
|
||||
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
|
||||
#if 0
|
||||
|
||||
@@ -119,7 +119,7 @@ unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq16)
|
||||
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;
|
||||
}
|
||||
@@ -203,14 +203,14 @@ unsigned short snd_gf1_compute_freq(unsigned int freq,
|
||||
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;
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -437,7 +437,7 @@ static void __devinit snd_interwave_detect_memory(snd_gus_card_t * gus)
|
||||
for (i = 0; i < 8; ++i)
|
||||
iwave[i] = snd_gf1_peek(gus, bank_pos + i);
|
||||
#ifdef CONFIG_SND_DEBUG_ROM
|
||||
printk("ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos,
|
||||
printk(KERN_DEBUG "ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos,
|
||||
iwave[0], iwave[1], iwave[2], iwave[3],
|
||||
iwave[4], iwave[5], iwave[6], iwave[7]);
|
||||
#endif
|
||||
@@ -447,7 +447,7 @@ static void __devinit snd_interwave_detect_memory(snd_gus_card_t * gus)
|
||||
for (i = 0; i < sizeof(struct rom_hdr); i++)
|
||||
csum += snd_gf1_peek(gus, bank_pos + i);
|
||||
#ifdef CONFIG_SND_DEBUG_ROM
|
||||
printk("ROM checksum = 0x%x (computed)\n", csum);
|
||||
printk(KERN_DEBUG "ROM checksum = 0x%x (computed)\n", csum);
|
||||
#endif
|
||||
if (csum != 0)
|
||||
continue; /* not valid rom */
|
||||
|
||||
@@ -56,7 +56,7 @@ static int snd_emu8000_new_device(snd_seq_device_t *dev)
|
||||
emu->num_ports = hw->seq_ports;
|
||||
|
||||
if (hw->memhdr) {
|
||||
snd_printk("memhdr is already initialized!?\n");
|
||||
snd_printk(KERN_ERR "memhdr is already initialized!?\n");
|
||||
snd_util_memhdr_free(hw->memhdr);
|
||||
}
|
||||
hw->memhdr = snd_util_memhdr_new(hw->mem_size);
|
||||
|
||||
@@ -747,7 +747,7 @@ int snd_sb16dsp_configure(sb_t * chip)
|
||||
unsigned char realirq, realdma, realmpureg;
|
||||
/* note: mpu register should be present only on SB16 Vibra soundcards */
|
||||
|
||||
// printk("codec->irq=%i, codec->dma8=%i, codec->dma16=%i\n", chip->irq, chip->dma8, chip->dma16);
|
||||
// printk(KERN_DEBUG "codec->irq=%i, codec->dma8=%i, codec->dma16=%i\n", chip->irq, chip->dma8, chip->dma16);
|
||||
spin_lock_irqsave(&chip->mixer_lock, flags);
|
||||
mpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP) & ~0x06;
|
||||
spin_unlock_irqrestore(&chip->mixer_lock, flags);
|
||||
@@ -821,9 +821,9 @@ int snd_sb16dsp_configure(sb_t * chip)
|
||||
|
||||
spin_unlock_irqrestore(&chip->mixer_lock, flags);
|
||||
if ((~realirq) & irqreg || (~realdma) & dmareg) {
|
||||
snd_printk("SB16 [0x%lx]: unable to set DMA & IRQ (PnP device?)\n", chip->port);
|
||||
snd_printk("SB16 [0x%lx]: wanted: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, realirq, realdma, realmpureg);
|
||||
snd_printk("SB16 [0x%lx]: got: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, irqreg, dmareg, mpureg);
|
||||
snd_printk(KERN_ERR "SB16 [0x%lx]: unable to set DMA & IRQ (PnP device?)\n", chip->port);
|
||||
snd_printk(KERN_ERR "SB16 [0x%lx]: wanted: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, realirq, realdma, realmpureg);
|
||||
snd_printk(KERN_ERR "SB16 [0x%lx]: got: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip->port, irqreg, dmareg, mpureg);
|
||||
return -ENODEV;
|
||||
}
|
||||
return 0;
|
||||
|
||||
@@ -334,9 +334,6 @@ irqreturn_t snd_sb8dsp_interrupt(sb_t *chip)
|
||||
snd_pcm_substream_t *substream;
|
||||
snd_pcm_runtime_t *runtime;
|
||||
|
||||
#if 0
|
||||
snd_printk("sb8: interrupt\n");
|
||||
#endif
|
||||
snd_sb_ack_8bit(chip);
|
||||
switch (chip->mode) {
|
||||
case SB_MODE_PLAYBACK_8: /* ok.. playback is active */
|
||||
|
||||
@@ -45,7 +45,7 @@ int snd_sbdsp_command(sb_t *chip, unsigned char val)
|
||||
{
|
||||
int i;
|
||||
#ifdef IO_DEBUG
|
||||
snd_printk("command 0x%x\n", val);
|
||||
snd_printk(KERN_DEBUG "command 0x%x\n", val);
|
||||
#endif
|
||||
for (i = BUSY_LOOPS; i; i--)
|
||||
if ((inb(SBP(chip, STATUS)) & 0x80) == 0) {
|
||||
@@ -64,7 +64,7 @@ int snd_sbdsp_get_byte(sb_t *chip)
|
||||
if (inb(SBP(chip, DATA_AVAIL)) & 0x80) {
|
||||
val = inb(SBP(chip, READ));
|
||||
#ifdef IO_DEBUG
|
||||
snd_printk("get_byte 0x%x\n", val);
|
||||
snd_printk(KERN_DEBUG "get_byte 0x%x\n", val);
|
||||
#endif
|
||||
return val;
|
||||
}
|
||||
@@ -154,7 +154,7 @@ static int snd_sbdsp_probe(sb_t * chip)
|
||||
str = "16";
|
||||
break;
|
||||
default:
|
||||
snd_printk("SB [0x%lx]: unknown DSP chip version %i.%i\n",
|
||||
snd_printk(KERN_INFO "SB [0x%lx]: unknown DSP chip version %i.%i\n",
|
||||
chip->port, major, minor);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user