Module Name: src
Committed By: riastradh
Date: Sat Jul 9 18:11:23 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: Make some private functions static.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/include/linux/hdmi.h
cvs rdiff -u -r1.1 -r1.2 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.18 src/sys/external/bsd/drm2/include/linux/hdmi.h:1.19
--- src/sys/external/bsd/drm2/include/linux/hdmi.h:1.18 Sat Jul 9 18:06:45 2022
+++ src/sys/external/bsd/drm2/include/linux/hdmi.h Sat Jul 9 18:11:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hdmi.h,v 1.18 2022/07/09 18:06:45 riastradh Exp $ */
+/* $NetBSD: hdmi.h,v 1.19 2022/07/09 18:11:23 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,16 +39,13 @@ struct device;
/* namespace */
#define hdmi_audio_infoframe_init linux_hdmi_audio_infoframe_init
#define hdmi_audio_infoframe_pack linux_hdmi_audio_infoframe_pack
-#define hdmi_audio_infoframe_unpack linux_hdmi_audio_infoframe_unpack
#define hdmi_avi_infoframe_check linux_hdmi_avi_infoframe_check
#define hdmi_avi_infoframe_init linux_hdmi_avi_infoframe_init
#define hdmi_avi_infoframe_pack linux_hdmi_avi_infoframe_pack
-#define hdmi_avi_infoframe_unpack linux_hdmi_avi_infoframe_unpack
#define hdmi_drm_infoframe_check linux_hdmi_drm_infoframe_check
#define hdmi_drm_infoframe_init linux_hdmi_drm_infoframe_init
#define hdmi_drm_infoframe_pack linux_hdmi_drm_infoframe_pack
#define hdmi_drm_infoframe_pack_only linux_hdmi_drm_infoframe_pack_only
-#define hdmi_drm_infoframe_unpack linux_hdmi_drm_infoframe_unpack
#define hdmi_infoframe_checksum linux_hdmi_infoframe_checksum
#define hdmi_infoframe_log linux_hdmi_infoframe_log
#define hdmi_infoframe_pack linux_hdmi_infoframe_pack
@@ -58,12 +55,10 @@ struct device;
#define hdmi_spd_infoframe_check linux_hdmi_spd_infoframe_check
#define hdmi_spd_infoframe_init linux_hdmi_spd_infoframe_init
#define hdmi_spd_infoframe_pack linux_hdmi_spd_infoframe_pack
-#define hdmi_spd_infoframe_unpack linux_hdmi_spd_infoframe_unpack
#define hdmi_vendor_infoframe_check linux_hdmi_vendor_infoframe_check
#define hdmi_vendor_infoframe_init linux_hdmi_vendor_infoframe_init
#define hdmi_vendor_infoframe_length linux_hdmi_vendor_infoframe_length
#define hdmi_vendor_infoframe_pack linux_hdmi_vendor_infoframe_pack
-#define hdmi_vendor_infoframe_unpack linux_hdmi_vendor_infoframe_unpack
enum hdmi_3d_structure {
HDMI_3D_STRUCTURE_INVALID = -1,
@@ -358,39 +353,28 @@ union hdmi_infoframe {
int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *);
ssize_t hdmi_audio_infoframe_pack(const struct hdmi_audio_infoframe *, void *,
size_t);
-int hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *, const void *,
- size_t);
int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *);
int hdmi_avi_infoframe_check(const struct hdmi_avi_infoframe *);
ssize_t hdmi_avi_infoframe_pack(const struct hdmi_avi_infoframe *, void *,
size_t);
-int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *, const void *,
- size_t);
int hdmi_drm_infoframe_init(struct hdmi_drm_infoframe *);
int hdmi_drm_infoframe_check(const struct hdmi_drm_infoframe *);
int hdmi_drm_infoframe_pack(const struct hdmi_drm_infoframe *, void *, size_t);
int hdmi_drm_infoframe_pack_only(const struct hdmi_drm_infoframe *, void *,
size_t);
-int hdmi_drm_infoframe_unpack(struct hdmi_drm_infoframe *, const void *,
- size_t);
int hdmi_spd_infoframe_init(struct hdmi_spd_infoframe *, const char *,
const char *);
int hdmi_spd_infoframe_check(const struct hdmi_spd_infoframe *);
ssize_t hdmi_spd_infoframe_pack(const struct hdmi_spd_infoframe *, void *,
size_t);
-int hdmi_spd_infoframe_unpack(struct hdmi_spd_infoframe *, const void *,
- size_t);
int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *);
-size_t hdmi_vendor_infoframe_length(const struct hdmi_vendor_infoframe *);
int hdmi_vendor_infoframe_check(const struct hdmi_vendor_infoframe *);
int hdmi_vendor_infoframe_pack(const struct hdmi_vendor_infoframe *, void *,
size_t);
-int hdmi_vendor_infoframe_unpack(struct hdmi_vendor_infoframe *, const void *,
- size_t);
ssize_t hdmi_infoframe_pack(const union hdmi_infoframe *, void *, size_t);
ssize_t hdmi_infoframe_pack_only(const union hdmi_infoframe *, void *, size_t);
Index: src/sys/external/bsd/drm2/linux/linux_hdmi.c
diff -u src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.1 src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.2
--- src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.1 Sat Jul 9 17:59:27 2022
+++ src/sys/external/bsd/drm2/linux/linux_hdmi.c Sat Jul 9 18:11:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_hdmi.c,v 1.1 2022/07/09 17:59:27 riastradh Exp $ */
+/* $NetBSD: linux_hdmi.c,v 1.2 2022/07/09 18:11:23 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.1 2022/07/09 17:59:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_hdmi.c,v 1.2 2022/07/09 18:11:23 riastradh Exp $");
#include <sys/types.h>
@@ -185,7 +185,7 @@ hdmi_audio_infoframe_pack(const struct h
return length;
}
-int
+static int
hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *frame,
const void *buf, size_t size)
{
@@ -295,7 +295,7 @@ hdmi_avi_infoframe_pack(const struct hdm
return length;
}
-int
+static int
hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, const void *buf,
size_t size)
{
@@ -411,7 +411,7 @@ hdmi_drm_infoframe_pack(const struct hdm
return length;
}
-int
+static int
hdmi_drm_infoframe_unpack(struct hdmi_drm_infoframe *frame, const void *buf,
size_t size)
{
@@ -505,7 +505,7 @@ hdmi_spd_infoframe_pack(const struct hdm
return length;
}
-int
+static int
hdmi_spd_infoframe_unpack(struct hdmi_spd_infoframe *frame, const void *buf,
size_t size)
{
@@ -547,7 +547,7 @@ hdmi_vendor_infoframe_init(struct hdmi_v
return 0;
}
-size_t
+static size_t
hdmi_vendor_infoframe_length(const struct hdmi_vendor_infoframe *frame)
{
@@ -622,7 +622,7 @@ hdmi_vendor_infoframe_pack(const struct
return length;
}
-int
+static int
hdmi_vendor_infoframe_unpack(struct hdmi_vendor_infoframe *frame,
const void *buf, size_t size)
{
