Changeset 281 for GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

Timestamp:

Jan 23, 2008, 7:05:10 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.1

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

@@ -72 +72 @@
 MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
 MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
-MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED ",allows:{{-1},{0x330},{0x320},{0x310},{0x300}},dialog:list");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED ",allows:{{0},{0x330},{0x320},{0x310},{0x300}},dialog:list");
 MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
 MODULE_PARM_DESC(fm_port, "FM port.");
-MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED ",allows:{{-1},{0x388},{0x3c8},{0x3e0},{0x3e8}},dialog:list");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED ",allows:{{0},{0x388},{0x3c8},{0x3e0},{0x3e8}},dialog:list");
 #ifdef DO_SOFT_AC3
 MODULE_PARM(soft_ac3, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
@@ -82 +82 @@
 #endif
 #ifdef SUPPORT_JOYSTICK
-MODULE_PARM(joystick, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(joystick, "Enable joystick.");
-MODULE_PARM_SYNTAX(joystick, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
+MODULE_PARM(joystick_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_port, "Joystick port address.");
+MODULE_PARM_SYNTAX(joystick_port, SNDRV_ENABLED ",allows:{{0},{1},{0x200},{0x201}},dialog:list");
 #endif
 
@@ -355 +355 @@
 #define CM_EXTENT_MIDI    0x2
 #define CM_EXTENT_SYNTH   0x4
-
-/* fixed legacy joystick address */
-#define CM_JOYSTICK_ADDR        0x200
   
 
@@ -2984 +2981 @@
 
 #ifdef SUPPORT_JOYSTICK
-        if (joystick[dev] &&
-            (cm->res_joystick = request_region(CM_JOYSTICK_ADDR, 8, "CMIPCI gameport")) != NULL) {
-                cm->gameport.io = CM_JOYSTICK_ADDR;
+        if (joystick_port[dev] > 0) {
+                if (joystick_port[dev] == 1) { /* auto-detect */
+                        static int ports[] = { 0x200, 0x201, 0 };
+                        int i;
+                        for (i = 0; ports[i]; i++) {
+                                joystick_port[dev] = ports[i];
+                                cm->res_joystick = request_region(ports[i], 8, "CMIPCI gameport");
+                                if (cm->res_joystick)
+                                        break;
+                        }
+                } else {
+                        cm->res_joystick = request_region(joystick_port[dev], 8, "CMIPCI gameport");
+                }
+        }
+        if (cm->res_joystick) {
+                cm->gameport.io = joystick_port[dev];
                 snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
                 gameport_register_port(&cm->gameport);
-        } else
+        } else {
+                if (joystick_port[dev] > 0)
+                        printk(KERN_WARNING "cmipci: cannot reserve joystick ports\n");
                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);
+        }
 #endif
     *rcmipci = cm;