Changeset 277 for GPL/branches/alsa-resync1/alsa-kernel/pci/als4000.c

Timestamp:

Dec 14, 2007, 8:27:04 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.8

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/als4000.c (modified) (9 diffs)

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

@@ -64 +64 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/gameport.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -79 +80 @@
 MODULE_DEVICES("{{Avance Logic,ALS4000}}");
 
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+#define SUPPORT_JOYSTICK 1
+#endif
+
 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 joystick_port[SNDRV_CARDS] =
-#ifdef CONFIG_ISA
-{0x200};        /* enable as default */
-#else
-{0};    /* disabled */
+#ifdef SUPPORT_JOYSTICK
+static int joystick_port[SNDRV_CARDS];
 #endif
 
@@ -536 +538 @@
 /******************************************************************/
 
-static void __devinit snd_als4000_set_addr(unsigned long gcr,
+static void snd_als4000_set_addr(unsigned long gcr,
                                            unsigned int sb,
                                            unsigned int mpu,
@@ -610 +612 @@
     unsigned short word;
     int err;
+        int joystick = 0;
 
     if (dev >= SNDRV_CARDS)
@@ -637 +640 @@
     pci_set_master(pci);
 
-    /* disable all legacy ISA stuff except for joystick */
-    snd_als4000_set_addr(gcr, 0, 0, 0, joystick_port[dev]);
-
     card = snd_card_new(index[dev], id[dev], THIS_MODULE,
                         sizeof( snd_card_als4000_t ) );
@@ -651 +651 @@
     acard->gcr = gcr;
     card->private_free = snd_card_als4000_free;
+
+        /* disable all legacy ISA stuff except for joystick */
+#ifdef SUPPORT_JOYSTICK
+        if (joystick_port[dev] > 0 &&
+            (acard->res_joystick = request_region(joystick_port[dev], 8, "ALS4000 gameport")) != NULL)
+                joystick = joystick_port[dev];
+#endif
+        snd_als4000_set_addr(gcr, 0, 0, 0, joystick);
 
     if ((err = snd_sbdsp_create(card,
@@ -697 +705 @@
     }
 
+#ifdef SUPPORT_JOYSTICK
+        if (acard->res_joystick) {
+                acard->gameport.io = joystick;
+                gameport_register_port(&acard->gameport);
+        }
+#endif
     strcpy(card->driver, "ALS4000");
     strcpy(card->shortname, "Avance Logic ALS4000");
@@ -747 +761 @@
 #ifndef MODULE
 
-/* format is: snd-als4000=enable,index,id */
+/* format is: snd-als4000=enable,index,id,joystick_port */
 
 static int __init alsa_card_als4000_setup(char *str)
@@ -757 +771 @@
     (void)(get_option(&str,&enable[nr_dev]) == 2 &&
            get_option(&str,&index[nr_dev]) == 2 &&
-           get_id(&str,&id[nr_dev]) == 2);
+               get_id(&str,&id[nr_dev]) == 2
+#ifdef SUPPORT_JOYSTICK
+               && get_option(&str,&joystick_port[nr_dev]) == 2
+#endif
+               );
     nr_dev++;
     return 1;