usb_power_delivery: Drop currently non-existing OUT_PYTHON.

[sigrok-test.git] / decoder / test / usb_power_delivery / pixel2015_hdmi.output

diff --git a/decoder/test/usb_power_delivery/pixel2015_hdmi.output b/decoder/test/usb_power_delivery/pixel2015_hdmi.output
index 195f2915fbfd1efbd66fc2acbc551704d4b11a80..c4b9b3ce5c5112d61f771b5063b66c5e5407d61e 100644 (file)
--- a/decoder/test/usb_power_delivery/pixel2015_hdmi.output
+++ b/decoder/test/usb_power_delivery/pixel2015_hdmi.output
@@ -9,7 +9,7 @@
 104405-104446 usb_power_delivery: Sym: "0x1" "1"
 104446-104487 usb_power_delivery: Sym: "0x1" "1"
 104323-104487 usb_power_delivery: Head: "H:1161" "HD"
-103643-105192 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+103643-105192 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 104487-104528 usb_power_delivery: Sym: "0xA" "A"
 104528-104569 usb_power_delivery: Sym: "0x5" "5"
 104569-104610 usb_power_delivery: Sym: "0x0" "0"
@@ -19,7 +19,7 @@
 104733-104774 usb_power_delivery: Sym: "0x6" "6"
 104774-104815 usb_power_delivery: Sym: "0x2" "2"
 104487-104815 usb_power_delivery: Data: "[0]2601905a" "D0"
-104487-104815 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
+104487-104815 usb_power_delivery: payload: "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]"
 104815-104856 usb_power_delivery: Sym: "0x4" "4"
 104856-104897 usb_power_delivery: Sym: "0xE" "E"
 104897-104938 usb_power_delivery: Sym: "0x0" "0"
@@ -31,7 +31,7 @@
 104815-105143 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 105143-105184 usb_power_delivery: Sym: "EOP" "#"
 105143-105184 usb_power_delivery: EOP: "EOP" "E"
-103643-105184 usb_power_delivery: text: "#1    (43.184583ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
+103643-105184 usb_power_delivery: text: "#1    (43.184583ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "..."
 110437-110954 usb_power_delivery: Preamble: "Preamble" "..."
 110954-110995 usb_power_delivery: Sym: "SYNC-1" "S1"
 110995-111036 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -43,7 +43,7 @@
 111200-111241 usb_power_delivery: Sym: "0x1" "1"
 111241-111282 usb_power_delivery: Sym: "0x1" "1"
 111118-111282 usb_power_delivery: Head: "H:1161" "HD"
-110437-111987 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+110437-111987 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 111282-111323 usb_power_delivery: Sym: "0xA" "A"
 111323-111364 usb_power_delivery: Sym: "0x5" "5"
 111364-111405 usb_power_delivery: Sym: "0x0" "0"
@@ -53,7 +53,7 @@
 111528-111569 usb_power_delivery: Sym: "0x6" "6"
 111569-111610 usb_power_delivery: Sym: "0x2" "2"
 111282-111610 usb_power_delivery: Data: "[0]2601905a" "D0"
-111282-111610 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
+111282-111610 usb_power_delivery: payload: "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]"
 111610-111651 usb_power_delivery: Sym: "0x4" "4"
 111651-111692 usb_power_delivery: Sym: "0xE" "E"
 111692-111733 usb_power_delivery: Sym: "0x0" "0"
@@ -65,7 +65,7 @@
 111610-111938 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 111938-111979 usb_power_delivery: Sym: "EOP" "#"
 111938-111979 usb_power_delivery: EOP: "EOP" "E"
-110437-111979 usb_power_delivery: text: "#2    (46.015417ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
+110437-111979 usb_power_delivery: text: "#2    (46.015417ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "..."
 116668-117184 usb_power_delivery: Preamble: "Preamble" "..."
 117184-117226 usb_power_delivery: Sym: "SYNC-1" "S1"
 117226-117266 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -77,7 +77,7 @@
 117431-117471 usb_power_delivery: Sym: "0x1" "1"
 117471-117513 usb_power_delivery: Sym: "0x1" "1"
 117348-117513 usb_power_delivery: Head: "H:1161" "HD"
-116668-118217 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+116668-118217 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 117513-117553 usb_power_delivery: Sym: "0xA" "A"
 117553-117595 usb_power_delivery: Sym: "0x5" "5"
 117595-117635 usb_power_delivery: Sym: "0x0" "0"
@@ -87,7 +87,7 @@
 117758-117799 usb_power_delivery: Sym: "0x6" "6"
 117799-117840 usb_power_delivery: Sym: "0x2" "2"
 117513-117840 usb_power_delivery: Data: "[0]2601905a" "D0"
-117513-117840 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
+117513-117840 usb_power_delivery: payload: "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]"
 117840-117881 usb_power_delivery: Sym: "0x4" "4"
 117881-117922 usb_power_delivery: Sym: "0xE" "E"
 117922-117963 usb_power_delivery: Sym: "0x0" "0"
@@ -99,7 +99,7 @@
 117840-118168 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 118168-118209 usb_power_delivery: Sym: "EOP" "#"
 118168-118209 usb_power_delivery: EOP: "EOP" "E"
-116668-118209 usb_power_delivery: text: "#3    (48.611667ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
+116668-118209 usb_power_delivery: text: "#3    (48.611667ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "..."
 122899-123415 usb_power_delivery: Preamble: "Preamble" "..."
 123415-123456 usb_power_delivery: Sym: "SYNC-1" "S1"
 123456-123497 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -111,7 +111,7 @@
 123661-123702 usb_power_delivery: Sym: "0x1" "1"
 123702-123743 usb_power_delivery: Sym: "0x1" "1"
 123579-123743 usb_power_delivery: Head: "H:1161" "HD"
-122899-124448 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+122899-124448 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 123743-123784 usb_power_delivery: Sym: "0xA" "A"
 123784-123825 usb_power_delivery: Sym: "0x5" "5"
 123825-123866 usb_power_delivery: Sym: "0x0" "0"
@@ -121,7 +121,7 @@
 123989-124030 usb_power_delivery: Sym: "0x6" "6"
 124030-124071 usb_power_delivery: Sym: "0x2" "2"
 123743-124071 usb_power_delivery: Data: "[0]2601905a" "D0"
-123743-124071 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
+123743-124071 usb_power_delivery: payload: "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]"
 124071-124112 usb_power_delivery: Sym: "0x4" "4"
 124112-124153 usb_power_delivery: Sym: "0xE" "E"
 124153-124194 usb_power_delivery: Sym: "0x0" "0"
@@ -133,7 +133,7 @@
 124071-124399 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 124399-124440 usb_power_delivery: Sym: "EOP" "#"
 124399-124440 usb_power_delivery: EOP: "EOP" "E"
-122899-124440 usb_power_delivery: text: "#4    (51.207917ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
+122899-124440 usb_power_delivery: text: "#4    (51.207917ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "..."
 372136-372653 usb_power_delivery: Preamble: "Preamble" "..."
 372653-372694 usb_power_delivery: Sym: "SYNC-1" "S1"
 372694-372735 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -145,7 +145,7 @@
 372899-372939 usb_power_delivery: Sym: "0x1" "1"
 372939-372981 usb_power_delivery: Sym: "0x1" "1"
 372817-372981 usb_power_delivery: Head: "H:1161" "HD"
-372136-373686 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+372136-373686 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 372981-373022 usb_power_delivery: Sym: "0xA" "A"
 373022-373063 usb_power_delivery: Sym: "0x5" "5"
 373063-373103 usb_power_delivery: Sym: "0x0" "0"
@@ -155,7 +155,7 @@
 373226-373267 usb_power_delivery: Sym: "0x6" "6"
 373267-373309 usb_power_delivery: Sym: "0x2" "2"
 372981-373309 usb_power_delivery: Data: "[0]2601905a" "D0"
-372981-373309 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
+372981-373309 usb_power_delivery: payload: "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]"
 373309-373349 usb_power_delivery: Sym: "0x4" "4"
 373349-373390 usb_power_delivery: Sym: "0xE" "E"
 373390-373431 usb_power_delivery: Sym: "0x0" "0"
@@ -167,7 +167,7 @@
 373309-373636 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 373636-373677 usb_power_delivery: Sym: "EOP" "#"
 373636-373677 usb_power_delivery: EOP: "EOP" "E"
-372136-373677 usb_power_delivery: text: "#5    (155.056667ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
+372136-373677 usb_power_delivery: text: "#5    (155.056667ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 0.9A (4.5W) [dual_role_power] [comm_cap] [dual_role_data]" "..."
 373850-374361 usb_power_delivery: Preamble: "Preamble" "..."
 374361-374402 usb_power_delivery: Sym: "SYNC-1" "S1"
 374402-374442 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -179,7 +179,7 @@
 374604-374645 usb_power_delivery: Sym: "0x0" "0"
 374645-374685 usb_power_delivery: Sym: "0x0" "0"
 374523-374685 usb_power_delivery: Head: "H:0041" "HD"
-373850-375058 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+373850-375058 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 374685-374726 usb_power_delivery: Sym: "0xB" "B"
 374726-374766 usb_power_delivery: Sym: "0xB" "B"
 374766-374807 usb_power_delivery: Sym: "0xC" "C"
@@ -191,7 +191,7 @@
 374685-375010 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 375010-375050 usb_power_delivery: Sym: "EOP" "#"
 375010-375050 usb_power_delivery: EOP: "EOP" "E"
-373850-375050 usb_power_delivery: text: "#6    (155.770833ms): SNK[0]:GOOD CRC" "..."
+373850-375050 usb_power_delivery: text: "#6    (155.770833ms): (r2) SNK[0]: GOOD CRC" "..."
 375653-376164 usb_power_delivery: Preamble: "Preamble" "..."
 376164-376204 usb_power_delivery: Sym: "SYNC-1" "S1"
 376204-376245 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -203,7 +203,7 @@
 376407-376448 usb_power_delivery: Sym: "0x0" "0"
 376448-376488 usb_power_delivery: Sym: "0x1" "1"
 376326-376488 usb_power_delivery: Head: "H:1042" "HD"
-375653-377185 usb_power_delivery: snk: "SNK[0]:REQUEST" "REQUEST"
+375653-377185 usb_power_delivery: snk: "(r2) SNK[0]: REQUEST" "REQUEST"
 376488-376529 usb_power_delivery: Sym: "0xE" "E"
 376529-376569 usb_power_delivery: Sym: "0x1" "1"
 376569-376610 usb_power_delivery: Sym: "0x8" "8"
@@ -213,7 +213,7 @@
 376731-376772 usb_power_delivery: Sym: "0x0" "0"
 376772-376812 usb_power_delivery: Sym: "0x1" "1"
 376488-376812 usb_power_delivery: Data: "[0]1000781e" "D0"
-376488-376812 usb_power_delivery: payload: "[1]300/300 mA" "[1]300/300 mA"
+376488-376812 usb_power_delivery: payload: "[1] (PDO #1: Fixed 5V) 0.3A (operating) / 0.3A (max)" "[1] (PDO #1: Fixed 5V) 0.3A (operating) / 0.3A (max)"
 376812-376853 usb_power_delivery: Sym: "0x6" "6"
 376853-376894 usb_power_delivery: Sym: "0x6" "6"
 376894-376934 usb_power_delivery: Sym: "0x4" "4"
@@ -225,7 +225,7 @@
 376812-377137 usb_power_delivery: CRC: "CRC:64219466" "CRC"
 377137-377177 usb_power_delivery: Sym: "EOP" "#"
 377137-377177 usb_power_delivery: EOP: "EOP" "E"
-375653-377177 usb_power_delivery: text: "#7    (156.522083ms): SNK[0]:REQUEST - [1]300/300 mA" "..."
+375653-377177 usb_power_delivery: text: "#7    (156.522083ms): (r2) SNK[0]: REQUEST - [1] (PDO #1: Fixed 5V) 0.3A (operating) / 0.3A (max)" "..."
 377374-377891 usb_power_delivery: Preamble: "Preamble" "..."
 377891-377932 usb_power_delivery: Sym: "SYNC-1" "S1"
 377932-377973 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -237,7 +237,7 @@
 378137-378178 usb_power_delivery: Sym: "0x1" "1"
 378178-378219 usb_power_delivery: Sym: "0x0" "0"
 378055-378219 usb_power_delivery: Head: "H:0161" "HD"
-377374-378596 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+377374-378596 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 378219-378260 usb_power_delivery: Sym: "0xF" "F"
 378260-378301 usb_power_delivery: Sym: "0x8" "8"
 378301-378342 usb_power_delivery: Sym: "0x8" "8"
@@ -249,7 +249,7 @@
 378219-378547 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 378547-378588 usb_power_delivery: Sym: "EOP" "#"
 378547-378588 usb_power_delivery: EOP: "EOP" "E"
-377374-378588 usb_power_delivery: text: "#8    (157.239167ms): SRC[0]:GOOD CRC" "..."
+377374-378588 usb_power_delivery: text: "#8    (157.239167ms): (r2) SRC[0]: GOOD CRC" "..."
 379244-379761 usb_power_delivery: Preamble: "Preamble" "..."
 379761-379802 usb_power_delivery: Sym: "SYNC-1" "S1"
 379802-379843 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -261,7 +261,7 @@
 380006-380047 usb_power_delivery: Sym: "0x3" "3"
 380047-380089 usb_power_delivery: Sym: "0x0" "0"
 379925-380089 usb_power_delivery: Head: "H:0363" "HD"
-379244-380466 usb_power_delivery: src: "SRC[1]:ACCEPT" "ACCEPT"
+379244-380466 usb_power_delivery: src: "(r2) SRC[1]: ACCEPT" "ACCEPT"
 380089-380129 usb_power_delivery: Sym: "0x1" "1"
 380129-380171 usb_power_delivery: Sym: "0x2" "2"
 380171-380211 usb_power_delivery: Sym: "0xB" "B"
@@ -273,7 +273,7 @@
 380089-380417 usb_power_delivery: CRC: "CRC:96007b21" "CRC"
 380417-380458 usb_power_delivery: Sym: "EOP" "#"
 380417-380458 usb_power_delivery: EOP: "EOP" "E"
-379244-380458 usb_power_delivery: text: "#9    (158.018333ms): SRC[1]:ACCEPT" "..."
+379244-380458 usb_power_delivery: text: "#9    (158.018333ms): (r2) SRC[1]: ACCEPT" "..."
 380644-381155 usb_power_delivery: Preamble: "Preamble" "..."
 381155-381195 usb_power_delivery: Sym: "SYNC-1" "S1"
 381195-381236 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -285,7 +285,7 @@
 381398-381439 usb_power_delivery: Sym: "0x2" "2"
 381439-381479 usb_power_delivery: Sym: "0x0" "0"
 381317-381479 usb_power_delivery: Head: "H:0241" "HD"
-380644-381852 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+380644-381852 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 381479-381520 usb_power_delivery: Sym: "0x7" "7"
 381520-381560 usb_power_delivery: Sym: "0x9" "9"
 381560-381601 usb_power_delivery: Sym: "0xD" "D"
@@ -297,7 +297,7 @@
 381479-381803 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 381803-381844 usb_power_delivery: Sym: "EOP" "#"
 381803-381844 usb_power_delivery: EOP: "EOP" "E"
-380644-381844 usb_power_delivery: text: "#10   (158.601667ms): SNK[1]:GOOD CRC" "..."
+380644-381844 usb_power_delivery: text: "#10   (158.601667ms): (r2) SNK[1]: GOOD CRC" "..."
 589338-589854 usb_power_delivery: Preamble: "Preamble" "..."
 589854-589895 usb_power_delivery: Sym: "SYNC-1" "S1"
 589895-589936 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -309,7 +309,7 @@
 590100-590141 usb_power_delivery: Sym: "0x5" "5"
 590141-590182 usb_power_delivery: Sym: "0x0" "0"
 590018-590182 usb_power_delivery: Head: "H:0566" "HD"
-589338-590559 usb_power_delivery: src: "SRC[2]:PS RDY" "PS RDY"
+589338-590559 usb_power_delivery: src: "(r2) SRC[2]: PS RDY" "PS RDY"
 590182-590223 usb_power_delivery: Sym: "0x1" "1"
 590223-590264 usb_power_delivery: Sym: "0x5" "5"
 590264-590305 usb_power_delivery: Sym: "0xA" "A"
@@ -321,7 +321,7 @@
 590182-590510 usb_power_delivery: CRC: "CRC:02142a51" "CRC"
 590510-590551 usb_power_delivery: Sym: "EOP" "#"
 590510-590551 usb_power_delivery: EOP: "EOP" "E"
-589338-590551 usb_power_delivery: text: "#11   (245.557500ms): SRC[2]:PS RDY" "..."
+589338-590551 usb_power_delivery: text: "#11   (245.557500ms): (r2) SRC[2]: PS RDY" "..."
 590724-591235 usb_power_delivery: Preamble: "Preamble" "..."
 591235-591275 usb_power_delivery: Sym: "SYNC-1" "S1"
 591275-591316 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -333,7 +333,7 @@
 591478-591518 usb_power_delivery: Sym: "0x4" "4"
 591518-591559 usb_power_delivery: Sym: "0x0" "0"
 591397-591559 usb_power_delivery: Head: "H:0441" "HD"
-590724-591924 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+590724-591924 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 591559-591600 usb_power_delivery: Sym: "0x2" "2"
 591600-591640 usb_power_delivery: Sym: "0xA" "A"
 591640-591681 usb_power_delivery: Sym: "0x8" "8"
@@ -345,7 +345,7 @@
 591559-591883 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 591883-591924 usb_power_delivery: Sym: "EOP" "#"
 591883-591924 usb_power_delivery: EOP: "EOP" "E"
-590724-591924 usb_power_delivery: text: "#12   (246.135000ms): SNK[2]:GOOD CRC" "..."
+590724-591924 usb_power_delivery: text: "#12   (246.135000ms): (r2) SNK[2]: GOOD CRC" "..."
 616699-617215 usb_power_delivery: Preamble: "Preamble" "..."
 617215-617256 usb_power_delivery: Sym: "SYNC-1" "S1"
 617256-617297 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -357,7 +357,7 @@
 617461-617502 usb_power_delivery: Sym: "0x7" "7"
 617502-617543 usb_power_delivery: Sym: "0x0" "0"
 617379-617543 usb_power_delivery: Head: "H:0768" "HD"
-616699-617912 usb_power_delivery: src: "SRC[3]:GET SINK CAP" "GET SINK CAP"
+616699-617912 usb_power_delivery: src: "(r2) SRC[3]: GET SINK CAP" "GET SINK CAP"
 617543-617584 usb_power_delivery: Sym: "0x3" "3"
 617584-617625 usb_power_delivery: Sym: "0xF" "F"
 617625-617666 usb_power_delivery: Sym: "0x6" "6"
@@ -369,7 +369,7 @@
 617543-617871 usb_power_delivery: CRC: "CRC:729966f3" "CRC"
 617871-617912 usb_power_delivery: Sym: "EOP" "#"
 617871-617912 usb_power_delivery: EOP: "EOP" "E"
-616699-617912 usb_power_delivery: text: "#13   (256.957917ms): SRC[3]:GET SINK CAP" "..."
+616699-617912 usb_power_delivery: text: "#13   (256.957917ms): (r2) SRC[3]: GET SINK CAP" "..."
 618089-618600 usb_power_delivery: Preamble: "Preamble" "..."
 618600-618640 usb_power_delivery: Sym: "SYNC-1" "S1"
 618640-618681 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -381,7 +381,7 @@
 618843-618883 usb_power_delivery: Sym: "0x6" "6"
 618883-618924 usb_power_delivery: Sym: "0x0" "0"
 618762-618924 usb_power_delivery: Head: "H:0641" "HD"
-618089-619289 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+618089-619289 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 618924-618965 usb_power_delivery: Sym: "0xE" "E"
 618965-619005 usb_power_delivery: Sym: "0x8" "8"
 619005-619046 usb_power_delivery: Sym: "0x9" "9"
@@ -393,7 +393,7 @@
 618924-619248 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 619248-619289 usb_power_delivery: Sym: "EOP" "#"
 619248-619289 usb_power_delivery: EOP: "EOP" "E"
-618089-619289 usb_power_delivery: text: "#14   (257.537083ms): SNK[3]:GOOD CRC" "..."
+618089-619289 usb_power_delivery: text: "#14   (257.537083ms): (r2) SNK[3]: GOOD CRC" "..."
 619558-620069 usb_power_delivery: Preamble: "Preamble" "..."
 620069-620109 usb_power_delivery: Sym: "SYNC-1" "S1"
 620109-620150 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -405,7 +405,7 @@
 620312-620352 usb_power_delivery: Sym: "0x2" "2"
 620352-620393 usb_power_delivery: Sym: "0x1" "1"
 620231-620393 usb_power_delivery: Head: "H:1244" "HD"
-619558-621082 usb_power_delivery: snk: "SNK[1]:SINK CAP" "SINK CAP"
+619558-621082 usb_power_delivery: snk: "(r2) SNK[1]: SINK CAP" "SINK CAP"
 620393-620433 usb_power_delivery: Sym: "0x2" "2"
 620433-620474 usb_power_delivery: Sym: "0x3" "3"
 620474-620515 usb_power_delivery: Sym: "0x0" "0"
@@ -415,7 +415,7 @@
 620636-620677 usb_power_delivery: Sym: "0x0" "0"
 620677-620717 usb_power_delivery: Sym: "0x0" "0"
 620393-620717 usb_power_delivery: Data: "[0]00019032" "D0"
-620393-620717 usb_power_delivery: payload: "5.0V 0.5A" "5.0V 0.5A"
+620393-620717 usb_power_delivery: payload: "[1] [Fixed] 5V 0.5A (2.5W)" "[1] [Fixed] 5V 0.5A (2.5W)"
 620717-620758 usb_power_delivery: Sym: "0x0" "0"
 620758-620798 usb_power_delivery: Sym: "0xA" "A"
 620798-620839 usb_power_delivery: Sym: "0x4" "4"
@@ -427,7 +427,7 @@
 620717-621041 usb_power_delivery: CRC: "CRC:810194a0" "CRC"
 621041-621082 usb_power_delivery: Sym: "EOP" "#"
 621041-621082 usb_power_delivery: EOP: "EOP" "E"
-619558-621082 usb_power_delivery: text: "#15   (258.149167ms): SNK[1]:SINK CAP - 5.0V 0.5A" "..."
+619558-621082 usb_power_delivery: text: "#15   (258.149167ms): (r2) SNK[1]: SINK CAP - [1] [Fixed] 5V 0.5A (2.5W)" "..."
 621269-621785 usb_power_delivery: Preamble: "Preamble" "..."
 621785-621826 usb_power_delivery: Sym: "SYNC-1" "S1"
 621826-621867 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -439,7 +439,7 @@
 622031-622072 usb_power_delivery: Sym: "0x3" "3"
 622072-622113 usb_power_delivery: Sym: "0x0" "0"
 621949-622113 usb_power_delivery: Head: "H:0361" "HD"
-621269-622482 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+621269-622482 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 622113-622154 usb_power_delivery: Sym: "0x3" "3"
 622154-622195 usb_power_delivery: Sym: "0xA" "A"
 622195-622236 usb_power_delivery: Sym: "0x9" "9"
@@ -451,7 +451,7 @@
 622113-622441 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 622441-622482 usb_power_delivery: Sym: "EOP" "#"
 622441-622482 usb_power_delivery: EOP: "EOP" "E"
-621269-622482 usb_power_delivery: text: "#16   (258.862083ms): SRC[1]:GOOD CRC" "..."
+621269-622482 usb_power_delivery: text: "#16   (258.862083ms): (r2) SRC[1]: GOOD CRC" "..."
 951191-951708 usb_power_delivery: Preamble: "Preamble" "..."
 951708-951749 usb_power_delivery: Sym: "SYNC-1" "S1"
 951749-951790 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -463,7 +463,7 @@
 951954-951995 usb_power_delivery: Sym: "0x9" "9"
 951995-952036 usb_power_delivery: Sym: "0x1" "1"
 951872-952036 usb_power_delivery: Head: "H:196f" "HD"
-951191-952732 usb_power_delivery: src: "SRC[4]:VDM" "VDM"
+951191-952732 usb_power_delivery: src: "(r2) SRC[4]: VDM" "VDM"
 952036-952077 usb_power_delivery: Sym: "0x1" "1"
 952077-952118 usb_power_delivery: Sym: "0x0" "0"
 952118-952159 usb_power_delivery: Sym: "0x0" "0"
@@ -473,7 +473,7 @@
 952281-952323 usb_power_delivery: Sym: "0xF" "F"
 952323-952363 usb_power_delivery: Sym: "0xF" "F"
 952036-952363 usb_power_delivery: Data: "[0]ff008001" "D0"
-952036-952363 usb_power_delivery: payload: "REQ Disc Ident  SVID:ff00" "REQ Disc Ident  SVID:ff00"
+952036-952363 usb_power_delivery: payload: "[1] REQ Disc Ident  SVID:ff00" "[1] REQ Disc Ident  SVID:ff00"
 952363-952405 usb_power_delivery: Sym: "0x7" "7"
 952405-952445 usb_power_delivery: Sym: "0xB" "B"
 952445-952486 usb_power_delivery: Sym: "0xA" "A"
@@ -485,7 +485,7 @@
 952363-952691 usb_power_delivery: CRC: "CRC:511b7ab7" "CRC"
 952691-952732 usb_power_delivery: Sym: "EOP" "#"
 952691-952732 usb_power_delivery: EOP: "EOP" "E"
-951191-952732 usb_power_delivery: text: "#17   (396.329583ms): SRC[4]:VDM - REQ Disc Ident  SVID:ff00" "..."
+951191-952732 usb_power_delivery: text: "#17   (396.329583ms): (r2) SRC[4]: VDM - [1] REQ Disc Ident  SVID:ff00" "..."
 952910-953420 usb_power_delivery: Preamble: "Preamble" "..."
 953420-953461 usb_power_delivery: Sym: "SYNC-1" "S1"
 953461-953502 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -497,7 +497,7 @@
 953664-953704 usb_power_delivery: Sym: "0x8" "8"
 953704-953745 usb_power_delivery: Sym: "0x0" "0"
 953583-953745 usb_power_delivery: Head: "H:0841" "HD"
-952910-954118 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+952910-954118 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 953745-953785 usb_power_delivery: Sym: "0x9" "9"
 953785-953826 usb_power_delivery: Sym: "0x8" "8"
 953826-953866 usb_power_delivery: Sym: "0x4" "4"
@@ -509,7 +509,7 @@
 953745-954069 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 954069-954110 usb_power_delivery: Sym: "EOP" "#"
 954069-954110 usb_power_delivery: EOP: "EOP" "E"
-952910-954110 usb_power_delivery: text: "#18   (397.045833ms): SNK[4]:GOOD CRC" "..."
+952910-954110 usb_power_delivery: text: "#18   (397.045833ms): (r2) SNK[4]: GOOD CRC" "..."
 954598-955108 usb_power_delivery: Preamble: "Preamble" "..."
 955108-955149 usb_power_delivery: Sym: "SYNC-1" "S1"
 955149-955189 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -521,7 +521,7 @@
 955351-955392 usb_power_delivery: Sym: "0x4" "4"
 955392-955432 usb_power_delivery: Sym: "0x5" "5"
 955270-955432 usb_power_delivery: Head: "H:544f" "HD"
-954598-957427 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+954598-957427 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 955432-955473 usb_power_delivery: Sym: "0x1" "1"
 955473-955514 usb_power_delivery: Sym: "0x4" "4"
 955514-955554 usb_power_delivery: Sym: "0x0" "0"
@@ -531,7 +531,7 @@
 955676-955716 usb_power_delivery: Sym: "0xF" "F"
 955716-955757 usb_power_delivery: Sym: "0xF" "F"
 955432-955757 usb_power_delivery: Data: "[0]ff008041" "D0"
-955432-955757 usb_power_delivery: payload: "ACK Disc Ident  SVID:ff00" "ACK Disc Ident  SVID:ff00"
+955432-955757 usb_power_delivery: payload: "[1] ACK Disc Ident  SVID:ff00" "[1] ACK Disc Ident  SVID:ff00"
 955757-955797 usb_power_delivery: Sym: "0x1" "1"
 955797-955838 usb_power_delivery: Sym: "0xD" "D"
 955838-955878 usb_power_delivery: Sym: "0x8" "8"
@@ -541,7 +541,7 @@
 956000-956041 usb_power_delivery: Sym: "0xC" "C"
 956041-956081 usb_power_delivery: Sym: "0x6" "6"
 955757-956081 usb_power_delivery: Data: "[1]6c0018d1" "D1"
-955757-956081 usb_power_delivery: payload: "VDO:6c0018d1" "VDO:6c0018d1"
+955757-956081 usb_power_delivery: payload: "[2] VDO:6c0018d1" "[2] VDO:6c0018d1"
 956081-956122 usb_power_delivery: Sym: "0x0" "0"
 956122-956162 usb_power_delivery: Sym: "0x0" "0"
 956162-956203 usb_power_delivery: Sym: "0x0" "0"
@@ -551,7 +551,7 @@
 956324-956365 usb_power_delivery: Sym: "0x0" "0"
 956365-956405 usb_power_delivery: Sym: "0x0" "0"
 956081-956405 usb_power_delivery: Data: "[2]00000000" "D2"
-956081-956405 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+956081-956405 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 956405-956446 usb_power_delivery: Sym: "0x1" "1"
 956446-956486 usb_power_delivery: Sym: "0x0" "0"
 956486-956527 usb_power_delivery: Sym: "0x0" "0"
@@ -561,7 +561,7 @@
 956649-956689 usb_power_delivery: Sym: "0x0" "0"
 956689-956730 usb_power_delivery: Sym: "0x5" "5"
 956405-956730 usb_power_delivery: Data: "[3]50100001" "D3"
-956405-956730 usb_power_delivery: payload: "VDO:50100001" "VDO:50100001"
+956405-956730 usb_power_delivery: payload: "[4] VDO:50100001" "[4] VDO:50100001"
 956730-956770 usb_power_delivery: Sym: "0xB" "B"
 956770-956811 usb_power_delivery: Sym: "0x0" "0"
 956811-956851 usb_power_delivery: Sym: "0x0" "0"
@@ -571,7 +571,7 @@
 956973-957013 usb_power_delivery: Sym: "0x1" "1"
 957013-957054 usb_power_delivery: Sym: "0x1" "1"
 956730-957054 usb_power_delivery: Data: "[4]1100000b" "D4"
-956730-957054 usb_power_delivery: payload: "VDO:1100000b" "VDO:1100000b"
+956730-957054 usb_power_delivery: payload: "[5] VDO:1100000b" "[5] VDO:1100000b"
 957054-957094 usb_power_delivery: Sym: "0xE" "E"
 957094-957135 usb_power_delivery: Sym: "0xD" "D"
 957135-957176 usb_power_delivery: Sym: "0xA" "A"
@@ -583,7 +583,7 @@
 957054-957378 usb_power_delivery: CRC: "CRC:ae854ade" "CRC"
 957378-957419 usb_power_delivery: Sym: "EOP" "#"
 957378-957419 usb_power_delivery: EOP: "EOP" "E"
-954598-957419 usb_power_delivery: text: "#19   (397.749167ms): SNK[2]:VDM - ACK Disc Ident  SVID:ff00 - VDO:6c0018d1 - VDO:00000000 - VDO:50100001 - VDO:1100000b" "..."
+954598-957419 usb_power_delivery: text: "#19   (397.749167ms): (r2) SNK[2]: VDM - [1] ACK Disc Ident  SVID:ff00 - [2] VDO:6c0018d1 - [3] VDO:00000000 - [4] VDO:50100001 - [5] VDO:1100000b" "..."
 957602-958118 usb_power_delivery: Preamble: "Preamble" "..."
 958118-958159 usb_power_delivery: Sym: "SYNC-1" "S1"
 958159-958200 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -595,7 +595,7 @@
 958364-958405 usb_power_delivery: Sym: "0x5" "5"
 958405-958446 usb_power_delivery: Sym: "0x0" "0"
 958282-958446 usb_power_delivery: Head: "H:0561" "HD"
-957602-958823 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+957602-958823 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 958446-958487 usb_power_delivery: Sym: "0x6" "6"
 958487-958528 usb_power_delivery: Sym: "0x9" "9"
 958528-958569 usb_power_delivery: Sym: "0xC" "C"
@@ -607,7 +607,7 @@
 958446-958774 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 958774-958815 usb_power_delivery: Sym: "EOP" "#"
 958774-958815 usb_power_delivery: EOP: "EOP" "E"
-957602-958815 usb_power_delivery: text: "#20   (399.000833ms): SRC[2]:GOOD CRC" "..."
+957602-958815 usb_power_delivery: text: "#20   (399.000833ms): (r2) SRC[2]: GOOD CRC" "..."
 959216-959732 usb_power_delivery: Preamble: "Preamble" "..."
 959732-959773 usb_power_delivery: Sym: "SYNC-1" "S1"
 959773-959814 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -619,7 +619,7 @@
 959978-960019 usb_power_delivery: Sym: "0xB" "B"
 960019-960060 usb_power_delivery: Sym: "0x1" "1"
 959896-960060 usb_power_delivery: Head: "H:1b6f" "HD"
-959216-960757 usb_power_delivery: src: "SRC[5]:VDM" "VDM"
+959216-960757 usb_power_delivery: src: "(r2) SRC[5]: VDM" "VDM"
 960060-960101 usb_power_delivery: Sym: "0x2" "2"
 960101-960142 usb_power_delivery: Sym: "0x0" "0"
 960142-960183 usb_power_delivery: Sym: "0x0" "0"
@@ -629,7 +629,7 @@
 960306-960347 usb_power_delivery: Sym: "0xF" "F"
 960347-960388 usb_power_delivery: Sym: "0xF" "F"
 960060-960388 usb_power_delivery: Data: "[0]ff008002" "D0"
-960060-960388 usb_power_delivery: payload: "REQ Disc SVID  SVID:ff00" "REQ Disc SVID  SVID:ff00"
+960060-960388 usb_power_delivery: payload: "[1] REQ Disc SVID  SVID:ff00" "[1] REQ Disc SVID  SVID:ff00"
 960388-960429 usb_power_delivery: Sym: "0x9" "9"
 960429-960470 usb_power_delivery: Sym: "0x3" "3"
 960470-960511 usb_power_delivery: Sym: "0x6" "6"
@@ -641,7 +641,7 @@
 960388-960716 usb_power_delivery: CRC: "CRC:396e8639" "CRC"
 960716-960757 usb_power_delivery: Sym: "EOP" "#"
 960716-960757 usb_power_delivery: EOP: "EOP" "E"
-959216-960757 usb_power_delivery: text: "#21   (399.673333ms): SRC[5]:VDM - REQ Disc SVID  SVID:ff00" "..."
+959216-960757 usb_power_delivery: text: "#21   (399.673333ms): (r2) SRC[5]: VDM - [1] REQ Disc SVID  SVID:ff00" "..."
 960931-961442 usb_power_delivery: Preamble: "Preamble" "..."
 961442-961482 usb_power_delivery: Sym: "SYNC-1" "S1"
 961482-961523 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -653,7 +653,7 @@
 961685-961726 usb_power_delivery: Sym: "0xA" "A"
 961726-961766 usb_power_delivery: Sym: "0x0" "0"
 961604-961766 usb_power_delivery: Head: "H:0a41" "HD"
-960931-962131 usb_power_delivery: snk: "SNK[5]:GOOD CRC" "GOOD CRC"
+960931-962131 usb_power_delivery: snk: "(r2) SNK[5]: GOOD CRC" "GOOD CRC"
 961766-961807 usb_power_delivery: Sym: "0x5" "5"
 961807-961847 usb_power_delivery: Sym: "0xA" "A"
 961847-961888 usb_power_delivery: Sym: "0x5" "5"
@@ -665,7 +665,7 @@
 961766-962090 usb_power_delivery: CRC: "CRC:486e85a5" "CRC"
 962090-962131 usb_power_delivery: Sym: "EOP" "#"
 962090-962131 usb_power_delivery: EOP: "EOP" "E"
-960931-962131 usb_power_delivery: text: "#22   (400.387917ms): SNK[5]:GOOD CRC" "..."
+960931-962131 usb_power_delivery: text: "#22   (400.387917ms): (r2) SNK[5]: GOOD CRC" "..."
 962522-963032 usb_power_delivery: Preamble: "Preamble" "..."
 963032-963073 usb_power_delivery: Sym: "SYNC-1" "S1"
 963073-963113 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -677,7 +677,7 @@
 963276-963316 usb_power_delivery: Sym: "0x6" "6"
 963316-963357 usb_power_delivery: Sym: "0x3" "3"
 963194-963357 usb_power_delivery: Head: "H:364f" "HD"
-962522-964694 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+962522-964694 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 963357-963397 usb_power_delivery: Sym: "0x2" "2"
 963397-963438 usb_power_delivery: Sym: "0x4" "4"
 963438-963478 usb_power_delivery: Sym: "0x0" "0"
@@ -687,7 +687,7 @@
 963600-963640 usb_power_delivery: Sym: "0xF" "F"
 963640-963681 usb_power_delivery: Sym: "0xF" "F"
 963357-963681 usb_power_delivery: Data: "[0]ff008042" "D0"
-963357-963681 usb_power_delivery: payload: "ACK Disc SVID  SVID:ff00" "ACK Disc SVID  SVID:ff00"
+963357-963681 usb_power_delivery: payload: "[1] ACK Disc SVID  SVID:ff00" "[1] ACK Disc SVID  SVID:ff00"
 963681-963721 usb_power_delivery: Sym: "0x1" "1"
 963721-963762 usb_power_delivery: Sym: "0xD" "D"
 963762-963802 usb_power_delivery: Sym: "0x8" "8"
@@ -697,7 +697,7 @@
 963924-963965 usb_power_delivery: Sym: "0xF" "F"
 963965-964005 usb_power_delivery: Sym: "0xF" "F"
 963681-964005 usb_power_delivery: Data: "[1]ff0118d1" "D1"
-963681-964005 usb_power_delivery: payload: "VDO:ff0118d1" "VDO:ff0118d1"
+963681-964005 usb_power_delivery: payload: "[2] VDO:ff0118d1" "[2] VDO:ff0118d1"
 964005-964046 usb_power_delivery: Sym: "0x0" "0"
 964046-964086 usb_power_delivery: Sym: "0x0" "0"
 964086-964127 usb_power_delivery: Sym: "0x0" "0"
@@ -707,7 +707,7 @@
 964248-964289 usb_power_delivery: Sym: "0x0" "0"
 964289-964329 usb_power_delivery: Sym: "0x0" "0"
 964005-964329 usb_power_delivery: Data: "[2]00000000" "D2"
-964005-964329 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+964005-964329 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 964329-964370 usb_power_delivery: Sym: "0xB" "B"
 964370-964410 usb_power_delivery: Sym: "0x8" "8"
 964410-964451 usb_power_delivery: Sym: "0x8" "8"
@@ -719,7 +719,7 @@
 964329-964654 usb_power_delivery: CRC: "CRC:1c42a88b" "CRC"
 964654-964694 usb_power_delivery: Sym: "EOP" "#"
 964654-964694 usb_power_delivery: EOP: "EOP" "E"
-962522-964694 usb_power_delivery: text: "#23   (401.050833ms): SNK[3]:VDM - ACK Disc SVID  SVID:ff00 - VDO:ff0118d1 - VDO:00000000" "..."
+962522-964694 usb_power_delivery: text: "#23   (401.050833ms): (r2) SNK[3]: VDM - [1] ACK Disc SVID  SVID:ff00 - [2] VDO:ff0118d1 - [3] VDO:00000000" "..."
 964881-965397 usb_power_delivery: Preamble: "Preamble" "..."
 965397-965438 usb_power_delivery: Sym: "SYNC-1" "S1"
 965438-965479 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -731,7 +731,7 @@
 965643-965684 usb_power_delivery: Sym: "0x7" "7"
 965684-965725 usb_power_delivery: Sym: "0x0" "0"
 965561-965725 usb_power_delivery: Head: "H:0761" "HD"
-964881-966102 usb_power_delivery: src: "SRC[3]:GOOD CRC" "GOOD CRC"
+964881-966102 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
 965725-965766 usb_power_delivery: Sym: "0xA" "A"
 965766-965807 usb_power_delivery: Sym: "0xB" "B"
 965807-965848 usb_power_delivery: Sym: "0xD" "D"
@@ -743,7 +743,7 @@
 965725-966053 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
 966053-966094 usb_power_delivery: Sym: "EOP" "#"
 966053-966094 usb_power_delivery: EOP: "EOP" "E"
-964881-966094 usb_power_delivery: text: "#24   (402.033750ms): SRC[3]:GOOD CRC" "..."
+964881-966094 usb_power_delivery: text: "#24   (402.033750ms): (r2) SRC[3]: GOOD CRC" "..."
 966434-966951 usb_power_delivery: Preamble: "Preamble" "..."
 966951-966992 usb_power_delivery: Sym: "SYNC-1" "S1"
 966992-967033 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -755,7 +755,7 @@
 967197-967238 usb_power_delivery: Sym: "0xD" "D"
 967238-967279 usb_power_delivery: Sym: "0x1" "1"
 967115-967279 usb_power_delivery: Head: "H:1d6f" "HD"
-966434-967976 usb_power_delivery: src: "SRC[6]:VDM" "VDM"
+966434-967976 usb_power_delivery: src: "(r2) SRC[6]: VDM" "VDM"
 967279-967320 usb_power_delivery: Sym: "0x3" "3"
 967320-967361 usb_power_delivery: Sym: "0x0" "0"
 967361-967402 usb_power_delivery: Sym: "0x0" "0"
@@ -765,7 +765,7 @@
 967525-967566 usb_power_delivery: Sym: "0xF" "F"
 967566-967607 usb_power_delivery: Sym: "0xF" "F"
 967279-967607 usb_power_delivery: Data: "[0]ff018003" "D0"
-967279-967607 usb_power_delivery: payload: "REQ Disc Mode  SVID:ff01" "REQ Disc Mode  SVID:ff01"
+967279-967607 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:ff01" "[1] REQ Disc Mode  SVID:ff01"
 967607-967648 usb_power_delivery: Sym: "0xD" "D"
 967648-967689 usb_power_delivery: Sym: "0xB" "B"
 967689-967730 usb_power_delivery: Sym: "0x5" "5"
@@ -777,7 +777,7 @@
 967607-967935 usb_power_delivery: CRC: "CRC:178925bd" "CRC"
 967935-967976 usb_power_delivery: Sym: "EOP" "#"
 967935-967976 usb_power_delivery: EOP: "EOP" "E"
-966434-967976 usb_power_delivery: text: "#25   (402.680833ms): SRC[6]:VDM - REQ Disc Mode  SVID:ff01" "..."
+966434-967976 usb_power_delivery: text: "#25   (402.680833ms): (r2) SRC[6]: VDM - [1] REQ Disc Mode  SVID:ff01" "..."
 968156-968667 usb_power_delivery: Preamble: "Preamble" "..."
 968667-968707 usb_power_delivery: Sym: "SYNC-1" "S1"
 968707-968748 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -789,7 +789,7 @@
 968910-968951 usb_power_delivery: Sym: "0xC" "C"
 968951-968991 usb_power_delivery: Sym: "0x0" "0"
 968829-968991 usb_power_delivery: Head: "H:0c41" "HD"
-968156-969364 usb_power_delivery: snk: "SNK[6]:GOOD CRC" "GOOD CRC"
+968156-969364 usb_power_delivery: snk: "(r2) SNK[6]: GOOD CRC" "GOOD CRC"
 968991-969032 usb_power_delivery: Sym: "0x0" "0"
 969032-969072 usb_power_delivery: Sym: "0x9" "9"
 969072-969113 usb_power_delivery: Sym: "0x0" "0"
@@ -801,7 +801,7 @@
 968991-969315 usb_power_delivery: CRC: "CRC:a10d2090" "CRC"
 969315-969356 usb_power_delivery: Sym: "EOP" "#"
 969315-969356 usb_power_delivery: EOP: "EOP" "E"
-968156-969356 usb_power_delivery: text: "#26   (403.398333ms): SNK[6]:GOOD CRC" "..."
+968156-969356 usb_power_delivery: text: "#26   (403.398333ms): (r2) SNK[6]: GOOD CRC" "..."
 969702-970213 usb_power_delivery: Preamble: "Preamble" "..."
 970213-970253 usb_power_delivery: Sym: "SYNC-1" "S1"
 970253-970294 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -813,7 +813,7 @@
 970456-970496 usb_power_delivery: Sym: "0x8" "8"
 970496-970537 usb_power_delivery: Sym: "0x2" "2"
 970375-970537 usb_power_delivery: Head: "H:284f" "HD"
-969702-971550 usb_power_delivery: snk: "SNK[4]:VDM" "VDM"
+969702-971550 usb_power_delivery: snk: "(r2) SNK[4]: VDM" "VDM"
 970537-970577 usb_power_delivery: Sym: "0x3" "3"
 970577-970618 usb_power_delivery: Sym: "0x4" "4"
 970618-970658 usb_power_delivery: Sym: "0x0" "0"
@@ -823,7 +823,7 @@
 970780-970821 usb_power_delivery: Sym: "0xF" "F"
 970821-970861 usb_power_delivery: Sym: "0xF" "F"
 970537-970861 usb_power_delivery: Data: "[0]ff018043" "D0"
-970537-970861 usb_power_delivery: payload: "ACK Disc Mode  SVID:ff01" "ACK Disc Mode  SVID:ff01"
+970537-970861 usb_power_delivery: payload: "[1] ACK Disc Mode  SVID:ff01" "[1] ACK Disc Mode  SVID:ff01"
 970861-970902 usb_power_delivery: Sym: "0x5" "5"
 970902-970942 usb_power_delivery: Sym: "0x8" "8"
 970942-970983 usb_power_delivery: Sym: "0x4" "4"
@@ -833,7 +833,7 @@
 971104-971145 usb_power_delivery: Sym: "0x0" "0"
 971145-971185 usb_power_delivery: Sym: "0x0" "0"
 970861-971185 usb_power_delivery: Data: "[1]00000485" "D1"
-970861-971185 usb_power_delivery: payload: "VDO:00000485" "VDO:00000485"
+970861-971185 usb_power_delivery: payload: "[2] VDO:00000485" "[2] VDO:00000485"
 971185-971226 usb_power_delivery: Sym: "0x0" "0"
 971226-971266 usb_power_delivery: Sym: "0xE" "E"
 971266-971307 usb_power_delivery: Sym: "0x1" "1"
@@ -845,7 +845,7 @@
 971185-971510 usb_power_delivery: CRC: "CRC:46a0c1e0" "CRC"
 971510-971550 usb_power_delivery: Sym: "EOP" "#"
 971510-971550 usb_power_delivery: EOP: "EOP" "E"
-969702-971550 usb_power_delivery: text: "#27   (404.042500ms): SNK[4]:VDM - ACK Disc Mode  SVID:ff01 - VDO:00000485" "..."
+969702-971550 usb_power_delivery: text: "#27   (404.042500ms): (r2) SNK[4]: VDM - [1] ACK Disc Mode  SVID:ff01 - [2] VDO:00000485" "..."
 971734-972250 usb_power_delivery: Preamble: "Preamble" "..."
 972250-972291 usb_power_delivery: Sym: "SYNC-1" "S1"
 972291-972332 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -857,7 +857,7 @@
 972496-972537 usb_power_delivery: Sym: "0x9" "9"
 972537-972578 usb_power_delivery: Sym: "0x0" "0"
 972414-972578 usb_power_delivery: Head: "H:0961" "HD"
-971734-972947 usb_power_delivery: src: "SRC[4]:GOOD CRC" "GOOD CRC"
+971734-972947 usb_power_delivery: src: "(r2) SRC[4]: GOOD CRC" "GOOD CRC"
 972578-972619 usb_power_delivery: Sym: "0xD" "D"
 972619-972660 usb_power_delivery: Sym: "0xB" "B"
 972660-972701 usb_power_delivery: Sym: "0x0" "0"
@@ -869,7 +869,7 @@
 972578-972906 usb_power_delivery: CRC: "CRC:44e3f0bd" "CRC"
 972906-972947 usb_power_delivery: Sym: "EOP" "#"
 972906-972947 usb_power_delivery: EOP: "EOP" "E"
-971734-972947 usb_power_delivery: text: "#28   (404.889167ms): SRC[4]:GOOD CRC" "..."
+971734-972947 usb_power_delivery: text: "#28   (404.889167ms): (r2) SRC[4]: GOOD CRC" "..."
 973286-973802 usb_power_delivery: Preamble: "Preamble" "..."
 973802-973843 usb_power_delivery: Sym: "SYNC-1" "S1"
 973843-973884 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -881,7 +881,7 @@
 974048-974089 usb_power_delivery: Sym: "0xF" "F"
 974089-974130 usb_power_delivery: Sym: "0x1" "1"
 973966-974130 usb_power_delivery: Head: "H:1f6f" "HD"
-973286-974827 usb_power_delivery: src: "SRC[7]:VDM" "VDM"
+973286-974827 usb_power_delivery: src: "(r2) SRC[7]: VDM" "VDM"
 974130-974171 usb_power_delivery: Sym: "0x3" "3"
 974171-974212 usb_power_delivery: Sym: "0x0" "0"
 974212-974253 usb_power_delivery: Sym: "0x0" "0"
@@ -891,7 +891,7 @@
 974376-974417 usb_power_delivery: Sym: "0x8" "8"
 974417-974458 usb_power_delivery: Sym: "0x1" "1"
 974130-974458 usb_power_delivery: Data: "[0]18d18003" "D0"
-974130-974458 usb_power_delivery: payload: "REQ Disc Mode  SVID:18d1" "REQ Disc Mode  SVID:18d1"
+974130-974458 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:18d1" "[1] REQ Disc Mode  SVID:18d1"
 974458-974499 usb_power_delivery: Sym: "0x9" "9"
 974499-974540 usb_power_delivery: Sym: "0x1" "1"
 974540-974581 usb_power_delivery: Sym: "0x4" "4"
@@ -903,7 +903,7 @@
 974458-974786 usb_power_delivery: CRC: "CRC:d21fc419" "CRC"
 974786-974827 usb_power_delivery: Sym: "EOP" "#"
 974786-974827 usb_power_delivery: EOP: "EOP" "E"
-973286-974827 usb_power_delivery: text: "#29   (405.535833ms): SRC[7]:VDM - REQ Disc Mode  SVID:18d1" "..."
+973286-974827 usb_power_delivery: text: "#29   (405.535833ms): (r2) SRC[7]: VDM - [1] REQ Disc Mode  SVID:18d1" "..."
 975003-975514 usb_power_delivery: Preamble: "Preamble" "..."
 975514-975554 usb_power_delivery: Sym: "SYNC-1" "S1"
 975554-975595 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -915,7 +915,7 @@
 975757-975797 usb_power_delivery: Sym: "0xE" "E"
 975797-975838 usb_power_delivery: Sym: "0x0" "0"
 975676-975838 usb_power_delivery: Head: "H:0e41" "HD"
-975003-976211 usb_power_delivery: snk: "SNK[7]:GOOD CRC" "GOOD CRC"
+975003-976211 usb_power_delivery: snk: "(r2) SNK[7]: GOOD CRC" "GOOD CRC"
 975838-975879 usb_power_delivery: Sym: "0xC" "C"
 975879-975919 usb_power_delivery: Sym: "0xB" "B"
 975919-975960 usb_power_delivery: Sym: "0x1" "1"
@@ -927,7 +927,7 @@
 975838-976162 usb_power_delivery: CRC: "CRC:4f0341bc" "CRC"
 976162-976203 usb_power_delivery: Sym: "EOP" "#"
 976162-976203 usb_power_delivery: EOP: "EOP" "E"
-975003-976203 usb_power_delivery: text: "#30   (406.251250ms): SNK[7]:GOOD CRC" "..."
+975003-976203 usb_power_delivery: text: "#30   (406.251250ms): (r2) SNK[7]: GOOD CRC" "..."
 976549-977060 usb_power_delivery: Preamble: "Preamble" "..."
 977060-977101 usb_power_delivery: Sym: "SYNC-1" "S1"
 977101-977141 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -939,7 +939,7 @@
 977303-977344 usb_power_delivery: Sym: "0xA" "A"
 977344-977384 usb_power_delivery: Sym: "0x2" "2"
 977222-977384 usb_power_delivery: Head: "H:2a4f" "HD"
-976549-978398 usb_power_delivery: snk: "SNK[5]:VDM" "VDM"
+976549-978398 usb_power_delivery: snk: "(r2) SNK[5]: VDM" "VDM"
 977384-977425 usb_power_delivery: Sym: "0x3" "3"
 977425-977465 usb_power_delivery: Sym: "0x4" "4"
 977465-977506 usb_power_delivery: Sym: "0x0" "0"
@@ -949,7 +949,7 @@
 977627-977668 usb_power_delivery: Sym: "0x8" "8"
 977668-977708 usb_power_delivery: Sym: "0x1" "1"
 977384-977708 usb_power_delivery: Data: "[0]18d18043" "D0"
-977384-977708 usb_power_delivery: payload: "ACK Disc Mode  SVID:18d1" "ACK Disc Mode  SVID:18d1"
+977384-977708 usb_power_delivery: payload: "[1] ACK Disc Mode  SVID:18d1" "[1] ACK Disc Mode  SVID:18d1"
 977708-977749 usb_power_delivery: Sym: "0x1" "1"
 977749-977790 usb_power_delivery: Sym: "0x0" "0"
 977790-977830 usb_power_delivery: Sym: "0x0" "0"
@@ -959,7 +959,7 @@
 977952-977992 usb_power_delivery: Sym: "0x0" "0"
 977992-978033 usb_power_delivery: Sym: "0x0" "0"
 977708-978033 usb_power_delivery: Data: "[1]00000001" "D1"
-977708-978033 usb_power_delivery: payload: "VDO:00000001" "VDO:00000001"
+977708-978033 usb_power_delivery: payload: "[2] VDO:00000001" "[2] VDO:00000001"
 978033-978073 usb_power_delivery: Sym: "0x6" "6"
 978073-978114 usb_power_delivery: Sym: "0x3" "3"
 978114-978154 usb_power_delivery: Sym: "0x7" "7"
@@ -971,7 +971,7 @@
 978033-978357 usb_power_delivery: CRC: "CRC:85ae6736" "CRC"
 978357-978398 usb_power_delivery: Sym: "EOP" "#"
 978357-978398 usb_power_delivery: EOP: "EOP" "E"
-976549-978398 usb_power_delivery: text: "#31   (406.895417ms): SNK[5]:VDM - ACK Disc Mode  SVID:18d1 - VDO:00000001" "..."
+976549-978398 usb_power_delivery: text: "#31   (406.895417ms): (r2) SNK[5]: VDM - [1] ACK Disc Mode  SVID:18d1 - [2] VDO:00000001" "..."
 978585-979101 usb_power_delivery: Preamble: "Preamble" "..."
 979101-979142 usb_power_delivery: Sym: "SYNC-1" "S1"
 979142-979183 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -983,7 +983,7 @@
 979347-979388 usb_power_delivery: Sym: "0xB" "B"
 979388-979429 usb_power_delivery: Sym: "0x0" "0"
 979265-979429 usb_power_delivery: Head: "H:0b61" "HD"
-978585-979798 usb_power_delivery: src: "SRC[5]:GOOD CRC" "GOOD CRC"
+978585-979798 usb_power_delivery: src: "(r2) SRC[5]: GOOD CRC" "GOOD CRC"
 979429-979470 usb_power_delivery: Sym: "0x1" "1"
 979470-979511 usb_power_delivery: Sym: "0x9" "9"
 979511-979552 usb_power_delivery: Sym: "0x1" "1"
@@ -995,7 +995,7 @@
 979429-979757 usb_power_delivery: CRC: "CRC:aaed9191" "CRC"
 979757-979798 usb_power_delivery: Sym: "EOP" "#"
 979757-979798 usb_power_delivery: EOP: "EOP" "E"
-978585-979798 usb_power_delivery: text: "#32   (407.743750ms): SRC[5]:GOOD CRC" "..."
+978585-979798 usb_power_delivery: text: "#32   (407.743750ms): (r2) SRC[5]: GOOD CRC" "..."
 980163-980679 usb_power_delivery: Preamble: "Preamble" "..."
 980679-980720 usb_power_delivery: Sym: "SYNC-1" "S1"
 980720-980761 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1007,7 +1007,7 @@
 980925-980966 usb_power_delivery: Sym: "0x1" "1"
 980966-981007 usb_power_delivery: Sym: "0x1" "1"
 980843-981007 usb_power_delivery: Head: "H:116f" "HD"
-980163-981712 usb_power_delivery: src: "SRC[0]:VDM" "VDM"
+980163-981712 usb_power_delivery: src: "(r2) SRC[0]: VDM" "VDM"
 981007-981048 usb_power_delivery: Sym: "0x4" "4"
 981048-981089 usb_power_delivery: Sym: "0x0" "0"
 981089-981130 usb_power_delivery: Sym: "0x1" "1"
@@ -1017,7 +1017,7 @@
 981253-981294 usb_power_delivery: Sym: "0xF" "F"
 981294-981335 usb_power_delivery: Sym: "0xF" "F"
 981007-981335 usb_power_delivery: Data: "[0]ff018104" "D0"
-981007-981335 usb_power_delivery: payload: "REQ Enter Mode pos 1 SVID:ff01" "REQ Enter Mode pos 1 SVID:ff01"
+981007-981335 usb_power_delivery: payload: "[1] REQ Enter Mode pos 1 SVID:ff01" "[1] REQ Enter Mode pos 1 SVID:ff01"
 981335-981376 usb_power_delivery: Sym: "0x2" "2"
 981376-981417 usb_power_delivery: Sym: "0x3" "3"
 981417-981458 usb_power_delivery: Sym: "0xA" "A"
@@ -1029,7 +1029,7 @@
 981335-981663 usb_power_delivery: CRC: "CRC:4e6c9a32" "CRC"
 981663-981704 usb_power_delivery: Sym: "EOP" "#"
 981663-981704 usb_power_delivery: EOP: "EOP" "E"
-980163-981704 usb_power_delivery: text: "#33   (408.401250ms): SRC[0]:VDM - REQ Enter Mode pos 1 SVID:ff01" "..."
+980163-981704 usb_power_delivery: text: "#33   (408.401250ms): (r2) SRC[0]: VDM - [1] REQ Enter Mode pos 1 SVID:ff01" "..."
 981884-982395 usb_power_delivery: Preamble: "Preamble" "..."
 982395-982435 usb_power_delivery: Sym: "SYNC-1" "S1"
 982435-982476 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1041,7 +1041,7 @@
 982638-982678 usb_power_delivery: Sym: "0x0" "0"
 982678-982719 usb_power_delivery: Sym: "0x0" "0"
 982557-982719 usb_power_delivery: Head: "H:0041" "HD"
-981884-983092 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+981884-983092 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 982719-982760 usb_power_delivery: Sym: "0xB" "B"
 982760-982800 usb_power_delivery: Sym: "0xB" "B"
 982800-982841 usb_power_delivery: Sym: "0xC" "C"
@@ -1053,7 +1053,7 @@
 982719-983043 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 983043-983084 usb_power_delivery: Sym: "EOP" "#"
 983043-983084 usb_power_delivery: EOP: "EOP" "E"
-981884-983084 usb_power_delivery: text: "#34   (409.118333ms): SNK[0]:GOOD CRC" "..."
+981884-983084 usb_power_delivery: text: "#34   (409.118333ms): (r2) SNK[0]: GOOD CRC" "..."
 983391-983902 usb_power_delivery: Preamble: "Preamble" "..."
 983902-983942 usb_power_delivery: Sym: "SYNC-1" "S1"
 983942-983983 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1065,7 +1065,7 @@
 984145-984185 usb_power_delivery: Sym: "0xC" "C"
 984185-984226 usb_power_delivery: Sym: "0x1" "1"
 984064-984226 usb_power_delivery: Head: "H:1c4f" "HD"
-983391-984923 usb_power_delivery: snk: "SNK[6]:VDM" "VDM"
+983391-984923 usb_power_delivery: snk: "(r2) SNK[6]: VDM" "VDM"
 984226-984267 usb_power_delivery: Sym: "0x4" "4"
 984267-984307 usb_power_delivery: Sym: "0x4" "4"
 984307-984348 usb_power_delivery: Sym: "0x1" "1"
@@ -1075,7 +1075,7 @@
 984469-984510 usb_power_delivery: Sym: "0xF" "F"
 984510-984550 usb_power_delivery: Sym: "0xF" "F"
 984226-984550 usb_power_delivery: Data: "[0]ff018144" "D0"
-984226-984550 usb_power_delivery: payload: "ACK Enter Mode pos 1 SVID:ff01" "ACK Enter Mode pos 1 SVID:ff01"
+984226-984550 usb_power_delivery: payload: "[1] ACK Enter Mode pos 1 SVID:ff01" "[1] ACK Enter Mode pos 1 SVID:ff01"
 984550-984591 usb_power_delivery: Sym: "0x8" "8"
 984591-984631 usb_power_delivery: Sym: "0x8" "8"
 984631-984672 usb_power_delivery: Sym: "0x3" "3"
@@ -1087,7 +1087,7 @@
 984550-984875 usb_power_delivery: CRC: "CRC:2a440388" "CRC"
 984875-984915 usb_power_delivery: Sym: "EOP" "#"
 984875-984915 usb_power_delivery: EOP: "EOP" "E"
-983391-984915 usb_power_delivery: text: "#35   (409.746250ms): SNK[6]:VDM - ACK Enter Mode pos 1 SVID:ff01" "..."
+983391-984915 usb_power_delivery: text: "#35   (409.746250ms): (r2) SNK[6]: VDM - [1] ACK Enter Mode pos 1 SVID:ff01" "..."
 985101-985617 usb_power_delivery: Preamble: "Preamble" "..."
 985617-985658 usb_power_delivery: Sym: "SYNC-1" "S1"
 985658-985699 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1099,7 +1099,7 @@
 985863-985904 usb_power_delivery: Sym: "0xD" "D"
 985904-985945 usb_power_delivery: Sym: "0x0" "0"
 985781-985945 usb_power_delivery: Head: "H:0d61" "HD"
-985101-986322 usb_power_delivery: src: "SRC[6]:GOOD CRC" "GOOD CRC"
+985101-986322 usb_power_delivery: src: "(r2) SRC[6]: GOOD CRC" "GOOD CRC"
 985945-985986 usb_power_delivery: Sym: "0x4" "4"
 985986-986027 usb_power_delivery: Sym: "0xA" "A"
 986027-986068 usb_power_delivery: Sym: "0x4" "4"
@@ -1111,7 +1111,7 @@
 985945-986273 usb_power_delivery: CRC: "CRC:438e34a4" "CRC"
 986273-986314 usb_power_delivery: Sym: "EOP" "#"
 986273-986314 usb_power_delivery: EOP: "EOP" "E"
-985101-986314 usb_power_delivery: text: "#36   (410.458750ms): SRC[6]:GOOD CRC" "..."
+985101-986314 usb_power_delivery: text: "#36   (410.458750ms): (r2) SRC[6]: GOOD CRC" "..."
 986702-987218 usb_power_delivery: Preamble: "Preamble" "..."
 987218-987259 usb_power_delivery: Sym: "SYNC-1" "S1"
 987259-987300 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1123,7 +1123,7 @@
 987464-987505 usb_power_delivery: Sym: "0x3" "3"
 987505-987546 usb_power_delivery: Sym: "0x2" "2"
 987382-987546 usb_power_delivery: Head: "H:236f" "HD"
-986702-988570 usb_power_delivery: src: "SRC[1]:VDM" "VDM"
+986702-988570 usb_power_delivery: src: "(r2) SRC[1]: VDM" "VDM"
 987546-987587 usb_power_delivery: Sym: "0x0" "0"
 987587-987628 usb_power_delivery: Sym: "0x1" "1"
 987628-987669 usb_power_delivery: Sym: "0x1" "1"
@@ -1133,7 +1133,7 @@
 987792-987833 usb_power_delivery: Sym: "0xF" "F"
 987833-987874 usb_power_delivery: Sym: "0xF" "F"
 987546-987874 usb_power_delivery: Data: "[0]ff018110" "D0"
-987546-987874 usb_power_delivery: payload: "REQ DP Status pos 1 SVID:ff01" "REQ DP Status pos 1 SVID:ff01"
+987546-987874 usb_power_delivery: payload: "[1] REQ DP Status pos 1 SVID:ff01" "[1] REQ DP Status pos 1 SVID:ff01"
 987874-987915 usb_power_delivery: Sym: "0x0" "0"
 987915-987956 usb_power_delivery: Sym: "0x0" "0"
 987956-987997 usb_power_delivery: Sym: "0x0" "0"
@@ -1143,7 +1143,7 @@
 988120-988161 usb_power_delivery: Sym: "0x0" "0"
 988161-988202 usb_power_delivery: Sym: "0x0" "0"
 987874-988202 usb_power_delivery: Data: "[1]00000000" "D1"
-987874-988202 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+987874-988202 usb_power_delivery: payload: "[2] VDO:00000000" "[2] VDO:00000000"
 988202-988243 usb_power_delivery: Sym: "0x9" "9"
 988243-988284 usb_power_delivery: Sym: "0xA" "A"
 988284-988325 usb_power_delivery: Sym: "0xD" "D"
@@ -1155,7 +1155,7 @@
 988202-988529 usb_power_delivery: CRC: "CRC:2bf84da9" "CRC"
 988529-988570 usb_power_delivery: Sym: "EOP" "#"
 988529-988570 usb_power_delivery: EOP: "EOP" "E"
-986702-988570 usb_power_delivery: text: "#37   (411.125833ms): SRC[1]:VDM - REQ DP Status pos 1 SVID:ff01 - VDO:00000000" "..."
+986702-988570 usb_power_delivery: text: "#37   (411.125833ms): (r2) SRC[1]: VDM - [1] REQ DP Status pos 1 SVID:ff01 - [2] VDO:00000000" "..."
 988749-989260 usb_power_delivery: Preamble: "Preamble" "..."
 989260-989300 usb_power_delivery: Sym: "SYNC-1" "S1"
 989300-989341 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1167,7 +1167,7 @@
 989503-989543 usb_power_delivery: Sym: "0x2" "2"
 989543-989584 usb_power_delivery: Sym: "0x0" "0"
 989422-989584 usb_power_delivery: Head: "H:0241" "HD"
-988749-989957 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+988749-989957 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 989584-989625 usb_power_delivery: Sym: "0x7" "7"
 989625-989665 usb_power_delivery: Sym: "0x9" "9"
 989665-989706 usb_power_delivery: Sym: "0xD" "D"
@@ -1179,7 +1179,7 @@
 989584-989908 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 989908-989949 usb_power_delivery: Sym: "EOP" "#"
 989908-989949 usb_power_delivery: EOP: "EOP" "E"
-988749-989949 usb_power_delivery: text: "#38   (411.978750ms): SNK[1]:GOOD CRC" "..."
+988749-989949 usb_power_delivery: text: "#38   (411.978750ms): (r2) SNK[1]: GOOD CRC" "..."
 990295-990806 usb_power_delivery: Preamble: "Preamble" "..."
 990806-990846 usb_power_delivery: Sym: "SYNC-1" "S1"
 990846-990887 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1191,7 +1191,7 @@
 991049-991090 usb_power_delivery: Sym: "0xE" "E"
 991090-991130 usb_power_delivery: Sym: "0x2" "2"
 990968-991130 usb_power_delivery: Head: "H:2e4f" "HD"
-990295-992144 usb_power_delivery: snk: "SNK[7]:VDM" "VDM"
+990295-992144 usb_power_delivery: snk: "(r2) SNK[7]: VDM" "VDM"
 991130-991171 usb_power_delivery: Sym: "0x0" "0"
 991171-991211 usb_power_delivery: Sym: "0x5" "5"
 991211-991252 usb_power_delivery: Sym: "0x1" "1"
@@ -1201,7 +1201,7 @@
 991373-991414 usb_power_delivery: Sym: "0xF" "F"
 991414-991454 usb_power_delivery: Sym: "0xF" "F"
 991130-991454 usb_power_delivery: Data: "[0]ff018150" "D0"
-991130-991454 usb_power_delivery: payload: "ACK DP Status pos 1 SVID:ff01" "ACK DP Status pos 1 SVID:ff01"
+991130-991454 usb_power_delivery: payload: "[1] ACK DP Status pos 1 SVID:ff01" "[1] ACK DP Status pos 1 SVID:ff01"
 991454-991495 usb_power_delivery: Sym: "0x2" "2"
 991495-991536 usb_power_delivery: Sym: "0x8" "8"
 991536-991576 usb_power_delivery: Sym: "0x0" "0"
@@ -1211,7 +1211,7 @@
 991698-991738 usb_power_delivery: Sym: "0x0" "0"
 991738-991779 usb_power_delivery: Sym: "0x0" "0"
 991454-991779 usb_power_delivery: Data: "[1]00000082" "D1"
-991454-991779 usb_power_delivery: payload: "VDO:00000082" "VDO:00000082"
+991454-991779 usb_power_delivery: payload: "[2] VDO:00000082" "[2] VDO:00000082"
 991779-991819 usb_power_delivery: Sym: "0x3" "3"
 991819-991860 usb_power_delivery: Sym: "0x7" "7"
 991860-991900 usb_power_delivery: Sym: "0x5" "5"
@@ -1223,7 +1223,7 @@
 991779-992103 usb_power_delivery: CRC: "CRC:fb271573" "CRC"
 992103-992144 usb_power_delivery: Sym: "EOP" "#"
 992103-992144 usb_power_delivery: EOP: "EOP" "E"
-990295-992144 usb_power_delivery: text: "#39   (412.622917ms): SNK[7]:VDM - ACK DP Status pos 1 SVID:ff01 - VDO:00000082" "..."
+990295-992144 usb_power_delivery: text: "#39   (412.622917ms): (r2) SNK[7]: VDM - [1] ACK DP Status pos 1 SVID:ff01 - [2] VDO:00000082" "..."
 992356-992872 usb_power_delivery: Preamble: "Preamble" "..."
 992872-992913 usb_power_delivery: Sym: "SYNC-1" "S1"
 992913-992954 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1235,7 +1235,7 @@
 993118-993159 usb_power_delivery: Sym: "0xF" "F"
 993159-993200 usb_power_delivery: Sym: "0x0" "0"
 993036-993200 usb_power_delivery: Head: "H:0f61" "HD"
-992356-993569 usb_power_delivery: src: "SRC[7]:GOOD CRC" "GOOD CRC"
+992356-993569 usb_power_delivery: src: "(r2) SRC[7]: GOOD CRC" "GOOD CRC"
 993200-993241 usb_power_delivery: Sym: "0x8" "8"
 993241-993282 usb_power_delivery: Sym: "0x8" "8"
 993282-993323 usb_power_delivery: Sym: "0x5" "5"
@@ -1247,7 +1247,7 @@
 993200-993528 usb_power_delivery: CRC: "CRC:ad805588" "CRC"
 993528-993569 usb_power_delivery: Sym: "EOP" "#"
 993528-993569 usb_power_delivery: EOP: "EOP" "E"
-992356-993569 usb_power_delivery: text: "#40   (413.481667ms): SRC[7]:GOOD CRC" "..."
+992356-993569 usb_power_delivery: text: "#40   (413.481667ms): (r2) SRC[7]: GOOD CRC" "..."
 993997-994513 usb_power_delivery: Preamble: "Preamble" "..."
 994513-994555 usb_power_delivery: Sym: "SYNC-1" "S1"
 994555-994595 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1259,7 +1259,7 @@
 994760-994801 usb_power_delivery: Sym: "0x5" "5"
 994801-994841 usb_power_delivery: Sym: "0x2" "2"
 994677-994841 usb_power_delivery: Head: "H:256f" "HD"
-993997-995874 usb_power_delivery: src: "SRC[2]:VDM" "VDM"
+993997-995874 usb_power_delivery: src: "(r2) SRC[2]: VDM" "VDM"
 994841-994883 usb_power_delivery: Sym: "0x1" "1"
 994883-994923 usb_power_delivery: Sym: "0x1" "1"
 994923-994965 usb_power_delivery: Sym: "0x1" "1"
@@ -1269,7 +1269,7 @@
 995087-995128 usb_power_delivery: Sym: "0xF" "F"
 995128-995169 usb_power_delivery: Sym: "0xF" "F"
 994841-995169 usb_power_delivery: Data: "[0]ff018111" "D0"
-994841-995169 usb_power_delivery: payload: "REQ DP Configure pos 1 SVID:ff01" "REQ DP Configure pos 1 SVID:ff01"
+994841-995169 usb_power_delivery: payload: "[1] REQ DP Configure pos 1 SVID:ff01" "[1] REQ DP Configure pos 1 SVID:ff01"
 995169-995210 usb_power_delivery: Sym: "0x6" "6"
 995210-995251 usb_power_delivery: Sym: "0x0" "0"
 995251-995292 usb_power_delivery: Sym: "0x4" "4"
@@ -1279,7 +1279,7 @@
 995415-995456 usb_power_delivery: Sym: "0x0" "0"
 995456-995497 usb_power_delivery: Sym: "0x0" "0"
 995169-995497 usb_power_delivery: Data: "[1]00000406" "D1"
-995169-995497 usb_power_delivery: payload: "VDO:00000406" "VDO:00000406"
+995169-995497 usb_power_delivery: payload: "[2] VDO:00000406" "[2] VDO:00000406"
 995497-995538 usb_power_delivery: Sym: "0xD" "D"
 995538-995579 usb_power_delivery: Sym: "0xB" "B"
 995579-995620 usb_power_delivery: Sym: "0x3" "3"
@@ -1291,7 +1291,7 @@
 995497-995825 usb_power_delivery: CRC: "CRC:b62ac3bd" "CRC"
 995825-995866 usb_power_delivery: Sym: "EOP" "#"
 995825-995866 usb_power_delivery: EOP: "EOP" "E"
-993997-995866 usb_power_delivery: text: "#41   (414.165417ms): SRC[2]:VDM - REQ DP Configure pos 1 SVID:ff01 - VDO:00000406" "..."
+993997-995866 usb_power_delivery: text: "#41   (414.165417ms): (r2) SRC[2]: VDM - [1] REQ DP Configure pos 1 SVID:ff01 - [2] VDO:00000406" "..."
 996043-996554 usb_power_delivery: Preamble: "Preamble" "..."
 996554-996594 usb_power_delivery: Sym: "SYNC-1" "S1"
 996594-996635 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1303,7 +1303,7 @@
 996797-996837 usb_power_delivery: Sym: "0x4" "4"
 996837-996878 usb_power_delivery: Sym: "0x0" "0"
 996716-996878 usb_power_delivery: Head: "H:0441" "HD"
-996043-997243 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+996043-997243 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 996878-996918 usb_power_delivery: Sym: "0x2" "2"
 996918-996959 usb_power_delivery: Sym: "0xA" "A"
 996959-996999 usb_power_delivery: Sym: "0x8" "8"
@@ -1315,7 +1315,7 @@
 996878-997202 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 997202-997243 usb_power_delivery: Sym: "EOP" "#"
 997202-997243 usb_power_delivery: EOP: "EOP" "E"
-996043-997243 usb_power_delivery: text: "#42   (415.017917ms): SNK[2]:GOOD CRC" "..."
+996043-997243 usb_power_delivery: text: "#42   (415.017917ms): (r2) SNK[2]: GOOD CRC" "..."
 997539-998050 usb_power_delivery: Preamble: "Preamble" "..."
 998050-998090 usb_power_delivery: Sym: "SYNC-1" "S1"
 998090-998131 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1327,7 +1327,7 @@
 998293-998333 usb_power_delivery: Sym: "0x0" "0"
 998333-998374 usb_power_delivery: Sym: "0x1" "1"
 998212-998374 usb_power_delivery: Head: "H:104f" "HD"
-997539-999071 usb_power_delivery: snk: "SNK[0]:VDM" "VDM"
+997539-999071 usb_power_delivery: snk: "(r2) SNK[0]: VDM" "VDM"
 998374-998414 usb_power_delivery: Sym: "0x1" "1"
 998414-998455 usb_power_delivery: Sym: "0x5" "5"
 998455-998495 usb_power_delivery: Sym: "0x1" "1"
@@ -1337,7 +1337,7 @@
 998617-998658 usb_power_delivery: Sym: "0xF" "F"
 998658-998698 usb_power_delivery: Sym: "0xF" "F"
 998374-998698 usb_power_delivery: Data: "[0]ff018151" "D0"
-998374-998698 usb_power_delivery: payload: "ACK DP Configure pos 1 SVID:ff01" "ACK DP Configure pos 1 SVID:ff01"
+998374-998698 usb_power_delivery: payload: "[1] ACK DP Configure pos 1 SVID:ff01" "[1] ACK DP Configure pos 1 SVID:ff01"
 998698-998739 usb_power_delivery: Sym: "0x4" "4"
 998739-998779 usb_power_delivery: Sym: "0x2" "2"
 998779-998820 usb_power_delivery: Sym: "0x9" "9"
@@ -1349,7 +1349,7 @@
 998698-999022 usb_power_delivery: CRC: "CRC:88734924" "CRC"
 999022-999063 usb_power_delivery: Sym: "EOP" "#"
 999022-999063 usb_power_delivery: EOP: "EOP" "E"
-997539-999063 usb_power_delivery: text: "#43   (415.641250ms): SNK[0]:VDM - ACK DP Configure pos 1 SVID:ff01" "..."
+997539-999063 usb_power_delivery: text: "#43   (415.641250ms): (r2) SNK[0]: VDM - [1] ACK DP Configure pos 1 SVID:ff01" "..."
 999250-999766 usb_power_delivery: Preamble: "Preamble" "..."
 999766-999807 usb_power_delivery: Sym: "SYNC-1" "S1"
 999807-999848 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1361,7 +1361,7 @@
 1000012-1000053 usb_power_delivery: Sym: "0x1" "1"
 1000053-1000094 usb_power_delivery: Sym: "0x0" "0"
 999930-1000094 usb_power_delivery: Head: "H:0161" "HD"
-999250-1000471 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+999250-1000471 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 1000094-1000135 usb_power_delivery: Sym: "0xF" "F"
 1000135-1000176 usb_power_delivery: Sym: "0x8" "8"
 1000176-1000217 usb_power_delivery: Sym: "0x8" "8"
@@ -1373,7 +1373,7 @@
 1000094-1000422 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 1000422-1000463 usb_power_delivery: Sym: "EOP" "#"
 1000422-1000463 usb_power_delivery: EOP: "EOP" "E"
-999250-1000463 usb_power_delivery: text: "#44   (416.354167ms): SRC[0]:GOOD CRC" "..."
+999250-1000463 usb_power_delivery: text: "#44   (416.354167ms): (r2) SRC[0]: GOOD CRC" "..."
 4249288-4249804 usb_power_delivery: Preamble: "Preamble" "..."
 4249804-4249845 usb_power_delivery: Sym: "SYNC-1" "S1"
 4249845-4249886 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1385,7 +1385,7 @@
 4250050-4250091 usb_power_delivery: Sym: "0x7" "7"
 4250091-4250132 usb_power_delivery: Sym: "0x1" "1"
 4249968-4250132 usb_power_delivery: Head: "H:176f" "HD"
-4249288-4250837 usb_power_delivery: src: "SRC[3]:VDM" "VDM"
+4249288-4250837 usb_power_delivery: src: "(r2) SRC[3]: VDM" "VDM"
 4250132-4250173 usb_power_delivery: Sym: "0x4" "4"
 4250173-4250214 usb_power_delivery: Sym: "0x0" "0"
 4250214-4250255 usb_power_delivery: Sym: "0x1" "1"
@@ -1395,7 +1395,7 @@
 4250378-4250419 usb_power_delivery: Sym: "0x8" "8"
 4250419-4250460 usb_power_delivery: Sym: "0x1" "1"
 4250132-4250460 usb_power_delivery: Data: "[0]18d18104" "D0"
-4250132-4250460 usb_power_delivery: payload: "REQ Enter Mode pos 1 SVID:18d1" "REQ Enter Mode pos 1 SVID:18d1"
+4250132-4250460 usb_power_delivery: payload: "[1] REQ Enter Mode pos 1 SVID:18d1" "[1] REQ Enter Mode pos 1 SVID:18d1"
 4250460-4250501 usb_power_delivery: Sym: "0x6" "6"
 4250501-4250542 usb_power_delivery: Sym: "0x5" "5"
 4250542-4250583 usb_power_delivery: Sym: "0xD" "D"
@@ -1407,7 +1407,7 @@
 4250460-4250788 usb_power_delivery: CRC: "CRC:7e7add56" "CRC"
 4250788-4250829 usb_power_delivery: Sym: "EOP" "#"
 4250788-4250829 usb_power_delivery: EOP: "EOP" "E"
-4249288-4250829 usb_power_delivery: text: "#45   (1770.536667ms): SRC[3]:VDM - REQ Enter Mode pos 1 SVID:18d1" "..."
+4249288-4250829 usb_power_delivery: text: "#45   (1770.536667ms): (r2) SRC[3]: VDM - [1] REQ Enter Mode pos 1 SVID:18d1" "..."
 4251007-4251517 usb_power_delivery: Preamble: "Preamble" "..."
 4251517-4251558 usb_power_delivery: Sym: "SYNC-1" "S1"
 4251558-4251598 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1419,7 +1419,7 @@
 4251761-4251801 usb_power_delivery: Sym: "0x6" "6"
 4251801-4251842 usb_power_delivery: Sym: "0x0" "0"
 4251680-4251842 usb_power_delivery: Head: "H:0641" "HD"
-4251007-4252206 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+4251007-4252206 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 4251842-4251882 usb_power_delivery: Sym: "0xE" "E"
 4251882-4251923 usb_power_delivery: Sym: "0x8" "8"
 4251923-4251963 usb_power_delivery: Sym: "0x9" "9"
@@ -1431,7 +1431,7 @@
 4251842-4252166 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 4252166-4252206 usb_power_delivery: Sym: "EOP" "#"
 4252166-4252206 usb_power_delivery: EOP: "EOP" "E"
-4251007-4252206 usb_power_delivery: text: "#46   (1771.252917ms): SNK[3]:GOOD CRC" "..."
+4251007-4252206 usb_power_delivery: text: "#46   (1771.252917ms): (r2) SNK[3]: GOOD CRC" "..."
 4252503-4253014 usb_power_delivery: Preamble: "Preamble" "..."
 4253014-4253054 usb_power_delivery: Sym: "SYNC-1" "S1"
 4253054-4253095 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1443,7 +1443,7 @@
 4253257-4253297 usb_power_delivery: Sym: "0x2" "2"
 4253297-4253338 usb_power_delivery: Sym: "0x1" "1"
 4253176-4253338 usb_power_delivery: Head: "H:124f" "HD"
-4252503-4254035 usb_power_delivery: snk: "SNK[1]:VDM" "VDM"
+4252503-4254035 usb_power_delivery: snk: "(r2) SNK[1]: VDM" "VDM"
 4253338-4253378 usb_power_delivery: Sym: "0x4" "4"
 4253378-4253419 usb_power_delivery: Sym: "0x4" "4"
 4253419-4253460 usb_power_delivery: Sym: "0x1" "1"
@@ -1453,7 +1453,7 @@
 4253581-4253622 usb_power_delivery: Sym: "0x8" "8"
 4253622-4253662 usb_power_delivery: Sym: "0x1" "1"
 4253338-4253662 usb_power_delivery: Data: "[0]18d18144" "D0"
-4253338-4253662 usb_power_delivery: payload: "ACK Enter Mode pos 1 SVID:18d1" "ACK Enter Mode pos 1 SVID:18d1"
+4253338-4253662 usb_power_delivery: payload: "[1] ACK Enter Mode pos 1 SVID:18d1" "[1] ACK Enter Mode pos 1 SVID:18d1"
 4253662-4253703 usb_power_delivery: Sym: "0xD" "D"
 4253703-4253743 usb_power_delivery: Sym: "0x2" "2"
 4253743-4253784 usb_power_delivery: Sym: "0xF" "F"
@@ -1465,7 +1465,7 @@
 4253662-4253986 usb_power_delivery: CRC: "CRC:2a220f2d" "CRC"
 4253986-4254027 usb_power_delivery: Sym: "EOP" "#"
 4253986-4254027 usb_power_delivery: EOP: "EOP" "E"
-4252503-4254027 usb_power_delivery: text: "#47   (1771.876250ms): SNK[1]:VDM - ACK Enter Mode pos 1 SVID:18d1" "..."
+4252503-4254027 usb_power_delivery: text: "#47   (1771.876250ms): (r2) SNK[1]: VDM - [1] ACK Enter Mode pos 1 SVID:18d1" "..."
 4254219-4254735 usb_power_delivery: Preamble: "Preamble" "..."
 4254735-4254777 usb_power_delivery: Sym: "SYNC-1" "S1"
 4254777-4254817 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1477,7 +1477,7 @@
 4254982-4255022 usb_power_delivery: Sym: "0x3" "3"
 4255022-4255063 usb_power_delivery: Sym: "0x0" "0"
 4254899-4255063 usb_power_delivery: Head: "H:0361" "HD"
-4254219-4255432 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+4254219-4255432 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 4255063-4255104 usb_power_delivery: Sym: "0x3" "3"
 4255104-4255145 usb_power_delivery: Sym: "0xA" "A"
 4255145-4255186 usb_power_delivery: Sym: "0x9" "9"
@@ -1489,7 +1489,7 @@
 4255063-4255391 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 4255391-4255432 usb_power_delivery: Sym: "EOP" "#"
 4255391-4255432 usb_power_delivery: EOP: "EOP" "E"
-4254219-4255432 usb_power_delivery: text: "#48   (1772.591250ms): SRC[1]:GOOD CRC" "..."
+4254219-4255432 usb_power_delivery: text: "#48   (1772.591250ms): (r2) SRC[1]: GOOD CRC" "..."
 4255794-4256310 usb_power_delivery: Preamble: "Preamble" "..."
 4256310-4256351 usb_power_delivery: Sym: "SYNC-1" "S1"
 4256351-4256392 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1501,7 +1501,7 @@
 4256556-4256597 usb_power_delivery: Sym: "0x9" "9"
 4256597-4256638 usb_power_delivery: Sym: "0x1" "1"
 4256474-4256638 usb_power_delivery: Head: "H:196f" "HD"
-4255794-4257335 usb_power_delivery: src: "SRC[4]:VDM" "VDM"
+4255794-4257335 usb_power_delivery: src: "(r2) SRC[4]: VDM" "VDM"
 4256638-4256679 usb_power_delivery: Sym: "0xC" "C"
 4256679-4256720 usb_power_delivery: Sym: "0x0" "0"
 4256720-4256761 usb_power_delivery: Sym: "0x0" "0"
@@ -1511,7 +1511,7 @@
 4256884-4256925 usb_power_delivery: Sym: "0x8" "8"
 4256925-4256966 usb_power_delivery: Sym: "0x1" "1"
 4256638-4256966 usb_power_delivery: Data: "[0]18d1000c" "D0"
-4256638-4256966 usb_power_delivery: payload: "unstruct [000c] SVID:18d1" "unstruct [000c] SVID:18d1"
+4256638-4256966 usb_power_delivery: payload: "[1] unstruct [000c] SVID:18d1" "[1] unstruct [000c] SVID:18d1"
 4256966-4257007 usb_power_delivery: Sym: "0xF" "F"
 4257007-4257048 usb_power_delivery: Sym: "0x6" "6"
 4257048-4257089 usb_power_delivery: Sym: "0xA" "A"
@@ -1523,7 +1523,7 @@
 4256966-4257294 usb_power_delivery: CRC: "CRC:e4093a6f" "CRC"
 4257294-4257335 usb_power_delivery: Sym: "EOP" "#"
 4257294-4257335 usb_power_delivery: EOP: "EOP" "E"
-4255794-4257335 usb_power_delivery: text: "#49   (1773.247500ms): SRC[4]:VDM - unstruct [000c] SVID:18d1" "..."
+4255794-4257335 usb_power_delivery: text: "#49   (1773.247500ms): (r2) SRC[4]: VDM - [1] unstruct [000c] SVID:18d1" "..."
 4257513-4258023 usb_power_delivery: Preamble: "Preamble" "..."
 4258023-4258064 usb_power_delivery: Sym: "SYNC-1" "S1"
 4258064-4258104 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1535,7 +1535,7 @@
 4258266-4258307 usb_power_delivery: Sym: "0x8" "8"
 4258307-4258348 usb_power_delivery: Sym: "0x0" "0"
 4258185-4258348 usb_power_delivery: Head: "H:0841" "HD"
-4257513-4258720 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+4257513-4258720 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 4258348-4258388 usb_power_delivery: Sym: "0x9" "9"
 4258388-4258429 usb_power_delivery: Sym: "0x8" "8"
 4258429-4258469 usb_power_delivery: Sym: "0x4" "4"
@@ -1547,7 +1547,7 @@
 4258348-4258672 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 4258672-4258712 usb_power_delivery: Sym: "EOP" "#"
 4258672-4258712 usb_power_delivery: EOP: "EOP" "E"
-4257513-4258712 usb_power_delivery: text: "#50   (1773.963750ms): SNK[4]:GOOD CRC" "..."
+4257513-4258712 usb_power_delivery: text: "#50   (1773.963750ms): (r2) SNK[4]: GOOD CRC" "..."
 4763951-4764462 usb_power_delivery: Preamble: "Preamble" "..."
 4764462-4764502 usb_power_delivery: Sym: "SYNC-1" "S1"
 4764502-4764543 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1559,7 +1559,7 @@
 4764705-4764746 usb_power_delivery: Sym: "0x4" "4"
 4764746-4764786 usb_power_delivery: Sym: "0x7" "7"
 4764624-4764786 usb_power_delivery: Head: "H:744f" "HD"
-4763951-4767429 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+4763951-4767429 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 4764786-4764827 usb_power_delivery: Sym: "0xC" "C"
 4764827-4764867 usb_power_delivery: Sym: "0x2" "2"
 4764867-4764908 usb_power_delivery: Sym: "0x0" "0"
@@ -1569,7 +1569,7 @@
 4765029-4765070 usb_power_delivery: Sym: "0x8" "8"
 4765070-4765110 usb_power_delivery: Sym: "0x1" "1"
 4764786-4765110 usb_power_delivery: Data: "[0]18d1002c" "D0"
-4764786-4765110 usb_power_delivery: payload: "unstruct [002c] SVID:18d1" "unstruct [002c] SVID:18d1"
+4764786-4765110 usb_power_delivery: payload: "[1] unstruct [002c] SVID:18d1" "[1] unstruct [002c] SVID:18d1"
 4765110-4765151 usb_power_delivery: Sym: "0x3" "3"
 4765151-4765191 usb_power_delivery: Sym: "0x4" "4"
 4765191-4765232 usb_power_delivery: Sym: "0xB" "B"
@@ -1579,7 +1579,7 @@
 4765354-4765394 usb_power_delivery: Sym: "0x0" "0"
 4765394-4765435 usb_power_delivery: Sym: "0x2" "2"
 4765110-4765435 usb_power_delivery: Data: "[1]204e1b43" "D1"
-4765110-4765435 usb_power_delivery: payload: "VDO:204e1b43" "VDO:204e1b43"
+4765110-4765435 usb_power_delivery: payload: "[2] VDO:204e1b43" "[2] VDO:204e1b43"
 4765435-4765475 usb_power_delivery: Sym: "0x8" "8"
 4765475-4765516 usb_power_delivery: Sym: "0xE" "E"
 4765516-4765556 usb_power_delivery: Sym: "0x8" "8"
@@ -1589,7 +1589,7 @@
 4765678-4765719 usb_power_delivery: Sym: "0x9" "9"
 4765719-4765759 usb_power_delivery: Sym: "0x2" "2"
 4765435-4765759 usb_power_delivery: Data: "[2]29dd38e8" "D2"
-4765435-4765759 usb_power_delivery: payload: "VDO:29dd38e8" "VDO:29dd38e8"
+4765435-4765759 usb_power_delivery: payload: "[3] VDO:29dd38e8" "[3] VDO:29dd38e8"
 4765759-4765800 usb_power_delivery: Sym: "0x2" "2"
 4765800-4765840 usb_power_delivery: Sym: "0x4" "4"
 4765840-4765881 usb_power_delivery: Sym: "0xD" "D"
@@ -1599,7 +1599,7 @@
 4766002-4766043 usb_power_delivery: Sym: "0xC" "C"
 4766043-4766083 usb_power_delivery: Sym: "0xF" "F"
 4765759-4766083 usb_power_delivery: Data: "[3]fc6dbd42" "D3"
-4765759-4766083 usb_power_delivery: payload: "VDO:fc6dbd42" "VDO:fc6dbd42"
+4765759-4766083 usb_power_delivery: payload: "[4] VDO:fc6dbd42" "[4] VDO:fc6dbd42"
 4766083-4766124 usb_power_delivery: Sym: "0x3" "3"
 4766124-4766165 usb_power_delivery: Sym: "0x1" "1"
 4766165-4766205 usb_power_delivery: Sym: "0x2" "2"
@@ -1609,7 +1609,7 @@
 4766327-4766367 usb_power_delivery: Sym: "0x6" "6"
 4766367-4766408 usb_power_delivery: Sym: "0x4" "4"
 4766083-4766408 usb_power_delivery: Data: "[4]46b2f213" "D4"
-4766083-4766408 usb_power_delivery: payload: "VDO:46b2f213" "VDO:46b2f213"
+4766083-4766408 usb_power_delivery: payload: "[5] VDO:46b2f213" "[5] VDO:46b2f213"
 4766408-4766448 usb_power_delivery: Sym: "0x6" "6"
 4766448-4766489 usb_power_delivery: Sym: "0xA" "A"
 4766489-4766529 usb_power_delivery: Sym: "0x4" "4"
@@ -1619,7 +1619,7 @@
 4766651-4766691 usb_power_delivery: Sym: "0x8" "8"
 4766691-4766732 usb_power_delivery: Sym: "0x0" "0"
 4766408-4766732 usb_power_delivery: Data: "[5]0898f4a6" "D5"
-4766408-4766732 usb_power_delivery: payload: "VDO:0898f4a6" "VDO:0898f4a6"
+4766408-4766732 usb_power_delivery: payload: "[6] VDO:0898f4a6" "[6] VDO:0898f4a6"
 4766732-4766773 usb_power_delivery: Sym: "0x9" "9"
 4766773-4766813 usb_power_delivery: Sym: "0x5" "5"
 4766813-4766854 usb_power_delivery: Sym: "0x5" "5"
@@ -1629,7 +1629,7 @@
 4766975-4767016 usb_power_delivery: Sym: "0x8" "8"
 4767016-4767056 usb_power_delivery: Sym: "0x0" "0"
 4766732-4767056 usb_power_delivery: Data: "[6]08040559" "D6"
-4766732-4767056 usb_power_delivery: payload: "VDO:08040559" "VDO:08040559"
+4766732-4767056 usb_power_delivery: payload: "[7] VDO:08040559" "[7] VDO:08040559"
 4767056-4767097 usb_power_delivery: Sym: "0xD" "D"
 4767097-4767137 usb_power_delivery: Sym: "0xC" "C"
 4767137-4767178 usb_power_delivery: Sym: "0x4" "4"
@@ -1641,7 +1641,7 @@
 4767056-4767381 usb_power_delivery: CRC: "CRC:8cf974cd" "CRC"
 4767381-4767421 usb_power_delivery: Sym: "EOP" "#"
 4767381-4767421 usb_power_delivery: EOP: "EOP" "E"
-4763951-4767421 usb_power_delivery: text: "#51   (1984.979583ms): SNK[2]:VDM - unstruct [002c] SVID:18d1 - VDO:204e1b43 - VDO:29dd38e8 - VDO:fc6dbd42 - VDO:46b2f213 - VDO:0898f4a6 - VDO:08040559" "..."
+4763951-4767421 usb_power_delivery: text: "#51   (1984.979583ms): (r2) SNK[2]: VDM - [1] unstruct [002c] SVID:18d1 - [2] VDO:204e1b43 - [3] VDO:29dd38e8 - [4] VDO:fc6dbd42 - [5] VDO:46b2f213 - [6] VDO:0898f4a6 - [7] VDO:08040559" "..."
 4767610-4768126 usb_power_delivery: Preamble: "Preamble" "..."
 4768126-4768167 usb_power_delivery: Sym: "SYNC-1" "S1"
 4768167-4768208 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1653,7 +1653,7 @@
 4768372-4768413 usb_power_delivery: Sym: "0x5" "5"
 4768413-4768454 usb_power_delivery: Sym: "0x0" "0"
 4768290-4768454 usb_power_delivery: Head: "H:0561" "HD"
-4767610-4768831 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+4767610-4768831 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 4768454-4768495 usb_power_delivery: Sym: "0x6" "6"
 4768495-4768536 usb_power_delivery: Sym: "0x9" "9"
 4768536-4768577 usb_power_delivery: Sym: "0xC" "C"
@@ -1665,7 +1665,7 @@
 4768454-4768782 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 4768782-4768823 usb_power_delivery: Sym: "EOP" "#"
 4768782-4768823 usb_power_delivery: EOP: "EOP" "E"
-4767610-4768823 usb_power_delivery: text: "#52   (1986.504167ms): SRC[2]:GOOD CRC" "..."
+4767610-4768823 usb_power_delivery: text: "#52   (1986.504167ms): (r2) SRC[2]: GOOD CRC" "..."
 4806118-4806629 usb_power_delivery: Preamble: "Preamble" "..."
 4806629-4806669 usb_power_delivery: Sym: "SYNC-1" "S1"
 4806669-4806710 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1677,7 +1677,7 @@
 4806872-4806913 usb_power_delivery: Sym: "0x6" "6"
 4806913-4806953 usb_power_delivery: Sym: "0x2" "2"
 4806791-4806953 usb_power_delivery: Head: "H:264f" "HD"
-4806118-4807967 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+4806118-4807967 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 4806953-4806994 usb_power_delivery: Sym: "0x6" "6"
 4806994-4807034 usb_power_delivery: Sym: "0x0" "0"
 4807034-4807075 usb_power_delivery: Sym: "0x1" "1"
@@ -1687,7 +1687,7 @@
 4807196-4807237 usb_power_delivery: Sym: "0xF" "F"
 4807237-4807277 usb_power_delivery: Sym: "0xF" "F"
 4806953-4807277 usb_power_delivery: Data: "[0]ff018106" "D0"
-4806953-4807277 usb_power_delivery: payload: "REQ Attention pos 1 SVID:ff01" "REQ Attention pos 1 SVID:ff01"
+4806953-4807277 usb_power_delivery: payload: "[1] REQ Attention pos 1 SVID:ff01" "[1] REQ Attention pos 1 SVID:ff01"
 4807277-4807318 usb_power_delivery: Sym: "0xA" "A"
 4807318-4807359 usb_power_delivery: Sym: "0x8" "8"
 4807359-4807399 usb_power_delivery: Sym: "0x1" "1"
@@ -1697,7 +1697,7 @@
 4807521-4807561 usb_power_delivery: Sym: "0x0" "0"
 4807561-4807602 usb_power_delivery: Sym: "0x0" "0"
 4807277-4807602 usb_power_delivery: Data: "[1]0000018a" "D1"
-4807277-4807602 usb_power_delivery: payload: "VDO:0000018a" "VDO:0000018a"
+4807277-4807602 usb_power_delivery: payload: "[2] VDO:0000018a" "[2] VDO:0000018a"
 4807602-4807642 usb_power_delivery: Sym: "0x2" "2"
 4807642-4807683 usb_power_delivery: Sym: "0xF" "F"
 4807683-4807723 usb_power_delivery: Sym: "0xF" "F"
@@ -1709,4 +1709,28 @@
 4807602-4807926 usb_power_delivery: CRC: "CRC:17c00ff2" "CRC"
 4807926-4807967 usb_power_delivery: Sym: "EOP" "#"
 4807926-4807967 usb_power_delivery: EOP: "EOP" "E"
-4806118-4807967 usb_power_delivery: text: "#53   (2002.549167ms): SNK[3]:VDM - REQ Attention pos 1 SVID:ff01 - VDO:0000018a" "..."
+4806118-4807967 usb_power_delivery: text: "#53   (2002.549167ms): (r2) SNK[3]: VDM - [1] REQ Attention pos 1 SVID:ff01 - [2] VDO:0000018a" "..."
+4808154-4808671 usb_power_delivery: Preamble: "Preamble" "..."
+4808671-4808712 usb_power_delivery: Sym: "SYNC-1" "S1"
+4808712-4808753 usb_power_delivery: Sym: "SYNC-1" "S1"
+4808753-4808794 usb_power_delivery: Sym: "SYNC-1" "S1"
+4808794-4808835 usb_power_delivery: Sym: "SYNC-2" "S2"
+4808671-4808835 usb_power_delivery: SOP: "SOP" "S"
+4808835-4808876 usb_power_delivery: Sym: "0x1" "1"
+4808876-4808917 usb_power_delivery: Sym: "0x6" "6"
+4808917-4808958 usb_power_delivery: Sym: "0x7" "7"
+4808958-4808999 usb_power_delivery: Sym: "0x0" "0"
+4808835-4808999 usb_power_delivery: Head: "H:0761" "HD"
+4808154-4809376 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
+4808999-4809040 usb_power_delivery: Sym: "0xA" "A"
+4809040-4809081 usb_power_delivery: Sym: "0xB" "B"
+4809081-4809122 usb_power_delivery: Sym: "0xD" "D"
+4809122-4809163 usb_power_delivery: Sym: "0xD" "D"
+4809163-4809204 usb_power_delivery: Sym: "0xB" "B"
+4809204-4809245 usb_power_delivery: Sym: "0x5" "5"
+4809245-4809286 usb_power_delivery: Sym: "0x3" "3"
+4809286-4809327 usb_power_delivery: Sym: "0xA" "A"
+4808999-4809327 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
+4809327-4809368 usb_power_delivery: Sym: "EOP" "#"
+4809327-4809368 usb_power_delivery: EOP: "EOP" "E"
+4808154-4809368 usb_power_delivery: text: "#54   (2003.397500ms): (r2) SRC[3]: GOOD CRC" "..."