patch-2.3.40 linux/drivers/sound/sscape.c

• Lines: 812
• Date: Thu Jan 20 10:48:35 2000
• Orig file: v2.3.39/linux/drivers/sound/sscape.c
• Orig date: Mon Oct 4 15:49:30 1999

diff -u --recursive --new-file v2.3.39/linux/drivers/sound/sscape.c linux/drivers/sound/sscape.c
@@ -3,7 +3,6 @@
  *
  * Low level driver for Ensoniq SoundScape
  */
-
 /*
  * Copyright (C) by Hannu Savolainen 1993-1997
  *
@@ -11,9 +10,10 @@
  * Version 2 (June 1991). See the "COPYING" file distributed with this software
  * for more info.
  */
-
+ 
 /*
- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)
+ * Thomas Sailer   	: ioctl code reworked (vmalloc/vfree removed)
+ * Sergey Smitienko	: ensoniq p'n'p support
  */
 
 #include <linux/config.h>
@@ -21,6 +21,26 @@
 
 #include "sound_config.h"
 #include "soundmodule.h"
+#include "sound_firmware.h"
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/fcntl.h>
+#include <linux/ctype.h>
+#include <linux/stddef.h>
+#include <linux/kmod.h>
+#ifdef __KERNEL__
+#include <asm/dma.h>
+#include <asm/io.h>
+#include <asm/segment.h>
+#include <linux/wait.h>
+#include <linux/malloc.h>
+#include <linux/ioport.h>
+#endif				/* __KERNEL__ */
+#include <linux/delay.h>
+#include <linux/proc_fs.h>
+
 
 #ifdef CONFIG_SSCAPE
 
@@ -71,10 +91,10 @@
 #define CMD_GET_BOARD_TYPE	0x82
 #define CMD_SET_CONTROL		0x88	/* Old firmware only */
 #define CMD_GET_CONTROL		0x89	/* Old firmware only */
-#define 	CTL_MASTER_VOL		0
-#define 	CTL_MIC_MODE		2
-#define 	CTL_SYNTH_VOL		4
-#define 	CTL_WAVE_VOL		7
+#define CTL_MASTER_VOL		0
+#define CTL_MIC_MODE		2
+#define CTL_SYNTH_VOL		4
+#define CTL_WAVE_VOL		7
 #define CMD_SET_EXTMIDI		0x8a
 #define CMD_GET_EXTMIDI		0x8b
 #define CMD_SET_MT32		0x8c
@@ -82,9 +102,20 @@
 
 #define CMD_ACK			0x80
 
+#define	IC_ODIE			1
+#define	IC_OPUS			2
+
 typedef struct sscape_info
 {
 	int	base, irq, dma;
+	
+	int	codec, codec_irq;	/* required to setup pnp cards*/
+	int	codec_type;
+	int	ic_type;
+	char*	raw_buf;
+	unsigned long	raw_buf_phys;
+	int	buffsize;		/* -------------------------- */
+	
 	int	ok;	/* Properly detected */
 	int	failed;
 	int	dma_allocated;
@@ -152,6 +183,31 @@
 	restore_flags(flags);
 }
 
+static unsigned char sscape_pnp_read_codec(sscape_info* devc, unsigned char reg)
+{
+	unsigned char res;
+	unsigned long flags;
+
+	save_flags(flags);
+	cli();	
+	outb( reg, devc -> codec);
+	res = inb (devc -> codec + 1);
+	restore_flags(flags);
+	return res;
+
+}
+
+static void sscape_pnp_write_codec(sscape_info* devc, unsigned char reg, unsigned char data)
+{
+	unsigned long flags;
+	
+	save_flags(flags);
+	cli();
+	outb( reg, devc -> codec);
+	outb( data, devc -> codec + 1);
+	restore_flags(flags);
+}
+
 static void host_open(struct sscape_info *devc)
 {
 	outb((0x00), PORT(HOST_CTRL));	/* Put the board to the host mode */
@@ -218,6 +274,13 @@
 	return data;
 }
 
+static int host_command1(struct sscape_info *devc, int cmd)
+{
+	unsigned char buf[10];
+	buf[0] = (unsigned char) (cmd & 0xff);
+	return host_write(devc, buf, 1);
+}
+
 
 static int host_command2(struct sscape_info *devc, int cmd, int parm1)
 {
@@ -544,6 +607,7 @@
 };
 
 static int sscape_detected = 0;
+static int sscape_is_pnp   = 0;
 
 void attach_sscape(struct address_info *hw_config)
 {
@@ -563,14 +627,14 @@
 	 */
 #define SSCAPE_REGS { \
 /* I0 */	0x00, \
-		0xf0, /* Note! Ignored. Set always to 0xf0 */ \
-		0x20, /* Note! Ignored. Set always to 0x20 */ \
-		0x20, /* Note! Ignored. Set always to 0x20 */ \
-		0xf5, /* Ignored */ \
-		0x10, \
-		0x00, \
-		0x2e, /* I7 MEM config A. Likely to vary between models */ \
-		0x00, /* I8 MEM config B. Likely to vary between models */ \
+/* I1 */	0xf0, /* Note! Ignored. Set always to 0xf0 */ \
+/* I2 */	0x20, /* Note! Ignored. Set always to 0x20 */ \
+/* I3 */	0x20, /* Note! Ignored. Set always to 0x20 */ \
+/* I4 */	0xf5, /* Ignored */ \
+/* I5 */	0x10, \
+/* I6 */	0x00, \
+/* I7 */	0x2e, /* I7 MEM config A. Likely to vary between models */ \
+/* I8 */	0x00, /* I8 MEM config B. Likely to vary between models */ \
 /* I9 */	0x40 /* Ignored */ \
 	}
 #endif
@@ -605,11 +669,13 @@
 		printk(KERN_ERR "Invalid IRQ%d\n", hw_config->irq);
 		return;
 	}
-	save_flags(flags);
-	cli();
-
-	for (i = 1; i < 10; i++)
-	{
+	
+	if (sscape_is_pnp == 0) {
+	
+	    save_flags(flags);
+	    cli();
+	    for (i = 1; i < 10; i++)
+	    {
 		switch (i)
 		{
 			case 1:	/* Host interrupt enable */
@@ -640,9 +706,9 @@
 			default:
 				sscape_write(devc, i, regs[i]);
 		}
+	    }
+	    restore_flags(flags);
 	}
-	restore_flags(flags);
-
 #ifdef SSCAPE_DEBUG2
 	/*
 	 * Temporary debugging aid. Print contents of the registers after
@@ -733,6 +799,452 @@
 	return 1;
 }
 
+static	int sscape_read_host_ctrl(sscape_info* devc)
+{
+	return host_read(devc);
+}
+
+static	void sscape_write_host_ctrl2(sscape_info *devc, int a, int b)
+{
+	host_command2(devc, a, b);
+}
+
+static int sscape_alloc_dma(sscape_info *devc)
+{
+	char *start_addr, *end_addr;
+	int i, dma_pagesize;
+	int sz, size;
+
+	if (devc->raw_buf != NULL) return 0;	/* Already done */
+	dma_pagesize = (devc->dma < 4) ? (64 * 1024) : (128 * 1024);
+	devc->raw_buf = NULL;
+	devc->buffsize = 8192*4;
+	if (devc->buffsize > dma_pagesize) devc->buffsize = dma_pagesize;
+	start_addr = NULL;
+	/*
+	 * Now loop until we get a free buffer. Try to get smaller buffer if
+	 * it fails. Don't accept smaller than 8k buffer for performance
+	 * reasons.
+	 */
+	while (start_addr == NULL && devc->buffsize > PAGE_SIZE) {
+		for (sz = 0, size = PAGE_SIZE; size < devc->buffsize; sz++, size <<= 1);
+		devc->buffsize = PAGE_SIZE * (1 << sz);
+		start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA, sz);
+		if (start_addr == NULL) devc->buffsize /= 2;
+	}
+
+	if (start_addr == NULL) {
+		printk(KERN_ERR "sscape pnp init error: Couldn't allocate DMA buffer\n");
+		return 0;
+	} else {
+		/* make some checks */
+		end_addr = start_addr + devc->buffsize - 1;		
+		/* now check if it fits into the same dma-pagesize */
+
+		if (((long) start_addr & ~(dma_pagesize - 1)) != ((long) end_addr & ~(dma_pagesize - 1))
+		    || end_addr >= (char *) (MAX_DMA_ADDRESS)) {
+			printk(KERN_ERR "sscape pnp: Got invalid address 0x%lx for %db DMA-buffer\n", (long) start_addr, devc->buffsize);
+			return 0;
+		}
+	}
+	devc->raw_buf = start_addr;
+	devc->raw_buf_phys = virt_to_bus(start_addr);
+
+	for (i = MAP_NR(start_addr); i <= MAP_NR(end_addr); i++)
+		set_bit(PG_reserved, &mem_map[i].flags);;
+	return 1;
+}
+
+static void sscape_free_dma(sscape_info *devc)
+{
+	int sz, size, i;
+	unsigned long start_addr, end_addr;
+
+	if (devc->raw_buf == NULL) return;
+	for (sz = 0, size = PAGE_SIZE; size < devc->buffsize; sz++, size <<= 1);
+	start_addr = (unsigned long) devc->raw_buf;
+	end_addr = start_addr + devc->buffsize;
+
+	for (i = MAP_NR(start_addr); i <= MAP_NR(end_addr); i++)
+		clear_bit(PG_reserved, &mem_map[i].flags);;
+
+	free_pages((unsigned long) devc->raw_buf, sz);
+	devc->raw_buf = NULL;
+}
+
+/* Intel version !!!!!!!!! */
+
+static int sscape_start_dma(int chan, unsigned long physaddr, int count, int dma_mode)
+{
+	unsigned long flags;
+
+	flags = claim_dma_lock();
+	disable_dma(chan);
+	clear_dma_ff(chan);
+	set_dma_mode(chan, dma_mode);
+	set_dma_addr(chan, physaddr);
+	set_dma_count(chan, count);
+	enable_dma(chan);
+	release_dma_lock(flags);
+	return 0;
+}
+
+static void sscape_pnp_start_dma(sscape_info* devc, int arg )
+{
+	int reg;
+	if (arg == 0) reg = 2;
+	else reg = 3;
+
+	sscape_write(devc, reg, sscape_read( devc, reg) | 0x01);
+	sscape_write(devc, reg, sscape_read( devc, reg) & 0xFE);
+}
+
+static int sscape_pnp_wait_dma (sscape_info* devc, int arg )
+{
+	int		reg;
+	unsigned long	i;
+	unsigned char	d;
+
+	if (arg == 0) reg = 2;
+	else reg = 3;
+
+	sleep ( 1 );
+	i = 0;
+	do {
+		d = sscape_read(devc, reg) & 1;
+		if ( d == 1)  break;
+		i++;
+	} while (i < 500000);
+	d = sscape_read(devc, reg) & 1; 
+	return d;
+}
+
+static	int	sscape_pnp_alloc_dma(sscape_info* devc)
+{
+	/* printk(KERN_INFO "sscape: requesting dma\n"); */
+	if (request_dma(devc -> dma, "sscape")) return 0;
+	/* printk(KERN_INFO "sscape: dma channel allocated\n"); */
+	if (!sscape_alloc_dma(devc)) {
+		free_dma(devc -> dma);
+		return 0;
+	};
+	return 1;
+}
+
+static	void	sscape_pnp_free_dma(sscape_info* devc)
+{
+	sscape_free_dma( devc);
+	free_dma(devc -> dma );	
+	/* printk(KERN_INFO "sscape: dma released\n"); */
+}
+
+static	int	sscape_pnp_upload_file(sscape_info* devc, char* fn)
+{	
+	int	     	done = 0;
+	int	     	timeout_val;
+	char*	     	data,*dt;
+	int	     	len,l;
+	unsigned long	flags;
+
+	sscape_write( devc, 9, sscape_read(devc, 9 )  & 0x3F );
+	sscape_write( devc, 2, (devc -> dma << 4) | 0x80 );
+	sscape_write( devc, 3, 0x20 );
+	sscape_write( devc, 9, sscape_read( devc, 9 )  | 0x80 );
+	
+	len = mod_firmware_load(fn, &data);
+	if (len == 0) {
+		    printk(KERN_ERR "sscape: file not found: %s\n", fn);
+		    return 0;
+	}
+	dt = data;
+	save_flags(flags);
+	cli();
+	while ( len > 0 ) {
+		if (len > devc -> buffsize) l = devc->buffsize;
+		else l = len;
+		len -= l;		
+		memcpy(devc->raw_buf, dt, l); dt += l;
+		sscape_start_dma(devc->dma, devc->raw_buf_phys, l, 0x48);
+		sscape_pnp_start_dma ( devc, 0 );
+		if (sscape_pnp_wait_dma ( devc, 0 ) == 0) return 0;
+	}
+	
+	restore_flags(flags);	    
+	vfree(data);
+	
+	outb(0, devc -> base + 2);
+	outb(0, devc -> base);
+
+	sscape_write ( devc, 9, sscape_read( devc, 9 ) | 0x40);
+
+	timeout_val = 5 * HZ; 
+	while (!done && timeout_val-- > 0)
+	{
+		unsigned char x;
+		sleep(1);
+		x = inb( devc -> base + 3);
+		if (x == 0xff || x == 0xfe)		/* OBP startup acknowledge */
+		{
+			//printk(KERN_ERR "Soundscape: Acknowledge = %x\n", x);
+			done = 1;
+		}
+	}
+	timeout_val = 5 * HZ;
+	done = 0;
+	while (!done && timeout_val-- > 0)
+	{
+		unsigned char x;
+		sleep(1);
+		x = inb( devc -> base + 3);
+		if (x == 0xfe)		/* OBP startup acknowledge */
+		{
+			//printk(KERN_ERR "Soundscape: Acknowledge = %x\n", x);
+			done = 1;
+		}
+	}
+
+	if ( !done ) printk(KERN_ERR "soundscape: OBP Initialization failed.\n");
+
+	sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40);
+	sscape_write( devc, 3, (devc -> dma << 4) + 0x80);
+	return 1;
+}
+
+static	void	sscape_pnp_init_hw(sscape_info* devc)
+{	
+	unsigned char midi_irq = 0, sb_irq = 0;
+	unsigned i;
+	static	char code_file_name[23] = "/sndscape/sndscape.cox";
+	
+	int sscape_sb_enable		= 0;
+	int sscape_joystic_enable	= 0x7f;
+	int sscape_mic_enable		= 0;
+	int sscape_ext_midi		= 0;		
+
+	if ( !sscape_pnp_alloc_dma(devc) ) {
+		printk(KERN_ERR "sscape: faild to allocate dma\n");
+		return;
+	}
+
+	for (i = 0; i < 4; i++) {
+		if ( devc -> irq   == valid_interrupts[i] ) 
+			midi_irq = i;
+		if ( devc -> codec_irq == valid_interrupts[i] ) 
+			sb_irq = i;
+	}
+
+	sscape_write( devc, 5, 0x50);
+	sscape_write( devc, 7, 0x2e);
+	sscape_write( devc, 8, 0x00);
+
+	sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40);
+	sscape_write( devc, 3, ( devc -> dma << 4) | 0x80);
+
+	if ( sscape_sb_enable )
+		sscape_write (devc, 4, 0xF0 | (sb_irq << 2) | midi_irq);
+	else	
+		sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq);
+
+	i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0);
+	if ( sscape_sb_enable )
+		i |= devc->ic_type == IC_ODIE ? 0x05 : 0x07;	    
+	if (sscape_joystic_enable) i |= 8;
+	
+	sscape_write (devc, 9, i);
+	sscape_write (devc, 6, 0x80);
+	sscape_write (devc, 1, 0x80);
+
+	if (devc -> codec_type == 2) {
+		sscape_pnp_write_codec( devc, 0x0C, 0x50);
+		sscape_pnp_write_codec( devc, 0x10, sscape_pnp_read_codec( devc, 0x10) & 0x3F);
+		sscape_pnp_write_codec( devc, 0x11, sscape_pnp_read_codec( devc, 0x11) | 0xC0);
+		sscape_pnp_write_codec( devc, 29, 0x20);
+	}
+
+	if (sscape_pnp_upload_file(devc, "/sndscape/scope.cod") == 0 ) {
+		printk(KERN_ERR "sscape: faild to upload file /sndscape/scope.cod\n");
+		sscape_pnp_free_dma(devc);
+		return;
+	}
+
+	i = sscape_read_host_ctrl( devc );
+	
+	if ( (i & 0x0F) >  7 ) {
+		printk(KERN_ERR "sscape: scope.cod faild\n");
+		sscape_pnp_free_dma(devc);
+		return;
+	}
+	if ( i & 0x10 ) sscape_write( devc, 7, 0x2F);
+	code_file_name[21] = (char) ( i & 0x0F) + 0x30;
+	if (sscape_pnp_upload_file( devc, code_file_name) == 0) {
+		printk(KERN_ERR "sscape: faild to upload file %s\n", code_file_name);
+		sscape_pnp_free_dma(devc);
+		return;
+	}
+	
+	if (devc->ic_type != IC_ODIE) {
+		sscape_pnp_write_codec( devc, 10, (sscape_pnp_read_codec(devc, 10) & 0x7f) |
+		 ( sscape_mic_enable == 0 ? 0x00 : 0x80) );
+	}
+	sscape_write_host_ctrl2( devc, 0x84, 0x32 );
+	sscape_write_host_ctrl2( devc, 0x86, 0x32 );
+	sscape_write_host_ctrl2( devc, 0x8A, sscape_ext_midi);
+
+	sscape_pnp_write_codec ( devc, 6, 0x3f ); //WAV_VOL
+	sscape_pnp_write_codec ( devc, 7, 0x3f ); //WAV_VOL
+	sscape_pnp_write_codec ( devc, 2, 0x1F ); //WD_CDXVOLL
+	sscape_pnp_write_codec ( devc, 3, 0x1F ); //WD_CDXVOLR
+
+	if (devc -> codec_type == 1) {
+		sscape_pnp_write_codec ( devc, 4, 0x1F );
+		sscape_pnp_write_codec ( devc, 5, 0x1F );
+		sscape_write_host_ctrl2( devc, 0x88, sscape_mic_enable);
+	} else {
+		int t;
+		sscape_pnp_write_codec ( devc, 0x10, 0x1F << 1);
+		sscape_pnp_write_codec ( devc, 0x11, 0xC0 | (0x1F << 1));
+
+		t = sscape_pnp_read_codec( devc, 0x00) & 0xDF;
+		if ( (sscape_mic_enable == 0)) t |= 0;
+		else t |= 0x20;
+		sscape_pnp_write_codec ( devc, 0x00, t);
+		t = sscape_pnp_read_codec( devc, 0x01) & 0xDF;
+		if ( (sscape_mic_enable == 0) ) t |= 0;
+		else t |= 0x20;
+		sscape_pnp_write_codec ( devc, 0x01, t);
+		sscape_pnp_write_codec ( devc, 0x40 | 29 , 0x20);
+		outb(0, devc -> codec);
+	}
+	if (devc -> ic_type == IC_OPUS ) {
+		int i = sscape_read( devc, 9 );
+		sscape_write( devc, 9, i | 3 );
+		sscape_write( devc, 3, 0x40);
+
+		if (check_region(0x228, 1)) {
+		    	    outb(0, 0x228);
+			    release_region(0x228,1);
+		}
+		sscape_write( devc, 3, (devc -> dma << 4) | 0x80);
+		sscape_write( devc, 9, i );
+	}
+	
+	host_close ( devc );
+	sscape_pnp_free_dma(devc);
+}
+
+static int	detect_sscape_pnp(sscape_info* devc)
+{
+	long	 i, irq_bits = 0xff;
+	unsigned int d;
+
+	DDB(printk("Entered detect_sscape_pnp(%x)\n", devc->base));
+
+	if (check_region(devc->base, 8)) {
+		printk(KERN_ERR "detect_sscape_pnp: port %x is not free\n", devc->base);	
+		return 0;
+	}
+		
+	if (check_region(devc->codec, 2)) {
+		printk(KERN_ERR "detect_sscape_pnp: port %x is not free\n", devc->codec);	
+		return 0;
+	}
+
+	if ( (inb( devc -> base + 2) & 0x78) != 0) return 0;
+
+	d = inb ( devc -> base + 4) & 0xF0;
+	if (  (d & 0x80) != 0)  return 0;
+	
+	if (d == 0) {
+			devc->codec_type = 1;
+			devc->ic_type = IC_ODIE;
+	}
+	else if ( (d & 0x60) != 0) {
+			devc->codec_type = 2;
+			devc->ic_type = IC_OPUS;
+	}
+	else if ( (d & 0x40) != 0) {
+			devc->codec_type = 2;
+			devc->ic_type = IC_ODIE;
+	} 
+	else return 0;
+	
+	sscape_is_pnp = 1;
+		
+	outb(0xFA, devc -> base+4);
+	if  ((inb( devc -> base+4) & 0x9F) != 0x0A)
+		return 0;
+	outb(0xFE, devc -> base+4);
+	if  ( (inb(devc -> base+4) & 0x9F) != 0x0E)
+		return 0;
+	if  ( (inb(devc -> base+5) & 0x9F) != 0x0E)
+		return 0;
+
+	if (devc->codec_type == 2) {
+		if (devc -> codec != devc -> base + 8)
+			printk("soundscape warning: incorrect codec port specified\n");
+		devc -> codec = devc -> base + 8;
+		d = 0x10 | (sscape_read(devc, 9)  & 0xCF);
+		sscape_write(devc, 9, d);
+		sscape_write(devc, 6, 0x80);
+	} else {
+		//todo: check codec is not base + 8
+	}
+
+	d  = (sscape_read(devc, 9) & 0x3F) | 0xC0;
+	sscape_write(devc, 9, d);
+
+	for (i = 0; i < 550000; i++)
+		if ( !(inb(devc -> codec) & 0x80) ) break;
+
+	d = inb(devc -> codec);
+	if (d & 0x80)
+		return 0;
+	if ( inb(devc -> codec + 2) == 0xFF)
+		return 0;
+
+	sscape_write(devc, 9, sscape_read(devc, 9)  & 0x3F );
+
+	d  = inb(devc -> codec) & 0x80;
+	if ( d == 0) {
+		printk(KERN_INFO "soundscape: hardware detected\n");
+		valid_interrupts = valid_interrupts_new;
+	} else	{
+		printk(KERN_INFO "soundscape: board looks like media fx\n");
+		valid_interrupts = valid_interrupts_old;
+		old_hardware = 1;
+	}
+
+	sscape_write( devc, 9, 0xC0 | (sscape_read(devc, 9)  & 0x3F) );
+
+	for (i = 0; i < 550000; i++)
+		if ( !(inb(devc -> codec) & 0x80)) 
+			break;
+		
+	sscape_pnp_init_hw(devc);
+
+	for (i = 0; i < sizeof(valid_interrupts); i++)
+	{
+		if (devc->codec_irq == valid_interrupts[i]) {
+			irq_bits = i;
+			break;
+		}
+	}	
+	sscape_write(devc, GA_INTENA_REG, 0x00);
+	sscape_write(devc, GA_DMACFG_REG, 0x50);
+	sscape_write(devc, GA_DMAA_REG, 0x70);
+	sscape_write(devc, GA_DMAB_REG, 0x20);
+	sscape_write(devc, GA_INTCFG_REG, 0xf0);
+	sscape_write(devc, GA_CDCFG_REG, 0x89 | (devc->dma << 4) | (irq_bits << 1));
+
+	sscape_pnp_write_codec( devc, 0, sscape_pnp_read_codec( devc, 0) | 0x20);
+	sscape_pnp_write_codec( devc, 0, sscape_pnp_read_codec( devc, 1) | 0x20);
+	
+	release_region(devc->codec, 2);
+	release_region(devc->base, 8);		
+		
+	return 1;	
+}
+
 int probe_sscape(struct address_info *hw_config)
 {
 
@@ -758,8 +1270,13 @@
 #endif
 	devc->failed = 1;
 
-	if (!detect_ga(devc))
-		return 0;
+	if (!detect_ga(devc)) {
+		if (detect_sscape_pnp(devc)) {		        
+			sscape_detected = hw_config->io_base;
+			return 1;
+		} 
+		else return 0;
+	}
 
 	if (old_hardware)	/* Check that it's really an old Spea/Reveal card. */
 	{
@@ -781,11 +1298,11 @@
 {
 	int i, irq_bits = 0xff;
 	int ad_flags = 0;
-
+	
 	if (devc->failed)
 	{
-		  printk(KERN_ERR "soundscape: Card not detected\n");
-		  return 0;
+		printk(KERN_ERR "soundscape: Card not detected\n");
+		return 0;
 	}
 	if (devc->ok == 0)
 	{
@@ -805,9 +1322,19 @@
 		printk(KERN_ERR "soundscape: Invalid MSS IRQ%d\n", hw_config->irq);
 		return 0;
 	}
-	if (old_hardware)
-		ad_flags = 0x12345677;	/* Tell that we may have a CS4248 chip (Spea-V7 Media FX) */
-	return ad1848_detect(hw_config->io_base, &ad_flags, hw_config->osp);
+	
+	if (!sscape_is_pnp) {
+		if (old_hardware)
+			ad_flags = 0x12345677;	/* Tell that we may have a CS4248 chip (Spea-V7 Media FX) */
+		return ad1848_detect(hw_config->io_base, &ad_flags, hw_config->osp);
+	} 
+	else {
+		if (old_hardware)
+			ad_flags = 0x12345677;	/* Tell that we may have a CS4248 chip (Spea-V7 Media FX) */
+		else
+			ad_flags = 0x87654321;  /* Tell that we have a soundscape pnp with 1845 chip */
+		return ad1848_detect(hw_config->io_base, &ad_flags, hw_config->osp);
+	}
 }
 
 void attach_ss_ms_sound(struct address_info *hw_config)
@@ -820,44 +1347,52 @@
 
 	int i, irq_bits = 0xff;
 
-	hw_config->dma = devc->dma;	/* Share the DMA with the ODIE/OPUS chip */
-
-	/*
-	 * Setup the DMA polarity.
-	 */
-
-	sscape_write(devc, GA_DMACFG_REG, 0x50);
-
-	/*
-	 * Take the gate-array off of the DMA channel.
-	 */
-	
-	sscape_write(devc, GA_DMAB_REG, 0x20);
-
-	/*
-	 * Init the AD1848 (CD-ROM) config reg.
-	 */
-
-	for (i = 0; i < sizeof(valid_interrupts); i++)
-	{
-		if (hw_config->irq == valid_interrupts[i])
-		{
-			irq_bits = i;
-			break;
-		}
-	}
-	sscape_write(devc, GA_CDCFG_REG, 0x89 | (hw_config->dma << 4) | (irq_bits << 1));
-
-	if (hw_config->irq == devc->irq)
-		printk(KERN_WARNING "soundscape: Warning! The WSS mode can't share IRQ with MIDI\n");
-
-	hw_config->slots[0] = ad1848_init("SoundScape", hw_config->io_base,
-					  hw_config->irq,
-					  hw_config->dma,
-					  hw_config->dma,
-					  0,
-					  devc->osp);
-
+ 		
+ 	if (!sscape_is_pnp)  /*pnp is already setup*/
+ 	{
+ 		/*
+     		 * Setup the DMA polarity.
+ 	    	 */
+ 		sscape_write(devc, GA_DMACFG_REG, 0x50);
+ 	
+ 		/*
+ 		 * Take the gate-array off of the DMA channel.
+ 		 */
+ 		sscape_write(devc, GA_DMAB_REG, 0x20);
+ 	
+ 		/*
+ 		 * Init the AD1848 (CD-ROM) config reg.
+ 		 */
+ 		for (i = 0; i < sizeof(valid_interrupts); i++)
+ 		{
+ 			if (hw_config->irq == valid_interrupts[i])
+ 			{
+ 				irq_bits = i;
+ 				break;
+ 			}
+ 		}	
+ 		sscape_write(devc, GA_CDCFG_REG, 0x89 | (hw_config->dma << 4) | (irq_bits << 1));
+ 	}
+ 	
+ 	if (hw_config->irq == devc->irq)
+ 		printk(KERN_WARNING "soundscape: Warning! The WSS mode can't share IRQ with MIDI\n");
+ 				
+ 	if (! sscape_is_pnp )
+		hw_config->slots[0] = ad1848_init("SoundScape", hw_config->io_base,
+						  hw_config->irq,
+						  hw_config->dma,
+						  hw_config->dma,
+						  0,
+						  devc->osp);
+
+	else 
+		hw_config->slots[0] = ad1848_init("SoundScape PNP", hw_config->io_base,
+	 					  hw_config->irq,
+	 					  hw_config->dma,
+	 					  hw_config->dma,
+	 					  0,
+	 					  devc->osp);
+ 					  
 	if (hw_config->slots[0] != -1)	/* The AD1848 driver installed itself */
 	{
 		audio_devs[hw_config->slots[0]]->coproc = &sscape_coproc_operations;
@@ -867,6 +1402,7 @@
 		/* Set proper routings here (what are they) */
 		AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_LINE);
 	}
+		
 #ifdef SSCAPE_DEBUG5
 	/*
 	 * Temporary debugging aid. Print contents of the registers
@@ -937,6 +1473,13 @@
 		  printk(KERN_ERR "CONFIG_MPU_IRQ must be specified if CONFIG_MPU_IO is set.\n");
 		  return -EINVAL;
 	}
+	
+	devc->codec = io;
+	devc->codec_irq = irq;
+	devc->codec_type = 0;
+	devc->ic_type = 0;
+	devc->raw_buf = NULL;
+	
 	config.irq = irq;
 	config.dma = dma;
 	config.io_base = io;