PERFORCE change 114864 for review
Alexander Leidinger
netchild at FreeBSD.org
Fri Feb 23 14:06:33 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=114864
Change 114864 by netchild at netchild_magellan on 2007/02/23 14:05:47
IFC after MFp4.
Affected files ...
.. //depot/projects/soundsystem/src/sys/dev/sound/driver.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/midiq.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu_if.m#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpufoi_if.m#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/midi/synth_if.m#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/spicds.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.h#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/pcm/vchan.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate
Differences ...
==== //depot/projects/soundsystem/src/sys/dev/sound/driver.c#2 (text+ko) ====
@@ -18,12 +18,12 @@
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHERIN CONTRACT, STRICT
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/driver.c,v 1.20 2006/10/01 14:57:34 netchild Exp $
+ * $FreeBSD: src/sys/dev/sound/driver.c,v 1.21 2007/01/31 08:53:45 joel Exp $
*/
#include <dev/sound/pcm/sound.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#3 (text+ko) ====
@@ -1,7 +1,7 @@
/*-
* Copyright (c) 1999 Cameron Grant <cg at freebsd.org>
- * Copyright Luigi Rizzo, 1997,1998
- * Copyright by Hannu Savolainen 1994, 1995
+ * Copyright (c) 1997,1998 Luigi Rizzo
+ * Copyright (c) 1994,1995 Hannu Savolainen
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.39 2006/03/21 03:47:25 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.41 2007/02/23 13:47:33 netchild Exp $");
struct ad1816_info;
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.h#2 (text+ko) ====
@@ -1,10 +1,34 @@
/*-
- * (C) 1997 Luigi Rizzo (luigi at iet.unipi.it)
+ * Copyright (c) 1997 Luigi Rizzo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
+ * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.4 2007/02/02 13:44:09 joel Exp $
+ */
+
+/*
* This file contains information and macro definitions for
* the ad1816 chip
- *
- * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.2 2005/01/06 01:43:17 imp Exp $
*/
/* AD1816 register macros */
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 1999 Cameron Grant <cg at freebsd.org>
- * Copyright 1997,1998 Luigi Rizzo.
+ * Copyright (c) 1997,1998 Luigi Rizzo
*
* Derived from files in the Voxware 3.5 distribution,
* Copyright by Hannu Savolainen 1994, under the same copyright
@@ -38,7 +38,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.36 2006/01/16 20:01:33 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.38 2007/02/23 13:47:33 netchild Exp $");
#define ESS_BUFFSIZE (4096)
#define ABS(x) (((x) < 0)? -(x) : (x))
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#include <isa/isavar.h>
#include <isa/isa_common.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.17 2006/05/12 05:04:43 jhb Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.18 2007/02/23 12:18:54 piso Exp $");
#define LOGICALID_NOPNP 0
#define LOGICALID_PCM 0x0000561e
@@ -316,7 +316,7 @@
}
if (scp->irq != NULL)
- bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, gusc_intr, scp, &ih);
+ bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, NULL, gusc_intr, scp, &ih);
bus_generic_attach(dev);
return (0);
@@ -419,11 +419,15 @@
static int
gusc_setup_intr(device_t dev, device_t child, struct resource *irq,
- int flags, driver_intr_t *intr, void *arg, void **cookiep)
+ int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep)
{
sc_p scp = (sc_p)device_get_softc(dev);
devclass_t devclass;
+ if (filter != NULL) {
+ printf("gusc.c: we cannot use a filter here\n");
+ return (EINVAL);
+ }
devclass = device_get_devclass(child);
if (strcmp(devclass_get_name(devclass), "midi") == 0) {
scp->midi_intr.intr = intr;
@@ -434,7 +438,7 @@
scp->pcm_intr.arg = arg;
return 0;
}
- return bus_generic_setup_intr(dev, child, irq, flags, intr,
+ return bus_generic_setup_intr(dev, child, irq, flags, filter, intr,
arg, cookiep);
}
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#3 (text+ko) ====
@@ -1,8 +1,8 @@
/*-
* Copyright (c) 2001 George Reid <greid at ukug.uk.freebsd.org>
* Copyright (c) 1999 Cameron Grant <cg at freebsd.org>
- * Copyright Luigi Rizzo, 1997,1998
- * Copyright by Hannu Savolainen 1994, 1995
+ * Copyright (c) 1997,1998 Luigi Rizzo
+ * Copyright (c) 1994,1995 Hannu Savolainen
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
#include <dev/sound/pcm/sound.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.105 2006/02/05 17:35:13 netchild Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.107 2007/02/23 13:47:33 netchild Exp $");
/* board-specific include files */
#include <dev/sound/isa/mss.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.h#2 (text+ko) ====
@@ -1,15 +1,6 @@
/*-
- * file: mss.h
- *
- * (C) 1997 Luigi Rizzo (luigi at iet.unipi.it)
- *
- * This file contains information and macro definitions for
- * AD1848-compatible devices, used in the MSS/WSS compatible boards.
- *
- */
-
-/*-
* Copyright (c) 1999 Doug Rabson
+ * Copyright (c) 1997 Luigi Rizzo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,7 +24,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.12 2005/01/06 01:43:17 imp Exp $
+ * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.14 2007/02/02 13:44:09 joel Exp $
+ */
+
+/*
+ * This file contains information and macro definitions for
+ * AD1848-compatible devices, used in the MSS/WSS compatible boards.
*/
/*
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb.h#2 (text+ko) ====
@@ -1,6 +1,29 @@
-/*
- * file: sbcard.h
- * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.15 2004/05/13 11:32:54 truckman Exp $
+/*-
+ * Copyright (c) 1997,1998 Luigi Rizzo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.16 2007/02/02 13:33:35 joel Exp $
*/
#ifndef SB_H
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 1999 Cameron Grant <cg at freebsd.org>
- * Copyright 1997,1998 Luigi Rizzo.
+ * Copyright (c) 1997,1998 Luigi Rizzo
*
* Derived from files in the Voxware 3.5 distribution,
* Copyright by Hannu Savolainen 1994, under the same copyright
@@ -38,7 +38,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.92 2005/11/14 18:16:59 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.94 2007/02/23 13:47:33 netchild Exp $");
#define SB16_BUFFSIZE 4096
#define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16)
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 1999 Cameron Grant <cg at freebsd.org>
- * Copyright 1997,1998 Luigi Rizzo.
+ * Copyright (c) 1997,1998 Luigi Rizzo
*
* Derived from files in the Voxware 3.5 distribution,
* Copyright by Hannu Savolainen 1994, under the same copyright
@@ -38,7 +38,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.81 2005/07/31 18:59:47 netchild Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.83 2007/02/23 13:47:33 netchild Exp $");
#define SB_DEFAULT_BUFSZ 4096
==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
#include <isa/isavar.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.45 2005/07/31 13:49:47 netchild Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.46 2007/02/23 12:18:54 piso Exp $");
#define IO_MAX 3
#define IRQ_MAX 1
@@ -80,8 +80,8 @@
static int sbc_release_resource(device_t bus, device_t child, int type, int rid,
struct resource *r);
static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq,
- int flags, driver_intr_t *intr, void *arg,
- void **cookiep);
+ int flags, driver_filter_t *filter, driver_intr_t *intr,
+ void *arg, void **cookiep);
static int sbc_teardown_intr(device_t dev, device_t child, struct resource *irq,
void *cookie);
@@ -503,13 +503,17 @@
static int
sbc_setup_intr(device_t dev, device_t child, struct resource *irq,
- int flags, driver_intr_t *intr, void *arg,
- void **cookiep)
+ int flags, driver_filter_t *filter, driver_intr_t *intr,
+ void *arg, void **cookiep)
{
struct sbc_softc *scp = device_get_softc(dev);
struct sbc_ihl *ihl = NULL;
int i, ret;
+ if (filter != NULL) {
+ printf("sbc.c: we cannot use a filter here\n");
+ return (EINVAL);
+ }
sbc_lock(scp);
i = 0;
while (i < IRQ_MAX) {
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#2 (text) ====
@@ -1,6 +1,5 @@
/*-
- * (c) 2003 Mathew Kanner
- *
+ * Copyright (c) 2003 Mathew Kanner
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -43,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.19 2006/06/18 14:14:41 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.21 2007/01/28 20:38:07 joel Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -931,11 +930,15 @@
return EBUSY;
}
midistat_isopen = 1;
+ mtx_unlock(&midistat_lock);
- if (sbuf_new(&midistat_sbuf, NULL, 4096, 0) == NULL) {
+ if (sbuf_new(&midistat_sbuf, NULL, 4096, SBUF_AUTOEXTEND) == NULL) {
error = ENXIO;
+ mtx_lock(&midistat_lock);
goto out;
}
+
+ mtx_lock(&midistat_lock);
midistat_bufptr = 0;
error = (midistat_prepare(&midistat_sbuf) > 0) ? 0 : ENOMEM;
@@ -974,9 +977,11 @@
}
l = min(buf->uio_resid, sbuf_len(&midistat_sbuf) - midistat_bufptr);
err = 0;
- if (l > 0)
+ if (l > 0) {
+ mtx_unlock(&midistat_lock);
err = uiomove(sbuf_data(&midistat_sbuf) + midistat_bufptr, l, buf);
- else
+ mtx_lock(&midistat_lock);
+ } else
l = 0;
midistat_bufptr += l;
mtx_unlock(&midistat_lock);
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.h#2 (text) ====
@@ -1,27 +1,29 @@
/*-
- * (c) 2003 Mathew Kanner
- *
+ * Copyright (c) 2003 Mathew Kanner
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.14 2006/05/27 16:32:05 netchild Exp $
+ * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.15 2007/01/28 20:38:07 joel Exp $
*/
#ifndef MIDI_H
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midiq.h#2 (text) ====
@@ -1,27 +1,29 @@
/*-
- * (c) 2003 Mathew Kanner
- *
+ * Copyright (c) 2003 Mathew Kanner
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/midi/midiq.h,v 1.1 2006/05/27 16:32:05 netchild Exp $
+ * $FreeBSD: src/sys/dev/sound/midi/midiq.h,v 1.2 2007/01/28 20:38:07 joel Exp $
*/
#ifndef MIDIQ_H
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.c#2 (text) ====
@@ -1,29 +1,31 @@
/*-
- * (c) 2003 Mathew Kanner
- *
+ * Copyright (c) 2003 Mathew Kanner
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sound/midi/mpu401.c,v 1.1 2006/05/27 16:32:05 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/mpu401.c,v 1.2 2007/01/28 20:38:07 joel Exp $");
#include <sys/param.h>
#include <sys/types.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.h#2 (text) ====
@@ -1,27 +1,29 @@
/*-
- * (c) 2003 Mathew Kanner
- *
+ * Copyright (c) 2003 Mathew Kanner
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/midi/mpu401.h,v 1.1 2006/05/27 16:32:05 netchild Exp $
+ * $FreeBSD: src/sys/dev/sound/midi/mpu401.h,v 1.2 2007/01/28 20:38:07 joel Exp $
*/
#ifndef MPU401_H
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu_if.m#2 (text) ====
@@ -1,27 +1,29 @@
#-
-# (c) 2003 Mathew Kanner
+# Copyright (c) 2003 Mathew Kanner
+# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. 2.
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/sound/midi/mpu_if.m,v 1.1 2006/05/27 16:32:05 netchild Exp $
+# $FreeBSD: src/sys/dev/sound/midi/mpu_if.m,v 1.2 2007/01/28 20:38:07 joel Exp $
#
#include <dev/sound/midi/midi.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpufoi_if.m#2 (text) ====
@@ -1,27 +1,29 @@
#-
-# (c) 2003 Mathew Kanner
+# Copyright (c) 2003 Mathew Kanner
+# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. 2.
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/sound/midi/mpufoi_if.m,v 1.1 2006/05/27 16:32:05 netchild Exp $
+# $FreeBSD: src/sys/dev/sound/midi/mpufoi_if.m,v 1.2 2007/01/28 20:38:07 joel Exp $
#
#include <sys/bus.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.c#2 (text) ====
@@ -1,31 +1,36 @@
-/*
- * The sequencer personality manager.
- * (c) 2003 Mathew Kanner
- * Copyright by Hannu Savolainen 1993
- *
+/*-
+ * Copyright (c) 2003 Mathew Kanner
+ * Copyright (c) 1993 Hannu Savolainen
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+/*
+ * The sequencer personality manager.
+ */
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.23 2006/10/15 08:23:48 ariff Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.24 2007/01/28 20:38:07 joel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.h#2 (text) ====
@@ -1,7 +1,7 @@
/*-
- * Include file for midi sequencer driver.
- * (c) 2003 Mathew Kanner
- * Copyright by Seigo Tanimura 1999.
+ * Copyright (c) 2003 Mathew Kanner
+ * Copyright (c) 1999 Seigo Tanimura
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -24,7 +24,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.7 2006/05/27 16:32:05 netchild Exp $
+ * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.8 2007/01/28 20:38:07 joel Exp $
+ */
+
+/*
+ * Include file for the midi sequence driver.
*/
#ifndef _SEQUENCER_H_
==== //depot/projects/soundsystem/src/sys/dev/sound/midi/synth_if.m#2 (text) ====
@@ -1,27 +1,29 @@
#-
-# (c) 2003 Mathew Kanner
+# Copyright (c) 2003 Mathew Kanner
+# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer. 2.
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/sound/midi/synth_if.m,v 1.1 2006/05/27 16:32:05 netchild Exp $
+# $FreeBSD: src/sys/dev/sound/midi/synth_if.m,v 1.2 2007/01/28 20:38:07 joel Exp $
#
INTERFACE synth;
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.22 2005/11/07 09:26:17 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.23 2007/02/23 13:47:34 netchild Exp $");
/* Debugging macro's */
#undef DEB
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#3 (text+ko) ====
@@ -63,7 +63,7 @@
#include <dev/sound/pci/atiixp.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.8 2006/11/26 12:24:04 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.9 2007/02/23 13:47:34 netchild Exp $");
#define ATI_IXP_DMA_RETRY_MAX 100
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.10 2005/03/01 08:58:05 imp Exp $
+ * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.11 2007/02/23 13:47:34 netchild Exp $
*/
#include <dev/sound/pcm/sound.h>
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.32 2005/03/01 08:58:05 imp Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.33 2007/02/23 13:47:34 netchild Exp $");
/* PCI IDs of supported chips */
#define AU8820_PCI_ID 0x000112eb
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#3 (text+ko) ====
@@ -53,7 +53,7 @@
#include "mixer_if.h"
#include "mpufoi_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.38 2006/11/26 12:24:04 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.39 2007/02/23 13:47:34 netchild Exp $");
/* Supported chip ID's */
#define CMI8338A_PCI_ID 0x010013f6
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
#include <dev/sound/pci/cs4281.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.22 2005/03/01 08:58:05 imp Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.23 2007/02/23 13:47:34 netchild Exp $");
#define CS4281_DEFAULT_BUFSZ 16384
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#2 (text+ko) ====
@@ -48,7 +48,7 @@
#include <gnu/dev/sound/pci/csaimg.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.34 2005/12/04 10:06:04 ru Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.35 2007/02/23 12:18:54 piso Exp $");
/* This is the pci device id. */
#define CS4610_PCI_ID 0x60011013
@@ -82,7 +82,8 @@
struct resource *r);
static int csa_setup_intr(device_t bus, device_t child,
struct resource *irq, int flags,
- driver_intr_t *intr, void *arg, void **cookiep);
+ driver_filter_t *filter, driver_intr_t *intr,
+ void *arg, void **cookiep);
static int csa_teardown_intr(device_t bus, device_t child,
struct resource *irq, void *cookie);
static driver_intr_t csa_intr;
@@ -439,12 +440,17 @@
static int
csa_setup_intr(device_t bus, device_t child,
struct resource *irq, int flags,
- driver_intr_t *intr, void *arg, void **cookiep)
+ driver_filter_t *filter, driver_intr_t *intr, void *arg,
+ void **cookiep)
{
sc_p scp;
csa_res *resp;
struct sndcard_func *func;
+ if (filter != NULL) {
+ printf("ata-csa.c: we cannot use a filter here\n");
+ return (EINVAL);
+ }
scp = device_get_softc(bus);
resp = &scp->res;
==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.37 2006/02/05 17:34:13 netchild Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list