[src/trunk]: src/sys/dev/hdaudio replace hdaudio_config.h with defflags

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3d5ade1f520
branches:  trunk
changeset: 336959:b3d5ade1f520
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Mar 28 14:50:20 2015 +0000

description:
replace hdaudio_config.h with defflags

diffstat:

 sys/dev/hdaudio/files.hdaudio    |   9 ++++++-
 sys/dev/hdaudio/hdafg.c          |  11 ++++-----
 sys/dev/hdaudio/hdaudio_config.h |  45 ----------------------------------------
 sys/dev/hdaudio/hdaudiovar.h     |   6 +++-
 4 files changed, 16 insertions(+), 55 deletions(-)

diffs (128 lines):

diff -r 1854adc19493 -r b3d5ade1f520 sys/dev/hdaudio/files.hdaudio
--- a/sys/dev/hdaudio/files.hdaudio     Sat Mar 28 14:48:53 2015 +0000
+++ b/sys/dev/hdaudio/files.hdaudio     Sat Mar 28 14:50:20 2015 +0000
@@ -1,9 +1,14 @@
-# $NetBSD: files.hdaudio,v 1.1 2015/03/28 14:09:59 jmcneill Exp $
+# $NetBSD: files.hdaudio,v 1.2 2015/03/28 14:50:20 jmcneill Exp $
 
 #
 # Intel High Definition Audio (Revision 1.0)
 #
-defflag        HDAUDIOVERBOSE
+defflag                        HDAUDIOVERBOSE
+defflag opt_hdaudio.h  HDAUDIO_ENABLE_HDMI
+defflag opt_hdaudio.h  HDAUDIO_ENABLE_DISPLAYPORT
+defflag opt_hdaudio.h  HDAUDIO_DEBUG
+defflag opt_hdaudio.h  HDAFG_DEBUG
+defflag opt_hdaudio.h  HDAFG_HDMI_DEBUG
 
 define hdaudiobus      {[nid = -1]}
 device hdaudio: hdaudiobus
diff -r 1854adc19493 -r b3d5ade1f520 sys/dev/hdaudio/hdafg.c
--- a/sys/dev/hdaudio/hdafg.c   Sat Mar 28 14:48:53 2015 +0000
+++ b/sys/dev/hdaudio/hdafg.c   Sat Mar 28 14:50:20 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.2 2015/03/28 14:50:20 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.1 2015/03/28 14:09:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.2 2015/03/28 14:50:20 jmcneill Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -76,7 +76,9 @@
 #include <dev/audio_if.h>
 #include <dev/auconv.h>
 
-#include "hdaudio_config.h"
+#ifdef _KERNEL_OPT
+#include "opt_hdaudio.h"
+#endif
 
 #include "hdaudiovar.h"
 #include "hdaudioreg.h"
@@ -3725,9 +3727,6 @@
        }
        hda_debug(sc, "assoc type mask: %x\n", astype);
 
-#ifndef HDAUDIO_ENABLE_SPDIF
-       astype &= ~(1 << HDAFG_AS_SPDIF);
-#endif
 #ifndef HDAUDIO_ENABLE_HDMI
        astype &= ~(1 << HDAFG_AS_HDMI);
 #endif
diff -r 1854adc19493 -r b3d5ade1f520 sys/dev/hdaudio/hdaudio_config.h
--- a/sys/dev/hdaudio/hdaudio_config.h  Sat Mar 28 14:48:53 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* $NetBSD: hdaudio_config.h,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ */
-
-/*
- * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
- * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef _HDAUDIO_CONFIG_H
-#define _HDAUDIO_CONFIG_H
-
-/* Enable SPDIF support */
-#define HDAUDIO_ENABLE_SPDIF
-
-/* Enable HDMI support (experimental) */
-/* #undef HDAUDIO_ENABLE_HDMI */
-
-/* Enable DisplayPort support (experimental) */
-/* #undef HDAUDIO_ENABLE_DISPLAYPORT */
-
-/* Driver debugging messages */
-/* #undef HDAUDIO_DEBUG */
-/* #undef HDAFG_DEBUG */
-/* #undef HDAFG_HDMI_DEBUG */
-
-#endif /* !_HDAUDIO_CONFIG_H */
diff -r 1854adc19493 -r b3d5ade1f520 sys/dev/hdaudio/hdaudiovar.h
--- a/sys/dev/hdaudio/hdaudiovar.h      Sat Mar 28 14:48:53 2015 +0000
+++ b/sys/dev/hdaudio/hdaudiovar.h      Sat Mar 28 14:50:20 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudiovar.h,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ */
+/* $NetBSD: hdaudiovar.h,v 1.2 2015/03/28 14:50:20 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -34,7 +34,9 @@
 
 #include <dev/auconv.h>
 
-#include "hdaudio_config.h"
+#ifdef _KERNEL_OPT
+#include "opt_hdaudio.h"
+#endif
 
 #define        HDAUDIO_MAX_CODECS      15