Changeset 224 for GPL/branches/alsa-resync1/alsa-kernel/drivers/mtpav.c

Timestamp:

Jul 26, 2007, 7:21:09 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.1

File:

• GPL/branches/alsa-resync1/alsa-kernel/drivers/mtpav.c (modified) (19 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/mtpav.c

@@ -52 +52 @@
 
 #include <sound/driver.h>
-#include <asm/io.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
@@ -61 +61 @@
 #include <sound/rawmidi.h>
 #include <linux/delay.h>
+
+#include <asm/io.h>
 
 /*
@@ -134 +136 @@
         u8 hwport;
         u8 mode;
+        u8 running_status;
         snd_rawmidi_substream_t *input;
         snd_rawmidi_substream_t *output;
@@ -204 +207 @@
 static int translate_hwport_to_subdevice(mtpav_t *chip, int hwport)
 {
-        int port;
+        int p;
         if (hwport <= 0x00) /* all ports */
                 return chip->num_ports + MTPAV_PIDX_BROADCAST;
         else if (hwport <= 0x08) { /* single port */
-                port = hwport - 1;
-                if (port >= chip->num_ports)
-                        port = 0;
-                return port;
+                p = hwport - 1;
+                if (p >= chip->num_ports)
+                        p = 0;
+                return p;
         } else if (hwport <= 0x10) { /* remote port */
-                port = hwport - 0x09 + chip->num_ports;
-                if (port >= chip->num_ports * 2)
-                        port = chip->num_ports;
-                return port;
+                p = hwport - 0x09 + chip->num_ports;
+                if (p >= chip->num_ports * 2)
+                        p = chip->num_ports;
+                return p;
         } else if (hwport == 0x11)  /* computer port */
                 return chip->num_ports + MTPAV_PIDX_COMPUTER;
@@ -300 +303 @@
         u8 outbyte;
 
+        // Get the outbyte first, so we can emulate running status if
+        // necessary
+        if (snd_rawmidi_transmit(substream, &outbyte, 1) != 1)
+                return;
+
         // send port change command if necessary
 
@@ -309 +317 @@
                 //snd_printk("new outport: 0x%x\n", (unsigned int) port->hwport);
 
+                if (!(outbyte & 0x80) && port->running_status)
+                        snd_mtpav_send_byte(mtp_card, port->running_status);
         }
 
         // send data
 
-        while (snd_rawmidi_transmit(substream, &outbyte, 1) == 1)
+        do {
+                if (outbyte & 0x80)
+                        port->running_status = outbyte;
+                
                 snd_mtpav_send_byte(mtp_card, outbyte);
+        } while (snd_rawmidi_transmit(substream, &outbyte, 1) == 1);
 }
 
@@ -334 +348 @@
 static void snd_mtpav_portscan(mtpav_t *chip)   // put mtp into smart routing mode
 {
-        u8 port;
-
-        for (port = 0; port < 8; port++) {
+        u8 p;
+
+        for (p = 0; p < 8; p++) {
                 snd_mtpav_send_byte(chip, 0xf5);
-                snd_mtpav_send_byte(chip, port);
+                snd_mtpav_send_byte(chip, p);
                 snd_mtpav_send_byte(chip, 0xfe);
         }
@@ -349 +363 @@
 {
         unsigned long flags;
-        mtpav_port_t *port = &mtp_card->ports[substream->number];
+        mtpav_port_t *portp = &mtp_card->ports[substream->number];
 
         //printk("mtpav port: %d opened\n", (int) substream->number);
         spin_lock_irqsave(&mtp_card->spinlock, flags);
-        port->mode |= MTPAV_MODE_INPUT_OPENED;
-        port->input = substream;
+        portp->mode |= MTPAV_MODE_INPUT_OPENED;
+        portp->input = substream;
         if (mtp_card->share_irq++ == 0)
                 snd_mtpav_mputreg(mtp_card, CREG, (SIGC_INTEN | SIGC_WRITE));   // enable pport interrupts
@@ -367 +381 @@
 {
         unsigned long flags;
-        mtpav_port_t *port = &mtp_card->ports[substream->number];
-
-        //printk("mtpav port: %d closed\n", (int) port);
+        mtpav_port_t *portp = &mtp_card->ports[substream->number];
+
+        //printk("mtpav port: %d closed\n", (int) portp);
 
         spin_lock_irqsave(&mtp_card->spinlock, flags);
 
-        port->mode &= (~MTPAV_MODE_INPUT_OPENED);
-        port->input = NULL;
+        portp->mode &= (~MTPAV_MODE_INPUT_OPENED);
+        portp->input = NULL;
         if (--mtp_card->share_irq == 0)
                 snd_mtpav_mputreg(mtp_card, CREG, 0);   // disable pport interrupts
@@ -388 +402 @@
 {
         unsigned long flags;
-        mtpav_port_t *port = &mtp_card->ports[substream->number];
+        mtpav_port_t *portp = &mtp_card->ports[substream->number];
 
         spin_lock_irqsave(&mtp_card->spinlock, flags);
         if (up)
-                port->mode |= MTPAV_MODE_INPUT_TRIGGERED;
+                portp->mode |= MTPAV_MODE_INPUT_TRIGGERED;
         else
-                port->mode &= ~MTPAV_MODE_INPUT_TRIGGERED;
+                portp->mode &= ~MTPAV_MODE_INPUT_TRIGGERED;
         spin_unlock_irqrestore(&mtp_card->spinlock, flags);
 
@@ -415 +429 @@
         /* process each port */
         for (p = 0; p <= chip->num_ports * 2 + MTPAV_PIDX_BROADCAST; p++) {
-                mtpav_port_t *port = &mtp_card->ports[p];
-                if ((port->mode & MTPAV_MODE_OUTPUT_TRIGGERED) && port->output)
-                        snd_mtpav_output_port_write(port, port->output);
+                mtpav_port_t *portp = &mtp_card->ports[p];
+                if ((portp->mode & MTPAV_MODE_OUTPUT_TRIGGERED) && portp->output)
+                        snd_mtpav_output_port_write(portp, portp->output);
         }
         spin_unlock(&chip->spinlock);
@@ -425 +439 @@
 static void snd_mtpav_add_output_timer(mtpav_t *chip)
 {
+        init_timer(&chip->timer);
         chip->timer.function = snd_mtpav_output_timer;
         chip->timer.data = (unsigned long) mtp_card;
@@ -443 +458 @@
 {
         unsigned long flags;
-        mtpav_port_t *port = &mtp_card->ports[substream->number];
+        mtpav_port_t *portp = &mtp_card->ports[substream->number];
 
         spin_lock_irqsave(&mtp_card->spinlock, flags);
-        port->mode |= MTPAV_MODE_OUTPUT_OPENED;
-        port->output = substream;
+        portp->mode |= MTPAV_MODE_OUTPUT_OPENED;
+        portp->output = substream;
         spin_unlock_irqrestore(&mtp_card->spinlock, flags);
         return 0;
@@ -458 +473 @@
 {
         unsigned long flags;
-        mtpav_port_t *port = &mtp_card->ports[substream->number];
+        mtpav_port_t *portp = &mtp_card->ports[substream->number];
 
         spin_lock_irqsave(&mtp_card->spinlock, flags);
-        port->mode &= (~MTPAV_MODE_OUTPUT_OPENED);
-        port->output = NULL;
+        portp->mode &= (~MTPAV_MODE_OUTPUT_OPENED);
+        portp->output = NULL;
         spin_unlock_irqrestore(&mtp_card->spinlock, flags);
         return 0;
@@ -473 +488 @@
 {
         unsigned long flags;
-        mtpav_port_t *port = &mtp_card->ports[substream->number];
+        mtpav_port_t *portp = &mtp_card->ports[substream->number];
 
         spin_lock_irqsave(&mtp_card->spinlock, flags);
         if (up) {
-                if (! (port->mode  & MTPAV_MODE_OUTPUT_TRIGGERED)) {
+                if (! (portp->mode  & MTPAV_MODE_OUTPUT_TRIGGERED)) {
                         if (mtp_card->istimer++ == 0)
                                 snd_mtpav_add_output_timer(mtp_card);
-                        port->mode |= MTPAV_MODE_OUTPUT_TRIGGERED;
+                        portp->mode |= MTPAV_MODE_OUTPUT_TRIGGERED;
                 }
         } else {
-                port->mode &= ~MTPAV_MODE_OUTPUT_TRIGGERED;
+                portp->mode &= ~MTPAV_MODE_OUTPUT_TRIGGERED;
                 if (--mtp_card->istimer == 0)
                         snd_mtpav_remove_output_timer(mtp_card);
@@ -499 +514 @@
 static void snd_mtpav_inmidi_process(mtpav_t *mcrd, u8 inbyte)
 {
-        mtpav_port_t *port;
-
-        if (mcrd->inmidiport > mcrd->num_ports * 2 + MTPAV_PIDX_BROADCAST)
+        mtpav_port_t *portp;
+
+        if ((int)mcrd->inmidiport > mcrd->num_ports * 2 + MTPAV_PIDX_BROADCAST)
                 return;
 
-        port = &mcrd->ports[mcrd->inmidiport];
-        if (port->mode & MTPAV_MODE_INPUT_TRIGGERED) {
+        portp = &mcrd->ports[mcrd->inmidiport];
+        if (portp->mode & MTPAV_MODE_INPUT_TRIGGERED) {
                 spin_unlock(&mcrd->spinlock);
-                snd_rawmidi_receive(port->input, &inbyte, 1);
+                snd_rawmidi_receive(portp->input, &inbyte, 1);
                 spin_lock(&mcrd->spinlock);
         }
@@ -681 +696 @@
 static mtpav_t *new_mtpav(void)
 {
-        mtpav_t *ncrd = (mtpav_t *) snd_kcalloc(sizeof(mtpav_t), GFP_KERNEL);
+        mtpav_t *ncrd = (mtpav_t *) snd_magic_kcalloc(mtpav_t, 0, GFP_KERNEL);
         if (ncrd != NULL) {
                 spin_lock_init(&ncrd->spinlock);
@@ -714 +729 @@
                 kfree_nocheck(crd->res_port);
         }
-        if (crd != NULL)
-                kfree(crd);
+        snd_magic_kfree(crd);
 }
 
@@ -790 +804 @@
 #ifndef MODULE
 
-/* format is: snd-mtpav=snd_enable,index,id,
+/* format is: snd-mtpav=enable,index,id,
                         port,irq,hwports */