Attachment #28904 for bug #47236

Lines 56-64 Link Here

(-)alsa-driver-1.0.4/alsa-kernel/include/trident.h (-2 / +2 lines)
56		56
57	/* Trident chipsets have 1GB memory limit */	57	/* Trident chipsets have 1GB memory limit */
58	#ifdef __alpha__	58	#ifdef __alpha__
59	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_PCI_16MB	59	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_DEV_16MB
60	#else	60	#else
61	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_PCI	61	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_DEV
62	#endif	62	#endif
63		63
64	#define SNDRV_SEQ_DEV_ID_TRIDENT "trident-synth"	64	#define SNDRV_SEQ_DEV_ID_TRIDENT "trident-synth"

Lines 1659-1665 Link Here

(-)alsa-driver-1.0.4/alsa-kernel/isa/cs423x/cs4231_lib.c (-1 / +1 lines)
1659	#else	1659	#else
1660	# ifdef EBUS_SUPPORT	1660	# ifdef EBUS_SUPPORT
1661	if (chip->ebus_flag) {	1661	if (chip->ebus_flag) {
1662	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,	1662	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
1663	chip->dev_u.pdev,	1663	chip->dev_u.pdev,
1664	641024, 1281024);	1664	641024, 1281024);
1665	} else {	1665	} else {

Lines 847-853 Link Here

(-)alsa-driver-1.0.4/alsa-kernel/parisc/harmony.c (-1 / +1 lines)
847	harmony->pcm = pcm;	847	harmony->pcm = pcm;
848		848
849	/* initialize graveyard buffer */	849	/* initialize graveyard buffer */
850	harmony->dma_dev.type = SNDRV_DMA_TYPE_PCI;	850	harmony->dma_dev.type = SNDRV_DMA_TYPE_DEV;
851	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev);	851	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev);
852	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,	852	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,
853	HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);	853	HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);




	 * true, but it seems to work.
	 */
	if ((err = snd_register_dma_channel(card, "HAL2 record", 0,
					    SNDRV_DMA_TYPE_DEV,
					    dma1_size[dev], NULL,
					    &hal2card->dma1ptr)) < 0) {
		snd_printk("Couldn't get dma1\n");
		return err;
	}
	if ((err = snd_register_dma_channel(card, "HAL2 playback", 0,
					    SNDRV_DMA_TYPE_DEV,
					    dma2_size[dev], NULL,
					    &hal2card->dma2ptr)) < 0) {
		snd_printk("Couldn't get dma2\n");

Lines 56-64 Link Here

(-)alsa-driver-1.0.4/sound/include/trident.h (-2 / +2 lines)
56		56
57	/* Trident chipsets have 1GB memory limit */	57	/* Trident chipsets have 1GB memory limit */
58	#ifdef __alpha__	58	#ifdef __alpha__
59	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_PCI_16MB	59	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_DEV_16MB
60	#else	60	#else
61	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_PCI	61	#define TRIDENT_DMA_TYPE SNDRV_DMA_TYPE_DEV
62	#endif	62	#endif
63		63
64	#define SNDRV_SEQ_DEV_ID_TRIDENT "trident-synth"	64	#define SNDRV_SEQ_DEV_ID_TRIDENT "trident-synth"

Lines 1659-1665 Link Here

(-)alsa-driver-1.0.4/sound/isa/cs423x/cs4231_lib.c (-1 / +1 lines)
1659	#else	1659	#else
1660	# ifdef EBUS_SUPPORT	1660	# ifdef EBUS_SUPPORT
1661	if (chip->ebus_flag) {	1661	if (chip->ebus_flag) {
1662	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,	1662	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
1663	chip->dev_u.pdev,	1663	chip->dev_u.pdev,
1664	641024, 1281024);	1664	641024, 1281024);
1665	} else {	1665	} else {

Lines 847-853 Link Here

(-)alsa-driver-1.0.4/sound/parisc/harmony.c (-1 / +1 lines)
847	harmony->pcm = pcm;	847	harmony->pcm = pcm;
848		848
849	/* initialize graveyard buffer */	849	/* initialize graveyard buffer */
850	harmony->dma_dev.type = SNDRV_DMA_TYPE_PCI;	850	harmony->dma_dev.type = SNDRV_DMA_TYPE_DEV;
851	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev);	851	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev);
852	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,	852	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,
853	HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);	853	HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);

Return to bug 47236

Lines 134-147 Link Here

(-)alsa-driver-1.0.4/hal2/hal2.c (-2 / +2 lines)
134	* true, but it seems to work.	134	* true, but it seems to work.
135	*/	135	*/
136	if ((err = snd_register_dma_channel(card, "HAL2 record", 0,	136	if ((err = snd_register_dma_channel(card, "HAL2 record", 0,
137	SNDRV_DMA_TYPE_PCI,	137	SNDRV_DMA_TYPE_DEV,
138	dma1_size[dev], NULL,	138	dma1_size[dev], NULL,
139	&hal2card->dma1ptr)) < 0) {	139	&hal2card->dma1ptr)) < 0) {
140	snd_printk("Couldn't get dma1\n");	140	snd_printk("Couldn't get dma1\n");
141	return err;	141	return err;
142	}	142	}
143	if ((err = snd_register_dma_channel(card, "HAL2 playback", 0,	143	if ((err = snd_register_dma_channel(card, "HAL2 playback", 0,
144	SNDRV_DMA_TYPE_PCI,	144	SNDRV_DMA_TYPE_DEV,
145	dma2_size[dev], NULL,	145	dma2_size[dev], NULL,
146	&hal2card->dma2ptr)) < 0) {	146	&hal2card->dma2ptr)) < 0) {
147	snd_printk("Couldn't get dma2\n");	147	snd_printk("Couldn't get dma2\n");