提交 6086a565 编写于 作者: P Peter Maydell 提交者: Gerd Hoffmann

audio: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Message-id: 1453138432-8324-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
上级 10ae9d76
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "audio.h" #include "audio.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
......
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "audio.h" #include "audio.h"
......
/* public domain */ /* public domain */
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#define AUDIO_CAP "win-int" #define AUDIO_CAP "win-int"
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include <CoreAudio/CoreAudio.h> #include <CoreAudio/CoreAudio.h>
#include <string.h> /* strerror */
#include <pthread.h> /* pthread_X */ #include <pthread.h> /* pthread_X */
#include "qemu-common.h" #include "qemu-common.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
* SEAL 1.07 by Carlos 'pel' Hasan was used as documentation * SEAL 1.07 by Carlos 'pel' Hasan was used as documentation
*/ */
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "audio.h" #include "audio.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "audio.h" #include "audio.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "audio.h" #include "audio.h"
#include "qemu/timer.h" #include "qemu/timer.h"
......
...@@ -21,9 +21,8 @@ ...@@ -21,9 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <stdlib.h> #include "qemu/osdep.h"
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
#include "qemu-common.h" #include "qemu-common.h"
......
/* public domain */ /* public domain */
#include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "audio.h" #include "audio.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include <SDL.h> #include <SDL.h>
#include <SDL_thread.h> #include <SDL_thread.h>
#include "qemu-common.h" #include "qemu-common.h"
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/timer.h" #include "qemu/timer.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "audio.h" #include "audio.h"
......
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* GNU GPL, version 2 or (at your option) any later version. * GNU GPL, version 2 or (at your option) any later version.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/audio/audio.h" #include "hw/audio/audio.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/audio/audio.h" #include "hw/audio/audio.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "trace.h" #include "trace.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/audio/audio.h" #include "hw/audio/audio.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
/* #define VERBOSE_ES1370 */ /* #define VERBOSE_ES1370 */
#define SILENT_ES1370 #define SILENT_ES1370
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/audio/audio.h" #include "hw/audio/audio.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -32,10 +32,7 @@ ...@@ -32,10 +32,7 @@
#define HAS_YM3812 1 #define HAS_YM3812 1
#include <stdio.h> #include "qemu/osdep.h"
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <math.h> #include <math.h>
//#include "driver.h" /* use M.A.M.E. */ //#include "driver.h" /* use M.A.M.E. */
#include "fmopl.h" #include "fmopl.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/audio/audio.h" #include "hw/audio/audio.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
* TODO: check mixer: see 7.20 of sdk for panning pos (applies to all gus models?)? * TODO: check mixer: see 7.20 of sdk for panning pos (applies to all gus models?)?
*/ */
#include "qemu/osdep.h"
#include "gustate.h" #include "gustate.h"
#include "gusemu.h" #include "gusemu.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "gusemu.h" #include "gusemu.h"
#include "gustate.h" #include "gustate.h"
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "intel-hda.h" #include "intel-hda.h"
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* It supports only one playback voice and no record voice. * It supports only one playback voice and no record voice.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "lm4549.h" #include "lm4549.h"
...@@ -33,7 +34,6 @@ do { printf("lm4549: " fmt , ## __VA_ARGS__); } while (0) ...@@ -33,7 +34,6 @@ do { printf("lm4549: " fmt , ## __VA_ARGS__); } while (0)
#endif #endif
#if defined(LM4549_DUMP_DAC_INPUT) #if defined(LM4549_DUMP_DAC_INPUT)
#include <stdio.h>
static FILE *fp_dac_input; static FILE *fp_dac_input;
#endif #endif
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the * Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version. * GNU GPL, version 2 or (at your option) any later version.
*/ */
#include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i2c/i2c.h" #include "hw/i2c/i2c.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* http://www.milkymist.org/socdoc/ac97.pdf * http://www.milkymist.org/socdoc/ac97.pdf
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "trace.h" #include "trace.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* *
*/ */
#include "qemu/osdep.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "pl041.h" #include "pl041.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/audio/audio.h" #include "hw/audio/audio.h"
#include "audio/audio.h" #include "audio/audio.h"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* This file is licensed under GNU GPL. * This file is licensed under GNU GPL.
*/ */
#include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i2c/i2c.h" #include "hw/i2c/i2c.h"
#include "audio/audio.h" #include "audio/audio.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册