[src/trunk]: src/sys/external/bsd/drm2/linux linux/hdmi: Handle unpacking aud...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c2eda8067439
branches:  trunk
changeset: 368402:c2eda8067439
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Jul 09 18:11:35 2022 +0000

description:
linux/hdmi: Handle unpacking audio frames too.  Sort by number.

diffstat:

 sys/external/bsd/drm2/include/linux/hdmi.h |   5 +++--
 sys/external/bsd/drm2/linux/linux_hdmi.c   |  18 ++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r 537a105d6432 -r c2eda8067439 sys/external/bsd/drm2/include/linux/hdmi.h
--- a/sys/external/bsd/drm2/include/linux/hdmi.h        Sat Jul 09 18:11:23 2022 +0000
+++ b/sys/external/bsd/drm2/include/linux/hdmi.h        Sat Jul 09 18:11:35 2022 +0000
@@ -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_infoframe {
        struct hdmi_infoframe_header    any;
        struct hdmi_avi_infoframe       avi;
+       struct hdmi_spd_infoframe       spd;
+       struct hdmi_audio_infoframe     audio;
        struct hdmi_drm_infoframe       drm;
-       struct hdmi_spd_infoframe       spd;
        union hdmi_vendor_any_infoframe vendor;
 };
 
diff -r 537a105d6432 -r c2eda8067439 sys/external/bsd/drm2/linux/linux_hdmi.c
--- a/sys/external/bsd/drm2/linux/linux_hdmi.c  Sat Jul 09 18:11:23 2022 +0000
+++ b/sys/external/bsd/drm2/linux/linux_hdmi.c  Sat Jul 09 18:11:35 2022 +0000
@@ -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 @@
        if (ret)
                return ret;
        switch (header.type) {
-       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_AVI:
+               return hdmi_avi_infoframe_unpack(&frame->avi, buf, size);
+       case HDMI_INFOFRAME_TYPE_SPD:
+               return hdmi_spd_infoframe_unpack(&frame->spd, 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;
        }