[igt-dev] [PATCH i-g-t v2 2/6] lib/igt_edid: s/vsd/vsdb/

[Simon Ser <simon.ser@intel.com>]

"VSDB" (Vendor-Specific Data Block) is the wording used by CEA 861D.

Signed-off-by: Simon Ser <simon.ser@intel.com>
---
 lib/igt_edid.c | 38 +++++++++++++++++++-------------------
 lib/igt_edid.h | 12 ++++++------
 lib/igt_kms.c  | 14 +++++++-------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/igt_edid.c b/lib/igt_edid.c
index cbb7eefff70d..df5b6611e22c 100644
--- a/lib/igt_edid.c
+++ b/lib/igt_edid.c
@@ -315,29 +315,29 @@ void cea_sad_init_pcm(struct cea_sad *sad, int channels,
 }
 
 /**
- * cea_vsd_get_hdmi_default:
+ * cea_vsdb_get_hdmi_default:
  *
  * Returns the default Vendor Specific Data block for HDMI.
  */
-const struct cea_vsd *cea_vsd_get_hdmi_default(size_t *size)
+const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size)
 {
-	static char raw[sizeof(struct cea_vsd) + 4] = {0};
-	struct cea_vsd *vsd;
+	static char raw[sizeof(struct cea_vsdb) + 4] = {0};
+	struct cea_vsdb *vsdb;
 
 	*size = sizeof(raw);
 
 	/* Magic incantation. Works better if you orient your screen in the
 	 * direction of the VESA headquarters. */
-	vsd = (struct cea_vsd *) raw;
-	vsd->ieee_oui[0] = 0x03;
-	vsd->ieee_oui[1] = 0x0C;
-	vsd->ieee_oui[2] = 0x00;
-	vsd->data[0] = 0x10;
-	vsd->data[1] = 0x00;
-	vsd->data[2] = 0x38;
-	vsd->data[3] = 0x2D;
-
-	return vsd;
+	vsdb = (struct cea_vsdb *) raw;
+	vsdb->ieee_oui[0] = 0x03;
+	vsdb->ieee_oui[1] = 0x0C;
+	vsdb->ieee_oui[2] = 0x00;
+	vsdb->data[0] = 0x10;
+	vsdb->data[1] = 0x00;
+	vsdb->data[2] = 0x38;
+	vsdb->data[3] = 0x2D;
+
+	return vsdb;
 }
 
 static void edid_cea_data_block_init(struct edid_cea_data_block *block,
@@ -360,15 +360,15 @@ size_t edid_cea_data_block_set_sad(struct edid_cea_data_block *block,
 	return sizeof(struct edid_cea_data_block) + sads_size;
 }
 
-size_t edid_cea_data_block_set_vsd(struct edid_cea_data_block *block,
-				   const struct cea_vsd *vsd, size_t vsd_size)
+size_t edid_cea_data_block_set_vsdb(struct edid_cea_data_block *block,
+				    const struct cea_vsdb *vsdb, size_t vsdb_size)
 {
 	edid_cea_data_block_init(block, EDID_CEA_DATA_VENDOR_SPECIFIC,
-				 vsd_size);
+				 vsdb_size);
 
-	memcpy(block->data.vsds, vsd, vsd_size);
+	memcpy(block->data.vsdbs, vsdb, vsdb_size);
 
-	return sizeof(struct edid_cea_data_block) + vsd_size;
+	return sizeof(struct edid_cea_data_block) + vsdb_size;
 }
 
 size_t edid_cea_data_block_set_speaker_alloc(struct edid_cea_data_block *block,
diff --git a/lib/igt_edid.h b/lib/igt_edid.h
index 47581bb778b0..6fcb50a3e95e 100644
--- a/lib/igt_edid.h
+++ b/lib/igt_edid.h
@@ -191,8 +191,8 @@ struct cea_sad {
 	uint8_t bitrate;
 } __attribute__((packed));
 
-/* Vendor Specific Data */
-struct cea_vsd {
+/* Vendor-Specific Data Block */
+struct cea_vsdb {
 	uint8_t ieee_oui[3];
 	char data[];
 };
@@ -223,7 +223,7 @@ struct edid_cea_data_block {
 	uint8_t type_len; /* type is from enum edid_cea_data_type */
 	union {
 		struct cea_sad sads[0];
-		struct cea_vsd vsds[0];
+		struct cea_vsdb vsdbs[0];
 		struct cea_speaker_alloc speakers[0];
 	} data;
 } __attribute__((packed));
@@ -310,11 +310,11 @@ void detailed_timing_set_string(struct detailed_timing *dt,
 void cea_sad_init_pcm(struct cea_sad *sad, int channels,
 		      uint8_t sampling_rates, uint8_t sample_sizes);
 void edid_ext_update_cea_checksum(struct edid_ext *ext);
-const struct cea_vsd *cea_vsd_get_hdmi_default(size_t *size);
+const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size);
 size_t edid_cea_data_block_set_sad(struct edid_cea_data_block *block,
 				   const struct cea_sad *sads, size_t sads_len);
-size_t edid_cea_data_block_set_vsd(struct edid_cea_data_block *block,
-				   const struct cea_vsd *vsd, size_t vsd_size);
+size_t edid_cea_data_block_set_vsdb(struct edid_cea_data_block *block,
+				   const struct cea_vsdb *vsdb, size_t vsdb_size);
 size_t edid_cea_data_block_set_speaker_alloc(struct edid_cea_data_block *block,
 					     const struct cea_speaker_alloc *speakers);
 void edid_ext_set_cea(struct edid_ext *ext, size_t data_blocks_size,
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index a66a685009cd..36e3b821275a 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -186,7 +186,7 @@ const unsigned char *igt_kms_get_alt_edid(void)
 
 static void
 generate_audio_edid(unsigned char raw_edid[static AUDIO_EDID_LENGTH],
-		    bool with_vsd, struct cea_sad *sad,
+		    bool with_vsdb, struct cea_sad *sad,
 		    struct cea_speaker_alloc *speaker_alloc)
 {
 	struct edid *edid;
@@ -194,8 +194,8 @@ generate_audio_edid(unsigned char raw_edid[static AUDIO_EDID_LENGTH],
 	struct edid_cea *edid_cea;
 	char *cea_data;
 	struct edid_cea_data_block *block;
-	const struct cea_vsd *vsd;
-	size_t cea_data_size, vsd_size;
+	const struct cea_vsdb *vsdb;
+	size_t cea_data_size, vsdb_size;
 
 	/* Create a new EDID from the base IGT EDID, and add an
 	 * extension that advertises audio support. */
@@ -212,11 +212,11 @@ generate_audio_edid(unsigned char raw_edid[static AUDIO_EDID_LENGTH],
 	cea_data_size += edid_cea_data_block_set_sad(block, sad, 1);
 
 	/* A Vendor Specific Data block is needed for HDMI audio */
-	if (with_vsd) {
+	if (with_vsdb) {
 		block = (struct edid_cea_data_block *) &cea_data[cea_data_size];
-		vsd = cea_vsd_get_hdmi_default(&vsd_size);
-		cea_data_size += edid_cea_data_block_set_vsd(block, vsd,
-							     vsd_size);
+		vsdb = cea_vsdb_get_hdmi_default(&vsdb_size);
+		cea_data_size += edid_cea_data_block_set_vsdb(block, vsdb,
+							      vsdb_size);
 	}
 
 	/* Speaker Allocation Data block */
-- 
2.22.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev