Changeset 250 for GPL/branches/alsa-resync1/alsa-kernel/pci/cs4281.c

Timestamp:

Aug 27, 2007, 7:41:50 PM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.5

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/cs4281.c (modified) (7 diffs)

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

@@ -27 +27 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
+#ifndef TARGET_OS2 //TODO: Implement linux/gameport.h
+#include <linux/gameport.h>
+#endif /* TARGET_OS2 */
 #include <sound/core.h>
 #include <sound/control.h>
@@ -36 +39 @@
 #include <sound/initval.h>
 
-#ifndef LINUX_2_2
-#include <linux/gameport.h>
-#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -1247 +1247 @@
  */
 
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
 
 typedef struct snd_cs4281_gameport {
@@ -1342 +1342 @@
 static int snd_cs4281_free(cs4281_t *chip)
 {
-#ifndef LINUX_2_2
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
     if (chip->gameport) {
         gameport_unregister_port(&chip->gameport->info);
@@ -1730 +1730 @@
     chip->uartm |= CS4281_MODE_OUTPUT;
     chip->midcr |= BA0_MIDCR_TXE;
-    chip->midi_input = substream;
+        chip->midi_output = substream;
     if (!(chip->uartm & CS4281_MODE_INPUT)) {
         snd_cs4281_midi_reset(chip);
@@ -1913 +1913 @@
     /* EOI to the PCI part... reenables interrupts */
     snd_cs4281_pokeBA0(chip, BA0_HICR, BA0_HICR_EOI);
+
     return IRQ_HANDLED;
 
@@ -1991 +1992 @@
         return err;
     }
-#ifndef LINUX_2_2
+#ifndef TARGET_OS2
     snd_cs4281_gameport(chip);
-#endif
+#endif /* !TARGET_OS2 */
     strcpy(card->driver, "CS4281");
     strcpy(card->shortname, "Cirrus Logic CS4281");