aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--edid-decode.cpp4
-rw-r--r--oui.h2
-rw-r--r--parse-displayid-block.cpp8
3 files changed, 8 insertions, 6 deletions
diff --git a/edid-decode.cpp b/edid-decode.cpp
index 1fc7fce..6df328b 100644
--- a/edid-decode.cpp
+++ b/edid-decode.cpp
@@ -706,9 +706,11 @@ void edid_state::data_block_oui(std::string block_name, const unsigned char *x,
} else if (do_ascii && valid_ascii) {
unsigned asciioui = (x[0] << 24) + (x[1] << 16) + (x[2] << 8);
ouiname = oui_name(asciioui, ouinum);
+ if (ouiname) {
+ matched_ascii = true;
+ }
}
}
- matched_ascii = do_ascii && valid_ascii && ouiname != NULL;
}
std::string name;
diff --git a/oui.h b/oui.h
index 77342ac..d4fea3c 100644
--- a/oui.h
+++ b/oui.h
@@ -15,6 +15,6 @@ oneoui(0xca125c, Microsoft, "Microsoft" )
oneoui(0x3a0292, VESA, "VESA" )
// https://uefi.org/pnp_id_list
-oneoui(0x415050, asciiApple, "Apple" ) // 'APP\0'
+oneoui(0x41505000, asciiApple, "Apple" ) // 'APP\0'
#undef oneoui
diff --git a/parse-displayid-block.cpp b/parse-displayid-block.cpp
index d527bf2..b318766 100644
--- a/parse-displayid-block.cpp
+++ b/parse-displayid-block.cpp
@@ -1678,7 +1678,7 @@ unsigned edid_state::displayid_block(const unsigned version, const unsigned char
// DisplayID 2.0
case 0x20:
data_block_oui("Product Identification Data Block (" + utohex(tag) + ")",
- x + 3, len, &ouinum, false, false, false);
+ x + 3, len, &ouinum, false, false, true);
dooutputname = false;
hasoui = true;
break;
@@ -1694,16 +1694,16 @@ unsigned edid_state::displayid_block(const unsigned version, const unsigned char
case 0x2b: data_block = "Adaptive Sync Data Block"; break;
case 0x32: data_block = "Video Timing Modes Type 10 - Formula-based Timings Data Block"; break;
// 0x2a .. 0x7d RESERVED for Additional VESA-defined Data Blocks
- case 0x7e:
+ case 0x7e: // DisplayID 2.0
data_block_oui("Vendor-Specific Data Block (" + utohex(tag) + ")",
x + 3, len, &ouinum, false, false, true);
dooutputname = false;
hasoui = true;
tag |= ouinum;
break;
- case 0x7f:
+ case 0x7f: // DisplayID 1.3
data_block_oui("Vendor-Specific Data Block (" + utohex(tag) + ")",
- x + 3, len, &ouinum, false, true, false);
+ x + 3, len, &ouinum, false, true, true);
dooutputname = false;
hasoui = true;
tag |= ouinum;

Privacy Policy