Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv3105/pci
Modified Files:
ens1370.c
Log Message:
[Patch: ens1370-2.2-fix.dif]
- fixed compilation on 2.2 kernels.
Index: ens1370.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ens1370.c 7 Jan 2003 10:36:30 -0000 1.32
+++ ens1370.c 7 Jan 2003 13:35:35 -0000 1.33
@@ -1262,9 +1262,10 @@
* Mixer section
*/
+/*
+ * ENS1371 mixer (including SPDIF interface)
+ */
#ifdef CHIP1371
-
-
static int snd_ens1373_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
@@ -1488,6 +1489,8 @@
#endif /* CHIP1371 */
+/* generic control callbacks for ens1370 and for joystick */
+#if defined(CHIP1370) || defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
#define ENSONIQ_CONTROL(xname, mask) \
{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, .info =
snd_ensoniq_control_info, \
.get = snd_ensoniq_control_get, .put = snd_ensoniq_control_put, \
@@ -1515,7 +1518,6 @@
}
#ifdef CHIP1370
-
static int snd_ensoniq_control_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
{
ensoniq_t *ensoniq = snd_kcontrol_chip(kcontrol);
@@ -1533,13 +1535,20 @@
spin_unlock_irqrestore(&ensoniq->reg_lock, flags);
return change;
}
+#endif /* CHIP1370 */
+#endif /* CHIP1370 || GAMEPORT */
-#define ES1370_CONTROLS 2
+/*
+ * ENS1370 mixer
+ */
+#ifdef CHIP1370
static snd_kcontrol_new_t snd_es1370_controls[2] __devinitdata = {
ENSONIQ_CONTROL("PCM 0 Output also on Line-In Jack", ES_1370_XCTL0),
ENSONIQ_CONTROL("Mic +5V bias", ES_1370_XCTL1)
};
+
+#define ES1370_CONTROLS ARRAY_SIZE(snd_es1370_controls)
static void snd_ensoniq_mixer_free_ak4531(ak4531_t *ak4531)
{
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
