patch-2.2.0-pre5 linux/drivers/sound/sb_common.c

• Lines: 125
• Date: Mon Jan 4 11:37:30 1999
• Orig file: v2.2.0-pre4/linux/drivers/sound/sb_common.c
• Orig date: Mon Dec 28 15:00:52 1998

diff -u --recursive --new-file v2.2.0-pre4/linux/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c
@@ -103,6 +103,13 @@
 	return 0xffff;
 }
 
+inline void ess_extended (sb_devc * devc)
+{
+	/* Enable extended mode */
+
+	sb_dsp_command(devc, 0xc6);
+}
+
 int ess_write(sb_devc * devc, unsigned char reg, unsigned char data)
 {
 	/* Write a byte to an extended mode register of ES1688 */
@@ -225,8 +232,7 @@
 		DDB(printk("sb: No response to RESET\n"));
 		return 0;	/* Sorry */
 	}
-	if (devc->model == MDL_ESS)
-		sb_dsp_command(devc, 0xc6);	/* Enable extended mode */
+	if (devc->model == MDL_ESS) ess_extended (devc);
 
 	DEB(printk("sb_dsp_reset() OK\n"));
 	return 1;
@@ -491,6 +497,8 @@
  * fiddling with the bits in certain mixer registers. ess_probe is supposed
  * to help.
  */
+static unsigned int ess_identify (sb_devc * devc);
+
 static int ess_probe (sb_devc * devc, int reg, int xorval)
 {
 	int  val1, val2, val3;
@@ -554,18 +562,40 @@
 
 	if (ess_major == 0x68 && (ess_minor & 0xf0) == 0x80)
 	{
-		char *chip = "ES688";
+		char *chip    = NULL;
+
+		if ((ess_minor & 0x0f) < 8) {
+			chip = "ES688";
+		};
+		if (chip == NULL) {
+			int type, dummy;
+
+			type = ess_identify (devc);
 
-		if ((ess_minor & 0x0f) >= 8) {
+			switch (type) {
+			case 0x1868:
+				chip = "ES1868";
+				devc->submodel = SUBMDL_ES1868;
+				break;
+			case 0x1869:
+				chip = "ES1869";
+				devc->submodel = SUBMDL_ES1869;
+				break;
+			case 0x1878:
+				chip = "ES1878";
+				devc->submodel = SUBMDL_ES1878;
+				break;
+			};
+		};
+		if (chip == NULL) {
 			if (  !ess_probe (devc, 0x64, (1 << 3))
 			    && ess_probe (devc, 0x70, 0x7f)) {
 				chip = "ES188x";
 				devc->submodel = SUBMDL_ES188X;
-			} else {
-				chip = "ES1688";
 			};
-		} else {
-			chip = "ES688";
+		};
+		if (chip == NULL) {
+			chip = "ES1688";
 		};
 
 		sprintf(name,"ESS %s AudioDrive (rev %d)",
@@ -750,7 +780,7 @@
 		return 0;
 	}
 	memcpy((char *) detected_devc, (char *) devc, sizeof(sb_devc));
-	MDB(printk("SB %d.%d detected OK (%x)\n", devc->major, devc->minor, hw_config->io_base));
+	MDB(printk(KERN_INFO "SB %d.%d detected OK (%x)\n", devc->major, devc->minor, hw_config->io_base));
 	return 1;
 }
 
@@ -1048,7 +1078,8 @@
 
 	save_flags(flags);
 	cli();
-	if (devc->model == MDL_ESS && port >= 0xa0 && port <= 0xbf) {
+	if (devc->model == MDL_ESS && port >= 0xa0) {
+		/* ess_extended (devc); */
 		ess_write (devc, port, value);
 	} else {
 		outb(((unsigned char) (port & 0xff)), MIXER_ADDR);
@@ -1071,6 +1102,25 @@
 
 	udelay(20);
 	val = inb(MIXER_DATA);
+	udelay(20);
+	restore_flags(flags);
+
+	return val;
+}
+
+static unsigned int ess_identify (sb_devc * devc)
+{
+	unsigned int val;
+	unsigned long flags;
+
+	save_flags(flags);
+	cli();
+	outb(((unsigned char) (0x40 & 0xff)), MIXER_ADDR);
+
+	udelay(20);
+	val  = inb(MIXER_DATA) << 8;
+	udelay(20);
+	val |= inb(MIXER_DATA);
 	udelay(20);
 	restore_flags(flags);