Thu Jan 30 00:21:23 2020 UTC ()

Only dump ELD info if HDAFG_HDMI_DEBUG is defined


(jmcneill)

diff -r1.19 -r1.20 src/sys/dev/hdaudio/hdafg.c

--- src/sys/dev/hdaudio/hdafg.c 2020/01/18 12:00:33	1.19
+++ src/sys/dev/hdaudio/hdafg.c 2020/01/30 00:21:23	1.20

 @@ -1,14 +1,14 @@
-/* $NetBSD: hdafg.c,v 1.19 2020/01/18 12:00:33 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.20 2020/01/30 00:21:23 jmcneill Exp $ */
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
  * Copyright (c) 2009-2011 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Precedence Technologies Ltd
+ *
  * 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
 @@ -50,27 +50,27 @@
  * 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>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.19 2020/01/18 12:00:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.20 2020/01/30 00:21:23 jmcneill Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 @@ -879,51 +879,53 @@ hdafg_assoc_dump_dd(struct hdafg_softc *
 #endif
 				break;
+			}
 			elddata[i] = COP_ELD_DATA(res);
+		}
 		if (hdafg_dd_parse_info(elddata, elddatalen, &hdi) != 0) {
 #ifdef HDAFG_HDMI_DEBUG
 			hda_error(sc, "failed to parse ELD data\n");
 #endif
 			return;
+		}
 #ifdef HDAFG_HDMI_DEBUG
 		hda_print(sc, "  ELD version=0x%x", ELD_VER(&hdi.eld));
 		hda_print1(sc, ",len=%u", hdi.eld.header.baseline_eld_len * 4);
 		hda_print1(sc, ",edid=0x%x", ELD_CEA_EDID_VER(&hdi.eld));
 		hda_print1(sc, ",port=0x%" PRIx64, hdi.eld.port_id);
 		hda_print1(sc, ",vendor=0x%04x", hdi.eld.vendor);
 		hda_print1(sc, ",product=0x%04x", hdi.eld.product);
 		hda_print1(sc, "\n");
 		hda_print(sc, "  Monitor = '%s'\n", hdi.monitor);
 		for (i = 0; i < hdi.nsad; i++) {
 			hda_print(sc, "  SAD id=%u", i);
 			hda_print1(sc, ",format=%u",
 			    CEA_AUDIO_FORMAT(&hdi.sad[i]));
 			hda_print1(sc, ",channels=%u",
 			    CEA_MAX_CHANNELS(&hdi.sad[i]));
 			hda_print1(sc, ",rate=0x%02x",
 			    CEA_SAMPLE_RATE(&hdi.sad[i]));
 			if (CEA_AUDIO_FORMAT(&hdi.sad[i]) ==
 			    CEA_AUDIO_FORMAT_LPCM)
 				hda_print1(sc, ",precision=0x%x",
 				    CEA_PRECISION(&hdi.sad[i]));
 			else
 				hda_print1(sc, ",maxbitrate=%u",
 				    CEA_MAX_BITRATE(&hdi.sad[i]));
 			hda_print1(sc, "\n");
+		}
 #endif
+	}
+}
 static char *
 hdafg_mixer_mask2allname(uint32_t mask, char *buf, size_t len)
+{
 	static const char *audioname[] = HDAUDIO_DEVICE_NAMES;
 	int i, first = 1;
 	memset(buf, 0, len);
 	for (i = 0; i < HDAUDIO_MIXER_NRDEVICES; i++) {
 		if (mask & (1 << i)) {
 			if (first == 0)