Attachment 204501 Details for Bug 291911 – Patch no. 2 against kernel 2.6.22.6 which fixes this bug.

[patch] Patch no. 2 against kernel 2.6.22.6 which fixes this bug.

alsa-include-20070818.patch (text/plain), 11.96 KB, created by Rohan Dhruva on 2007-09-24 19:48:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rohan Dhruva

Created: 2007-09-24 19:48:34 UTC

Size: 11.96 KB

patch

obsolete

>diff -Nru include/sound/ak4xxx-adda.h include/sound/ak4xxx-adda.h
>--- include/sound/ak4xxx-adda.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/ak4xxx-adda.h	2007-05-20 02:00:11.000000000 +0200
>@@ -43,6 +43,7 @@
> struct snd_akm4xxx_dac_channel {
> 	char *name;		/* mixer volume name */
> 	unsigned int num_channels;
>+	char *switch_name;		/* mixer switch*/
> };
> 
> /* ADC labels and channels */
>diff -Nru include/sound/asound.h include/sound/asound.h
>--- include/sound/asound.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/asound.h	2007-07-28 02:00:08.000000000 +0200
>@@ -92,6 +92,7 @@
> 	SNDRV_HWDEP_IFACE_USX2Y_PCM,	/* Tascam US122, US224 & US428 rawusb pcm */
> 	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */
> 	SNDRV_HWDEP_IFACE_SB_RC,	/* SB Extigy/Audigy2NX remote control */
>+	SNDRV_HWDEP_IFACE_HDA,		/* HD-audio */
> 
> 	/* Don't forget to change the following: */
> 	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_SB_RC
>diff -Nru include/sound/control.h include/sound/control.h
>--- include/sound/control.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/control.h	2007-07-24 02:00:10.000000000 +0200
>@@ -161,4 +161,12 @@
> 	return dst_id;
> }
> 
>+/*
>+ * Frequently used control callbacks
>+ */
>+int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
>+			      struct snd_ctl_elem_info *uinfo);
>+int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
>+				struct snd_ctl_elem_info *uinfo);
>+
> #endif	/* __SOUND_CONTROL_H */
>diff -Nru include/sound/cs4231.h include/sound/cs4231.h
>--- include/sound/cs4231.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/cs4231.h	2007-07-28 02:00:08.000000000 +0200
>@@ -210,7 +210,7 @@
> #define CS4231_HW_CS4239	0x0404	/* CS4239 - Crystal Clear (tm) stereo enhancement */
> /* compatible, but clones */
> #define CS4231_HW_INTERWAVE     0x1000	/* InterWave chip */
>-#define CS4231_HW_OPL3SA2       0x1001	/* OPL3-SA2 chip */
>+#define CS4231_HW_OPL3SA2       0x1101	/* OPL3-SA2 chip, similar to cs4231 */
> 
> /* defines for codec.hwshare */
> #define CS4231_HWSHARE_IRQ	(1<<0)
>diff -Nru include/sound/cs46xx.h include/sound/cs46xx.h
>--- include/sound/cs46xx.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/cs46xx.h	2007-07-20 02:00:08.000000000 +0200
>@@ -1723,6 +1723,10 @@
> 	struct snd_cs46xx_pcm *playback_pcm;
> 	unsigned int play_ctl;
> #endif
>+
>+#ifdef CONFIG_PM
>+	u32 *saved_regs;
>+#endif
> };
> 
> int snd_cs46xx_create(struct snd_card *card,
>diff -Nru include/sound/cs46xx_dsp_spos.h include/sound/cs46xx_dsp_spos.h
>--- include/sound/cs46xx_dsp_spos.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/cs46xx_dsp_spos.h	2007-07-20 02:00:08.000000000 +0200
>@@ -107,6 +107,7 @@
> 	char scb_name[DSP_MAX_SCB_NAME];
> 	u32 address;
> 	int index;
>+	u32 *data;
> 
> 	struct dsp_scb_descriptor * sub_list_ptr;
> 	struct dsp_scb_descriptor * next_scb_ptr;
>@@ -127,6 +128,7 @@
> 	int size;
> 	u32 address;
> 	int index;
>+	u32 *data;
> };
> 
> struct dsp_pcm_channel_descriptor {
>diff -Nru include/sound/emu10k1.h include/sound/emu10k1.h
>--- include/sound/emu10k1.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/emu10k1.h	2007-07-27 02:00:07.000000000 +0200
>@@ -1120,6 +1120,16 @@
> /************************************************************************************************/
> /* EMU1010m HANA Destinations									*/
> /************************************************************************************************/
>+/* 32-bit destinations of signal in the Hana FPGA. Destinations are either
>+ * physical outputs of Hana, or outputs going to Alice2 (audigy) for capture
>+ * - 16 x EMU_DST_ALICE2_EMU32_X.
>+ */
>+/* EMU32 = 32-bit serial channel between Alice2 (audigy) and Hana (FPGA) */
>+/* EMU_DST_ALICE2_EMU32_X - data channels from Hana to Alice2 used for capture.
>+ * Which data is fed into a EMU_DST_ALICE2_EMU32_X channel in Hana depends on
>+ * setup of mixer control for each destination - see emumixer.c -
>+ * snd_emu1010_output_enum_ctls[], snd_emu1010_input_enum_ctls[]
>+ */
> #define EMU_DST_ALICE2_EMU32_0	0x000f	/* 16 EMU32 channels to Alice2 +0 to +0xf */
> #define EMU_DST_ALICE2_EMU32_1	0x0000	/* 16 EMU32 channels to Alice2 +0 to +0xf */
> #define EMU_DST_ALICE2_EMU32_2	0x0001	/* 16 EMU32 channels to Alice2 +0 to +0xf */
>@@ -1199,6 +1209,12 @@
> /************************************************************************************************/
> /* EMU1010m HANA Sources									*/
> /************************************************************************************************/
>+/* 32-bit sources of signal in the Hana FPGA. The sources are routed to
>+ * destinations using mixer control for each destination - see emumixer.c
>+ * Sources are either physical inputs of FPGA,
>+ * or outputs from Alice (audigy) - 16 x EMU_SRC_ALICE_EMU32A +
>+ * 16 x EMU_SRC_ALICE_EMU32B
>+ */
> #define EMU_SRC_SILENCE		0x0000	/* Silence */
> #define EMU_SRC_DOCK_MIC_A1	0x0100	/* Audio Dock Mic A, 1st or 48kHz only */
> #define EMU_SRC_DOCK_MIC_A2	0x0101	/* Audio Dock Mic A, 2nd or 96kHz */
>@@ -1440,6 +1456,9 @@
> 	unsigned int adc_pads; /* bit mask */
> 	unsigned int dac_pads; /* bit mask */
> 	unsigned int internal_clock; /* 44100 or 48000 */
>+	unsigned int optical_in; /* 0:SPDIF, 1:ADAT */
>+	unsigned int optical_out; /* 0:SPDIF, 1:ADAT */
>+	struct task_struct *firmware_thread;
> };
> 
> struct snd_emu10k1 {
>@@ -1583,9 +1602,9 @@
> void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data);
> int snd_emu10k1_spi_write(struct snd_emu10k1 * emu, unsigned int data);
> int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, u32 reg, u32 value);
>-int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value);
>-int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value);
>-int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src);
>+int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value);
>+int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, u32 reg, u32 *value);
>+int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, u32 dst, u32 src);
> unsigned int snd_emu10k1_efx_read(struct snd_emu10k1 *emu, unsigned int pc);
> void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb);
> void snd_emu10k1_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb);
>@@ -1730,6 +1749,8 @@
> #define A_FXBUS2(x)	(0x80 + (x))	/* x = 0x00 - 0x1f extra outs used for EFX capture -> A_FXWC2 */
> #define A_EMU32OUTH(x)	(0xa0 + (x))	/* x = 0x00 - 0x0f "EMU32_OUT_10 - _1F" - ??? */
> #define A_EMU32OUTL(x)	(0xb0 + (x))	/* x = 0x00 - 0x0f "EMU32_OUT_1 - _F" - ??? */
>+#define A3_EMU32IN(x)	(0x160 + (x))	/* x = 0x00 - 0x3f "EMU32_IN_00 - _3F" - Only when .device = 0x0008 */
>+#define A3_EMU32OUT(x)	(0x1E0 + (x))	/* x = 0x00 - 0x0f "EMU32_OUT_00 - _3F" - Only when .device = 0x0008 */
> #define A_GPR(x)	(A_FXGPREGBASE + (x))
> 
> /* cc_reg constants */
>diff -Nru include/sound/hda_hwdep.h include/sound/hda_hwdep.h
>--- include/sound/hda_hwdep.h	1970-01-01 01:00:00.000000000 +0100
>+++ include/sound/hda_hwdep.h	2007-07-28 02:00:08.000000000 +0200
>@@ -0,0 +1,44 @@
>+/*
>+ * HWDEP Interface for HD-audio codec
>+ *
>+ * Copyright (c) 2007 Takashi Iwai <tiwai@suse.de>
>+ *
>+ *  This driver is free software; you can redistribute it and/or modify
>+ *  it under the terms of the GNU General Public License as published by
>+ *  the Free Software Foundation; either version 2 of the License, or
>+ *  (at your option) any later version.
>+ *
>+ *  This driver is distributed in the hope that it will be useful,
>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ *  GNU General Public License for more details.
>+ *
>+ *  You should have received a copy of the GNU General Public License
>+ *  along with this program; if not, write to the Free Software
>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+ */
>+
>+#ifndef __SOUND_HDA_HWDEP_H
>+#define __SOUND_HDA_HWDEP_H
>+
>+#define HDA_HWDEP_VERSION	((1 << 16) | (0 << 8) | (0 << 0)) /* 1.0.0 */
>+
>+/* verb */
>+#define HDA_REG_NID_SHIFT	24
>+#define HDA_REG_VERB_SHIFT	8
>+#define HDA_REG_VAL_SHIFT	0
>+#define HDA_VERB(nid,verb,param)	((nid)<<24 | (verb)<<8 | (param))
>+
>+struct hda_verb_ioctl {
>+	u32 verb;	/* HDA_VERB() */
>+	u32 res;	/* response */
>+};
>+
>+/*
>+ * ioctls
>+ */
>+#define HDA_IOCTL_PVERSION		_IOR('H', 0x10, int)
>+#define HDA_IOCTL_VERB_WRITE		_IOWR('H', 0x11, struct hda_verb_ioctl)
>+#define HDA_IOCTL_GET_WCAP		_IOWR('H', 0x12, struct hda_verb_ioctl)
>+
>+#endif
>diff -Nru include/sound/hdspm.h include/sound/hdspm.h
>--- include/sound/hdspm.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/hdspm.h	2007-07-28 02:00:08.000000000 +0200
>@@ -1,4 +1,4 @@
>-#ifndef __SOUND_HDSPM_H		/* -*- linux-c -*- */
>+#ifndef __SOUND_HDSPM_H
> #define __SOUND_HDSPM_H
> /*
>  *   Copyright (C) 2003 Winfried Ritsch (IEM)
>@@ -61,7 +61,8 @@
> };
> 
> /* use indirect access due to the limit of ioctl bit size */
>-#define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdspm_peak_rms_ioctl)
>+#define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS \
>+	_IOR('H', 0x40, struct hdspm_peak_rms_ioctl)
> 
> /* ------------ CONFIG block IOCTL ---------------------- */
> 
>@@ -79,7 +80,8 @@
> 	unsigned int analog_out;
> };
> 
>-#define SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, struct hdspm_config_info)
>+#define SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO \
>+	_IOR('H', 0x41, struct hdspm_config_info)
> 
> 
> /* get Soundcard Version */
>@@ -93,10 +95,14 @@
> 
> /* ------------- get Matrix Mixer IOCTL --------------- */
> 
>-/* MADI mixer: 64inputs+64playback in 64outputs = 8192 => *4Byte = 32768 Bytes */
>+/* MADI mixer: 64inputs+64playback in 64outputs = 8192 => *4Byte =
>+ * 32768 Bytes
>+ */
> 
> /* organisation is 64 channelfader in a continous memory block */
>-/* equivalent to hardware definition, maybe for future feature of mmap of them */
>+/* equivalent to hardware definition, maybe for future feature of mmap of
>+ * them
>+ */
> /* each of 64 outputs has 64 infader and 64 outfader: 
>    Ins to Outs mixer[out].in[in], Outstreams to Outs mixer[out].pb[pb] */
> 
>diff -Nru include/sound/pcm.h include/sound/pcm.h
>--- include/sound/pcm.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/pcm.h	2007-08-14 02:00:08.000000000 +0200
>@@ -922,7 +922,10 @@
> snd_pcm_sframes_t snd_pcm_lib_readv(struct snd_pcm_substream *substream,
> 				    void __user **bufs, snd_pcm_uframes_t frames);
> 
>+extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates;
>+
> int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);
>+unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);
> 
> static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream,
> 					      struct snd_dma_buffer *bufp)
>diff -Nru include/sound/sb.h include/sound/sb.h
>--- include/sound/sb.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/sb.h	2007-05-25 02:00:06.000000000 +0200
>@@ -38,6 +38,7 @@
> 	SB_HW_ALS100,		/* Avance Logic ALS100 chip */
> 	SB_HW_ALS4000,		/* Avance Logic ALS4000 chip */
> 	SB_HW_DT019X,		/* Diamond Tech. DT-019X / Avance Logic ALS-007 */
>+	SB_HW_CS5530,		/* Cyrix/NatSemi 5530 VSA1 */
> };
> 
> #define SB_OPEN_PCM			0x01
>diff -Nru include/sound/soc.h include/sound/soc.h
>--- include/sound/soc.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/soc.h	2007-07-24 02:00:10.000000000 +0200
>@@ -201,8 +201,7 @@
> 	struct snd_ctl_elem_info *uinfo);
> int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,
> 	struct snd_ctl_elem_info *uinfo);
>-int snd_soc_info_bool_ext(struct snd_kcontrol *kcontrol,
>-	struct snd_ctl_elem_info *uinfo);
>+#define snd_soc_info_bool_ext		snd_ctl_boolean_mono
> int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
> 	struct snd_ctl_elem_value *ucontrol);
> int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
>diff -Nru include/sound/wavefront_fx.h include/sound/wavefront_fx.h
>--- include/sound/wavefront_fx.h	2007-07-09 01:32:17.000000000 +0200
>+++ include/sound/wavefront_fx.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,9 +0,0 @@
>-#ifndef __SOUND_WAVEFRONT_FX_H
>-#define __SOUND_WAVEFRONT_FX_H
>-
>-extern int  snd_wavefront_fx_detect (snd_wavefront_t *);
>-extern void snd_wavefront_fx_ioctl  (snd_synth_t *sdev, 
>-				     unsigned int cmd, 
>-				     unsigned long arg);
>-
>-#endif  __SOUND_WAVEFRONT_FX_H

Actions: View | Diff

Attachments on bug 291911: 196311 | 196321 | 196331 | 196341 | 196361 | 196371 | 196381 | 196391 | 204491 | 204501