Commit Graph

189 Commits

Author SHA1 Message Date
James Courtier-Dutton 025cd2f6b1 [ALSA] snd-ca0106, snd-emu10k1: Add symlink in the sys tree.
CA0106 driver,EMU10K1/EMU10K2 driver
A thread appeared on the LKML. This patch implements the fix.

Question:
in sysfs, /sys/bus/*/drivers lists the driver names, with their exported .name (eg. '.name = 'EMU10K1_Audigy'' in the module code, from now on 'driver name'). In /sys/modules, the kernel modules are listed with their module name, eg. snd_emu10k1. However, it seems to me that in sysfs, there is no way in particular to tell, which module has which .name. That is, that snd_emu10k1 is EMU10K1_Audigy and vice versa.

I wonder whether it wouldn't be possible to add a symlink to the particular module from the driver, and/or from the module to the driver, so the list of devices handled by the module and the module name would be accessible. This way, I would know which driver name corresponds to which module name and vice versa.

Answer:
For PCI drivers, just add the line:
	.owner = THIS_MODULE,

to their struct pci_driver definition and you will get the symlink
created for you.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-09-12 10:41:07 +02:00
Lee Revell c6c0b841dd [ALSA] Add identification for Live 5.1 [SB0220]
EMU10K1/EMU10K2 driver
Add identification for Live 5.1 [SB0220]

Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:48 +02:00
Takashi Iwai 6a293552ba [ALSA] emu10k1 - Add missing ac97 support on SBLive! Player 5.1
EMU10K1/EMU10K2 driver
Added the missing ac97 support on SBLive! Player 5.1.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:47:46 +02:00
James Courtier-Dutton 99250872fc [ALSA] Add new card ID. Fixes ALSA bug #1297
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-08-30 08:45:38 +02:00
Clemens Ladisch 5549d54992 [ALSA] use PCM interface for IEC958 controls
Digigram VX core,ENS1370/1+ driver,CA0106 driver,EMU10K1/EMU10K2 driver
RME HDSP driver,RME9652 driver
For consistency, use the PCM interface instead of MIXER for IEC958
default/mask/stream mixer controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:43:39 +02:00
Clemens Ladisch 10e8d78a94 [ALSA] use SNDRV_CTL_NAME_IEC958 macro
CMI8330 driver,ENS1370/1+ driver,FM801 driver,VIA82xx driver,AC97 Codec
ALI5451 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver
ICE1712 driver,ICE1724 driver
Where appropriate, use the SNDRV_CTL_NAME_IEC958 instead of a literal
string.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:43:35 +02:00
Clemens Ladisch 67ed4161f6 [ALSA] sound - fix .iface field of mixer control elements
Documentation,CS46xx driver,EMU10K1/EMU10K2 driver,AD1848 driver
SB16/AWE driver,CMIPCI driver,ENS1370/1+ driver,RME32 driver
RME96 driver,ICE1712 driver,ICE1724 driver,KORG1212 driver
RME HDSP driver,RME9652 driver
This patch changes .iface to SNDRV_CTL_ELEM_IFACE_MIXER whre _PCM or
_HWDEP was used in controls that are not associated with a specific PCM
(sub)stream or hwdep device, and changes some controls that got
inconsitent .iface values due to copy+paste errors.  Furthermore, it
makes sure that all control that do use _PCM or _HWDEP use the correct
number in the .device field.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:43:22 +02:00
James Courtier-Dutton 7c1d549aa9 [ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:25 +02:00
James Courtier-Dutton ae3a72d8cb [ALSA] snd-emu10k1: Fixes recognition of Audigy ES.
EMU10K1/EMU10K2 driver
Fixes ALSA bug #1237.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:03 +02:00
James Courtier-Dutton e66bc8b2a7 [ALSA] emu10k1: Add module option uint subsystem.
EMU10K1/EMU10K2 driver
It allows the user to force the snd-emu10k1 module to think the user
has a particular sound card. Useful if their particular sound card
is not yet recognised.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:00 +02:00
James Courtier-Dutton 88dc0e5dad [ALSA] emu10k1: Added tested status comments.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:32 +02:00
James Courtier-Dutton a6f6192bb3 [ALSA] emu10k1: Sort by card id.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:31 +02:00
James Courtier-Dutton 3818152e64 [ALSA] snd-emu10k1: Tidy mixer controls.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:28 +02:00
James Courtier-Dutton e0474e5398 [ALSA] snd-emu10k1: Card capabilities tidy up.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:26 +02:00
Jesper Juhl 77933d7276 [PATCH] clean up inline static vs static inline
`gcc -W' likes to complain if the static keyword is not at the beginning of
the declaration.  This patch fixes all remaining occurrences of "inline
static" up with "static inline" in the entire kernel tree (140 occurrences in
47 files).

While making this change I came across a few lines with trailing whitespace
that I also fixed up, I have also added or removed a blank line or two here
and there, but there are no functional changes in the patch.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-27 16:26:20 -07:00
James Courtier-Dutton 2b6b22f381 [ALSA] emu10k1: Add more card identification entries.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:29:11 +02:00
Jesper Juhl 4d572776d4 [ALSA] Remove redundant NULL checks before kfree
Timer Midlevel,ALSA sequencer,ALSA<-OSS sequencer,Digigram VX core
I2C tea6330t,GUS Library,VIA82xx driver,VIA82xx-modem driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,YMFPCI driver
Digigram VX Pocket driver,Common EMU synth,USB generic driver,USB USX2Y
Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/

This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:43 +02:00
Arnaud Patard a6c17ec89d [ALSA] emu10k1: add details for the audigy player box version
EMU10K1/EMU10K2 driver
Add details for the audigy player box version.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:27 +02:00
Mikael Magnusson f7de9cfd25 [ALSA] emu10k1 - add SB0060 to emu_chip_details
EMU10K1/EMU10K2 driver
The following patch adds SB0060 to emu_chip_details.

Signed-off-by: Mikael Magnusson <mikaelmagnusson@glocalnet.net>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-05-29 10:06:46 +02:00
James Courtier-Dutton 22bc30c84b [ALSA] Increase capture buffer sizes.
EMU10K1/EMU10K2 driver


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 10:06:19 +02:00
James Courtier-Dutton f927c8fc64 [ALSA] Implement different capture sources.
EMU10K1/EMU10K2 driver
e.g. When HD Capture source is set to SPDIF,
     setting HD Capture channel to 0 captures from CDROM digital input.
     setting HD Capture channel to 1 captures from SPDIF in.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 10:06:16 +02:00
James Courtier-Dutton c702563703 [ALSA] Support multiple capture rates on p16v.
EMU10K1/EMU10K2 driver
The capture rate does in fact vary, but it only captures anything if
the HD Capture source is set to I2S or AC97. I have not tested if the sound
is actually captured from an physical input of some type or not.
TODO: Get SPDIF capture working.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 10:06:13 +02:00
Jesper Juhl fe5ac9dcfe [ALSA] trivial warning fix for emu10k1
EMU10K1/EMU10K2 driver
When building with gcc -W sound/pci/emu10k1/emupcm.c produces this little
warning in 2.6.12-rc2-mm3 :
  sound/pci/emu10k1/emupcm.c:265: warning: 'inline' is not at beginning of
declaration
No big deal, but trivial to fix.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:04:43 +02:00
Takashi Iwai bd7bf042e8 [ALSA] Fix permissions in some /proc files
PCM Midlevel,CA0106 driver,EMU10K1/EMU10K2 driver
Fix by Guillaume Chazarain <guichaz@yahoo.fr>:

Some tunables in /proc have a write() function, but as their
permission does not reflect it, it can be confusing to the user.

So here is a patch that corrects the mode of those files. Note that I
have only tested the 'xrun_debug' entry.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:00:39 +02:00
Takashi Iwai 0af68e5ed4 [ALSA] Fix compile warning
EMU10K1/EMU10K2 driver
Fix compile warnings regarding the unused variables/functions.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:00:35 +02:00
Takashi Iwai 01d25d460a [ALSA] Replace pci_module_init() with pci_register_driver()
Documentation,ALS4000 driver,ATIIXP driver,ATIIXP-modem driver
AZT3328 driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,FM801 driver
Intel8x0 driver,Intel8x0-modem driver,Maestro3 driver,RME32 driver
RME96 driver,SonicVibes driver,VIA82xx driver,VIA82xx-modem driver
ALI5451 driver,au88x0 driver,CA0106 driver,CS46xx driver
EMU10K1/EMU10K2 driver,HDA Intel driver,ICE1712 driver,ICE1724 driver
KORG1212 driver,MIXART driver,NM256 driver,RME HDSP driver
RME9652 driver,Trident driver,Digigram VX222 driver,YMFPCI driver
Replace the obsolete pci_module_init() with pci_register_driver().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:00:32 +02:00
James Courtier-Dutton fd9a98ec0a [ALSA] Fix typo in speaker routing. Now sound comes from the correct speakers
EMU10K1/EMU10K2 driver
when using the p16v HD device.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:58:55 +02:00
James Courtier-Dutton 310bacd292 [ALSA] Improve playback startup. Increase buffer size, and reduce xruns.
EMU10K1/EMU10K2 driver


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:58:52 +02:00
James Courtier-Dutton 001f758990 [ALSA] Improve SPDIF playback via the P16V/CA0151 chip.
EMU10K1/EMU10K2 driver
Although we can set 44100 as the output rate, the SPDIF can do it, but the Analog output cannot.
The SPDIF has the bug, whereby the Left channel arrives one sample late, so although we don't do any resampling,
it is not good for AC3 non-audio output.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:58:49 +02:00
James Courtier-Dutton df34140a9c [ALSA] Display SPDIF in status in proc fs 'spdif-in' file.
EMU10K1/EMU10K2 driver


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:58:46 +02:00
Takashi Iwai bdaed50292 [ALSA] Check revision for the proper detection of audigy 2
EMU10K1/EMU10K2 driver
Check ther revision to detect non-listed audigy 2 boards.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 09:58:22 +02:00
Peter Zubaj 2668907a82 [ALSA] Audigy SB0090 identification
EMU10K1/EMU10K2 driver
This add identification of Audigy 1 model SB0090 and fixes
problems with ac97 codec (mic not working).

Signed-off-by: Peter Zubaj <pzad@pobox.sk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 09:00:56 +02:00
Takashi Iwai 85a655d66b [ALSA] Fix the default id of multiple cards
EMU10K1/EMU10K2 driver
Fixed the default id string in case identical multiple cards exist.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 09:00:50 +02:00
Takashi Iwai aec72e0a4b [ALSA] Use old default id strings for compatibility
EMU10K1/EMU10K2 driver
Use expliciitly the old default id strings for backward compatibility.
This will make 'alsactl restore' working again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 09:00:47 +02:00
Lee Revell 2b637da5a1 [ALSA] clean up card features
EMU10K1/EMU10K2 driver
This patch converts the emu10k1 driver to use the card capabilities
structure for some more things.

Not extensively tested but seems to work.

Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 09:00:41 +02:00
James Courtier-Dutton 56f5ceed00 [ALSA] Added identification for the Audigy ES.
EMU10K1/EMU10K2 driver


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:00:30 +02:00
James Courtier-Dutton 65f3764771 [ALSA] Add's identification of the SB Live! Platinum [CT4760P]
EMU10K1/EMU10K2 driver


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:00:27 +02:00
James Courtier-Dutton 6e4abc40fc [ALSA] Adds Capture to P16V chip.
EMU10K1/EMU10K2 driver
One can select which capture source, but one cannot yet set volumes.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 09:00:24 +02:00
Linus Torvalds 1da177e4c3 Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!
2005-04-16 15:20:36 -07:00