ALSA: sscape: use common MPU401 macros
Remove local macros which redefines the common ones. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
9ef344f89a
Коммит
c9864fd30a
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче