aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-11-28 09:40:47 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-11-28 09:40:47 +0100
commit4f0f5f582f52a135a587e63d657efe46bb73d53d (patch)
treefe3dff5b4736694269172e7e9e7cdf70a9f78d21
parent8a370df2c4eae8d159aa0a9d2469898cd65a1e5f (diff)
edid-decode: remove the old --extract option
This option gave a breakdown of the first block like this: Extracted contents: header: 00 ff ff ff ff ff ff 00 serial number: 22 f0 08 28 01 01 01 01 19 12 version: 01 04 basic params: a5 2f 1e 78 ee chroma info: ce 50 a3 54 4c 99 26 0f 50 54 established: a5 6b 80 standard: 81 40 81 80 95 00 b3 00 a9 00 01 01 01 01 01 01 descriptor 1: 21 39 90 30 62 1a 27 40 68 b0 36 00 d6 2c 11 00 00 1c descriptor 2: 00 00 00 fd 00 30 55 1e 5d 11 04 11 50 d2 f8 58 f0 00 descriptor 3: 00 00 00 fc 00 48 50 20 4c 50 32 32 37 35 77 0a 20 20 descriptor 4: 00 00 00 ff 00 43 4e 43 38 32 35 30 47 53 53 0a 20 20 extensions: 00 checksum: 63 This option was kept for backwards compatibility with the old edid-decode utility, but I never saw the point of such a breakdown. Remove this option. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--edid-decode.15
-rw-r--r--edid-decode.cpp38
2 files changed, 0 insertions, 43 deletions
diff --git a/edid-decode.1 b/edid-decode.1
index 2fb5e17..c1d40b2 100644
--- a/edid-decode.1
+++ b/edid-decode.1
@@ -227,11 +227,6 @@ the start.
.TP
\fB\-\-version\fR
Show the SHA hash and the last commit date.
-.TP
-\fB\-e\fR, \fB\-\-extract\fR
-Extract the contents of the first block in hex values.
-This was always done in old edid-decode versions. To get
-the same behavior add this option.
.PP
.SH NOTES
diff --git a/edid-decode.cpp b/edid-decode.cpp
index 948eacf..8f42b2f 100644
--- a/edid-decode.cpp
+++ b/edid-decode.cpp
@@ -42,7 +42,6 @@ enum output_format {
enum Option {
OptCheck = 'c',
OptCheckInline = 'C',
- OptExtract = 'e',
OptHelp = 'h',
OptNativeTimings = 'n',
OptOutputFormat = 'o',
@@ -65,7 +64,6 @@ static char options[OptLast];
static struct option long_options[] = {
{ "help", no_argument, 0, OptHelp },
{ "output-format", required_argument, 0, OptOutputFormat },
- { "extract", no_argument, 0, OptExtract },
{ "native-timings", no_argument, 0, OptNativeTimings },
{ "preferred-timings", no_argument, 0, OptPreferredTimings },
{ "physical-address", no_argument, 0, OptPhysicalAddress },
@@ -114,7 +112,6 @@ static void usage(void)
" --skip-sha skip the SHA report\n"
" --hide-serial-numbers replace serial numbers with '...'\n"
" --version show the edid-decode version (SHA)\n"
- " -e, --extract extract the contents of the first block in hex values\n"
" -h, --help display this help message\n");
}
@@ -771,38 +768,6 @@ static bool extract_edid(int fd, FILE *error)
return true;
}
-static void print_subsection(const char *name, const unsigned char *edid,
- unsigned start, unsigned end)
-{
- unsigned i;
-
- printf("%s:", name);
- for (i = strlen(name); i < 15; i++)
- printf(" ");
- for (i = start; i <= end; i++)
- printf(" %02x", edid[i]);
- printf("\n");
-}
-
-static void dump_breakdown(const unsigned char *edid)
-{
- printf("Extracted contents:\n");
- print_subsection("header", edid, 0, 7);
- print_subsection("serial number", edid, 8, 17);
- print_subsection("version", edid,18, 19);
- print_subsection("basic params", edid, 20, 24);
- print_subsection("chroma info", edid, 25, 34);
- print_subsection("established", edid, 35, 37);
- print_subsection("standard", edid, 38, 53);
- print_subsection("descriptor 1", edid, 54, 71);
- print_subsection("descriptor 2", edid, 72, 89);
- print_subsection("descriptor 3", edid, 90, 107);
- print_subsection("descriptor 4", edid, 108, 125);
- print_subsection("extensions", edid, 126, 126);
- print_subsection("checksum", edid, 127, 127);
- printf("\n");
-}
-
static unsigned char crc_calc(const unsigned char *b)
{
unsigned char sum = 0;
@@ -1110,9 +1075,6 @@ int edid_state::parse_edid()
printf("----------------\n\n");
}
- if (options[OptExtract])
- dump_breakdown(edid);
-
block = block_name(0x00);
printf("Block %u, %s:\n", block_nr, block.c_str());
parse_base_block(edid);

Privacy Policy