[ALSA PATCH] OSS emulation fixes

[ALSA PATCH] OSS emulation fixes

[Jaroslav Kysela]

Linus, please do a

  bk pull http://linux-sound.bkbits.net/linux-sound

The GNU patch is available at:

  ftp://ftp.alsa-project.org/pub/kernel-patches/alsa-bk-2003-09-30.patch.gz

Additional notes:

  Linus, please, merge C: (means changed code block) lines to your
  release change log too - otherwise it's not much readable. Thank you.

The pull command will update the following files:

 include/sound/pcm_oss.h      |    1
 include/sound/rawmidi.h      |    1
 sound/core/control.c         |    3 --
 sound/core/hwdep.c           |    3 +-
 sound/core/init.c            |    2 -
 sound/core/oss/pcm_oss.c     |   59 +++++++++++++++++++++++++++++++------------
 sound/core/pcm_lib.c         |    6 +---
 sound/core/pcm_native.c      |    9 ++----
 sound/core/rawmidi.c         |   32 +++++++++++++----------
 sound/core/seq/seq_lock.c    |   38 ---------------------------
 sound/core/timer.c           |    1
 sound/drivers/dummy.c        |   32 +++++++++++++++++++++++
 sound/isa/sb/emu8000_patch.c |    6 ----
 sound/isa/sb/emu8000_pcm.c   |   10 ++-----
 sound/pci/Kconfig            |   12 ++++----
 sound/pci/via82xx.c          |   21 ++++++++-------
 sound/pci/vx222/vx222_ops.c  |    6 ----
 sound/usb/usbaudio.c         |    1
 sound/usb/usbmixer.c         |   10 +++----
 19 files changed, 132 insertions(+), 121 deletions(-)

through these ChangeSets:

<perex@suse.cz> (03/09/30 1.1457)
   ALSA CVS update
   D:2003/09/30 11:15:44
   C:RawMidi Midlevel
   A:Takashi Iwai <tiwai@suse.de>
   F:core/rawmidi.c:1.38->1.39
   L:fixed typos (open_lock -> open_mutex).

<perex@suse.cz> (03/09/30 1.1456)
   ALSA CVS update
   D:2003/09/30 11:12:09
   C:VIA82xx driver
   A:Takashi Iwai <tiwai@suse.de>
   F:pci/via82xx.c:1.52->1.53
   L:- fixed the detection of VIA8233A (it was overridden by dxs_support
   L:  option).

<perex@suse.cz> (03/09/30 1.1267.62.6)
   ALSA CVS update
   D:2003/09/30 10:28:26
   C:Control Midlevel,HWDEP Midlevel,ALSA Core,PCM Midlevel,RawMidi Midlevel
   C:Timer Midlevel,ALSA<-OSS emulation,ALSA sequencer,EMU8000 driver
   C:Digigram VX222 driver,USB generic driver
   A:Jaroslav Kysela <perex@suse.cz>
   F:core/control.c:1.37->1.38
   F:core/hwdep.c:1.21->1.22
   F:core/init.c:1.38->1.39
   F:core/pcm_lib.c:1.43->1.44
   F:core/pcm_native.c:1.81->1.82
   F:core/rawmidi.c:1.37->1.38
   F:core/timer.c:1.46->1.47
   F:core/oss/pcm_oss.c:1.52->1.53
   F:core/seq/seq_lock.c:1.7->1.8
   F:include/rawmidi.h:1.10->1.11
   F:isa/sb/emu8000_patch.c:1.6->1.7
   F:isa/sb/emu8000_pcm.c:1.10->1.11
   F:pci/vx222/vx222_ops.c:1.2->1.3
   F:usb/usbaudio.c:1.65->1.66
   L:Revised schedule() and set_current_state() calls.
   L:Replaced need_resched() with cond_resched() call.

<perex@suse.cz> (03/09/30 1.1267.62.5)
   ALSA CVS update
   D:2003/09/30 09:58:53
   C:Generic drivers
   A:Jaroslav Kysela <perex@suse.cz>
   F:drivers/dummy.c:1.25->1.26
   L:Added emu10k1 emulation by Takashi

<perex@suse.cz> (03/09/30 1.1267.62.4)
   ALSA CVS update
   D:2003/09/30 08:54:19
   C:ALSA<-OSS emulation
   A:Jaroslav Kysela <perex@suse.cz>
   F:core/oss/pcm_oss.c:1.51->1.52
   L:Fixed compilation for the sync code commited by mistake.
   L:Fixed possible race in sync1 code (schedule call) and used schedule_timeout.

<perex@suse.cz> (03/09/30 1.1267.62.3)
   ALSA CVS update
   D:2003/09/29 19:16:18
   C:ALSA<-OSS emulation
   A:Jaroslav Kysela <perex@suse.cz>
   F:core/oss/pcm_oss.c:1.50->1.51
   F:include/pcm_oss.h:1.7->1.8
   L:Fixed oops in oss_sync() routine.

<perex@suse.cz> (03/09/30 1.1267.62.2)
   ALSA CVS update
   D:2003/09/29 08:31:25
   C:PCI drivers
   A:Jaroslav Kysela <perex@suse.cz>
   F:pci/Kconfig:1.8->1.9
   L:Removed GAMEPORT dependency (already handled in drivers)

<perex@suse.cz> (03/09/30 1.1267.62.1)
   ALSA CVS update
   D:2003/09/26 15:29:05
   C:USB generic driver
   A:Takashi Iwai <tiwai@suse.de>
   F:usb/usbmixer.c:1.23->1.24
   L:probe units even under a selector unit which is marked as ignored or has
   L:only a single selector.


						Jaroslav

-----
Jaroslav Kysela <perex@suse.cz>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs

Re: [ALSA PATCH] OSS emulation fixes

[Linus Torvalds]

On Tue, 30 Sep 2003, Jaroslav Kysela wrote:
> 
> Additional notes:
> 
>   Linus, please, merge C: (means changed code block) lines to your
>   release change log too - otherwise it's not much readable. Thank you.

The shortlogs are automatically generated, and I sometimes edit them to be 
slightly more readable by hand.

What this means is that if you want a human-readable short-log, then your
ALSA log message itself should be human-readable, and not that automated
crap.

So instead of your CVS merges doing this crap:
> 
> <perex@suse.cz> (03/09/30 1.1457)
>    ALSA CVS update
>    D:2003/09/30 11:15:44
>    C:RawMidi Midlevel
>    A:Takashi Iwai <tiwai@suse.de>
>    F:core/rawmidi.c:1.38->1.39
>    L:fixed typos (open_lock -> open_mutex).

Why don't you just make the BK log something sane instead, ie

	RawMidi Midlevel: fixed typos (open_lock -> open_mutex).

	Bt Takashi Iwai <tiwai@suse.de>

(the "F:" is useless, since the files already show up in any sane source 
control, and the rest is just fluff.

		Linus

Re: [ALSA PATCH] OSS emulation fixes

[Joshua Kwan]

[-- Attachment #1: Type: text/plain, Size: 677 bytes --]

Hi Jaroslav,

On Tue, Sep 30, 2003 at 12:51:52PM +0200, Jaroslav Kysela wrote:
> The pull command will update the following files:
> 
>  include/sound/pcm_oss.h      |    1
>  include/sound/rawmidi.h      |    1
...

In 2.6.0-test6-mm1 with OSS emulation I encountered a problem where xine
would use the sound card in OSS mode and no other application would be
able to use it after that until I rebooted. Do any of these fixes
address this problem?

By the way - something you folks did during -test5 improved the quality
of snd-intel8x0 by leaps and bounds. It used to crackle a lot at certain
frequencies and works great now. :)

Thanks,
-- 
Joshua Kwan

[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]

Re: [ALSA PATCH] OSS emulation fixes

[Jaroslav Kysela]

On Tue, 30 Sep 2003, Joshua Kwan wrote:

> Hi Jaroslav,
>
> On Tue, Sep 30, 2003 at 12:51:52PM +0200, Jaroslav Kysela wrote:
> > The pull command will update the following files:
> >
> >  include/sound/pcm_oss.h      |    1
> >  include/sound/rawmidi.h      |    1
> ...
>
> In 2.6.0-test6-mm1 with OSS emulation I encountered a problem where xine
> would use the sound card in OSS mode and no other application would be
> able to use it after that until I rebooted. Do any of these fixes
> address this problem?

Yes, it will fix oops when an application releases the OSS emulation
device.

> By the way - something you folks did during -test5 improved the quality
> of snd-intel8x0 by leaps and bounds. It used to crackle a lot at certain
> frequencies and works great now. :)

Yes, the method to obtain the current position in the DMA buffer was
changed.

						Jaroslav

-----
Jaroslav Kysela <perex@suse.cz>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs