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

Commit 9fb5430c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/oss-fix' into for-linus

parents 4c5ecb7e e5bf4843

Documentation/sound/oss/CS4232

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
To configure the Crystal CS423x sound chip and activate its DSP functions,

modules may be loaded in this order:

  

	modprobe sound

	insmod ad1848

	insmod uart401

	insmod cs4232 io=* irq=* dma=* dma2=*

  

This is the meaning of the parameters:

  

	io--I/O address of the Windows Sound System (normally 0x534)

	irq--IRQ of this device

	dma and dma2--DMA channels (DMA2 may be 0)

  

On some cards, the board attempts to do non-PnP setup, and fails.  If you

have problems, use Linux' PnP facilities. 

  

To get MIDI facilities add

  

	insmod opl3 io=*

  

where "io" is the I/O address of the OPL3 synthesizer. This will be shown

in /proc/sys/pnp and is normally 0x388.

Documentation/sound/oss/Introduction

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ Notes: 
    additional features.



2.  The commercial OSS driver may be obtained from the site:

    http://www/opensound.com.  This may be used for cards that

    http://www.opensound.com.  This may be used for cards that

    are unsupported by the kernel driver, or may be used

    by other operating systems.

sound/oss/ad1848.c

+2 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void wait_for_calibration(ad1848_info * devc) 
	while (timeout > 0 && (ad_read(devc, 11) & 0x20))

		timeout--;

	if (ad_read(devc, 11) & 0x20)

		if ( (devc->model != MD_1845) || (devc->model != MD_1845_SSCAPE))

		if ((devc->model != MD_1845) && (devc->model != MD_1845_SSCAPE))

			printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n");

}
@@ -2107,7 +2107,7 @@ int ad1848_control(int cmd, int arg) 
	switch (cmd)

	{

		case AD1848_SET_XTAL:	/* Change clock frequency of AD1845 (only ) */

			if (devc->model != MD_1845 || devc->model != MD_1845_SSCAPE)

			if (devc->model != MD_1845 && devc->model != MD_1845_SSCAPE)

				return -EINVAL;

			spin_lock_irqsave(&devc->lock,flags);

			ad_enter_MCE(devc);

sound/oss/dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ int DMAbuf_sync(int dev) 
			DMAbuf_launch_output(dev, dmap);

		adev->dmap_out->flags |= DMA_SYNCING;

		adev->dmap_out->underrun_count = 0;

		while (!signal_pending(current) && n++ <= adev->dmap_out->nbufs && 

		while (!signal_pending(current) && n++ < adev->dmap_out->nbufs &&

		       adev->dmap_out->qlen && adev->dmap_out->underrun_count == 0) {

			long t = dmabuf_timeout(dmap);

			spin_unlock_irqrestore(&dmap->lock,flags);

sound/oss/pas2_card.c

+1 −3
Original line number Diff line number Diff line
@@ -156,9 +156,7 @@ static int __init config_pas_hw(struct address_info *hw_config) 
						 * 0x80

						 */ , 0xB88);



	pas_write(0x80

		  | joystick?0x40:0

		  ,0xF388);

	pas_write(0x80 | (joystick ? 0x40 : 0), 0xF388);



	if (pas_irq < 0 || pas_irq > 15)

	{