adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ALSA] cmipci: do not check for integrated FM/MIDI ports with chip version 37

Browse source 
Integrated MPU-401/OPL3 ports are available with chip version 39 and
later, so we do not test for the port with version 37.
Now that the test is known to work, we can again enable the MIDI port by
default.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Clemens Ladisch 2007-09-03 09:55:49 +02:00 committed by Jaroslav Kysela
parent 8992e18db3
commit c78c950d28
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/sound/alsa/ALSA-Configuration.txt
View file

@ -367,9 +367,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
Module for C-Media CMI8338/8738/8768/8770 PCI sound cards. Module for C-Media CMI8338/8738/8768/8770 PCI sound cards.
mpu_port - port address of MIDI interface: mpu_port - port address of MIDI interface (8338 only):
0x300,0x310,0x320,0x330 = legacy port, 0x300,0x310,0x320,0x330 = legacy port,
1 = integrated PCI port (8738 or later),
0 = disable (default) 0 = disable (default)
fm_port - port address of OPL-3 FM synthesizer (8x38 only): fm_port - port address of OPL-3 FM synthesizer (8x38 only):
0x388 = legacy port, 0x388 = legacy port,

13
Documentation/sound/alsa/CMIPCI.txt
View file

@ -209,12 +209,13 @@ In addition to the standard SB mixer, CM8x38 provides more functions.
MIDI CONTROLLER MIDI CONTROLLER
--------------- ---------------
The MPU401-UART interface is disabled as default. You need to set With CMI8338 chips, the MPU401-UART interface is disabled as default.
module option "mpu_port" with a valid I/O port address to enable the You need to set the module option "mpu_port" to a valid I/O port address
MIDI support. The valid I/O ports are 0x300, 0x310, 0x320 and 0x330. to enable MIDI support. Valid I/O ports are 0x300, 0x310, 0x320 and
Choose the value which doesn't conflict with other cards. With 0x330. Choose a value that doesn't conflict with other cards.
CMI8738 and newer chips, you can use "mpu_port=1" to use a PCI port
address that does not conflict with any other card. With CMI8738 and newer chips, the MIDI interface is enabled by default
and the driver automatically chooses a port address.
There is _no_ hardware wavetable function on this chip (except for There is _no_ hardware wavetable function on this chip (except for
OPL3 synth below). OPL3 synth below).

6
sound/pci/cmipci.c
View file

@ -2798,7 +2798,7 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)
if (!fm_port) if (!fm_port)
goto disable_fm; goto disable_fm;
if (cm->chip_version > 33) { if (cm->chip_version >= 39) {
/* first try FM regs in PCI port range */ /* first try FM regs in PCI port range */
iosynth = cm->iobase + CM_REG_FM_PCI; iosynth = cm->iobase + CM_REG_FM_PCI;
err = snd_opl3_create(cm->card, iosynth, iosynth + 2, err = snd_opl3_create(cm->card, iosynth, iosynth + 2,
@ -2990,8 +2990,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
return err; return err;
} }
val = 0; if (cm->chip_version >= 39) {
if (cm->chip_version > 33 && mpu_port[dev] == 1) {
val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1); val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1);
if (val != 0x00 && val != 0xff) { if (val != 0x00 && val != 0xff) {
iomidi = cm->iobase + CM_REG_MPU_PCI; iomidi = cm->iobase + CM_REG_MPU_PCI;
@ -2999,6 +2998,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
} }
} }
if (!integrated_midi) { if (!integrated_midi) {
val = 0;
iomidi = mpu_port[dev]; iomidi = mpu_port[dev];
switch (iomidi) { switch (iomidi) {
case 0x320: val = CM_VMPU_320; break; case 0x320: val = CM_VMPU_320; break;