Re: i810_audio

[Nathan Bryant <nbryant@allegientsystems.com>]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

Mario Mikocevic wrote:

>Hi,
>
>>OK, various clean ups made, and enough of the SiS code included that I think 
>>it should work, plus one change to the i810 interrupt handler that will 
>>(hopefully) render the other change you made to get_dma_addr and drain_dac 
>>unnecessary.  If people could please download and test the new 0.14 version 
>>of the driver on my site, I would appreciate it.
>>
>>http://people.redhat.com/dledford/i810_audio.c.gz
>>
>
>Hmmm, maybe way too much cleanups !? :)
>
Works fine for me with the attached patch. (artsd, mmap mode ok so far)

[-- Attachment #2: 14.diff --]
[-- Type: text/plain, Size: 626 bytes --]

--- i810_audio.c.14	Tue Jan  8 03:28:31 2002
+++ linux/drivers/sound/i810_audio.c	Tue Jan  8 14:01:26 2002
@@ -655,7 +655,6 @@
 {
 	struct dmabuf *dmabuf = &state->dmabuf;
 	unsigned int civ, offset, port, port_picb, bytes = 2;
-	struct i810_channel *c;
 	
 	if (!dmabuf->enable)
 		return 0;
@@ -744,7 +743,7 @@
 	if(card->pci_id == PCI_DEVICE_ID_SI_7012)
 		outb( inb(card->iobase + PO_PICB), card->iobase + PO_PICB );
 	else
-		outb( inb(card->iobase + PO_SR), card->iobase + PI_OR );
+		outb( inb(card->iobase + PO_SR), card->iobase + PO_SR );
 	outl( inl(card->iobase + GLOB_STA) & INT_PO, card->iobase + GLOB_STA);
 }