mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
- Remove the portion that contains a $FreeBSD$ which is a keyword to our CVS
to avoid broken patch file. As it seems no way to tell CVS not to expand the keywords after add, it's better not to contain $FreeBSD$ in the patch file. PR: ports/131925 Reported by: Tom Mende <tmende at optusnet.com.au> Approved by: maintainer
This commit is contained in:
parent
4ede76ef15
commit
04c5998629
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=228762
@ -1,7 +1,6 @@
|
||||
--- au88x0.c.orig 2002-05-10 09:32:55.000000000 +0800
|
||||
+++ au88x0.c 2009-01-06 17:05:04.000000000 +0800
|
||||
@@ -29,18 +29,15 @@
|
||||
*/
|
||||
+++ au88x0.c 2009-02-21 16:14:41.000000000 +0800
|
||||
@@ -30,8 +30,9 @@
|
||||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
-#include <dev/sound/pci/au88x0.h>
|
||||
@ -14,17 +13,7 @@
|
||||
+#include <dev/pci/pcivar.h>
|
||||
#include <sys/queue.h>
|
||||
|
||||
SND_DECLARE_FILE("$FreeBSD$");
|
||||
|
||||
-#if __FreeBSD_version < 500033
|
||||
-#error Cannot be compiled on older 5.0-CURRENT and 4.x systems
|
||||
-#endif
|
||||
-
|
||||
#include "mixer_if.h"
|
||||
|
||||
MALLOC_DEFINE(M_PCMAUCORE, "PCMaucore", "Aureal Vortex 88x0 core");
|
||||
@@ -573,7 +570,11 @@
|
||||
ch->channel = c;
|
||||
@@ -574,5 +575,9 @@
|
||||
ch->buffer = b;
|
||||
ch->run = 0;
|
||||
- if (sndbuf_alloc(ch->buffer, au->parent_dmat, AU_BUFFSIZE) == -1) {
|
||||
@ -35,27 +24,21 @@
|
||||
+ AU_BUFFSIZE) != 0) {
|
||||
printf("sndbuf_alloc failed\n");
|
||||
return NULL;
|
||||
}
|
||||
@@ -768,7 +769,7 @@
|
||||
}
|
||||
@@ -769,5 +774,5 @@
|
||||
|
||||
if (s) device_set_desc(dev, s);
|
||||
- return s ? 0 : ENXIO;
|
||||
+ return s ? BUS_PROBE_DEFAULT : ENXIO;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -802,7 +803,7 @@
|
||||
data = pci_read_config(dev, PCIR_COMMAND, 2);
|
||||
@@ -803,5 +808,5 @@
|
||||
|
||||
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 +853,9 @@
|
||||
/*highaddr*/BUS_SPACE_MAXADDR,
|
||||
@@ -853,5 +858,7 @@
|
||||
/*filter*/NULL, /*filterarg*/NULL,
|
||||
/*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff,
|
||||
- /*flags*/0, &au->parent_dmat) != 0) {
|
||||
@ -64,9 +47,7 @@
|
||||
+ &au->parent_dmat) != 0) {
|
||||
device_printf(dev, "unable to create dma tag\n");
|
||||
goto bad;
|
||||
}
|
||||
@@ -942,6 +945,6 @@
|
||||
|
||||
@@ -943,5 +950,5 @@
|
||||
|
||||
DRIVER_MODULE(snd_au88x0, pci, au_driver, pcm_devclass, 0, 0);
|
||||
-MODULE_DEPEND(snd_au88x0, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
|
Loading…
Reference in New Issue
Block a user