vserver 2.0 rc7

[linux-2.6.git] / sound / pci / ens1370.c

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 900069b..f910399 100644 (file)
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -430,7 +430,7 @@ struct _snd_ensoniq {
 #endif
 
 #ifdef SUPPORT_JOYSTICK
-       struct gameport gameport;
+       struct gameport *gameport;
 #endif
 };
 
@@ -1734,43 +1734,99 @@ static int __devinit snd_ensoniq_1370_mixer(ensoniq_t * ensoniq)
 #endif /* CHIP1370 */
 
 #ifdef SUPPORT_JOYSTICK
-static int snd_ensoniq_joystick(ensoniq_t *ensoniq, long port)
-{
+
 #ifdef CHIP1371
-       if (port == 1) { /* auto-detect */
-               for (port = 0x200; port <= 0x218; port += 8)
-                       if (request_region(port, 8, "ens137x: gameport"))
+static int __devinit snd_ensoniq_get_joystick_port(int dev)
+{
+       switch (joystick_port[dev]) {
+       case 0: /* disabled */
+       case 1: /* auto-detect */
+       case 0x200:
+       case 0x208:
+       case 0x210:
+       case 0x218:
+               return joystick_port[dev];
+
+       default:
+               printk(KERN_ERR "ens1371: invalid joystick port %#x", joystick_port[dev]);
+               return 0;
+       }
+}
+#else
+static inline int snd_ensoniq_get_joystick_port(int dev)
+{
+       return joystick[dev] ? 0x200 : 0;
+}
+#endif
+
+static int __devinit snd_ensoniq_create_gameport(ensoniq_t *ensoniq, int dev)
+{
+       struct gameport *gp;
+       int io_port;
+
+       io_port = snd_ensoniq_get_joystick_port(dev);
+
+       switch (io_port) {
+       case 0:
+               return -ENOSYS;
+
+       case 1: /* auto_detect */
+               for (io_port = 0x200; io_port <= 0x218; io_port += 8)
+                       if (request_region(io_port, 8, "ens137x: gameport"))
                                break;
-               if (port > 0x218) {
-                       snd_printk("no gameport available\n");
+               if (io_port > 0x218) {
+                       printk(KERN_WARNING "ens137x: no gameport ports available\n");
                        return -EBUSY;
                }
-       } else
-#endif
-       {
-               if (!request_region(port, 8, "ens137x: gameport")) {
-                       snd_printk("gameport io port 0x%03x in use", ensoniq->gameport.io);
+               break;
+
+       default:
+               if (!request_region(io_port, 8, "ens137x: gameport")) {
+                       printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n", io_port);
                        return -EBUSY;
                }
+               break;
        }
-       ensoniq->gameport.io = port;
+
+       ensoniq->gameport = gp = gameport_allocate_port();
+       if (!gp) {
+               printk(KERN_ERR "ens137x: cannot allocate memory for gameport\n");
+               release_region(io_port, 8);
+               return -ENOMEM;
+       }
+
+       gameport_set_name(gp, "ES137x");
+       gameport_set_phys(gp, "pci%s/gameport0", pci_name(ensoniq->pci));
+       gameport_set_dev_parent(gp, &ensoniq->pci->dev);
+       gp->io = io_port;
+
        ensoniq->ctrl |= ES_JYSTK_EN;
 #ifdef CHIP1371
        ensoniq->ctrl &= ~ES_1371_JOY_ASELM;
-       ensoniq->ctrl |= ES_1371_JOY_ASEL((ensoniq->gameport.io - 0x200) / 8);
+       ensoniq->ctrl |= ES_1371_JOY_ASEL((io_port - 0x200) / 8);
 #endif
        outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
-       gameport_register_port(&ensoniq->gameport);
+
+       gameport_register_port(ensoniq->gameport);
+
        return 0;
 }
 
-static void snd_ensoniq_joystick_free(ensoniq_t *ensoniq)
+static void snd_ensoniq_free_gameport(ensoniq_t *ensoniq)
 {
-       gameport_unregister_port(&ensoniq->gameport);
-       ensoniq->ctrl &= ~ES_JYSTK_EN;
-       outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
-       release_region(ensoniq->gameport.io, 8);
+       if (ensoniq->gameport) {
+               int port = ensoniq->gameport->io;
+
+               gameport_unregister_port(ensoniq->gameport);
+               ensoniq->gameport = NULL;
+               ensoniq->ctrl &= ~ES_JYSTK_EN;
+               outl(ensoniq->ctrl, ES_REG(ensoniq, CONTROL));
+               release_region(port, 8);
+       }
 }
+#else
+static inline int snd_ensoniq_create_gameport(ensoniq_t *ensoniq, long port) { return -ENOSYS; }
+static inline void snd_ensoniq_free_gameport(ensoniq_t *ensoniq) { }
 #endif /* SUPPORT_JOYSTICK */
 
 /*
@@ -1810,10 +1866,7 @@ static void __devinit snd_ensoniq_proc_init(ensoniq_t * ensoniq)
 
 static int snd_ensoniq_free(ensoniq_t *ensoniq)
 {
-#ifdef SUPPORT_JOYSTICK
-       if (ensoniq->ctrl & ES_JYSTK_EN)
-               snd_ensoniq_joystick_free(ensoniq);
-#endif
+       snd_ensoniq_free_gameport(ensoniq);
        if (ensoniq->irq < 0)
                goto __hw_end;
 #ifdef CHIP1370
@@ -2043,9 +2096,7 @@ static void snd_ensoniq_midi_interrupt(ensoniq_t * ensoniq)
                if ((status & mask) == 0)
                        break;
                byte = inb(ES_REG(ensoniq, UART_DATA));
-               spin_unlock(&ensoniq->reg_lock);
                snd_rawmidi_receive(ensoniq->midi_input, &byte, 1);
-               spin_lock(&ensoniq->reg_lock);
        }
        spin_unlock(&ensoniq->reg_lock);
 
@@ -2313,22 +2364,9 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,
                snd_card_free(card);
                return err;
        }
-#ifdef SUPPORT_JOYSTICK
-#ifdef CHIP1371
-       switch (joystick_port[dev]) {
-       case 1: /* auto-detect */
-       case 0x200:
-       case 0x208:
-       case 0x210:
-       case 0x218:
-               snd_ensoniq_joystick(ensoniq, joystick_port[dev]);
-               break;
-       }
-#else
-       if (joystick[dev])
-               snd_ensoniq_joystick(ensoniq, 0x200);
-#endif
-#endif /* SUPPORT_JOYSTICK */
+
+       snd_ensoniq_create_gameport(ensoniq, dev);
+
        strcpy(card->driver, DRIVER_NAME);
 
        strcpy(card->shortname, "Ensoniq AudioPCI");