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

ALSA: sc6000: enable joystick port

Browse source 
Add module parameter to enable or disable
joystick port (gameport) on the SC6600 and
later cards.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Krzysztof Helt 2009-05-03 10:39:19 +02:00 committed by Takashi Iwai
parent 0cfcdedadd
commit b0ec3a30bc
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1543,13 +1543,15 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
Module snd-sc6000 Module snd-sc6000
----------------- -----------------
Module for Gallant SC-6000 soundcard. Module for Gallant SC-6000 soundcard and later models: SC-6600
and SC-7000.
port - Port # (0x220 or 0x240) port - Port # (0x220 or 0x240)
mss_port - MSS Port # (0x530 or 0xe80) mss_port - MSS Port # (0x530 or 0xe80)
irq - IRQ # (5,7,9,10,11) irq - IRQ # (5,7,9,10,11)
mpu_irq - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq mpu_irq - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq
dma - DMA # (1,3,0) dma - DMA # (1,3,0)
joystick - Enable gameport - 0 = disable (default), 1 = enable
This module supports multiple cards. This module supports multiple cards.

9
sound/isa/sc6000.c
View file

@ -56,6 +56,7 @@ static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
/* 0x300, 0x310, 0x320, 0x330 */ /* 0x300, 0x310, 0x320, 0x330 */
static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5, 7, 9, 10, 0 */ static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5, 7, 9, 10, 0 */
static int dma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0, 1, 3 */ static int dma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0, 1, 3 */
static bool joystick[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = false };
module_param_array(index, int, NULL, 0444); module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for sc-6000 based soundcard."); MODULE_PARM_DESC(index, "Index value for sc-6000 based soundcard.");
@ -75,6 +76,8 @@ module_param_array(mpu_irq, int, NULL, 0444);
MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for sc-6000 driver."); MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for sc-6000 driver.");
module_param_array(dma, int, NULL, 0444); module_param_array(dma, int, NULL, 0444);
MODULE_PARM_DESC(dma, "DMA # for sc-6000 driver."); MODULE_PARM_DESC(dma, "DMA # for sc-6000 driver.");
module_param_array(joystick, bool, NULL, 0444);
MODULE_PARM_DESC(joystick, "Enable gameport.");
/* /*
* Commands of SC6000's DSP (SBPRO+special). * Commands of SC6000's DSP (SBPRO+special).
@ -363,7 +366,7 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config,
static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg, static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,
long xport, long xmpu, long xport, long xmpu,
long xmss_port) long xmss_port, int joystick)
{ {
cfg[0] = 0; cfg[0] = 0;
cfg[1] = 0; cfg[1] = 0;
@ -376,6 +379,8 @@ static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,
if (xmss_port == 0xe80) if (xmss_port == 0xe80)
cfg[0] |= 0x10; cfg[0] |= 0x10;
cfg[0] |= 0x40; /* always set */ cfg[0] |= 0x40; /* always set */
if (!joystick)
cfg[0] |= 0x02;
cfg[1] |= 0x80; /* enable WSS system */ cfg[1] |= 0x80; /* enable WSS system */
cfg[1] &= ~0x40; /* disable IDE */ cfg[1] &= ~0x40; /* disable IDE */
snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]); snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]);
@ -427,7 +432,7 @@ static int __devinit sc6000_init_board(char __iomem *vport,
if (!old) { if (!old) {
int cfg[2]; int cfg[2];
sc6000_hw_cfg_encode(vport, &cfg[0], port[dev], mpu_port[dev], sc6000_hw_cfg_encode(vport, &cfg[0], port[dev], mpu_port[dev],
mss_port[dev]); mss_port[dev], joystick[dev]);
if (sc6000_hw_cfg_write(vport, cfg) < 0) { if (sc6000_hw_cfg_write(vport, cfg) < 0) {
snd_printk(KERN_ERR "sc6000_hw_cfg_write: failed!\n"); snd_printk(KERN_ERR "sc6000_hw_cfg_write: failed!\n");
return -EIO; return -EIO;