Module Name: src
Committed By: mrg
Date: Fri Aug 4 00:25:24 UTC 2017
Modified Files:
src/sys/dev/hdaudio: hdafg.c hdafg_dd.c
Log Message:
put all the ELD debugging messages under #ifdef HDAFG_HDMI_DEBUG.
this silences a frequent and largely useless series of messages
in my dmesg. ok jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/hdaudio/hdafg.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hdaudio/hdafg_dd.c
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/hdafg.c
diff -u src/sys/dev/hdaudio/hdafg.c:1.12 src/sys/dev/hdaudio/hdafg.c:1.13
--- src/sys/dev/hdaudio/hdafg.c:1.12 Thu Jun 1 02:45:10 2017
+++ src/sys/dev/hdaudio/hdafg.c Fri Aug 4 00:25:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.12 2017/06/01 02:45:10 chs Exp $ */
+/* $NetBSD: hdafg.c,v 1.13 2017/08/04 00:25:23 mrg 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.12 2017/06/01 02:45:10 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.13 2017/08/04 00:25:23 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -879,15 +879,19 @@ hdafg_assoc_dump_dd(struct hdafg_softc *
res = (*cmd)(sc->sc_codec, as->as_pins[pin],
CORB_GET_HDMI_ELD_DATA, i);
if (!(res & COP_ELD_VALID)) {
+#ifdef HDAFG_HDMI_DEBUG
hda_error(sc, "bad ELD size (%u/%u)\n",
i, elddatalen);
+#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;
}
@@ -4342,7 +4346,9 @@ hdafg_unsol(device_t self, uint8_t tag)
switch (tag) {
case HDAUDIO_UNSOLTAG_EVENT_DD:
+#ifdef HDAFG_HDMI_DEBUG
hda_print(sc, "unsol: display device hotplug\n");
+#endif
for (i = 0; i < sc->sc_nassocs; i++) {
if (as[i].as_displaydev == false)
continue;
@@ -4354,7 +4360,9 @@ hdafg_unsol(device_t self, uint8_t tag)
}
break;
default:
+#ifdef HDAFG_HDMI_DEBUG
hda_print(sc, "unsol: tag=%u\n", tag);
+#endif
break;
}
Index: src/sys/dev/hdaudio/hdafg_dd.c
diff -u src/sys/dev/hdaudio/hdafg_dd.c:1.1 src/sys/dev/hdaudio/hdafg_dd.c:1.2
--- src/sys/dev/hdaudio/hdafg_dd.c:1.1 Sat Mar 28 14:09:59 2015
+++ src/sys/dev/hdaudio/hdafg_dd.c Fri Aug 4 00:25:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg_dd.c,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ */
+/* $NetBSD: hdafg_dd.c,v 1.2 2017/08/04 00:25:23 mrg Exp $ */
/*
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg_dd.c,v 1.1 2015/03/28 14:09:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg_dd.c,v 1.2 2017/08/04 00:25:23 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,12 +50,16 @@ hdafg_dd_parse_info(uint8_t *data, size_
struct eld_baseline_block *block = &hdi->eld;
unsigned int i;
+#ifdef HDAFG_HDMI_DEBUG
printf("hdafg_dd_parse_info: datalen=%u\n", (unsigned int)datalen);
+#endif
memset(hdi, 0, sizeof(*hdi));
if (datalen < sizeof(block->header)) {
+#ifdef HDAFG_HDMI_DEBUG
printf(" no room for header\n");
+#endif
return EINVAL;
}
@@ -65,7 +69,9 @@ hdafg_dd_parse_info(uint8_t *data, size_
if (datalen < block->header.baseline_eld_len * 4 ||
datalen < sizeof(*block) - sizeof(block->header)) {
+#ifdef HDAFG_HDMI_DEBUG
printf(" ack!\n");
+#endif
return EINVAL;
}
@@ -76,7 +82,9 @@ hdafg_dd_parse_info(uint8_t *data, size_
datalen -= sizeof(*block) - sizeof(block->header);
if (datalen < ELD_MNL(block)) {
+#ifdef HDAFG_HDMI_DEBUG
printf(" MNL=%u\n", ELD_MNL(block));
+#endif
return EINVAL;
}
@@ -85,10 +93,12 @@ hdafg_dd_parse_info(uint8_t *data, size_
datalen -= ELD_MNL(block);
if (datalen != ELD_SAD_COUNT(block) * sizeof(hdi->sad[0])) {
+#ifdef HDAFG_HDMI_DEBUG
printf(" datalen %u sadcount %u sizeof sad %u\n",
(unsigned int)datalen,
ELD_SAD_COUNT(block),
(unsigned int)sizeof(hdi->sad[0]));
+#endif
return EINVAL;
}
hdi->nsad = ELD_SAD_COUNT(block);
@@ -98,7 +108,9 @@ hdafg_dd_parse_info(uint8_t *data, size_
datalen -= sizeof(hdi->sad[i]);
}
+#ifdef HDAFG_HDMI_DEBUG
printf("datalen = %u\n", (unsigned int)datalen);
+#endif
KASSERT(datalen == 0);
return 0;
