Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e24a121a authored by Andreas Mohr's avatar Andreas Mohr Committed by Jaroslav Kysela
Browse files

[ALSA] azt3328.c: small cleanup patch 



- change 'PCM' mixer control (pre/post 3D) to 'PCM Output Route'
- improve snd_azf3328_debug_show_ports
- less aggressive module init message
- document Bass/Treble non-bug (prompted by user report - Thank You!!)
- add some items to card description
- add some I/O register documentation
- enhance copyright

Signed-off-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 1aba2bc3

sound/pci/azt3328.c

+21 −9
Original line number Diff line number Diff line 
/*

 *  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).

 *  Copyright (C) 2002, 2005 by Andreas Mohr <andi AT lisas.de>

 *  Copyright (C) 2002, 2005, 2006, 2007 by Andreas Mohr <andi AT lisas.de>

 *

 *  Framework borrowed from Bart Hartgers's als4000.c.

 *  Driver developed on PCI168 AP(W) version (PCI rev. 10, subsystem ID 1801),
@@ -52,6 +52,9 @@ 
 *  - full duplex 16bit playback/record at independent sampling rate

 *  - MPU401 (+ legacy address support) FIXME: how to enable legacy addr??

 *  - game port (legacy address support)

 *  - builtin 3D enhancement (said to be YAMAHA Ymersion)

 *  - builtin DirectInput support, helps reduce CPU overhead (interrupt-driven

 *    features supported)

 *  - built-in General DirectX timer having a 20 bits counter

 *    with 1us resolution (see below!)

 *  - I2S serial port for external DAC
@@ -94,6 +97,10 @@ 
 * 

 * BUGS

 *  - full-duplex might *still* be problematic, not fully tested recently

 *  - (non-bug) "Bass/Treble or 3D settings don't work" - they do get evaluated

 *    if you set PCM output switch to "pre 3D" instead of "post 3D".

 *    If this can't be set, then get a mixer application that Isn't Stupid (tm)

 *    (e.g. kmix, gamix) - unfortunately several are!!

 * 

 * TODO

 *  - test MPU401 MIDI playback etc.
@@ -652,7 +659,7 @@ static struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = { 
	AZF3328_MIXER_VOL_MONO("Modem Capture Volume", IDX_MIXER_MODEMIN, 0x1f, 1),

	AZF3328_MIXER_ENUM("Mic Select", IDX_MIXER_ADVCTL2, 2, 8),

	AZF3328_MIXER_ENUM("Mono Output Select", IDX_MIXER_ADVCTL2, 2, 9),

	AZF3328_MIXER_ENUM("PCM", IDX_MIXER_ADVCTL2, 2, 15), /* PCM Out Path, place in front since it controls *both* 3D and Bass/Treble! */

	AZF3328_MIXER_ENUM("PCM Output Route", IDX_MIXER_ADVCTL2, 2, 15), /* PCM Out Path, place in front since it controls *both* 3D and Bass/Treble! */

	AZF3328_MIXER_VOL_SPECIAL("Tone Control - Treble", IDX_MIXER_BASSTREBLE, 0x07, 1, 0),

	AZF3328_MIXER_VOL_SPECIAL("Tone Control - Bass", IDX_MIXER_BASSTREBLE, 0x07, 9, 0),

	AZF3328_MIXER_SWITCH("3D Control - Switch", IDX_MIXER_ADVCTL2, 13, 0),
@@ -1369,7 +1376,6 @@ snd_azf3328_playback_close(struct snd_pcm_substream *substream) 
	struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);



	snd_azf3328_dbgcallenter();



	chip->playback_substream = NULL;

	snd_azf3328_dbgcallleave();

	return 0;
@@ -1660,10 +1666,10 @@ snd_azf3328_test_bit(unsigned int reg, int bit) 
}

#endif



#if DEBUG_MISC

static void

snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip)

{

#if DEBUG_MISC

	u16 tmp;



	snd_azf3328_dbgmisc("codec_port 0x%lx, io2_port 0x%lx, mpu_port 0x%lx, synth_port 0x%lx, mixer_port 0x%lx, irq %d\n", chip->codec_port, chip->io2_port, chip->mpu_port, chip->synth_port, chip->mixer_port, chip->irq);
@@ -1673,10 +1679,16 @@ snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip) 
	for (tmp=0; tmp <= 0x01; tmp += 1)

		snd_azf3328_dbgmisc("0x%02x: opl 0x%04x, mpu300 0x%04x, mpu310 0x%04x, mpu320 0x%04x, mpu330 0x%04x\n", tmp, inb(0x388 + tmp), inb(0x300 + tmp), inb(0x310 + tmp), inb(0x320 + tmp), inb(0x330 + tmp));



	for (tmp = 0; tmp <= 0x6E; tmp += 2)

		snd_azf3328_dbgmisc("0x%02x: 0x%04x\n", tmp, snd_azf3328_codec_inb(chip, tmp));

#endif

	for (tmp = 0; tmp < AZF_IO_SIZE_CODEC; tmp += 2)

		snd_azf3328_dbgmisc("codec 0x%02x: 0x%04x\n", tmp, snd_azf3328_codec_inw(chip, tmp));



	for (tmp = 0; tmp < AZF_IO_SIZE_MIXER; tmp += 2)

		snd_azf3328_dbgmisc("mixer 0x%02x: 0x%04x\n", tmp, snd_azf3328_mixer_inw(chip, tmp));

}

#else

static inline void

snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip) {}

#endif



static int __devinit

snd_azf3328_create(struct snd_card *card,
@@ -1842,8 +1854,8 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 


#ifdef MODULE

	printk(

"azt3328: Sound driver for Aztech AZF3328-based soundcards such as PCI168\n"

"azt3328: (hardware was completely undocumented - ZERO support from Aztech).\n"

"azt3328: Sound driver for Aztech AZF3328-based soundcards such as PCI168.\n"

"azt3328: Hardware was completely undocumented, unfortunately.\n"

"azt3328: Feel free to contact andi AT lisas.de for bug reports etc.!\n"

"azt3328: User-scalable sequencer timer set to %dHz (1024000Hz / %d).\n",

	1024000 / seqtimer_scaling, seqtimer_scaling);

sound/pci/azt3328.h

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ 
  #define IRQ_RECORDING			0x0002

  #define IRQ_MPU401			0x0010

  #define IRQ_TIMER			0x0020 /* DirectX timer */

  #define IRQ_UNKNOWN1			0x0040 /* probably unused */

  #define IRQ_UNKNOWN2			0x0080 /* probably unused */

  #define IRQ_UNKNOWN1			0x0040 /* probably unused, or possibly I2S port? or gameport IRQ? */

  #define IRQ_UNKNOWN2			0x0080 /* probably unused, or possibly I2S port? or gameport IRQ? */

#define IDX_IO_66H		0x66    /* writing 0xffff returns 0x0000 */

#define IDX_IO_SOME_VALUE	0x68	/* this is set to e.g. 0x3ff or 0x300, and writable; maybe some buffer limit, but I couldn't find out more, PU:0x00ff */

#define IDX_IO_6AH		0x6A	/* this WORD can be set to have bits 0x0028 activated (FIXME: correct??); actually inhibits PCM playback!!! maybe power management?? */