Module Name: src
Committed By: msaitoh
Date: Wed Nov 18 08:52:04 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-7]: hdmi.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1039):
sys/external/bsd/drm2/include/linux/hdmi.h: revision 1.6
hdmi_audio_infoframe_pack: Initialize the entire output buffer.
hdmi_infoframe_checksum: Fix HDMI infoframe checksum calculations.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/sys/external/bsd/drm2/include/linux/hdmi.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/external/bsd/drm2/include/linux/hdmi.h
diff -u src/sys/external/bsd/drm2/include/linux/hdmi.h:1.2.4.1 src/sys/external/bsd/drm2/include/linux/hdmi.h:1.2.4.2
--- src/sys/external/bsd/drm2/include/linux/hdmi.h:1.2.4.1 Sun Jan 11 05:59:17 2015
+++ src/sys/external/bsd/drm2/include/linux/hdmi.h Wed Nov 18 08:52:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdmi.h,v 1.2.4.1 2015/01/11 05:59:17 snj Exp $ */
+/* $NetBSD: hdmi.h,v 1.2.4.2 2015/11/18 08:52:04 msaitoh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -217,7 +217,7 @@ hdmi_infoframe_checksum(void *buf, size_
uint8_t checksum = 0;
while (length--)
- checksum = *p++;
+ checksum += *p++;
p = buf;
p[3] = (256 - checksum);
@@ -283,7 +283,13 @@ hdmi_audio_infoframe_pack(const struct h
p[4] = __SHIFTIN(frame->downmix_inhibit? 1 : 0, __BIT(7));
- /* XXX p[5], p[6], p[7], p[8], p[9]? */
+ /* PB6 to PB10 are reserved */
+ p[5] = 0;
+ p[6] = 0;
+ p[7] = 0;
+ p[8] = 0;
+ p[9] = 0;
+
CTASSERT(HDMI_AUDIO_INFOFRAME_SIZE == 10);
hdmi_infoframe_checksum(buf, length);
