Changeset 777 for GPL/trunk/alsa-kernel/drivers/opl3

Timestamp:

Apr 21, 2025, 7:17:25 PM (6 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/drivers/opl3/opl3_lib.c (modified) (7 diffs)
• alsa-kernel/drivers/opl3/opl3_midi.c (modified) (16 diffs)
• alsa-kernel/drivers/opl3/opl3_synth.c (modified) (1 diff)

GPL/trunk/alsa-kernel/drivers/opl3/opl3_lib.c

@@ -93 +93 @@
         signature = stat1 = inb(opl3->l_port);  /* Status register */
         if ((stat1 & 0xe0) != 0x00) {   /* Should be 0x00 */
-                snd_printd("OPL3: stat1 = 0x%x\n", stat1);
+                dev_dbg(opl3->card->dev, "OPL3: stat1 = 0x%x\n", stat1);
                 return -ENODEV;
         }
@@ -109 +109 @@
         opl3->command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, OPL3_IRQ_RESET);
         if ((stat2 & 0xe0) != 0xc0) {   /* There is no YM3812 */
-                snd_printd("OPL3: stat2 = 0x%x\n", stat2);
+                dev_dbg(opl3->card->dev, "OPL3: stat2 = 0x%x\n", stat2);
                 return -ENODEV;
         }
@@ -290 +290 @@
         opl3 = hw->private_data;
         status = inb(opl3->l_port);
-#if 0
-        snd_printk(KERN_DEBUG "AdLib IRQ status = 0x%x\n", status);
-#endif
         if (!(status & 0x80))
                 return;
@@ -366 +363 @@
 {
         if (! opl3->command) {
-                printk(KERN_ERR "snd_opl3_init: command not defined!\n");
+                dev_err(opl3->card->dev,
+                        "snd_opl3_init: command not defined!\n");
                 return -EINVAL;
         }
@@ -406 +404 @@
                 opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)");
                 if (!opl3->res_l_port) {
-                        snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
+                        dev_err(card->dev, "opl3: can't grab left port 0x%lx\n", l_port);
                         snd_device_free(card, opl3);
                         return -EBUSY;
@@ -413 +411 @@
                         opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)");
                         if (!opl3->res_r_port) {
-                                snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
+                                dev_err(card->dev, "opl3: can't grab right port 0x%lx\n", r_port);
                                 snd_device_free(card, opl3);
                                 return -EBUSY;
@@ -433 +431 @@
                 err = snd_opl3_detect(opl3);
                 if (err < 0) {
-                        snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n",
+                        dev_dbg(card->dev, "OPL2/3 chip not detected at 0x%lx/0x%lx\n",
                                    opl3->l_port, opl3->r_port);
                         snd_device_free(card, opl3);

GPL/trunk/alsa-kernel/drivers/opl3/opl3_midi.c

@@ -11 +11 @@
 #include "opl3_voice.h"
 #include <sound/asoundef.h>
+
+#ifdef DEBUG_MIDI
+#define opl3_dbg(opl3, fmt, ...) \
+        dev_dbg(((struct snd_opl3 *)(opl3))->card->dev, fmt, ##__VA_ARGS__)
+#else
+#define opl3_dbg(opl3, fmt, ...) do {} while (0)
+#endif
 
 static void snd_opl3_note_off_unsafe(void *p, int note, int vel,
@@ -108 +115 @@
 
 #ifdef DEBUG_ALLOC
-static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice) {
+static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice)
+{
         int i;
-        char *str = "x.24";
-
-        printk(KERN_DEBUG "time %.5i: %s [%.2i]: ", opl3->use_time, s, voice);
+        const char *str = "x.24";
+        char buf[MAX_OPL3_VOICES + 1];
+
         for (i = 0; i < opl3->max_voices; i++)
-                printk(KERN_CONT "%c", *(str + opl3->voices[i].state + 1));
-        printk(KERN_CONT "\n");
+                buf[i] = str[opl3->voices[i].state + 1];
+        buf[i] = 0;
+        dev_dbg(opl3->card->dev, "time %.5i: %s [%.2i]: %s\n",
+                opl3->use_time, s, voice, buf);
 }
 #endif
@@ -204 +214 @@
                 if (best[i].voice >= 0) {
 #ifdef DEBUG_ALLOC
-                        printk(KERN_DEBUG "%s %iop allocation on voice %i\n",
+                        dev_dbg(opl3->card->dev,
+                                "%s %iop allocation on voice %i\n",
                                alloc_type[i], instr_4op ? 4 : 2,
                                best[i].voice);
@@ -306 +317 @@
         opl3 = p;
 
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "Note on, ch %i, inst %i, note %i, vel %i\n",
+        opl3_dbg(opl3, "Note on, ch %i, inst %i, note %i, vel %i\n",
                    chan->number, chan->midi_program, note, vel);
-#endif
 
         /* in SYNTH mode, application takes care of voices */
@@ -362 +371 @@
                 return;
         }
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "  --> OPL%i instrument: %s\n",
+        opl3_dbg(opl3, "  --> OPL%i instrument: %s\n",
                    instr_4op ? 3 : 2, patch->name);
-#endif
         /* in SYNTH mode, application takes care of voices */
         /* in SEQ mode, allocate voice on free OPL3 channel */
@@ -426 +433 @@
         }
 
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "  --> setting OPL3 connection: 0x%x\n",
+        opl3_dbg(opl3, "  --> setting OPL3 connection: 0x%x\n",
                    opl3->connection_reg);
-#endif
         /*
          * calculate volume depending on connection
@@ -461 +466 @@
         /* Program the FM voice characteristics */
         for (i = 0; i < (instr_4op ? 4 : 2); i++) {
-#ifdef DEBUG_MIDI
-                snd_printk(KERN_DEBUG "  --> programming operator %i\n", i);
-#endif
+                opl3_dbg(opl3, "  --> programming operator %i\n", i);
                 op_offset = snd_opl3_regmap[voice_offset][i];
 
@@ -541 +544 @@
         blocknum |= OPL3_KEYON_BIT;
 
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "  --> trigger voice %i\n", voice);
-#endif
+        opl3_dbg(opl3, "  --> trigger voice %i\n", voice);
         /* Set OPL3 KEYON_BLOCK register of requested voice */ 
         opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset);
@@ -597 +598 @@
                         prg = extra_prg - 1;
                 }
-#ifdef DEBUG_MIDI
-                snd_printk(KERN_DEBUG " *** allocating extra program\n");
-#endif
+                opl3_dbg(opl3, " *** allocating extra program\n");
                 goto __extra_prg;
         }
@@ -628 +627 @@
 
         /* kill voice */
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "  --> kill voice %i\n", voice);
-#endif
+        opl3_dbg(opl3, "  --> kill voice %i\n", voice);
         opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset);
         /* clear Key ON bit */
@@ -664 +661 @@
         opl3 = p;
 
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "Note off, ch %i, inst %i, note %i\n",
+        opl3_dbg(opl3, "Note off, ch %i, inst %i, note %i\n",
                    chan->number, chan->midi_program, note);
-#endif
 
         if (opl3->synth_mode == SNDRV_OPL3_MODE_SEQ) {
@@ -707 +702 @@
 void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *chan)
 {
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n",
+        opl3_dbg(p, "Key pressure, ch#: %i, inst#: %i\n",
                    chan->number, chan->midi_program);
-#endif
 }
 
@@ -718 +711 @@
 void snd_opl3_terminate_note(void *p, int note, struct snd_midi_channel *chan)
 {
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n",
+        opl3_dbg(p, "Terminate note, ch#: %i, inst#: %i\n",
                    chan->number, chan->midi_program);
-#endif
 }
 
@@ -807 +798 @@
 
         opl3 = p;
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "Controller, TYPE = %i, ch#: %i, inst#: %i\n",
+        opl3_dbg(opl3, "Controller, TYPE = %i, ch#: %i, inst#: %i\n",
                    type, chan->number, chan->midi_program);
-#endif
 
         switch (type) {
@@ -841 +830 @@
                    struct snd_midi_channel_set *chset)
 {
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n",
+        opl3_dbg(p, "NRPN, ch#: %i, inst#: %i\n",
                    chan->number, chan->midi_program);
-#endif
 }
 
@@ -853 +840 @@
                     int parsed, struct snd_midi_channel_set *chset)
 {
-#ifdef DEBUG_MIDI
-        snd_printk(KERN_DEBUG "SYSEX\n");
-#endif
-}
+        opl3_dbg(p, "SYSEX\n");
+}

GPL/trunk/alsa-kernel/drivers/opl3/opl3_synth.c

@@ -159 +159 @@
 #endif
 
-#ifdef CONFIG_SND_DEBUG
         default:
-                snd_printk(KERN_WARNING "unknown IOCTL: 0x%x\n", cmd);
-#endif
+                dev_dbg(opl3->card->dev, "unknown IOCTL: 0x%x\n", cmd);
         }
         return -ENOTTY;