From d598f5b350dc0f84d9a92058798d02a168a5b174 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 1 Oct 1994 12:42:17 +0000
Subject: [PATCH] Fix again PAS16D detection and MVA508 handle. Initial
 importers (swallace) please be more carefully to not break old things!

---
 sys/i386/isa/sound/pas.h       | 3 ++-
 sys/i386/isa/sound/pas2_card.c | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/i386/isa/sound/pas.h b/sys/i386/isa/sound/pas.h
index 34fd322f196..415c2bfd173 100644
--- a/sys/i386/isa/sound/pas.h
+++ b/sys/i386/isa/sound/pas.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pas.h,v 1.4 1994/08/02 07:40:19 davidg Exp $
+ * $Id: pas.h,v 1.5 1994/10/01 02:16:54 swallace Exp $
  */
 /* 																*/
 /*	Port addresses and bit fields for the Media Vision Pro AudioSpectrum second generation sound cards.			*/
@@ -131,6 +131,7 @@
 	#define F_F_PCM_RATE_COUNTER	0x40		/* R W	PCM		1=enable, 0=disable sample rate counter		*/
 	#define F_F_PCM_BUFFER_COUNTER	0x80		/* R W 	PCM		1=enable, 0=disable sample buffer counter	*/
 
+#define	CHIP_REV			0xFF88		/* R	Control		0=PAS, 1=PAS+, 2=CDPC, 3=PAS16C, 4=PAS16D	*/
 #define PAS_NONE	0
 #define PAS_PLUS	1
 #define PAS_CDPC	2
diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c
index 63f52352499..96bf58d53b9 100644
--- a/sys/i386/isa/sound/pas2_card.c
+++ b/sys/i386/isa/sound/pas2_card.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pas2_card.c,v 1.9 1994/08/02 07:40:20 davidg Exp $
+ * $Id: pas2_card.c,v 1.10 1994/10/01 02:16:55 swallace Exp $
  */
 
 #include "sound_config.h"
@@ -47,7 +47,6 @@ static int      pas_irq = 0;
 
 static char     pas_model;
 static unsigned char board_rev_id;
-#define PAS_REVD_BOARD_ID 127
 static char    *pas_model_names[] =
 {"", "Pro AudioSpectrum+", "CDPC", "Pro AudioSpectrum 16", "Pro AudioSpectrum 16D"};
 
@@ -83,7 +82,7 @@ pas_write (unsigned char data, int ioaddr)
 void
 mix_write (unsigned char data, int ioaddr)
 {
-  if (board_rev_id >= PAS_REVD_BOARD_ID) {
+  if (pas_model == PAS_16D) {
 	outw ((ioaddr ^ translat_code) - 1, data | (data << 8));
 	outb (0, 0x80);
   } else
@@ -368,7 +367,7 @@ detect_pas_hw (struct address_info *hw_config)
 				 */
     return 0;
 
-  pas_model = O_M_1_to_card[pas_read (OPERATION_MODE_1) & 0x0f];
+  pas_model = pas_read (CHIP_REV);
 
   return pas_model;
 }
@@ -382,7 +381,7 @@ attach_pas_card (long mem_start, struct address_info *hw_config)
     {
 
  	board_rev_id = pas_read (BOARD_REV_ID);	
-	if ((pas_model = O_M_1_to_card[pas_read (OPERATION_MODE_1) & 0x0f]))
+	if (pas_model = pas_read (CHIP_REV))
 	{
 #ifdef __FreeBSD__
 	  printk ("snd3: <%s rev %d>", pas_model_names[(int) pas_model], board_rev_id);