[patch] linux-2.6.5-rc1.sndfix.patch

linux-2.6.5-rc1.sndfix.patch (text/plain), 2.45 KB, created by Jeremy Huddleston (RETIRED) on 2004-04-08 10:00:29 UTC

diff -Naur linux-2.6.5-rc1/include/sound/trident.h linux-2.6.5-rc1.sndfix/include/sound/trident.h
--- linux-2.6.5-rc1/include/sound/trident.h	2004-04-08 09:54:31.000000000 -0700
+++ linux-2.6.5-rc1.sndfix/include/sound/trident.h	2004-04-08 09:56:08.000000000 -0700
@@ -56,9 +56,9 @@
 
 /* Trident chipsets have 1GB memory limit */
 #ifdef __alpha__
-#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_PCI_16MB
+#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_DEV_16MB
 #else
-#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_PCI
+#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_DEV
 #endif
 
 #define SNDRV_SEQ_DEV_ID_TRIDENT			"trident-synth"
diff -Naur linux-2.6.5-rc1/sound/isa/cs423x/cs4231_lib.c linux-2.6.5-rc1.sndfix/sound/isa/cs423x/cs4231_lib.c
--- linux-2.6.5-rc1/sound/isa/cs423x/cs4231_lib.c	2004-04-08 09:54:32.000000000 -0700
+++ linux-2.6.5-rc1.sndfix/sound/isa/cs423x/cs4231_lib.c	2004-04-08 09:56:09.000000000 -0700
@@ -1659,7 +1659,7 @@
 #else
 #  ifdef EBUS_SUPPORT
         if (chip->ebus_flag) {
-                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                 				      chip->dev_u.pdev,
 						      64*1024, 128*1024);
         } else {
diff -Naur linux-2.6.5-rc1/sound/parisc/harmony.c linux-2.6.5-rc1.sndfix/sound/parisc/harmony.c
--- linux-2.6.5-rc1/sound/parisc/harmony.c	2004-04-08 09:54:32.000000000 -0700
+++ linux-2.6.5-rc1.sndfix/sound/parisc/harmony.c	2004-04-08 09:56:09.000000000 -0700
@@ -847,7 +847,7 @@
 	harmony->pcm = pcm;
 	
 	/* initialize graveyard buffer */
-	harmony->dma_dev.type = SNDRV_DMA_TYPE_PCI;
+	harmony->dma_dev.type = SNDRV_DMA_TYPE_DEV;
 	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev); 
 	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,
 			HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);
diff -Naur linux-2.6.5-rc1/sound/sparc/cs4231.c linux-2.6.5-rc1.sndfix/sound/sparc/cs4231.c
--- linux-2.6.5-rc1/sound/sparc/cs4231.c	2004-04-08 09:54:33.000000000 -0700
+++ linux-2.6.5-rc1.sndfix/sound/sparc/cs4231.c	2004-04-08 09:56:19.000000000 -0700
@@ -1570,8 +1570,8 @@
 
 #ifdef EBUS_SUPPORT
 	if (chip->flags & CS4231_FLAG_EBUS) {
-		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
-						      snd_dma_pci_data(chip->dev_u.pdev)
+		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+						      snd_dma_pci_data(chip->dev_u.pdev),
 						      64*1024, 128*1024);
 	} else {
 #endif