diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2005-08-28 23:04:34 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2005-08-28 23:04:34 +0000 |
| commit | c34c843e67bb37671eb9dab2ae25bc5dd5a57a02 (patch) | |
| tree | 935d3a77fb5a45b266521830441730613add9a87 /audio/aureal-kmod | |
| parent | a2aefd0e3441a5c25c152c3703206d8679b536f9 (diff) | |
| download | ports-c34c843e67bb37671eb9dab2ae25bc5dd5a57a02.tar.gz ports-c34c843e67bb37671eb9dab2ae25bc5dd5a57a02.zip | |
fix > 5 with MFsrc:
| Mar 1 2005 by imp
| Use BUS_PROBE_DEFAULT in preference to 0 and BUS_PROBE_LOW_PRIORITY in
| preference to some random negative number to allow other drivers a
| bite at the apple.
| Sep 2 2003 by jhb
| Use PCIR_BAR(x) instead of PCIR_MAPS.
Notes
Notes:
svn path=/head/; revision=141205
Diffstat (limited to 'audio/aureal-kmod')
| -rw-r--r-- | audio/aureal-kmod/files/patch-au88x0.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/audio/aureal-kmod/files/patch-au88x0.c b/audio/aureal-kmod/files/patch-au88x0.c index fed742dd039e..d158dfc7f797 100644 --- a/audio/aureal-kmod/files/patch-au88x0.c +++ b/audio/aureal-kmod/files/patch-au88x0.c @@ -2,7 +2,7 @@ $FreeBSD$ --- au88x0.c.orig Fri May 10 10:32:55 2002 -+++ au88x0.c Thu Aug 5 05:44:30 2004 ++++ au88x0.c Sun Aug 7 18:14:57 2005 @@ -29,10 +29,16 @@ */ @@ -30,6 +30,24 @@ $FreeBSD$ printf("sndbuf_alloc failed\n"); return NULL; } +@@ -768,7 +774,7 @@ + } + + if (s) device_set_desc(dev, s); +- return s ? 0 : ENXIO; ++ return s ? BUS_PROBE_DEFAULT : ENXIO; + } + + static int +@@ -802,7 +808,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 +858,11 @@ /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, |