Date: Sun, 13 Dec 2009 15:02:25 GMT From: Volodymyr Kostyrko <c.kworr@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/141433: audio/aureal-kmod fails to build under RELENG_8 Message-ID: <200912131502.nBDF2PLf012049@www.freebsd.org> Resent-Message-ID: <200912131510.nBDFA1Wr085812@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141433
>Category: ports
>Synopsis: audio/aureal-kmod fails to build under RELENG_8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 13 15:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Volodymyr Kostyrko
>Release: RELENG_8
>Organization:
>Environment:
FreeBSD limbo.lan 8.0-STABLE FreeBSD 8.0-STABLE #0: Sun Dec 13 13:37:10 EET 2009 arcade@limbo.lan:/usr/obj/usr/src/sys/MINIMAL_8 i386
>Description:
When building port the process fails with:
cc -O2 -pipe -march=athlon-xp -fno-strict-aliasing -march=athlon-xp -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I/usr/tmp/usr/ports/audio/aureal-kmod/work -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/tmp/usr/ports/audio/aureal-kmod/work/au88x0.c
cc1: warnings being treated as errors
/usr/tmp/usr/ports/audio/aureal-kmod/work/au88x0.c:535: warning: pointer type mismatch in conditional expression
/usr/tmp/usr/ports/audio/aureal-kmod/work/au88x0.c:691: warning: pointer type mismatch in conditional expression
/usr/tmp/usr/ports/audio/aureal-kmod/work/au88x0.c:692: warning: pointer type mismatch in conditional expression
/usr/tmp/usr/ports/audio/aureal-kmod/work/au88x0.c:694: warning: pointer type mismatch in conditional expression
>How-To-Repeat:
Try to build port on RELENG_8.
>Fix:
The attached patch is actually a replacement for files/patch-au88x0.c which just adjusts some function returning types (int changed to uint32_t).
Patch attached with submission follows:
--- au88x0.c.orig 2002-05-10 04:32:55.000000000 +0300
+++ au88x0.c 2009-12-07 23:50:11.552923256 +0200
@@ -29,10 +29,11 @@
*/
#include <dev/sound/pcm/sound.h>
-#include <dev/sound/pci/au88x0.h>
+#include "au88x0.h"
+#include <sys/systm.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <sys/queue.h>
SND_DECLARE_FILE("$FreeBSD$");
@@ -490,7 +491,7 @@
return left | (right << 8);
}
-static int
+static uint32_t
aumix_setrecsrc(struct snd_mixer *m, u_int32_t src)
{
struct au_info *au;
@@ -573,7 +574,11 @@
ch->channel = c;
ch->buffer = b;
ch->run = 0;
- if (sndbuf_alloc(ch->buffer, au->parent_dmat, AU_BUFFSIZE) == -1) {
+ if (sndbuf_alloc(ch->buffer, au->parent_dmat,
+#if __FreeBSD_version >= 700037
+ 0,
+#endif
+ AU_BUFFSIZE) != 0) {
printf("sndbuf_alloc failed\n");
return NULL;
}
@@ -606,7 +611,7 @@
return 0;
}
-static int
+static uint32_t
auchan_setspeed(kobj_t obj, void *data, u_int32_t speed)
{
struct au_chinfo *ch = data;
@@ -616,7 +621,7 @@
return speed;
}
-static int
+static uint32_t
auchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
{
return blocksize;
@@ -656,7 +661,7 @@
return 0;
}
-static int
+static uint32_t
auchan_getptr(kobj_t obj, void *data)
{
struct au_chinfo *ch = data;
@@ -768,7 +773,7 @@
}
if (s) device_set_desc(dev, s);
- return s ? 0 : ENXIO;
+ return s ? BUS_PROBE_DEFAULT : ENXIO;
}
static int
@@ -802,7 +807,7 @@
data = pci_read_config(dev, PCIR_COMMAND, 2);
for (i = 0; i < 3; i++) {
- au->regid[i] = PCIR_MAPS + i*4;
+ au->regid[i] = PCIR_BAR(i);
au->regtype[i] = SYS_RES_MEMORY;
au->reg[i] = bus_alloc_resource(dev, au->regtype[i], &au->regid[i], 0, ~0, 1, RF_ACTIVE);
if (!au->reg[i]) {
@@ -852,7 +857,9 @@
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
/*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff,
- /*flags*/0, &au->parent_dmat) != 0) {
+ /*flags*/0,
+ /*lockfunc*/NULL, /*lockarg*/NULL,
+ &au->parent_dmat) != 0) {
device_printf(dev, "unable to create dma tag\n");
goto bad;
}
@@ -942,6 +949,6 @@
DRIVER_MODULE(snd_au88x0, pci, au_driver, pcm_devclass, 0, 0);
-MODULE_DEPEND(snd_au88x0, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
+MODULE_DEPEND(snd_au88x0, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_VERSION(snd_au88x0, 1);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912131502.nBDF2PLf012049>