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

Commit c9864fd3 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Takashi Iwai
Browse files

ALSA: sscape: use common MPU401 macros 



Remove local macros which redefines the
common ones.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9ef344f8

sound/isa/sscape.c

+4 −8
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ MODULE_DEVICE_TABLE(pnp_card, sscape_pnpids); 
#endif





#define MPU401_IO(i)     ((i) + 0)

#define MIDI_DATA_IO(i)  ((i) + 0)

#define MIDI_CTRL_IO(i)  ((i) + 1)

#define HOST_CTRL_IO(i)  ((i) + 2)

#define HOST_DATA_IO(i)  ((i) + 3)

#define ODIE_ADDR_IO(i)  ((i) + 4)
@@ -327,7 +324,7 @@ static int host_write_ctrl_unsafe(unsigned io_base, unsigned char data, 
 */

static inline int verify_mpu401(const struct snd_mpu401 * mpu)

{

	return ((inb(MIDI_CTRL_IO(mpu->port)) & 0xc0) == 0x80);

	return ((inb(MPU401C(mpu)) & 0xc0) == 0x80);

}



/*
@@ -335,7 +332,7 @@ static inline int verify_mpu401(const struct snd_mpu401 * mpu) 
 */

static inline void initialise_mpu401(const struct snd_mpu401 * mpu)

{

	outb(0, MIDI_DATA_IO(mpu->port));

	outb(0, MPU401D(mpu));

}



/*
@@ -1191,12 +1188,11 @@ static int __devinit create_sscape(int dev, struct snd_card *card) 
	}

#define MIDI_DEVNUM  0

	if (sscape->type != SSCAPE_VIVO) {

		err = create_mpu401(card, MIDI_DEVNUM,

				    MPU401_IO(xport), mpu_irq[dev]);

		err = create_mpu401(card, MIDI_DEVNUM, xport, mpu_irq[dev]);

		if (err < 0) {

			printk(KERN_ERR "sscape: Failed to create "

					"MPU-401 device at 0x%x\n",

					MPU401_IO(xport));

					xport);

			goto _release_dma;

		}