Module Name: src
Committed By: jmcneill
Date: Sat Mar 28 14:50:20 UTC 2015
Modified Files:
src/sys/dev/hdaudio: files.hdaudio hdafg.c hdaudiovar.h
Removed Files:
src/sys/dev/hdaudio: hdaudio_config.h
Log Message:
replace hdaudio_config.h with defflags
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hdaudio/files.hdaudio \
src/sys/dev/hdaudio/hdafg.c src/sys/dev/hdaudio/hdaudiovar.h
cvs rdiff -u -r1.1 -r0 src/sys/dev/hdaudio/hdaudio_config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hdaudio/files.hdaudio
diff -u src/sys/dev/hdaudio/files.hdaudio:1.1 src/sys/dev/hdaudio/files.hdaudio:1.2
--- src/sys/dev/hdaudio/files.hdaudio:1.1 Sat Mar 28 14:09:59 2015
+++ src/sys/dev/hdaudio/files.hdaudio Sat Mar 28 14:50:20 2015
@@ -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
Index: src/sys/dev/hdaudio/hdafg.c
diff -u src/sys/dev/hdaudio/hdafg.c:1.1 src/sys/dev/hdaudio/hdafg.c:1.2
--- src/sys/dev/hdaudio/hdafg.c:1.1 Sat Mar 28 14:09:59 2015
+++ src/sys/dev/hdaudio/hdafg.c Sat Mar 28 14:50:20 2015
@@ -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 <[email protected]>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.
#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 @@ hdafg_attach(device_t parent, device_t s
}
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
Index: src/sys/dev/hdaudio/hdaudiovar.h
diff -u src/sys/dev/hdaudio/hdaudiovar.h:1.1 src/sys/dev/hdaudio/hdaudiovar.h:1.2
--- src/sys/dev/hdaudio/hdaudiovar.h:1.1 Sat Mar 28 14:09:59 2015
+++ src/sys/dev/hdaudio/hdaudiovar.h Sat Mar 28 14:50:20 2015
@@ -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 <[email protected]>
@@ -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
