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

Commit 63f3d1df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current

parents a8cd2e50 676e1a2c

Documentation/sound/alsa/ALSA-Configuration.txt

+87 −37
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    adsp_map	- PCM device number maps assigned to the 2st OSS device.

		- Default: 1

    nonblock_open

		- Don't block opening busy PCM devices.

		- Don't block opening busy PCM devices.  Default: 1



    For example, when dsp_map=2, /dev/dsp will be mapped to PCM #2 of

    the card #0.  Similarly, when adsp_map=0, /dev/adsp will be mapped
@@ -148,6 +148,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    Module supports up to 8 cards. This module does not support autoprobe

    thus main port must be specified!!! Other ports are optional.

    

  Module snd-ad1889

  -----------------



    Module for Analog Devices AD1889 chips.



    ac97_quirk  - AC'97 workaround for strange hardware

                  See the description of intel8x0 module for details.



    This module supports up to 8 cards.



  Module snd-ali5451

  ------------------
@@ -189,15 +199,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-atiixp

  -----------------



    Module for ATI IXP 150/200/250 AC97 controllers.

    Module for ATI IXP 150/200/250/400 AC97 controllers.



    ac97_clock		- AC'97 clock (defalut = 48000)

    ac97_clock		- AC'97 clock (default = 48000)

    ac97_quirk		- AC'97 workaround for strange hardware

			  See the description of intel8x0 module for details.

			  See "AC97 Quirk Option" section below.

    spdif_aclink	- S/PDIF transfer over AC-link (default = 1)



    This module supports up to 8 cards and autoprobe.



    ATI IXP has two different methods to control SPDIF output.  One is

    over AC-link and another is over the "direct" SPDIF output.  The

    implementation depends on the motherboard, and you'll need to

    choose the correct one via spdif_aclink module option.



  Module snd-atiixp-modem

  -----------------------
@@ -230,7 +245,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    The hardware EQ hardware and SPDIF is only present in the Vortex2 and 

    Advantage.



    Note: Some ALSA mixer applicactions don't handle the SPDIF samplerate 

    Note: Some ALSA mixer applications don't handle the SPDIF sample rate 

           control correctly. If you have problems regarding this, try

           another ALSA compliant mixer (alsamixer works).
@@ -302,7 +317,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    mpu_port	- 0x300,0x310,0x320,0x330, 0 = disable (default)

    fm_port     - 0x388 (default), 0 = disable (default)

    soft_ac3    - Sofware-conversion of raw SPDIF packets (model 033 only)

    soft_ac3    - Software-conversion of raw SPDIF packets (model 033 only)

                  (default = 1)

    joystick_port - Joystick port address (0 = disable, 1 = auto-detect)
@@ -384,7 +399,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    Module for PCI sound cards based on CS4610/CS4612/CS4614/CS4615/CS4622/

				       CS4624/CS4630/CS4280 PCI chips.



    external_amp     - Force to enable external amplifer.

    external_amp     - Force to enable external amplifier.

    thinkpad         - Force to enable Thinkpad's CLKRUN control.

    mmap_valid       - Support OSS mmap mode (default = 0).
@@ -620,7 +635,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	       VIA VT8251/VT8237A



    model	- force the model name

    position_fix - Fix DMA pointer (0 = FIFO size, 1 = none, 2 = POSBUF)

    position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)



    Module supports up to 8 cards.
@@ -656,6 +671,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  allout	5-jack in back, 2-jack in front, SPDIF out

	  auto		auto-config reading BIOS (default)



    If the default configuration doesn't work and one of the above

    matches with your device, report it together with the PCI

    subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel

    ML (see the section "Links and Addresses").



    Note 2: If you get click noises on output, try the module option

	    position_fix=1 or 2.  position_fix=1 will use the SD_LPIB

	    register value without FIFO size correction as the current
@@ -783,20 +803,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    ac97_clock	  - AC'97 codec clock base (0 = auto-detect)

    ac97_quirk    - AC'97 workaround for strange hardware

                    The following strings are accepted:

                      default = don't override the default setting

                      disable = disable the quirk

                      hp_only = use headphone control as master

                      swap_hp = swap headphone and master controls

                      swap_surround = swap master and surround controls

                      ad_sharing = for AD1985, turn on OMS bit and use headphone

                      alc_jack = for ALC65x, turn on the jack sense mode

                      inv_eapd = inverted EAPD implementation

                      mute_led = bind EAPD bit for turning on/off mute LED

                    For backward compatibility, the corresponding integer

                    value -1, 0, ... are accepted, too.

		    See "AC97 Quirk Option" section below.

    buggy_irq     - Enable workaround for buggy interrupts on some

                    motherboards (default off)

                    motherboards (default yes on nForce chips,

		    otherwise off)

    buggy_semaphore - Enable workaround for hardwares with buggy

		    semaphores (e.g. on some ASUS laptops)

		    (default off)



    Module supports autoprobe and multiple bus-master chips (max 8).
@@ -808,13 +821,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    motherboard has these devices, use the ns558 or snd-mpu401

    modules, respectively.



    The ac97_quirk option is used to enable/override the workaround

    for specific devices.  Some hardware have swapped output pins

    between Master and Headphone, or Surround.  The driver provides

    the auto-detection of known problematic devices, but some might

    be unknown or wrongly detected.  In such a case, pass the proper

    value with this option.



    The power-management is supported.

    

  Module snd-intel8x0m
@@ -966,7 +972,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    with machines with other (most likely CS423x or OPL3SAx) chips,

    even though the device is detected in lspci.  In such a case, try

    other drivers, e.g. snd-cs4232 or snd-opl3sa2.  Some has ISA-PnP

    but some doesn't have ISA PnP.  You'll need to speicfy isapnp=0

    but some doesn't have ISA PnP.  You'll need to specify isapnp=0

    and proper hardware parameters in the case without ISA PnP.



    Note: some laptops need a workaround for AC97 RESET.  For the
@@ -1302,7 +1308,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
		  channels

		  [VIA8233/C, 8235, 8237 only]

    ac97_quirk  - AC'97 workaround for strange hardware

                  See the description of intel8x0 module for details.

		  See "AC97 Quirk Option" section below.



    Module supports autoprobe and multiple bus-master chips (max 8).
@@ -1327,16 +1333,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  "lspci -nv").

	  If dxs_support=5 does not work, try dxs_support=4; if it

	  doesn't work too, try dxs_support=1.  (dxs_support=1 is

	  usually for old motherboards.  The correct implementated

	  usually for old motherboards.  The correct implemented

	  board should work with 4 or 5.)  If it still doesn't

	  work and the default setting is ok, dxs_support=3 is the

	  right choice.  If the default setting doesn't work at all,

	  try dxs_support=2 to disable the DXS channels.

	  In any cases, please let us know the result and the

	  subsystem vendor/device ids.

	  subsystem vendor/device ids.  See "Links and Addresses"

	  below.



    Note: for the MPU401 on VIA823x, use snd-mpu401 driver

	  additonally.  The mpu_port option is for VIA686 chips only.

	  additionally.  The mpu_port option is for VIA686 chips only.



  Module snd-via82xx-modem

  ------------------------
@@ -1398,8 +1405,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    Module supports up to 8 cards.  The module is compiled only when

    PCMCIA is supported on kernel.



    To activate the driver via the card manager, you'll need to set

    up /etc/pcmcia/vxpocket.conf.  See the sound/pcmcia/vx/vxpocket.c.

    With the older 2.6.x kernel, to activate the driver via the card

    manager, you'll need to set up /etc/pcmcia/vxpocket.conf.  See the

    sound/pcmcia/vx/vxpocket.c.  2.6.13 or later kernel requires no

    longer require a config file.



    When the driver is compiled as a module and the hotplug firmware

    is supported, the firmware data is loaded via hotplug automatically.
@@ -1411,6 +1420,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    Note: the driver is build only when CONFIG_ISA is set.

    

    Note2: snd-vxp440 driver is merged to snd-vxpocket driver since

           ALSA 1.0.10.



  Module snd-ymfpci

  -----------------
@@ -1436,6 +1448,37 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    Note: the driver is build only when CONFIG_ISA is set.





AC97 Quirk Option

=================



The ac97_quirk option is used to enable/override the workaround for

specific devices on drivers for on-board AC'97 controllers like

snd-intel8x0.  Some hardware have swapped output pins between Master

and Headphone, or Surround (thanks to confusion of AC'97

specifications from version to version :-)



The driver provides the auto-detection of known problematic devices,

but some might be unknown or wrongly detected.  In such a case, pass

the proper value with this option.



The following strings are accepted:

    - default	Don't override the default setting

    - disable	Disable the quirk

    - hp_only	Bind Master and Headphone controls as a single control

    - swap_hp	Swap headphone and master controls

    - swap_surround  Swap master and surround controls

    - ad_sharing  For AD1985, turn on OMS bit and use headphone

    - alc_jack	For ALC65x, turn on the jack sense mode

    - inv_eapd	Inverted EAPD implementation

    - mute_led	Bind EAPD bit for turning on/off mute LED



For backward compatibility, the corresponding integer value -1, 0,

... are  accepted, too.



For example, if "Master" volume control has no effect on your device

but only "Headphone" does, pass ac97_quirk=hp_only module option.





Configuring Non-ISAPNP Cards

============================
@@ -1553,6 +1596,8 @@ Proc interfaces (/proc/asound) 
	  - whole-frag  write only whole fragments (optimization affecting

			playback only)

	  - no-silence  do not fill silence ahead to avoid clicks

	  - buggy-ptr	Returns the whitespace blocks in GETOPTR ioctl

			instead of filled blocks



  Example: echo "x11amp 128 16384" > /proc/asound/card0/pcm0p/oss

           echo "squake 0 0 disable" > /proc/asound/card0/pcm0c/oss
@@ -1589,9 +1634,14 @@ commands to the snd-page-alloc driver: 
    use.





Links

=====

Links and Addresses

===================



  ALSA project homepage

       http://www.alsa-project.org



  ALSA Bug Tracking System

       https://bugtrack.alsa-project.org/bugs/



  ALSA Developers ML

       mailto:alsa-devel@lists.sourceforge.net

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+5 −5
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ 
          ....



          /* allocate a chip-specific data with zero filled */

          chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);

          chip = kzalloc(sizeof(*chip), GFP_KERNEL);

          if (chip == NULL)

                  return -ENOMEM;
@@ -949,7 +949,7 @@ 
          After allocating a card instance via

          <function>snd_card_new()</function> (with

          <constant>NULL</constant> on the 4th arg), call

          <function>kcalloc()</function>. 

          <function>kzalloc()</function>. 



          <informalexample>

            <programlisting>
@@ -958,7 +958,7 @@ 
  mychip_t *chip;

  card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL);

  .....

  chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);

  chip = kzalloc(sizeof(*chip), GFP_KERNEL);

]]>

            </programlisting>

          </informalexample>
@@ -1136,7 +1136,7 @@ 
                  return -ENXIO;

          }



          chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);

          chip = kzalloc(sizeof(*chip), GFP_KERNEL);

          if (chip == NULL) {

                  pci_disable_device(pci);

                  return -ENOMEM;
@@ -1292,7 +1292,7 @@ 
      need to initialize this number as -1 before actual allocation,

      since irq 0 is valid. The port address and its resource pointer

      can be initialized as null by

      <function>kcalloc()</function> automatically, so you

      <function>kzalloc()</function> automatically, so you

      don't have to take care of resetting them. 

      </para>

include/linux/pci_ids.h

+44 −0
Original line number Diff line number Diff line
@@ -447,6 +447,10 @@ 
#define PCI_DEVICE_ID_CIRRUS_7542	0x1200

#define PCI_DEVICE_ID_CIRRUS_7543	0x1202

#define PCI_DEVICE_ID_CIRRUS_7541	0x1204

#define PCI_DEVICE_ID_CIRRUS_4610	0x6001

#define PCI_DEVICE_ID_CIRRUS_4612	0x6003

#define PCI_DEVICE_ID_CIRRUS_4615	0x6004

#define PCI_DEVICE_ID_CIRRUS_4281	0x6005



#define PCI_VENDOR_ID_IBM		0x1014

#define PCI_DEVICE_ID_IBM_FIRE_CORAL	0x000a
@@ -682,7 +686,9 @@ 
#define PCI_DEVICE_ID_SI_6326		0x6326

#define PCI_DEVICE_ID_SI_7001		0x7001

#define PCI_DEVICE_ID_SI_7012		0x7012

#define PCI_DEVICE_ID_SI_7013		0x7013

#define PCI_DEVICE_ID_SI_7016		0x7016

#define PCI_DEVICE_ID_SI_7018		0x7018



#define PCI_VENDOR_ID_HP		0x103c

#define PCI_DEVICE_ID_HP_VISUALIZE_EG	0x1005
@@ -993,6 +999,7 @@ 
#define PCI_DEVICE_ID_BROOKTREE_849A	0x0351

#define PCI_DEVICE_ID_BROOKTREE_878_1	0x036e

#define PCI_DEVICE_ID_BROOKTREE_878	0x0878

#define PCI_DEVICE_ID_BROOKTREE_879	0x0879

#define PCI_DEVICE_ID_BROOKTREE_8474	0x8474



#define PCI_VENDOR_ID_SIERRA		0x10a8
@@ -1111,6 +1118,9 @@ 
#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004

#define PCI_DEVICE_ID_NEOMAGIC_MAGICMEDIA_256AV       0x0005

#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS   0x0083

#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005

#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006

#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016



#define PCI_VENDOR_ID_ASP		0x10cd

#define PCI_DEVICE_ID_ASP_ABP940	0x1200
@@ -1157,10 +1167,13 @@ 
#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS	0x0064

#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE	0x0065

#define PCI_DEVICE_ID_NVIDIA_NVENET_2		0x0066

#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM		0x0069

#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO		0x006a

#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS	0x0084

#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE	0x0085

#define PCI_DEVICE_ID_NVIDIA_NVENET_4		0x0086

#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM	0x0089

#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO		0x008a

#define PCI_DEVICE_ID_NVIDIA_NVENET_5		0x008c

#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA	0x008e

#define PCI_DEVICE_ID_NVIDIA_ITNT2		0x00A0
@@ -1175,6 +1188,7 @@ 
#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS	0x00d4

#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE	0x00d5

#define PCI_DEVICE_ID_NVIDIA_NVENET_3		0x00d6

#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM		0x00d9

#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO		0x00da

#define PCI_DEVICE_ID_NVIDIA_NVENET_7		0x00df

#define PCI_DEVICE_ID_NVIDIA_NFORCE3S		0x00e1
@@ -1182,6 +1196,7 @@ 
#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS	0x00e4

#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE	0x00e5

#define PCI_DEVICE_ID_NVIDIA_NVENET_6		0x00e6

#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO		0x00ea

#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2	0x00ee

#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR	0x0100

#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR	0x0101
@@ -1232,6 +1247,7 @@ 
#define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO		0x01b1

#define PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS	0x01b4

#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE		0x01bc

#define PCI_DEVICE_ID_NVIDIA_MCP1_MODEM		0x01c1

#define PCI_DEVICE_ID_NVIDIA_NVENET_1		0x01c3

#define PCI_DEVICE_ID_NVIDIA_NFORCE2		0x01e0

#define PCI_DEVICE_ID_NVIDIA_GEFORCE3		0x0200
@@ -1336,6 +1352,13 @@ 
#define PCI_DEVICE_ID_REALTEK_8169	0x8169



#define PCI_VENDOR_ID_XILINX		0x10ee

#define PCI_DEVICE_ID_RME_DIGI96	0x3fc0

#define PCI_DEVICE_ID_RME_DIGI96_8	0x3fc1

#define PCI_DEVICE_ID_RME_DIGI96_8_PRO	0x3fc2

#define PCI_DEVICE_IDRME__DIGI96_8_PAD_OR_PST 0x3fc3

#define PCI_DEVICE_ID_XILINX_HAMMERFALL	0x3fc4

#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5

#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI 0x3fc6

#define PCI_DEVICE_ID_TURBOPAM		0x4020



#define PCI_VENDOR_ID_TRUEVISION	0x10fa
@@ -1811,6 +1834,14 @@ 
#define PCI_DEVICE_ID_ESS_ESS1968	0x1968

#define PCI_DEVICE_ID_ESS_AUDIOPCI	0x1969

#define PCI_DEVICE_ID_ESS_ESS1978	0x1978

#define PCI_DEVICE_ID_ESS_ALLEGRO_1	0x1988

#define PCI_DEVICE_ID_ESS_ALLEGRO	0x1989

#define PCI_DEVICE_ID_ESS_CANYON3D_2LE	0x1990

#define PCI_DEVICE_ID_ESS_CANYON3D_2	0x1992

#define PCI_DEVICE_ID_ESS_MAESTRO3	0x1998

#define PCI_DEVICE_ID_ESS_MAESTRO3_1	0x1999

#define PCI_DEVICE_ID_ESS_MAESTRO3_HW	0x199a

#define PCI_DEVICE_ID_ESS_MAESTRO3_2	0x199b



#define PCI_VENDOR_ID_SATSAGEM		0x1267

#define PCI_DEVICE_ID_SATSAGEM_NICCY	0x1016
@@ -1970,6 +2001,9 @@ 
#define PCI_DEVICE_ID_LMC_SSI		0x0005

#define PCI_DEVICE_ID_LMC_T1		0x0006



#define PCI_VENDOR_ID_MARIAN		0x1382

#define PCI_DEVICE_ID_MARIAN_PRODIF_PLUS 0x2048



#define PCI_VENDOR_ID_NETGEAR		0x1385

#define PCI_DEVICE_ID_NETGEAR_GA620	0x620a

#define PCI_DEVICE_ID_NETGEAR_GA622	0x622a
@@ -2058,6 +2092,10 @@ 
#define PCI_VENDOR_ID_TIMEDIA		0x1409

#define PCI_DEVICE_ID_TIMEDIA_1889	0x7168



#define PCI_VENDOR_ID_ICE		0x1412

#define PCI_DEVICE_ID_ICE_1712		0x1712

#define PCI_DEVICE_ID_VT1724		0x1724



#define PCI_VENDOR_ID_OXSEMI		0x1415

#define PCI_DEVICE_ID_OXSEMI_12PCI840	0x8403

#define PCI_DEVICE_ID_OXSEMI_16PCI954	0x9501
@@ -2538,6 +2576,7 @@ 
#define PCI_DEVICE_ID_INTEL_82443BX_1	0x7191

#define PCI_DEVICE_ID_INTEL_82443BX_2	0x7192

#define PCI_DEVICE_ID_INTEL_440MX	0x7195

#define PCI_DEVICE_ID_INTEL_440MX_6	0x7196

#define PCI_DEVICE_ID_INTEL_82443MX_0	0x7198

#define PCI_DEVICE_ID_INTEL_82443MX_1	0x7199

#define PCI_DEVICE_ID_INTEL_82443MX_2	0x719a
@@ -2644,6 +2683,11 @@ 
#define PCI_VENDOR_ID_TTTECH		0x0357

#define PCI_DEVICE_ID_TTTECH_MC322	0x000A



#define PCI_VENDOR_ID_XILINX_RME	0xea60

#define PCI_DEVICE_ID_RME_DIGI32	0x9896

#define PCI_DEVICE_ID_RME_DIGI32_PRO	0x9897

#define PCI_DEVICE_ID_RME_DIGI32_8	0x9898



#define PCI_VENDOR_ID_ARK		0xedd8

#define PCI_DEVICE_ID_ARK_STING		0xa091

#define PCI_DEVICE_ID_ARK_STINGARK	0xa099

include/sound/core.h

+5 −3
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ struct _snd_card { 
	wait_queue_head_t shutdown_sleep;

	struct work_struct free_workq;	/* for free in workqueue */

	struct device *dev;

#ifdef CONFIG_SND_GENERIC_DRIVER

	struct snd_generic_device *generic_dev;

#endif



#ifdef CONFIG_PM

	int (*pm_suspend)(snd_card_t *card, pm_message_t state);
@@ -176,9 +179,6 @@ struct _snd_card { 
	unsigned int power_state;	/* power state */

	struct semaphore power_lock;	/* power lock */

	wait_queue_head_t power_sleep;

#ifdef CONFIG_SND_GENERIC_PM

	struct snd_generic_device *pm_dev;	/* for ISA */

#endif

#endif



#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
@@ -348,6 +348,8 @@ int snd_card_file_remove(snd_card_t *card, struct file *file); 
#ifndef snd_card_set_dev

#define snd_card_set_dev(card,devptr) ((card)->dev = (devptr))

#endif

/* register a generic device (for ISA, etc) */

int snd_card_set_generic_dev(snd_card_t *card);



/* device.c */

include/sound/cs46xx.h

+0 −14
Original line number Diff line number Diff line
@@ -29,19 +29,6 @@ 
#include "ac97_codec.h"

#include "cs46xx_dsp_spos.h"



#ifndef PCI_VENDOR_ID_CIRRUS

#define PCI_VENDOR_ID_CIRRUS            0x1013

#endif

#ifndef PCI_DEVICE_ID_CIRRUS_4610

#define PCI_DEVICE_ID_CIRRUS_4610       0x6001

#endif

#ifndef PCI_DEVICE_ID_CIRRUS_4612

#define PCI_DEVICE_ID_CIRRUS_4612       0x6003

#endif

#ifndef PCI_DEVICE_ID_CIRRUS_4615

#define PCI_DEVICE_ID_CIRRUS_4615       0x6004

#endif



/*

 *  Direct registers

 */
@@ -1715,7 +1702,6 @@ struct _snd_cs46xx { 
	void (*active_ctrl)(cs46xx_t *, int);

  	void (*mixer_init)(cs46xx_t *);



	struct pci_dev *acpi_dev;

	int acpi_port;

	snd_kcontrol_t *eapd_switch; /* for amplifier hack */

	int accept_valid;	/* accept mmap valid (for OSS) */