patch-1.3.69 linux/drivers/sound/opl3.c

Next file: linux/drivers/sound/pas2_card.c
Previous file: linux/drivers/sound/mpu401.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.68/linux/drivers/sound/opl3.c linux/drivers/sound/opl3.c
@@ -82,6 +82,7 @@
 
 static struct opl_devinfo *devc = NULL;
 
+static int      force_opl3_mode = 0;
 
 static int      detected_model;
 
@@ -93,7 +94,7 @@
 void
 enable_opl3_mode (int left, int right, int both)
 {
-  /* NOP */
+  force_opl3_mode = 1;
 }
 
 static void
@@ -254,7 +255,7 @@
    * There is a FM chicp in this address. Detect the type (OPL2 to OPL4)
    */
 
-  if (signature == 0x06)	/* OPL2 */
+  if (signature == 0x06 && !force_opl3_mode)	/* OPL2 */
     {
       detected_model = 2;
     }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this