Module Name: src
Committed By: riastradh
Date: Sat Jul 9 18:11:36 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/include/linux: hdmi.h
src/sys/external/bsd/drm2/linux: linux_hdmi.c
Log Message:
linux/hdmi: Handle unpacking audio frames too. Sort by number.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/include/linux/hdmi.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_hdmi.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/external/bsd/drm2/include/linux/hdmi.h
diff -u src/sys/external/bsd/drm2/include/linux/hdmi.h:1.19 src/sys/external/bsd/drm2/include/linux/hdmi.h:1.20
--- src/sys/external/bsd/drm2/include/linux/hdmi.h:1.19 Sat Jul 9 18:11:23 2022
+++ src/sys/external/bsd/drm2/include/linux/hdmi.h Sat Jul 9 18:11:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hdmi.h,v 1.19 2022/07/09 18:11:23 riastradh Exp $ */
+/* $NetBSD: hdmi.h,v 1.20 2022/07/09 18:11:35 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -345,8 +345,9 @@ union hdmi_vendor_any_infoframe {
union hdmi_infoframe {
struct hdmi_infoframe_header any;
struct hdmi_avi_infoframe avi;
- struct hdmi_drm_infoframe drm;
struct hdmi_spd_infoframe spd;
+ struct hdmi_audio_infoframe audio;
+ struct hdmi_drm_infoframe drm;
union hdmi_vendor_any_infoframe vendor;
};
Index: src/sys/external/bsd/drm2/linux/linux_hdmi.c
diff -u src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.2 src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.3
--- src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.2 Sat Jul 9 18:11:23 2022
+++ src/sys/external/bsd/drm2/linux/linux_hdmi.c Sat Jul 9 18:11:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_hdmi.c,v 1.2 2022/07/09 18:11:23 riastradh Exp $ */
+/* $NetBSD: linux_hdmi.c,v 1.3 2022/07/09 18:11:36 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_hdmi.c,v 1.2 2022/07/09 18:11:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_hdmi.c,v 1.3 2022/07/09 18:11:36 riastradh Exp $");
#include <sys/types.h>
@@ -706,15 +706,17 @@ hdmi_infoframe_unpack(union hdmi_infofra
if (ret)
return ret;
switch (header.type) {
+ case HDMI_INFOFRAME_TYPE_VENDOR:
+ return hdmi_vendor_infoframe_unpack(&frame->vendor.hdmi, buf,
+ size);
case HDMI_INFOFRAME_TYPE_AVI:
return hdmi_avi_infoframe_unpack(&frame->avi, buf, size);
- case HDMI_INFOFRAME_TYPE_DRM:
- return hdmi_drm_infoframe_unpack(&frame->drm, buf, size);
case HDMI_INFOFRAME_TYPE_SPD:
return hdmi_spd_infoframe_unpack(&frame->spd, buf, size);
- case HDMI_INFOFRAME_TYPE_VENDOR:
- return hdmi_vendor_infoframe_unpack(&frame->vendor.hdmi, buf,
- size);
+ case HDMI_INFOFRAME_TYPE_AUDIO:
+ return hdmi_audio_infoframe_unpack(&frame->audio, buf, size);
+ case HDMI_INFOFRAME_TYPE_DRM:
+ return hdmi_drm_infoframe_unpack(&frame->drm, buf, size);
default:
return -EINVAL;
}
