mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
sound: Move chip.h contents to pcm/sound.h
Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44997 (cherry picked from commit 923e0040a59af8ac2271d3e673fef1c641d0cce7)
This commit is contained in:
Christos Margiolis
parent
d1eaefde3b
commit
e14f7d11cb
13 changed files with 16 additions and 58 deletions
|
|
@ -1,47 +0,0 @@
|
|||
/*-
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*
|
||||
* 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
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* These are the function codes assigned to the children of
|
||||
* sound cards.
|
||||
*/
|
||||
enum {
|
||||
SCF_PCM,
|
||||
SCF_MIDI,
|
||||
SCF_SYNTH,
|
||||
};
|
||||
|
||||
/*
|
||||
* This is the device information struct, used by
|
||||
* a bridge device to pass the device function code
|
||||
* to the children.
|
||||
*/
|
||||
struct sndcard_func {
|
||||
int func; /* The function code. */
|
||||
void *varinfo; /* Bridge-specific information. */
|
||||
};
|
||||
|
|
@ -45,7 +45,6 @@
|
|||
#endif
|
||||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/pci/csareg.h>
|
||||
#include <dev/sound/pci/csavar.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
|
||||
#include <dev/sound/midi/midi.h>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/pcm/ac97.h>
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/pci/csareg.h>
|
||||
#include <dev/sound/pci/csavar.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include "opt_snd.h"
|
||||
#endif
|
||||
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
|
||||
#include <dev/sound/midi/midi.h>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include "opt_snd.h"
|
||||
#endif
|
||||
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/pcm/ac97.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@
|
|||
#include "opt_snd.h"
|
||||
#endif
|
||||
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/pcm/ac97.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/pci/hdspe.h>
|
||||
#include <dev/sound/chip.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/pci/hdspe.h>
|
||||
#include <dev/sound/chip.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#include <dev/pci/pcivar.h>
|
||||
|
||||
#include <dev/sound/isa/sb.h>
|
||||
#include <dev/sound/chip.h>
|
||||
|
||||
#include "mixer_if.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -321,6 +321,22 @@ void snd_mtxassert(void *m);
|
|||
int sndstat_register(device_t dev, char *str);
|
||||
int sndstat_unregister(device_t dev);
|
||||
|
||||
/* These are the function codes assigned to the children of sound cards. */
|
||||
enum {
|
||||
SCF_PCM,
|
||||
SCF_MIDI,
|
||||
SCF_SYNTH,
|
||||
};
|
||||
|
||||
/*
|
||||
* This is the device information struct, used by a bridge device to pass the
|
||||
* device function code to the children.
|
||||
*/
|
||||
struct sndcard_func {
|
||||
int func; /* The function code. */
|
||||
void *varinfo; /* Bridge-specific information. */
|
||||
};
|
||||
|
||||
/*
|
||||
* this is rather kludgey- we need to duplicate these struct def'ns from sound.c
|
||||
* so that the macro versions of pcm_{,un}lock can dereference them.
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@
|
|||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/usb/uaudioreg.h>
|
||||
#include <dev/sound/usb/uaudio.h>
|
||||
#include <dev/sound/chip.h>
|
||||
#include "feeder_if.h"
|
||||
|
||||
static int uaudio_default_rate = 0; /* use rate list */
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#endif
|
||||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/chip.h>
|
||||
#include <dev/sound/usb/uaudio.h>
|
||||
|
||||
#include "mixer_if.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue