diff options
| author | Denis Brockus <dbrockus@google.com> | 2020-11-09 12:38:36 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-10 01:05:42 +0000 |
| commit | 63b45bb3c5bac197b281c419a3e0c3e3c9327ea7 (patch) | |
| tree | 1bbaceeaf3c65dc17f7ca0ef086b69aea1f878ec | |
| parent | 3b4177ddd41a6f39725b6fe80b0ad01bf1bf7cad (diff) | |
| download | chrome-ec-63b45bb3c5bac197b281c419a3e0c3e3c9327ea7.tar.gz | |
genvif: Guard Manufacturer_Info_PID_Port
Adding CONFIG_USB_PD_MANUFACTURING_INFO guard
BUG=b:172842062
BRANCH=none
TEST=verify XML output
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: Ia048ead9060f11dc9bc943ef6dd3b935c7d5cf5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2527701
Tested-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | util/genvif.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/util/genvif.c b/util/genvif.c index caa7e29a89..88e19502b0 100644 --- a/util/genvif.c +++ b/util/genvif.c @@ -1356,13 +1356,13 @@ static void init_vif_component_general_pd_fields( "Unchunked_Extended_Messages_Supported", false); - set_vif_field_b(&vif_fields[Manufacturer_Info_Supported_Port], - "Manufacturer_Info_Supported_Port", - IS_ENABLED(CONFIG_USB_PD_MANUFACTURER_INFO)); - - { + if (IS_ENABLED(CONFIG_USB_PD_MANUFACTURER_INFO)) { char hex_str[10]; + set_vif_field_b(&vif_fields[Manufacturer_Info_Supported_Port], + "Manufacturer_Info_Supported_Port", + true); + #if defined(CONFIG_USB_PID) sprintf(hex_str, "%04X", CONFIG_USB_PID); set_vif_field_itss(&vif_fields[ @@ -1376,6 +1376,10 @@ static void init_vif_component_general_pd_fields( "Manufacturer_Info_PID_Port", DEFAULT_MISSING_PID, hex_str); #endif + } else { + set_vif_field_b(&vif_fields[Manufacturer_Info_Supported_Port], + "Manufacturer_Info_Supported_Port", + false); } set_vif_field_b(&vif_fields[Security_Msgs_Supported_SOP], |