lkml.org 
[lkml]   [2003]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [2.5.64][COMPILE] opl3sa2.c
On Fri, 7 Mar 2003, Bill Davidsen wrote:

> gcc -Wp,-MD,sound/oss/.opl3sa2.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=opl3sa2 -DKBUILD_MODNAME=opl3sa2 -c -o sound/oss/opl3sa2.o sound/oss/opl3sa2.c
> sound/oss/opl3sa2.c: In function `opl3sa2_pnp_probe':
> sound/oss/opl3sa2.c:854: structure has no member named `io_resource'
> sound/oss/opl3sa2.c:855: structure has no member named `irq_resource'
> sound/oss/opl3sa2.c:856: structure has no member named `dma_resource'
> sound/oss/opl3sa2.c:857: structure has no member named `dma_resource'
> sound/oss/opl3sa2.c:860: structure has no member named `io_resource'
> sound/oss/opl3sa2.c:861: structure has no member named `irq_resource'
> sound/oss/opl3sa2.c:862: structure has no member named `dma_resource'
> sound/oss/opl3sa2.c:863: structure has no member named `dma_resource'
> sound/oss/opl3sa2.c:866: structure has no member named `io_resource'
> sound/oss/opl3sa2.c:867: structure has no member named `irq_resource'
> make[2]: *** [sound/oss/opl3sa2.o] Error 1
> make[1]: *** [sound/oss] Error 2
> make: *** [sound] Error 2

The following would fix compilation but it has been broken wrt actually
functioning by the pnp changes. I'll have a look at resurrecting it this
weekend.

Index: linux-2.5.64/sound/oss/opl3sa2.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.64/sound/oss/opl3sa2.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 opl3sa2.c
--- linux-2.5.64/sound/oss/opl3sa2.c 5 Mar 2003 05:08:32 -0000 1.1.1.1
+++ linux-2.5.64/sound/oss/opl3sa2.c 5 Mar 2003 08:34:21 -0000
@@ -851,20 +851,20 @@
opl3sa2_activated[card] = 1;

/* Our own config: */
- cfg[card].io_base = dev->io_resource[4].start;
- cfg[card].irq = dev->irq_resource[0].start;
- cfg[card].dma = dev->dma_resource[0].start;
- cfg[card].dma2 = dev->dma_resource[1].start;
+ cfg[card].io_base = pnp_port_start(dev, 4);
+ cfg[card].irq = pnp_irq(dev, 0);
+ cfg[card].dma = pnp_dma(dev, 0);
+ cfg[card].dma2 = pnp_dma(dev, 1);

/* The MSS config: */
- cfg_mss[card].io_base = dev->io_resource[1].start;
- cfg_mss[card].irq = dev->irq_resource[0].start;
- cfg_mss[card].dma = dev->dma_resource[0].start;
- cfg_mss[card].dma2 = dev->dma_resource[1].start;
+ cfg_mss[card].io_base = pnp_port_start(dev, 1);
+ cfg_mss[card].irq = pnp_irq(dev, 0);
+ cfg_mss[card].dma = pnp_dma(dev, 0);
+ cfg_mss[card].dma2 = pnp_dma(dev, 1);
cfg_mss[card].card_subtype = 1; /* No IRQ or DMA setup */

- cfg_mpu[card].io_base = dev->io_resource[3].start;
- cfg_mpu[card].irq = dev->irq_resource[0].start;
+ cfg_mpu[card].io_base = pnp_port_start(dev, 3);
+ cfg_mpu[card].irq = pnp_irq(dev, 0);
cfg_mpu[card].dma = -1;
cfg_mpu[card].dma2 = -1;
cfg_mpu[card].always_detect = 1; /* It's there, so use shared IRQs */
--
function.linuxpower.ca
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:33    [W:0.026 / U:0.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site