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

Commit cf78ee2c authored by Alan Horstmann's avatar Alan Horstmann Committed by Jaroslav Kysela
Browse files

[ALSA] ice1712 - Set mpu401 info flags from _card_info 



To permit use, in ice1712, of the mpu401 info flags recently added to
mpu401_uart, adds info_flags in snd_ice1712_card_info so that additional
flags can be set, if desired.  'MPU401_INFO_INTEGRATED' is always set with
the ice1712.  The flags are passed on to snd_mpu401_uart_new().
_INFO_OUTPUT is set for DMX6fire mpu2.

Signed-off-by: default avatarAlan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 766a6c36

sound/pci/ice1712/ews.c

+1 −0
Original line number Diff line number Diff line
@@ -1033,6 +1033,7 @@ struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = { 
		.build_controls = snd_ice1712_ews_add_controls,

		.mpu401_1_name = "MIDI-Front DMX6fire",

		.mpu401_2_name = "Wavetable DMX6fire",

		.mpu401_2_info_flags = MPU401_INFO_OUTPUT,

	},

	{ } /* terminator */

};

sound/pci/ice1712/ice1712.c

+4 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#include <sound/core.h>

#include <sound/cs8427.h>

#include <sound/info.h>

#include <sound/mpu401.h>

#include <sound/initval.h>



#include <sound/asoundef.h>
@@ -2739,7 +2738,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, 
	if (! c->no_mpu401) {

		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,

					       ICEREG(ice, MPU1_CTRL),

					       MPU401_INFO_INTEGRATED,

					       (c->mpu401_1_info_flags |

						MPU401_INFO_INTEGRATED),

					       ice->irq, 0,

					       &ice->rmidi[0])) < 0) {

			snd_card_free(card);
@@ -2755,7 +2755,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, 
			/*  2nd port used  */

			if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712,

						       ICEREG(ice, MPU2_CTRL),

						       MPU401_INFO_INTEGRATED,

						       (c->mpu401_2_info_flags |

							MPU401_INFO_INTEGRATED),

						       ice->irq, 0,

						       &ice->rmidi[1])) < 0) {

				snd_card_free(card);

sound/pci/ice1712/ice1712.h

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <sound/ak4xxx-adda.h>

#include <sound/ak4114.h>

#include <sound/pcm.h>

#include <sound/mpu401.h>





/*
@@ -495,6 +496,8 @@ struct snd_ice1712_card_info { 
	int (*chip_init)(struct snd_ice1712 *);

	int (*build_controls)(struct snd_ice1712 *);

	unsigned int no_mpu401: 1;

	unsigned int mpu401_1_info_flags;

	unsigned int mpu401_2_info_flags;

	const char *mpu401_1_name;

	const char *mpu401_2_name;

	unsigned int eeprom_size;