Skip to contentSkip to conversation

miro: OPL4 support

PATCH Applied Martin Langer 2 participants 2 messages Jun 24, 2005 – Jun 27, 2005

lore
Share & tools
lore

Martin Langer

author
#0 lore raw

PATCH 1/1 miro: OPL4 support

OPL4 support on miroSOUND PCMxx is working now. This patch makes it possible. Miro soundcards with OPL3 don't exist and so there's no OPL3 fallback.

Signed-off-by Martin Langer <[email protected]>

Enjoy it!
martin

Index: isa/opti9xx/miro.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/isa/opti9xx/miro.c,v retrieving revision 1.5

opti9xx/miro.c +10 -2
diff -u -r1.5 miro.c
@@ -983,14 +983,14 @@
 	case OPTi9XX_HW_82C924:
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x02);
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80);
-		snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x00, 0x20);
+		snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(3), 0xf0, 0xff);
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(5), 0x02, 0x02);
 		break;
 	case OPTi9XX_HW_82C929:
 		/* untested init commands for OPTi929 */
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80);
-		snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x00, 0x20);
+		snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(4), 0x00, 0x0c);
 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(5), 0x02, 0x02);
 		break;

@@ -1394,6 +1394,14 @@
 				&rmidi)))
 			snd_printk("no MPU-401 device at 0x%lx?\n", miro->mpu_port);
 
+	if (miro->fm_port > 0 && miro->fm_port != SNDRV_AUTO_PORT) {
+		opl3_t *opl3 = NULL;
+		opl4_t *opl4;
+		if (snd_opl4_create(card, miro->fm_port, miro->fm_port - 8, 
+				    2, &opl3, &opl4) < 0)
+			snd_printk("no OPL4 device at 0x%lx\n", miro->fm_port);
+	}
+
 	if ((error = snd_set_aci_init_values(miro)) < 0) {
 		snd_card_free(card);
                 return error;
Applied
#1 lore raw
Quoted 1 line · Martin Langer

OPL4 support on miroSOUND PCMxx is working now.

Applied, thanks!

Clemens

-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click