Skip to content

L
linux
Commit 05ccb0a8 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files
Options

[ALSA] remove gameport/MIDI support 

Documentation,PCI drivers,Intel8x0 driver
snd-intel8x0's gameport/MIDI code has quite a few problems:  the port
addresses cannot be detected reliably (or not at all with newer LPC
bridge devices), joystick port address 0x208 isn't supported, the MIDI
interrupt isn't detected, PnP isn't supported, changing the port
addresses in the LPC bridge configuration doesn't affect the devices
in the Super-I/O chip connected to the LPC bus, and registering this
driver for the LPC bridge PCI device prevents other drivers using the
LPC's PCI id from loading later.

All these problems can be cured by removing the offending code and
using the proper modules for these devices (ns558/snd-mpu401) instead.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent a82441a4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 151 deletions
Documentation/sound/alsa/ALSA-Configuration.txt
View file @ 05ccb0a8
......@@ -661,8 +661,6 @@ Module parameters
* ALi m5455
ac97_clock - AC'97 codec clock base (0 = auto-detect)
joystick - Enable joystick (default off)
mpu_port - MPU401 port # (0 = disabled, 0x330,0x300)
ac97_quirk - AC'97 workaround for strange hardware (-1 = default)
-1 = default, don't override
0 = disable
......@@ -679,8 +677,9 @@ Module parameters
if you still encounter too fast playback, specify the clock
explicitly via the module option "ac97_clock=41194".
The joystick and MPU-401 are supported only certain hardwares.
MPU401 is experimental, It doesn't work perfectly.
Joystick/MIDI ports are not supported by this driver. If your
motherboard has these devices, use the ns558 or snd-mpu401
modules, respectively.
The ac97_quirk option is used to enable/override the workaround
for specific devices. Some hardware have swapped output pins
......
sound/pci/Kconfig
View file @ 05ccb0a8
......@@ -291,7 +291,6 @@ config SND_ICE1724
config SND_INTEL8X0
tristate "Intel i8x0/MX440, SiS 7012; Ali 5455; NForce Audio; AMD768/8111"
depends on SND
select SND_MPU401_UART
select SND_AC97_CODEC
help
Say 'Y' or 'M' to include support for Intel8x0 based soundcards,
......
sound/pci/intel8x0.c
View file @ 05ccb0a8
......@@ -33,13 +33,11 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/moduleparam.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/ac97_codec.h>
#include <sound/info.h>
#include <sound/mpu401.h>
#include <sound/initval.h>
/* for 440MX workaround */
#include <asm/pgtable.h>
......@@ -64,23 +62,12 @@ MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"
"{AMD,AMD8111},"
"{ALI,M5455}}");
#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
#define SUPPORT_JOYSTICK 1
#endif
#define SUPPORT_MIDI 1
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
static int ac97_quirk[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = AC97_TUNE_DEFAULT};
static int buggy_irq[SNDRV_CARDS];
#ifdef SUPPORT_JOYSTICK
static int joystick[SNDRV_CARDS];
#endif
#ifdef SUPPORT_MIDI
static int mpu_port[SNDRV_CARDS]; /* disabled */
#endif
static int boot_devs;
module_param_array(index, int, boot_devs, 0444);
......@@ -95,14 +82,6 @@ module_param_array(ac97_quirk, int, boot_devs, 0444);
MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
module_param_array(buggy_irq, bool, boot_devs, 0444);
MODULE_PARM_DESC(buggy_irq, "Enable workaround for buggy interrupts on some motherboards.");
#ifdef SUPPORT_JOYSTICK
module_param_array(joystick, bool, boot_devs, 0444);
MODULE_PARM_DESC(joystick, "Enable joystick for Intel i8x0 soundcard.");
#endif
#ifdef SUPPORT_MIDI
module_param_array(mpu_port, int, boot_devs, 0444);
MODULE_PARM_DESC(mpu_port, "MPU401 port # for Intel i8x0 driver.");
#endif
/*
* Direct registers
......@@ -431,8 +410,6 @@ struct _snd_intel8x0 {
ac97_t *ac97[3];
unsigned int ac97_sdin[3];
snd_rawmidi_t *rmidi;
spinlock_t reg_lock;
spinlock_t ac97_lock;
......@@ -2712,18 +2689,6 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
return err;
}
#ifdef SUPPORT_MIDI
if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_INTEL8X0,
mpu_port[dev], 0,
-1, 0, &chip->rmidi)) < 0) {
printk(KERN_ERR "intel8x0: no UART401 device at 0x%x, skipping.\n", mpu_port[dev]);
mpu_port[dev] = 0;
}
} else
mpu_port[dev] = 0;
#endif
snd_intel8x0_proc_init(chip);
sprintf(card->longname, "%s at 0x%lx, irq %i",
......@@ -2756,129 +2721,18 @@ static struct pci_driver driver = {
};
#if defined(SUPPORT_JOYSTICK) || defined(SUPPORT_MIDI)
/*
* initialize joystick/midi addresses
*/
#ifdef SUPPORT_JOYSTICK
/* there is only one available device, so we keep it here */
static struct pci_dev *ich_gameport_pci;
static struct gameport ich_gameport = { .io = 0x200 };
#endif
static int __devinit snd_intel8x0_joystick_probe(struct pci_dev *pci,
const struct pci_device_id *id)
{
u16 val;
static int dev;
if (dev >= SNDRV_CARDS)
return -ENODEV;
if (!enable[dev]) {
dev++;
return -ENOENT;
}
pci_read_config_word(pci, 0xe6, &val);
#ifdef SUPPORT_JOYSTICK
val &= ~0x100;
if (joystick[dev]) {
if (! request_region(ich_gameport.io, 8, "ICH gameport")) {
printk(KERN_WARNING "intel8x0: cannot grab gameport 0x%x\n", ich_gameport.io);
joystick[dev] = 0;
} else {
ich_gameport_pci = pci;
gameport_register_port(&ich_gameport);
val |= 0x100;
}
}
#endif
#ifdef SUPPORT_MIDI
val &= ~0x20;
if (mpu_port[dev] > 0) {
if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {
u8 b;
val |= 0x20;
pci_read_config_byte(pci, 0xe2, &b);
if (mpu_port[dev] == 0x300)
b |= 0x08;
else
b &= ~0x08;
pci_write_config_byte(pci, 0xe2, b);
}
}
#endif
pci_write_config_word(pci, 0xe6, val);
return 0;
}
static void __devexit snd_intel8x0_joystick_remove(struct pci_dev *pci)
{
u16 val;
#ifdef SUPPORT_JOYSTICK
if (ich_gameport_pci == pci) {
gameport_unregister_port(&ich_gameport);
release_region(ich_gameport.io, 8);
ich_gameport_pci = NULL;
}
#endif
/* disable joystick and MIDI */
pci_read_config_word(pci, 0xe6, &val);
val &= ~0x120;
pci_write_config_word(pci, 0xe6, val);
}
static struct pci_device_id snd_intel8x0_joystick_ids[] = {
{ 0x8086, 0x2410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 82801AA */
{ 0x8086, 0x2420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 82901AB */
{ 0x8086, 0x2440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH2 */
{ 0x8086, 0x244c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH2M */
{ 0x8086, 0x248c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH3 */
// { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 440MX */
// { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SI7012 */
{ 0x10de, 0x01b2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* NFORCE */
{ 0x10de, 0x006b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* NFORCE2 */
{ 0x10de, 0x00db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* NFORCE3 */
{ 0, }
};
static struct pci_driver joystick_driver = {
.name = "Intel ICH Joystick",
.id_table = snd_intel8x0_joystick_ids,
.probe = snd_intel8x0_joystick_probe,
.remove = __devexit_p(snd_intel8x0_joystick_remove),
};
static int have_joystick;
#endif
static int __init alsa_card_intel8x0_init(void)
{
int err;
if ((err = pci_module_init(&driver)) < 0)
return err;
#if defined(SUPPORT_JOYSTICK) || defined(SUPPORT_MIDI)
if (pci_module_init(&joystick_driver) < 0) {
snd_printdd(KERN_INFO "no joystick found\n");
have_joystick = 0;
} else {
snd_printdd(KERN_INFO "joystick(s) found\n");
have_joystick = 1;
}
#endif
return 0;
}
static void __exit alsa_card_intel8x0_exit(void)
{
pci_unregister_driver(&driver);
#if defined(SUPPORT_JOYSTICK) || defined(SUPPORT_MIDI)
if (have_joystick)
pci_unregister_driver(&joystick_driver);
#endif
}
module_init(alsa_card_intel8x0_init)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7