usb_power_delivery: Update tests to match new output of decoder

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

diff --git a/decoder/test/usb_power_delivery/macbook2015_hdmi.output b/decoder/test/usb_power_delivery/macbook2015_hdmi.output
index c49fee6439c20191c5f0097a01547697993ee047..44ed003624009b43533549a1f7da4e1a1c77dff5 100644 (file)
--- a/decoder/test/usb_power_delivery/macbook2015_hdmi.output
+++ b/decoder/test/usb_power_delivery/macbook2015_hdmi.output
@@ -9,7 +9,7 @@
 56665-56705 usb_power_delivery: Sym: "0x1" "1"
 56705-56745 usb_power_delivery: Sym: "0x1" "1"
 56585-56745 usb_power_delivery: Head: "H:1161" "HD"
-55912-57428 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+55912-57428 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 56745-56786 usb_power_delivery: Sym: "0x6" "6"
 56786-56826 usb_power_delivery: Sym: "0x9" "9"
 56826-56866 usb_power_delivery: Sym: "0x0" "0"
@@ -19,7 +19,7 @@
 56986-57027 usb_power_delivery: Sym: "0x6" "6"
 57027-57067 usb_power_delivery: Sym: "0x3" "3"
 56745-57067 usb_power_delivery: Data: "[0]36019096" "D0"
-56745-57067 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
+56745-57067 usb_power_delivery: payload: "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]"
 57067-57107 usb_power_delivery: Sym: "0xE" "E"
 57107-57147 usb_power_delivery: Sym: "0x3" "3"
 57147-57187 usb_power_delivery: Sym: "0x1" "1"
@@ -31,7 +31,7 @@
 57067-57388 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 57388-57428 usb_power_delivery: Sym: "EOP" "#"
 57388-57428 usb_power_delivery: EOP: "EOP" "E"
-55912-57428 usb_power_delivery: text: "#1    (23.296667ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
+55912-57428 usb_power_delivery: text: "#1    (23.296667ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "..."
 62499-63011 usb_power_delivery: Preamble: "Preamble" "..."
 63011-63051 usb_power_delivery: Sym: "SYNC-1" "S1"
 63051-63091 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -43,7 +43,7 @@
 63252-63292 usb_power_delivery: Sym: "0x1" "1"
 63292-63332 usb_power_delivery: Sym: "0x1" "1"
 63172-63332 usb_power_delivery: Head: "H:1161" "HD"
-62499-64015 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+62499-64015 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 63332-63373 usb_power_delivery: Sym: "0x6" "6"
 63373-63413 usb_power_delivery: Sym: "0x9" "9"
 63413-63453 usb_power_delivery: Sym: "0x0" "0"
@@ -53,7 +53,7 @@
 63573-63614 usb_power_delivery: Sym: "0x6" "6"
 63614-63654 usb_power_delivery: Sym: "0x3" "3"
 63332-63654 usb_power_delivery: Data: "[0]36019096" "D0"
-63332-63654 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
+63332-63654 usb_power_delivery: payload: "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]"
 63654-63694 usb_power_delivery: Sym: "0xE" "E"
 63694-63734 usb_power_delivery: Sym: "0x3" "3"
 63734-63774 usb_power_delivery: Sym: "0x1" "1"
@@ -65,7 +65,7 @@
 63654-63975 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 63975-64015 usb_power_delivery: Sym: "EOP" "#"
 63975-64015 usb_power_delivery: EOP: "EOP" "E"
-62499-64015 usb_power_delivery: text: "#2    (26.041250ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
+62499-64015 usb_power_delivery: text: "#2    (26.041250ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "..."
 69076-69589 usb_power_delivery: Preamble: "Preamble" "..."
 69589-69629 usb_power_delivery: Sym: "SYNC-1" "S1"
 69629-69669 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -77,7 +77,7 @@
 69830-69870 usb_power_delivery: Sym: "0x1" "1"
 69870-69910 usb_power_delivery: Sym: "0x1" "1"
 69749-69910 usb_power_delivery: Head: "H:1161" "HD"
-69076-70593 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+69076-70593 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 69910-69950 usb_power_delivery: Sym: "0x6" "6"
 69950-69990 usb_power_delivery: Sym: "0x9" "9"
 69990-70030 usb_power_delivery: Sym: "0x0" "0"
@@ -87,7 +87,7 @@
 70151-70191 usb_power_delivery: Sym: "0x6" "6"
 70191-70231 usb_power_delivery: Sym: "0x3" "3"
 69910-70231 usb_power_delivery: Data: "[0]36019096" "D0"
-69910-70231 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
+69910-70231 usb_power_delivery: payload: "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]"
 70231-70271 usb_power_delivery: Sym: "0xE" "E"
 70271-70312 usb_power_delivery: Sym: "0x3" "3"
 70312-70352 usb_power_delivery: Sym: "0x1" "1"
@@ -99,7 +99,7 @@
 70231-70553 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 70553-70593 usb_power_delivery: Sym: "EOP" "#"
 70553-70593 usb_power_delivery: EOP: "EOP" "E"
-69076-70593 usb_power_delivery: text: "#3    (28.781667ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
+69076-70593 usb_power_delivery: text: "#3    (28.781667ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "..."
 463745-464257 usb_power_delivery: Preamble: "Preamble" "..."
 464257-464297 usb_power_delivery: Sym: "SYNC-1" "S1"
 464297-464337 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -111,7 +111,7 @@
 464498-464538 usb_power_delivery: Sym: "0x1" "1"
 464538-464579 usb_power_delivery: Sym: "0x1" "1"
 464418-464579 usb_power_delivery: Head: "H:1161" "HD"
-463745-465261 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+463745-465261 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 464579-464619 usb_power_delivery: Sym: "0x6" "6"
 464619-464659 usb_power_delivery: Sym: "0x9" "9"
 464659-464699 usb_power_delivery: Sym: "0x0" "0"
@@ -121,7 +121,7 @@
 464820-464860 usb_power_delivery: Sym: "0x6" "6"
 464860-464900 usb_power_delivery: Sym: "0x3" "3"
 464579-464900 usb_power_delivery: Data: "[0]36019096" "D0"
-464579-464900 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
+464579-464900 usb_power_delivery: payload: "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]"
 464900-464940 usb_power_delivery: Sym: "0xE" "E"
 464940-464980 usb_power_delivery: Sym: "0x3" "3"
 464980-465020 usb_power_delivery: Sym: "0x1" "1"
@@ -133,7 +133,7 @@
 464900-465221 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 465221-465261 usb_power_delivery: Sym: "EOP" "#"
 465221-465261 usb_power_delivery: EOP: "EOP" "E"
-463745-465261 usb_power_delivery: text: "#4    (193.227083ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
+463745-465261 usb_power_delivery: text: "#4    (193.227083ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [suspend] [comm_cap] [dual_role_data]" "..."
 465508-466023 usb_power_delivery: Preamble: "Preamble" "..."
 466023-466064 usb_power_delivery: Sym: "SYNC-1" "S1"
 466064-466104 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -145,7 +145,7 @@
 466265-466306 usb_power_delivery: Sym: "0x0" "0"
 466306-466346 usb_power_delivery: Sym: "0x0" "0"
 466185-466346 usb_power_delivery: Head: "H:0041" "HD"
-465508-466718 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+465508-466718 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 466346-466387 usb_power_delivery: Sym: "0xB" "B"
 466387-466427 usb_power_delivery: Sym: "0xB" "B"
 466427-466467 usb_power_delivery: Sym: "0xC" "C"
@@ -157,7 +157,7 @@
 466346-466669 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 466669-466710 usb_power_delivery: Sym: "EOP" "#"
 466669-466710 usb_power_delivery: EOP: "EOP" "E"
-465508-466710 usb_power_delivery: text: "#5    (193.961667ms): SNK[0]:GOOD CRC" "..."
+465508-466710 usb_power_delivery: text: "#5    (193.961667ms): (r2) SNK[0]: GOOD CRC" "..."
 467724-468239 usb_power_delivery: Preamble: "Preamble" "..."
 468239-468280 usb_power_delivery: Sym: "SYNC-1" "S1"
 468280-468320 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -169,7 +169,7 @@
 468481-468522 usb_power_delivery: Sym: "0x0" "0"
 468522-468562 usb_power_delivery: Sym: "0x1" "1"
 468401-468562 usb_power_delivery: Head: "H:1042" "HD"
-467724-469256 usb_power_delivery: snk: "SNK[0]:REQUEST" "REQUEST"
+467724-469256 usb_power_delivery: snk: "(r2) SNK[0]: REQUEST" "REQUEST"
 468562-468603 usb_power_delivery: Sym: "0x6" "6"
 468603-468643 usb_power_delivery: Sym: "0x9" "9"
 468643-468683 usb_power_delivery: Sym: "0x8" "8"
@@ -179,7 +179,7 @@
 468805-468845 usb_power_delivery: Sym: "0x3" "3"
 468845-468885 usb_power_delivery: Sym: "0x1" "1"
 468562-468885 usb_power_delivery: Data: "[0]13025896" "D0"
-468562-468885 usb_power_delivery: payload: "[1]1500/1500 mA comm_cap no_suspend" "[1]1500/1500 mA comm_cap no_suspend"
+468562-468885 usb_power_delivery: payload: "[1] (PDO #1: Fixed 5V) 1.5A (operating) / 1.5A (max) [comm_cap] [no_suspend]" "[1] (PDO #1: Fixed 5V) 1.5A (operating) / 1.5A (max) [comm_cap] [no_suspend]"
 468885-468925 usb_power_delivery: Sym: "0xA" "A"
 468925-468966 usb_power_delivery: Sym: "0x6" "6"
 468966-469006 usb_power_delivery: Sym: "0xF" "F"
@@ -191,7 +191,7 @@
 468885-469208 usb_power_delivery: CRC: "CRC:dfbe7f6a" "CRC"
 469208-469248 usb_power_delivery: Sym: "EOP" "#"
 469208-469248 usb_power_delivery: EOP: "EOP" "E"
-467724-469248 usb_power_delivery: text: "#6    (194.885000ms): SNK[0]:REQUEST - [1]1500/1500 mA comm_cap no_suspend" "..."
+467724-469248 usb_power_delivery: text: "#6    (194.885000ms): (r2) SNK[0]: REQUEST - [1] (PDO #1: Fixed 5V) 1.5A (operating) / 1.5A (max) [comm_cap] [no_suspend]" "..."
 469499-470011 usb_power_delivery: Preamble: "Preamble" "..."
 470011-470052 usb_power_delivery: Sym: "SYNC-1" "S1"
 470052-470092 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -203,7 +203,7 @@
 470252-470293 usb_power_delivery: Sym: "0x1" "1"
 470293-470333 usb_power_delivery: Sym: "0x0" "0"
 470172-470333 usb_power_delivery: Head: "H:0161" "HD"
-469499-470702 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+469499-470702 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 470333-470373 usb_power_delivery: Sym: "0xF" "F"
 470373-470413 usb_power_delivery: Sym: "0x8" "8"
 470413-470453 usb_power_delivery: Sym: "0x8" "8"
@@ -215,7 +215,7 @@
 470333-470654 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 470654-470694 usb_power_delivery: Sym: "EOP" "#"
 470654-470694 usb_power_delivery: EOP: "EOP" "E"
-469499-470694 usb_power_delivery: text: "#7    (195.624583ms): SRC[0]:GOOD CRC" "..."
+469499-470694 usb_power_delivery: text: "#7    (195.624583ms): (r2) SRC[0]: GOOD CRC" "..."
 471380-471893 usb_power_delivery: Preamble: "Preamble" "..."
 471893-471933 usb_power_delivery: Sym: "SYNC-1" "S1"
 471933-471973 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -227,7 +227,7 @@
 472134-472174 usb_power_delivery: Sym: "0x3" "3"
 472174-472214 usb_power_delivery: Sym: "0x0" "0"
 472054-472214 usb_power_delivery: Head: "H:0363" "HD"
-471380-472584 usb_power_delivery: src: "SRC[1]:ACCEPT" "ACCEPT"
+471380-472584 usb_power_delivery: src: "(r2) SRC[1]: ACCEPT" "ACCEPT"
 472214-472255 usb_power_delivery: Sym: "0x1" "1"
 472255-472295 usb_power_delivery: Sym: "0x2" "2"
 472295-472335 usb_power_delivery: Sym: "0xB" "B"
@@ -239,7 +239,7 @@
 472214-472536 usb_power_delivery: CRC: "CRC:96007b21" "CRC"
 472536-472576 usb_power_delivery: Sym: "EOP" "#"
 472536-472576 usb_power_delivery: EOP: "EOP" "E"
-471380-472576 usb_power_delivery: text: "#8    (196.408333ms): SRC[1]:ACCEPT" "..."
+471380-472576 usb_power_delivery: text: "#8    (196.408333ms): (r2) SRC[1]: ACCEPT" "..."
 472834-473349 usb_power_delivery: Preamble: "Preamble" "..."
 473349-473389 usb_power_delivery: Sym: "SYNC-1" "S1"
 473389-473430 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -251,7 +251,7 @@
 473591-473632 usb_power_delivery: Sym: "0x2" "2"
 473632-473672 usb_power_delivery: Sym: "0x0" "0"
 473510-473672 usb_power_delivery: Head: "H:0241" "HD"
-472834-474043 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+472834-474043 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 473672-473712 usb_power_delivery: Sym: "0x7" "7"
 473712-473753 usb_power_delivery: Sym: "0x9" "9"
 473753-473793 usb_power_delivery: Sym: "0xD" "D"
@@ -263,7 +263,7 @@
 473672-473995 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 473995-474035 usb_power_delivery: Sym: "EOP" "#"
 473995-474035 usb_power_delivery: EOP: "EOP" "E"
-472834-474035 usb_power_delivery: text: "#9    (197.014167ms): SNK[1]:GOOD CRC" "..."
+472834-474035 usb_power_delivery: text: "#9    (197.014167ms): (r2) SNK[1]: GOOD CRC" "..."
 595656-596169 usb_power_delivery: Preamble: "Preamble" "..."
 596169-596209 usb_power_delivery: Sym: "SYNC-1" "S1"
 596209-596249 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -275,7 +275,7 @@
 596410-596450 usb_power_delivery: Sym: "0x5" "5"
 596450-596490 usb_power_delivery: Sym: "0x0" "0"
 596329-596490 usb_power_delivery: Head: "H:0566" "HD"
-595656-596860 usb_power_delivery: src: "SRC[2]:PS RDY" "PS RDY"
+595656-596860 usb_power_delivery: src: "(r2) SRC[2]: PS RDY" "PS RDY"
 596490-596530 usb_power_delivery: Sym: "0x1" "1"
 596530-596570 usb_power_delivery: Sym: "0x5" "5"
 596570-596611 usb_power_delivery: Sym: "0xA" "A"
@@ -287,7 +287,7 @@
 596490-596812 usb_power_delivery: CRC: "CRC:02142a51" "CRC"
 596812-596852 usb_power_delivery: Sym: "EOP" "#"
 596812-596852 usb_power_delivery: EOP: "EOP" "E"
-595656-596852 usb_power_delivery: text: "#10   (248.190000ms): SRC[2]:PS RDY" "..."
+595656-596852 usb_power_delivery: text: "#10   (248.190000ms): (r2) SRC[2]: PS RDY" "..."
 597133-597648 usb_power_delivery: Preamble: "Preamble" "..."
 597648-597688 usb_power_delivery: Sym: "SYNC-1" "S1"
 597688-597729 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -299,7 +299,7 @@
 597890-597931 usb_power_delivery: Sym: "0x4" "4"
 597931-597971 usb_power_delivery: Sym: "0x0" "0"
 597809-597971 usb_power_delivery: Head: "H:0441" "HD"
-597133-598334 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+597133-598334 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 597971-598011 usb_power_delivery: Sym: "0x2" "2"
 598011-598052 usb_power_delivery: Sym: "0xA" "A"
 598052-598092 usb_power_delivery: Sym: "0x8" "8"
@@ -311,7 +311,7 @@
 597971-598294 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 598294-598334 usb_power_delivery: Sym: "EOP" "#"
 598294-598334 usb_power_delivery: EOP: "EOP" "E"
-597133-598334 usb_power_delivery: text: "#11   (248.805417ms): SNK[2]:GOOD CRC" "..."
+597133-598334 usb_power_delivery: text: "#11   (248.805417ms): (r2) SNK[2]: GOOD CRC" "..."
 598834-599346 usb_power_delivery: Preamble: "Preamble" "..."
 599346-599387 usb_power_delivery: Sym: "SYNC-1" "S1"
 599387-599427 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -323,7 +323,7 @@
 599588-599628 usb_power_delivery: Sym: "0x7" "7"
 599628-599668 usb_power_delivery: Sym: "0x1" "1"
 599507-599668 usb_power_delivery: Head: "H:1761" "HD"
-598834-600359 usb_power_delivery: src: "SRC[3]:SOURCE CAP" "SOURCE CAP"
+598834-600359 usb_power_delivery: src: "(r2) SRC[3]: SOURCE CAP" "SOURCE CAP"
 599668-599708 usb_power_delivery: Sym: "0x6" "6"
 599708-599748 usb_power_delivery: Sym: "0x9" "9"
 599748-599788 usb_power_delivery: Sym: "0x0" "0"
@@ -333,7 +333,7 @@
 599909-599949 usb_power_delivery: Sym: "0x6" "6"
 599949-599989 usb_power_delivery: Sym: "0x2" "2"
 599668-599989 usb_power_delivery: Data: "[0]26019096" "D0"
-599668-599989 usb_power_delivery: payload: "5.0V 1.5A dual_role_power comm_cap dual_role_data" "5.0V 1.5A dual_role_power comm_cap dual_role_data"
+599668-599989 usb_power_delivery: payload: "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [comm_cap] [dual_role_data]" "[1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [comm_cap] [dual_role_data]"
 599989-600029 usb_power_delivery: Sym: "0xA" "A"
 600029-600069 usb_power_delivery: Sym: "0xF" "F"
 600069-600110 usb_power_delivery: Sym: "0x4" "4"
@@ -345,7 +345,7 @@
 599989-600311 usb_power_delivery: CRC: "CRC:0e8484fa" "CRC"
 600311-600351 usb_power_delivery: Sym: "EOP" "#"
 600311-600351 usb_power_delivery: EOP: "EOP" "E"
-598834-600351 usb_power_delivery: text: "#12   (249.514167ms): SRC[3]:SOURCE CAP - 5.0V 1.5A dual_role_power comm_cap dual_role_data" "..."
+598834-600351 usb_power_delivery: text: "#12   (249.514167ms): (r2) SRC[3]: SOURCE CAP - [1] [Fixed] 5V 1.5A (7.5W) [dual_role_power] [comm_cap] [dual_role_data]" "..."
 600632-601147 usb_power_delivery: Preamble: "Preamble" "..."
 601147-601187 usb_power_delivery: Sym: "SYNC-1" "S1"
 601187-601228 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -357,7 +357,7 @@
 601389-601429 usb_power_delivery: Sym: "0x6" "6"
 601429-601470 usb_power_delivery: Sym: "0x0" "0"
 601308-601470 usb_power_delivery: Head: "H:0641" "HD"
-600632-601833 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+600632-601833 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 601470-601510 usb_power_delivery: Sym: "0xE" "E"
 601510-601550 usb_power_delivery: Sym: "0x8" "8"
 601550-601591 usb_power_delivery: Sym: "0x9" "9"
@@ -369,7 +369,7 @@
 601470-601793 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 601793-601833 usb_power_delivery: Sym: "EOP" "#"
 601793-601833 usb_power_delivery: EOP: "EOP" "E"
-600632-601833 usb_power_delivery: text: "#13   (250.263333ms): SNK[3]:GOOD CRC" "..."
+600632-601833 usb_power_delivery: text: "#13   (250.263333ms): (r2) SNK[3]: GOOD CRC" "..."
 603380-603895 usb_power_delivery: Preamble: "Preamble" "..."
 603895-603936 usb_power_delivery: Sym: "SYNC-1" "S1"
 603936-603976 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -381,7 +381,7 @@
 604137-604178 usb_power_delivery: Sym: "0x2" "2"
 604178-604218 usb_power_delivery: Sym: "0x1" "1"
 604056-604218 usb_power_delivery: Head: "H:1242" "HD"
-603380-604912 usb_power_delivery: snk: "SNK[1]:REQUEST" "REQUEST"
+603380-604912 usb_power_delivery: snk: "(r2) SNK[1]: REQUEST" "REQUEST"
 604218-604258 usb_power_delivery: Sym: "0x6" "6"
 604258-604299 usb_power_delivery: Sym: "0x9" "9"
 604299-604339 usb_power_delivery: Sym: "0x8" "8"
@@ -391,7 +391,7 @@
 604460-604501 usb_power_delivery: Sym: "0x3" "3"
 604501-604541 usb_power_delivery: Sym: "0x1" "1"
 604218-604541 usb_power_delivery: Data: "[0]13025896" "D0"
-604218-604541 usb_power_delivery: payload: "[1]1500/1500 mA comm_cap no_suspend" "[1]1500/1500 mA comm_cap no_suspend"
+604218-604541 usb_power_delivery: payload: "[1] (PDO #1: Fixed 5V) 1.5A (operating) / 1.5A (max) [comm_cap] [no_suspend]" "[1] (PDO #1: Fixed 5V) 1.5A (operating) / 1.5A (max) [comm_cap] [no_suspend]"
 604541-604581 usb_power_delivery: Sym: "0xA" "A"
 604581-604622 usb_power_delivery: Sym: "0x0" "0"
 604622-604662 usb_power_delivery: Sym: "0xC" "C"
@@ -403,7 +403,7 @@
 604541-604864 usb_power_delivery: CRC: "CRC:a57e2c0a" "CRC"
 604864-604904 usb_power_delivery: Sym: "EOP" "#"
 604864-604904 usb_power_delivery: EOP: "EOP" "E"
-603380-604904 usb_power_delivery: text: "#14   (251.408333ms): SNK[1]:REQUEST - [1]1500/1500 mA comm_cap no_suspend" "..."
+603380-604904 usb_power_delivery: text: "#14   (251.408333ms): (r2) SNK[1]: REQUEST - [1] (PDO #1: Fixed 5V) 1.5A (operating) / 1.5A (max) [comm_cap] [no_suspend]" "..."
 605141-605654 usb_power_delivery: Preamble: "Preamble" "..."
 605654-605694 usb_power_delivery: Sym: "SYNC-1" "S1"
 605694-605734 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -415,7 +415,7 @@
 605895-605935 usb_power_delivery: Sym: "0x3" "3"
 605935-605975 usb_power_delivery: Sym: "0x0" "0"
 605815-605975 usb_power_delivery: Head: "H:0361" "HD"
-605141-606337 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+605141-606337 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 605975-606015 usb_power_delivery: Sym: "0x3" "3"
 606015-606056 usb_power_delivery: Sym: "0xA" "A"
 606056-606096 usb_power_delivery: Sym: "0x9" "9"
@@ -427,7 +427,7 @@
 605975-606297 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 606297-606337 usb_power_delivery: Sym: "EOP" "#"
 606297-606337 usb_power_delivery: EOP: "EOP" "E"
-605141-606337 usb_power_delivery: text: "#15   (252.142083ms): SRC[1]:GOOD CRC" "..."
+605141-606337 usb_power_delivery: text: "#15   (252.142083ms): (r2) SRC[1]: GOOD CRC" "..."
 606877-607389 usb_power_delivery: Preamble: "Preamble" "..."
 607389-607430 usb_power_delivery: Sym: "SYNC-1" "S1"
 607430-607470 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -439,7 +439,7 @@
 607630-607670 usb_power_delivery: Sym: "0x9" "9"
 607670-607711 usb_power_delivery: Sym: "0x0" "0"
 607550-607711 usb_power_delivery: Head: "H:0963" "HD"
-606877-608080 usb_power_delivery: src: "SRC[4]:ACCEPT" "ACCEPT"
+606877-608080 usb_power_delivery: src: "(r2) SRC[4]: ACCEPT" "ACCEPT"
 607711-607751 usb_power_delivery: Sym: "0xF" "F"
 607751-607791 usb_power_delivery: Sym: "0x3" "3"
 607791-607831 usb_power_delivery: Sym: "0x2" "2"
@@ -451,7 +451,7 @@
 607711-608032 usb_power_delivery: CRC: "CRC:76d5923f" "CRC"
 608032-608072 usb_power_delivery: Sym: "EOP" "#"
 608032-608072 usb_power_delivery: EOP: "EOP" "E"
-606877-608072 usb_power_delivery: text: "#16   (252.865417ms): SRC[4]:ACCEPT" "..."
+606877-608072 usb_power_delivery: text: "#16   (252.865417ms): (r2) SRC[4]: ACCEPT" "..."
 608325-608840 usb_power_delivery: Preamble: "Preamble" "..."
 608840-608880 usb_power_delivery: Sym: "SYNC-1" "S1"
 608880-608920 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -463,7 +463,7 @@
 609082-609122 usb_power_delivery: Sym: "0x8" "8"
 609122-609162 usb_power_delivery: Sym: "0x0" "0"
 609001-609162 usb_power_delivery: Head: "H:0841" "HD"
-608325-609534 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+608325-609534 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 609162-609203 usb_power_delivery: Sym: "0x9" "9"
 609203-609243 usb_power_delivery: Sym: "0x8" "8"
 609243-609284 usb_power_delivery: Sym: "0x4" "4"
@@ -475,7 +475,7 @@
 609162-609486 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 609486-609526 usb_power_delivery: Sym: "EOP" "#"
 609486-609526 usb_power_delivery: EOP: "EOP" "E"
-608325-609526 usb_power_delivery: text: "#17   (253.468750ms): SNK[4]:GOOD CRC" "..."
+608325-609526 usb_power_delivery: text: "#17   (253.468750ms): (r2) SNK[4]: GOOD CRC" "..."
 731206-731719 usb_power_delivery: Preamble: "Preamble" "..."
 731719-731759 usb_power_delivery: Sym: "SYNC-1" "S1"
 731759-731799 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -487,7 +487,7 @@
 731960-732000 usb_power_delivery: Sym: "0xB" "B"
 732000-732040 usb_power_delivery: Sym: "0x0" "0"
 731879-732040 usb_power_delivery: Head: "H:0b66" "HD"
-731206-732401 usb_power_delivery: src: "SRC[5]:PS RDY" "PS RDY"
+731206-732401 usb_power_delivery: src: "(r2) SRC[5]: PS RDY" "PS RDY"
 732040-732080 usb_power_delivery: Sym: "0x6" "6"
 732080-732120 usb_power_delivery: Sym: "0x5" "5"
 732120-732160 usb_power_delivery: Sym: "0x7" "7"
@@ -499,7 +499,7 @@
 732040-732361 usb_power_delivery: CRC: "CRC:e5ac0756" "CRC"
 732361-732401 usb_power_delivery: Sym: "EOP" "#"
 732361-732401 usb_power_delivery: EOP: "EOP" "E"
-731206-732401 usb_power_delivery: text: "#18   (304.669167ms): SRC[5]:PS RDY" "..."
+731206-732401 usb_power_delivery: text: "#18   (304.669167ms): (r2) SRC[5]: PS RDY" "..."
 732677-733191 usb_power_delivery: Preamble: "Preamble" "..."
 733191-733232 usb_power_delivery: Sym: "SYNC-1" "S1"
 733232-733272 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -511,7 +511,7 @@
 733434-733474 usb_power_delivery: Sym: "0xA" "A"
 733474-733514 usb_power_delivery: Sym: "0x0" "0"
 733353-733514 usb_power_delivery: Head: "H:0a41" "HD"
-732677-733877 usb_power_delivery: snk: "SNK[5]:GOOD CRC" "GOOD CRC"
+732677-733877 usb_power_delivery: snk: "(r2) SNK[5]: GOOD CRC" "GOOD CRC"
 733514-733555 usb_power_delivery: Sym: "0x5" "5"
 733555-733595 usb_power_delivery: Sym: "0xA" "A"
 733595-733635 usb_power_delivery: Sym: "0x5" "5"
@@ -523,7 +523,7 @@
 733514-733837 usb_power_delivery: CRC: "CRC:486e85a5" "CRC"
 733837-733877 usb_power_delivery: Sym: "EOP" "#"
 733837-733877 usb_power_delivery: EOP: "EOP" "E"
-732677-733877 usb_power_delivery: text: "#19   (305.282083ms): SNK[5]:GOOD CRC" "..."
+732677-733877 usb_power_delivery: text: "#19   (305.282083ms): (r2) SNK[5]: GOOD CRC" "..."
 860313-860825 usb_power_delivery: Preamble: "Preamble" "..."
 860825-860866 usb_power_delivery: Sym: "SYNC-1" "S1"
 860866-860906 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -535,7 +535,7 @@
 861067-861107 usb_power_delivery: Sym: "0xD" "D"
 861107-861147 usb_power_delivery: Sym: "0x1" "1"
 860986-861147 usb_power_delivery: Head: "H:1d6f" "HD"
-860313-861830 usb_power_delivery: src: "SRC[6]:VDM" "VDM"
+860313-861830 usb_power_delivery: src: "(r2) SRC[6]: VDM" "VDM"
 861147-861187 usb_power_delivery: Sym: "0x1" "1"
 861187-861227 usb_power_delivery: Sym: "0x0" "0"
 861227-861267 usb_power_delivery: Sym: "0x0" "0"
@@ -545,7 +545,7 @@
 861388-861428 usb_power_delivery: Sym: "0xF" "F"
 861428-861468 usb_power_delivery: Sym: "0xF" "F"
 861147-861468 usb_power_delivery: Data: "[0]ff008001" "D0"
-861147-861468 usb_power_delivery: payload: "REQ Disc Ident  SVID:ff00" "REQ Disc Ident  SVID:ff00"
+861147-861468 usb_power_delivery: payload: "[1] REQ Disc Ident  SVID:ff00" "[1] REQ Disc Ident  SVID:ff00"
 861468-861508 usb_power_delivery: Sym: "0x7" "7"
 861508-861549 usb_power_delivery: Sym: "0x7" "7"
 861549-861589 usb_power_delivery: Sym: "0xC" "C"
@@ -557,7 +557,7 @@
 861468-861790 usb_power_delivery: CRC: "CRC:a49bdc77" "CRC"
 861790-861830 usb_power_delivery: Sym: "EOP" "#"
 861790-861830 usb_power_delivery: EOP: "EOP" "E"
-860313-861830 usb_power_delivery: text: "#20   (358.463750ms): SRC[6]:VDM - REQ Disc Ident  SVID:ff00" "..."
+860313-861830 usb_power_delivery: text: "#20   (358.463750ms): (r2) SRC[6]: VDM - [1] REQ Disc Ident  SVID:ff00" "..."
 862103-862618 usb_power_delivery: Preamble: "Preamble" "..."
 862618-862659 usb_power_delivery: Sym: "SYNC-1" "S1"
 862659-862699 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -569,7 +569,7 @@
 862860-862901 usb_power_delivery: Sym: "0xC" "C"
 862901-862941 usb_power_delivery: Sym: "0x0" "0"
 862779-862941 usb_power_delivery: Head: "H:0c41" "HD"
-862103-863312 usb_power_delivery: snk: "SNK[6]:GOOD CRC" "GOOD CRC"
+862103-863312 usb_power_delivery: snk: "(r2) SNK[6]: GOOD CRC" "GOOD CRC"
 862941-862981 usb_power_delivery: Sym: "0x0" "0"
 862981-863022 usb_power_delivery: Sym: "0x9" "9"
 863022-863062 usb_power_delivery: Sym: "0x0" "0"
@@ -581,7 +581,7 @@
 862941-863264 usb_power_delivery: CRC: "CRC:a10d2090" "CRC"
 863264-863304 usb_power_delivery: Sym: "EOP" "#"
 863264-863304 usb_power_delivery: EOP: "EOP" "E"
-862103-863304 usb_power_delivery: text: "#21   (359.209583ms): SNK[6]:GOOD CRC" "..."
+862103-863304 usb_power_delivery: text: "#21   (359.209583ms): (r2) SNK[6]: GOOD CRC" "..."
 864178-864693 usb_power_delivery: Preamble: "Preamble" "..."
 864693-864734 usb_power_delivery: Sym: "SYNC-1" "S1"
 864734-864774 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -593,7 +593,7 @@
 864935-864976 usb_power_delivery: Sym: "0x4" "4"
 864976-865016 usb_power_delivery: Sym: "0x5" "5"
 864855-865016 usb_power_delivery: Head: "H:544f" "HD"
-864178-867001 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+864178-867001 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 865016-865056 usb_power_delivery: Sym: "0x1" "1"
 865056-865097 usb_power_delivery: Sym: "0x4" "4"
 865097-865137 usb_power_delivery: Sym: "0x0" "0"
@@ -603,7 +603,7 @@
 865258-865299 usb_power_delivery: Sym: "0xF" "F"
 865299-865339 usb_power_delivery: Sym: "0xF" "F"
 865016-865339 usb_power_delivery: Data: "[0]ff008041" "D0"
-865016-865339 usb_power_delivery: payload: "ACK Disc Ident  SVID:ff00" "ACK Disc Ident  SVID:ff00"
+865016-865339 usb_power_delivery: payload: "[1] ACK Disc Ident  SVID:ff00" "[1] ACK Disc Ident  SVID:ff00"
 865339-865379 usb_power_delivery: Sym: "0xC" "C"
 865379-865420 usb_power_delivery: Sym: "0xA" "A"
 865420-865460 usb_power_delivery: Sym: "0x5" "5"
@@ -613,7 +613,7 @@
 865581-865621 usb_power_delivery: Sym: "0xC" "C"
 865621-865662 usb_power_delivery: Sym: "0x6" "6"
 865339-865662 usb_power_delivery: Data: "[1]6c0005ac" "D1"
-865339-865662 usb_power_delivery: payload: "VDO:6c0005ac" "VDO:6c0005ac"
+865339-865662 usb_power_delivery: payload: "[2] VDO:6c0005ac" "[2] VDO:6c0005ac"
 865662-865702 usb_power_delivery: Sym: "0x0" "0"
 865702-865742 usb_power_delivery: Sym: "0x0" "0"
 865742-865783 usb_power_delivery: Sym: "0x0" "0"
@@ -623,7 +623,7 @@
 865904-865944 usb_power_delivery: Sym: "0x0" "0"
 865944-865984 usb_power_delivery: Sym: "0x0" "0"
 865662-865984 usb_power_delivery: Data: "[2]00000000" "D2"
-865662-865984 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+865662-865984 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 865984-866025 usb_power_delivery: Sym: "0x8" "8"
 866025-866065 usb_power_delivery: Sym: "0x5" "5"
 866065-866105 usb_power_delivery: Sym: "0x1" "1"
@@ -633,7 +633,7 @@
 866227-866267 usb_power_delivery: Sym: "0x0" "0"
 866267-866307 usb_power_delivery: Sym: "0x1" "1"
 865984-866307 usb_power_delivery: Data: "[3]10120158" "D3"
-865984-866307 usb_power_delivery: payload: "VDO:10120158" "VDO:10120158"
+865984-866307 usb_power_delivery: payload: "[4] VDO:10120158" "[4] VDO:10120158"
 866307-866348 usb_power_delivery: Sym: "0x9" "9"
 866348-866388 usb_power_delivery: Sym: "0x3" "3"
 866388-866428 usb_power_delivery: Sym: "0x0" "0"
@@ -643,7 +643,7 @@
 866549-866590 usb_power_delivery: Sym: "0x1" "1"
 866590-866630 usb_power_delivery: Sym: "0x6" "6"
 866307-866630 usb_power_delivery: Data: "[4]61000039" "D4"
-866307-866630 usb_power_delivery: payload: "VDO:61000039" "VDO:61000039"
+866307-866630 usb_power_delivery: payload: "[5] VDO:61000039" "[5] VDO:61000039"
 866630-866670 usb_power_delivery: Sym: "0x0" "0"
 866670-866711 usb_power_delivery: Sym: "0xD" "D"
 866711-866751 usb_power_delivery: Sym: "0xD" "D"
@@ -655,7 +655,7 @@
 866630-866953 usb_power_delivery: CRC: "CRC:33c70dd0" "CRC"
 866953-866993 usb_power_delivery: Sym: "EOP" "#"
 866953-866993 usb_power_delivery: EOP: "EOP" "E"
-864178-866993 usb_power_delivery: text: "#22   (360.074167ms): SNK[2]:VDM - ACK Disc Ident  SVID:ff00 - VDO:6c0005ac - VDO:00000000 - VDO:10120158 - VDO:61000039" "..."
+864178-866993 usb_power_delivery: text: "#22   (360.074167ms): (r2) SNK[2]: VDM - [1] ACK Disc Ident  SVID:ff00 - [2] VDO:6c0005ac - [3] VDO:00000000 - [4] VDO:10120158 - [5] VDO:61000039" "..."
 867231-867744 usb_power_delivery: Preamble: "Preamble" "..."
 867744-867784 usb_power_delivery: Sym: "SYNC-1" "S1"
 867784-867824 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -667,7 +667,7 @@
 867985-868025 usb_power_delivery: Sym: "0x5" "5"
 868025-868065 usb_power_delivery: Sym: "0x0" "0"
 867904-868065 usb_power_delivery: Head: "H:0561" "HD"
-867231-868435 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+867231-868435 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 868065-868105 usb_power_delivery: Sym: "0x6" "6"
 868105-868145 usb_power_delivery: Sym: "0x9" "9"
 868145-868186 usb_power_delivery: Sym: "0xC" "C"
@@ -679,7 +679,7 @@
 868065-868387 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 868387-868427 usb_power_delivery: Sym: "EOP" "#"
 868387-868427 usb_power_delivery: EOP: "EOP" "E"
-867231-868427 usb_power_delivery: text: "#23   (361.346250ms): SRC[2]:GOOD CRC" "..."
+867231-868427 usb_power_delivery: text: "#23   (361.346250ms): (r2) SRC[2]: GOOD CRC" "..."
 869448-869977 usb_power_delivery: Preamble: "Junk???" "XXX"
 869448-869977 usb_power_delivery: warnings: "No start of packet found" "XXX"
 869448-869977 usb_power_delivery: text: "#24   (362.270000ms): Junk???" "..."
@@ -694,7 +694,7 @@
 870714-870754 usb_power_delivery: Sym: "0x7" "7"
 870754-870794 usb_power_delivery: Sym: "0x0" "0"
 870634-870794 usb_power_delivery: Head: "H:0761" "HD"
-870175-871164 usb_power_delivery: src: "SRC[3]:GOOD CRC" "GOOD CRC"
+870175-871164 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
 870794-870835 usb_power_delivery: Sym: "0xA" "A"
 870835-870875 usb_power_delivery: Sym: "0xB" "B"
 870875-870915 usb_power_delivery: Sym: "0xD" "D"
@@ -706,7 +706,7 @@
 870794-871116 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
 871116-871156 usb_power_delivery: Sym: "EOP" "#"
 871116-871156 usb_power_delivery: EOP: "EOP" "E"
-870175-871156 usb_power_delivery: text: "#25   (362.572917ms): SRC[3]:GOOD CRC" "..."
+870175-871156 usb_power_delivery: text: "#25   (362.572917ms): (r2) SRC[3]: GOOD CRC" "..."
 872088-872600 usb_power_delivery: Preamble: "Preamble" "..."
 872600-872641 usb_power_delivery: Sym: "SYNC-1" "S1"
 872641-872681 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -718,7 +718,7 @@
 872842-872882 usb_power_delivery: Sym: "0x1" "1"
 872882-872922 usb_power_delivery: Sym: "0x1" "1"
 872761-872922 usb_power_delivery: Head: "H:116f" "HD"
-872088-873613 usb_power_delivery: src: "SRC[0]:VDM" "VDM"
+872088-873613 usb_power_delivery: src: "(r2) SRC[0]: VDM" "VDM"
 872922-872962 usb_power_delivery: Sym: "0x3" "3"
 872962-873002 usb_power_delivery: Sym: "0x0" "0"
 873002-873042 usb_power_delivery: Sym: "0x0" "0"
@@ -728,7 +728,7 @@
 873163-873203 usb_power_delivery: Sym: "0xF" "F"
 873203-873243 usb_power_delivery: Sym: "0xF" "F"
 872922-873243 usb_power_delivery: Data: "[0]ff018003" "D0"
-872922-873243 usb_power_delivery: payload: "REQ Disc Mode  SVID:ff01" "REQ Disc Mode  SVID:ff01"
+872922-873243 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:ff01" "[1] REQ Disc Mode  SVID:ff01"
 873243-873283 usb_power_delivery: Sym: "0xC" "C"
 873283-873324 usb_power_delivery: Sym: "0xB" "B"
 873324-873364 usb_power_delivery: Sym: "0x8" "8"
@@ -740,7 +740,7 @@
 873243-873565 usb_power_delivery: CRC: "CRC:d279c8bc" "CRC"
 873565-873605 usb_power_delivery: Sym: "EOP" "#"
 873565-873605 usb_power_delivery: EOP: "EOP" "E"
-872088-873605 usb_power_delivery: text: "#26   (363.370000ms): SRC[0]:VDM - REQ Disc Mode  SVID:ff01" "..."
+872088-873605 usb_power_delivery: text: "#26   (363.370000ms): (r2) SRC[0]: VDM - [1] REQ Disc Mode  SVID:ff01" "..."
 874437-874470 usb_power_delivery: Preamble: "Preamble" "..."
 874470-874510 usb_power_delivery: Sym: "SYNC-1" "S1"
 874510-874550 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -752,7 +752,7 @@
 874712-874752 usb_power_delivery: Sym: "0x6" "6"
 874752-874792 usb_power_delivery: Sym: "0x3" "3"
 874631-874792 usb_power_delivery: Head: "H:364f" "HD"
-874437-876132 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+874437-876132 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 874792-874833 usb_power_delivery: Sym: "0x2" "2"
 874833-874873 usb_power_delivery: Sym: "0x4" "4"
 874873-874913 usb_power_delivery: Sym: "0x0" "0"
@@ -762,7 +762,7 @@
 875034-875075 usb_power_delivery: Sym: "0xF" "F"
 875075-875115 usb_power_delivery: Sym: "0xF" "F"
 874792-875115 usb_power_delivery: Data: "[0]ff008042" "D0"
-874792-875115 usb_power_delivery: payload: "ACK Disc SVID  SVID:ff00" "ACK Disc SVID  SVID:ff00"
+874792-875115 usb_power_delivery: payload: "[1] ACK Disc SVID  SVID:ff00" "[1] ACK Disc SVID  SVID:ff00"
 875115-875155 usb_power_delivery: Sym: "0xC" "C"
 875155-875196 usb_power_delivery: Sym: "0xA" "A"
 875196-875236 usb_power_delivery: Sym: "0x5" "5"
@@ -772,7 +772,7 @@
 875357-875398 usb_power_delivery: Sym: "0xF" "F"
 875398-875438 usb_power_delivery: Sym: "0xF" "F"
 875115-875438 usb_power_delivery: Data: "[1]ff0105ac" "D1"
-875115-875438 usb_power_delivery: payload: "VDO:ff0105ac" "VDO:ff0105ac"
+875115-875438 usb_power_delivery: payload: "[2] VDO:ff0105ac" "[2] VDO:ff0105ac"
 875438-875478 usb_power_delivery: Sym: "0x0" "0"
 875478-875519 usb_power_delivery: Sym: "0x0" "0"
 875519-875559 usb_power_delivery: Sym: "0x0" "0"
@@ -782,7 +782,7 @@
 875680-875720 usb_power_delivery: Sym: "0x0" "0"
 875720-875761 usb_power_delivery: Sym: "0x0" "0"
 875438-875761 usb_power_delivery: Data: "[2]00000000" "D2"
-875438-875761 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+875438-875761 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 875761-875801 usb_power_delivery: Sym: "0x4" "4"
 875801-875841 usb_power_delivery: Sym: "0xC" "C"
 875841-875882 usb_power_delivery: Sym: "0x1" "1"
@@ -794,7 +794,7 @@
 875761-876084 usb_power_delivery: CRC: "CRC:2d1ed1c4" "CRC"
 876084-876124 usb_power_delivery: Sym: "EOP" "#"
 876084-876124 usb_power_delivery: EOP: "EOP" "E"
-874437-876124 usb_power_delivery: text: "#27   (364.348750ms): SNK[3]:VDM - ACK Disc SVID  SVID:ff00 - VDO:ff0105ac - VDO:00000000" "..."
+874437-876124 usb_power_delivery: text: "#27   (364.348750ms): (r2) SNK[3]: VDM - [1] ACK Disc SVID  SVID:ff00 - [2] VDO:ff0105ac - [3] VDO:00000000" "..."
 876696-876696 usb_power_delivery: Preamble: "Preamble" "..."
 876696-876737 usb_power_delivery: Sym: "SYNC-1" "S1"
 876737-876777 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -806,7 +806,7 @@
 876938-876978 usb_power_delivery: Sym: "0x1" "1"
 876978-877018 usb_power_delivery: Sym: "0x1" "1"
 876857-877018 usb_power_delivery: Head: "H:116f" "HD"
-876696-877709 usb_power_delivery: src: "SRC[0]:VDM" "VDM"
+876696-877709 usb_power_delivery: src: "(r2) SRC[0]: VDM" "VDM"
 877018-877058 usb_power_delivery: Sym: "0x3" "3"
 877058-877098 usb_power_delivery: Sym: "0x0" "0"
 877098-877138 usb_power_delivery: Sym: "0x0" "0"
@@ -816,7 +816,7 @@
 877259-877299 usb_power_delivery: Sym: "0xF" "F"
 877299-877339 usb_power_delivery: Sym: "0xF" "F"
 877018-877339 usb_power_delivery: Data: "[0]ff018003" "D0"
-877018-877339 usb_power_delivery: payload: "REQ Disc Mode  SVID:ff01" "REQ Disc Mode  SVID:ff01"
+877018-877339 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:ff01" "[1] REQ Disc Mode  SVID:ff01"
 877339-877379 usb_power_delivery: Sym: "0xC" "C"
 877379-877420 usb_power_delivery: Sym: "0xB" "B"
 877420-877460 usb_power_delivery: Sym: "0x8" "8"
@@ -828,7 +828,7 @@
 877339-877661 usb_power_delivery: CRC: "CRC:d279c8bc" "CRC"
 877661-877701 usb_power_delivery: Sym: "EOP" "#"
 877661-877701 usb_power_delivery: EOP: "EOP" "E"
-876696-877701 usb_power_delivery: text: "#28   (365.290000ms): SRC[0]:VDM - REQ Disc Mode  SVID:ff01" "..."
+876696-877701 usb_power_delivery: text: "#28   (365.290000ms): (r2) SRC[0]: VDM - [1] REQ Disc Mode  SVID:ff01" "..."
 877974-878489 usb_power_delivery: Preamble: "Preamble" "..."
 878489-878529 usb_power_delivery: Sym: "SYNC-1" "S1"
 878529-878569 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -840,7 +840,7 @@
 878731-878771 usb_power_delivery: Sym: "0x0" "0"
 878771-878812 usb_power_delivery: Sym: "0x0" "0"
 878650-878812 usb_power_delivery: Head: "H:0041" "HD"
-877974-879183 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+877974-879183 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 878812-878852 usb_power_delivery: Sym: "0xB" "B"
 878852-878892 usb_power_delivery: Sym: "0xB" "B"
 878892-878933 usb_power_delivery: Sym: "0xC" "C"
@@ -852,7 +852,7 @@
 878812-879134 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 879134-879175 usb_power_delivery: Sym: "EOP" "#"
 879134-879175 usb_power_delivery: EOP: "EOP" "E"
-877974-879175 usb_power_delivery: text: "#29   (365.822500ms): SNK[0]:GOOD CRC" "..."
+877974-879175 usb_power_delivery: text: "#29   (365.822500ms): (r2) SNK[0]: GOOD CRC" "..."
 880167-880682 usb_power_delivery: Preamble: "Preamble" "..."
 880682-880723 usb_power_delivery: Sym: "SYNC-1" "S1"
 880723-880763 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -864,7 +864,7 @@
 880924-880965 usb_power_delivery: Sym: "0x8" "8"
 880965-881005 usb_power_delivery: Sym: "0x2" "2"
 880844-881005 usb_power_delivery: Head: "H:284f" "HD"
-880167-882014 usb_power_delivery: snk: "SNK[4]:VDM" "VDM"
+880167-882014 usb_power_delivery: snk: "(r2) SNK[4]: VDM" "VDM"
 881005-881045 usb_power_delivery: Sym: "0x3" "3"
 881045-881086 usb_power_delivery: Sym: "0x4" "4"
 881086-881126 usb_power_delivery: Sym: "0x0" "0"
@@ -874,7 +874,7 @@
 881247-881287 usb_power_delivery: Sym: "0xF" "F"
 881287-881328 usb_power_delivery: Sym: "0xF" "F"
 881005-881328 usb_power_delivery: Data: "[0]ff018043" "D0"
-881005-881328 usb_power_delivery: payload: "ACK Disc Mode  SVID:ff01" "ACK Disc Mode  SVID:ff01"
+881005-881328 usb_power_delivery: payload: "[1] ACK Disc Mode  SVID:ff01" "[1] ACK Disc Mode  SVID:ff01"
 881328-881368 usb_power_delivery: Sym: "0x5" "5"
 881368-881408 usb_power_delivery: Sym: "0x0" "0"
 881408-881449 usb_power_delivery: Sym: "0xC" "C"
@@ -884,7 +884,7 @@
 881570-881610 usb_power_delivery: Sym: "0x0" "0"
 881610-881651 usb_power_delivery: Sym: "0x0" "0"
 881328-881651 usb_power_delivery: Data: "[1]00000c05" "D1"
-881328-881651 usb_power_delivery: payload: "VDO:00000c05" "VDO:00000c05"
+881328-881651 usb_power_delivery: payload: "[2] VDO:00000c05" "[2] VDO:00000c05"
 881651-881691 usb_power_delivery: Sym: "0x3" "3"
 881691-881731 usb_power_delivery: Sym: "0x6" "6"
 881731-881772 usb_power_delivery: Sym: "0x6" "6"
@@ -896,7 +896,7 @@
 881651-881973 usb_power_delivery: CRC: "CRC:a5ea2663" "CRC"
 881973-882014 usb_power_delivery: Sym: "EOP" "#"
 881973-882014 usb_power_delivery: EOP: "EOP" "E"
-880167-882014 usb_power_delivery: text: "#30   (366.736250ms): SNK[4]:VDM - ACK Disc Mode  SVID:ff01 - VDO:00000c05" "..."
+880167-882014 usb_power_delivery: text: "#30   (366.736250ms): (r2) SNK[4]: VDM - [1] ACK Disc Mode  SVID:ff01 - [2] VDO:00000c05" "..."
 882242-882754 usb_power_delivery: Preamble: "Preamble" "..."
 882754-882795 usb_power_delivery: Sym: "SYNC-1" "S1"
 882795-882835 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -908,7 +908,7 @@
 882995-883036 usb_power_delivery: Sym: "0x9" "9"
 883036-883076 usb_power_delivery: Sym: "0x0" "0"
 882915-883076 usb_power_delivery: Head: "H:0961" "HD"
-882242-883437 usb_power_delivery: src: "SRC[4]:GOOD CRC" "GOOD CRC"
+882242-883437 usb_power_delivery: src: "(r2) SRC[4]: GOOD CRC" "GOOD CRC"
 883076-883116 usb_power_delivery: Sym: "0xD" "D"
 883116-883156 usb_power_delivery: Sym: "0xB" "B"
 883156-883196 usb_power_delivery: Sym: "0x0" "0"
@@ -920,7 +920,7 @@
 883076-883397 usb_power_delivery: CRC: "CRC:44e3f0bd" "CRC"
 883397-883437 usb_power_delivery: Sym: "EOP" "#"
 883397-883437 usb_power_delivery: EOP: "EOP" "E"
-882242-883437 usb_power_delivery: text: "#31   (367.600833ms): SRC[4]:GOOD CRC" "..."
+882242-883437 usb_power_delivery: text: "#31   (367.600833ms): (r2) SRC[4]: GOOD CRC" "..."
 884062-884574 usb_power_delivery: Preamble: "Preamble" "..."
 884574-884615 usb_power_delivery: Sym: "SYNC-1" "S1"
 884615-884655 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -932,7 +932,7 @@
 884815-884856 usb_power_delivery: Sym: "0x3" "3"
 884856-884896 usb_power_delivery: Sym: "0x1" "1"
 884735-884896 usb_power_delivery: Head: "H:136f" "HD"
-884062-885579 usb_power_delivery: src: "SRC[1]:VDM" "VDM"
+884062-885579 usb_power_delivery: src: "(r2) SRC[1]: VDM" "VDM"
 884896-884936 usb_power_delivery: Sym: "0x4" "4"
 884936-884976 usb_power_delivery: Sym: "0x0" "0"
 884976-885016 usb_power_delivery: Sym: "0x1" "1"
@@ -942,7 +942,7 @@
 885137-885177 usb_power_delivery: Sym: "0xF" "F"
 885177-885217 usb_power_delivery: Sym: "0xF" "F"
 884896-885217 usb_power_delivery: Data: "[0]ff018104" "D0"
-884896-885217 usb_power_delivery: payload: "REQ Enter Mode pos 1 SVID:ff01" "REQ Enter Mode pos 1 SVID:ff01"
+884896-885217 usb_power_delivery: payload: "[1] REQ Enter Mode pos 1 SVID:ff01" "[1] REQ Enter Mode pos 1 SVID:ff01"
 885217-885257 usb_power_delivery: Sym: "0x2" "2"
 885257-885298 usb_power_delivery: Sym: "0x5" "5"
 885298-885338 usb_power_delivery: Sym: "0x9" "9"
@@ -954,7 +954,7 @@
 885217-885539 usb_power_delivery: CRC: "CRC:34acc952" "CRC"
 885539-885579 usb_power_delivery: Sym: "EOP" "#"
 885539-885579 usb_power_delivery: EOP: "EOP" "E"
-884062-885579 usb_power_delivery: text: "#32   (368.359167ms): SRC[1]:VDM - REQ Enter Mode pos 1 SVID:ff01" "..."
+884062-885579 usb_power_delivery: text: "#32   (368.359167ms): (r2) SRC[1]: VDM - [1] REQ Enter Mode pos 1 SVID:ff01" "..."
 885809-886324 usb_power_delivery: Preamble: "Preamble" "..."
 886324-886365 usb_power_delivery: Sym: "SYNC-1" "S1"
 886365-886405 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -966,7 +966,7 @@
 886566-886607 usb_power_delivery: Sym: "0x2" "2"
 886607-886647 usb_power_delivery: Sym: "0x0" "0"
 886485-886647 usb_power_delivery: Head: "H:0241" "HD"
-885809-887018 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+885809-887018 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 886647-886687 usb_power_delivery: Sym: "0x7" "7"
 886687-886728 usb_power_delivery: Sym: "0x9" "9"
 886728-886768 usb_power_delivery: Sym: "0xD" "D"
@@ -978,7 +978,7 @@
 886647-886970 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 886970-887010 usb_power_delivery: Sym: "EOP" "#"
 886970-887010 usb_power_delivery: EOP: "EOP" "E"
-885809-887010 usb_power_delivery: text: "#33   (369.087083ms): SNK[1]:GOOD CRC" "..."
+885809-887010 usb_power_delivery: text: "#33   (369.087083ms): (r2) SNK[1]: GOOD CRC" "..."
 887613-888128 usb_power_delivery: Preamble: "Preamble" "..."
 888128-888169 usb_power_delivery: Sym: "SYNC-1" "S1"
 888169-888209 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -990,7 +990,7 @@
 888370-888411 usb_power_delivery: Sym: "0xA" "A"
 888411-888451 usb_power_delivery: Sym: "0x1" "1"
 888290-888451 usb_power_delivery: Head: "H:1a4f" "HD"
-887613-889137 usb_power_delivery: snk: "SNK[5]:VDM" "VDM"
+887613-889137 usb_power_delivery: snk: "(r2) SNK[5]: VDM" "VDM"
 888451-888491 usb_power_delivery: Sym: "0x4" "4"
 888491-888532 usb_power_delivery: Sym: "0x4" "4"
 888532-888572 usb_power_delivery: Sym: "0x1" "1"
@@ -1000,7 +1000,7 @@
 888693-888733 usb_power_delivery: Sym: "0xF" "F"
 888733-888774 usb_power_delivery: Sym: "0xF" "F"
 888451-888774 usb_power_delivery: Data: "[0]ff018144" "D0"
-888451-888774 usb_power_delivery: payload: "ACK Enter Mode pos 1 SVID:ff01" "ACK Enter Mode pos 1 SVID:ff01"
+888451-888774 usb_power_delivery: payload: "[1] ACK Enter Mode pos 1 SVID:ff01" "[1] ACK Enter Mode pos 1 SVID:ff01"
 888774-888814 usb_power_delivery: Sym: "0x8" "8"
 888814-888855 usb_power_delivery: Sym: "0x2" "2"
 888855-888895 usb_power_delivery: Sym: "0x6" "6"
@@ -1012,7 +1012,7 @@
 888774-889097 usb_power_delivery: CRC: "CRC:a504f628" "CRC"
 889097-889137 usb_power_delivery: Sym: "EOP" "#"
 889097-889137 usb_power_delivery: EOP: "EOP" "E"
-887613-889137 usb_power_delivery: text: "#34   (369.838750ms): SNK[5]:VDM - ACK Enter Mode pos 1 SVID:ff01" "..."
+887613-889137 usb_power_delivery: text: "#34   (369.838750ms): (r2) SNK[5]: VDM - [1] ACK Enter Mode pos 1 SVID:ff01" "..."
 889366-889879 usb_power_delivery: Preamble: "Preamble" "..."
 889879-889919 usb_power_delivery: Sym: "SYNC-1" "S1"
 889919-889959 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1024,7 +1024,7 @@
 890120-890160 usb_power_delivery: Sym: "0xB" "B"
 890160-890201 usb_power_delivery: Sym: "0x0" "0"
 890040-890201 usb_power_delivery: Head: "H:0b61" "HD"
-889366-890562 usb_power_delivery: src: "SRC[5]:GOOD CRC" "GOOD CRC"
+889366-890562 usb_power_delivery: src: "(r2) SRC[5]: GOOD CRC" "GOOD CRC"
 890201-890241 usb_power_delivery: Sym: "0x1" "1"
 890241-890281 usb_power_delivery: Sym: "0x9" "9"
 890281-890321 usb_power_delivery: Sym: "0x1" "1"
@@ -1036,7 +1036,7 @@
 890201-890522 usb_power_delivery: CRC: "CRC:aaed9191" "CRC"
 890522-890562 usb_power_delivery: Sym: "EOP" "#"
 890522-890562 usb_power_delivery: EOP: "EOP" "E"
-889366-890562 usb_power_delivery: text: "#35   (370.569167ms): SRC[5]:GOOD CRC" "..."
+889366-890562 usb_power_delivery: text: "#35   (370.569167ms): (r2) SRC[5]: GOOD CRC" "..."
 891150-891663 usb_power_delivery: Preamble: "Preamble" "..."
 891663-891703 usb_power_delivery: Sym: "SYNC-1" "S1"
 891703-891743 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1048,7 +1048,7 @@
 891904-891944 usb_power_delivery: Sym: "0x5" "5"
 891944-891984 usb_power_delivery: Sym: "0x2" "2"
 891823-891984 usb_power_delivery: Head: "H:256f" "HD"
-891150-892988 usb_power_delivery: src: "SRC[2]:VDM" "VDM"
+891150-892988 usb_power_delivery: src: "(r2) SRC[2]: VDM" "VDM"
 891984-892024 usb_power_delivery: Sym: "0x0" "0"
 892024-892064 usb_power_delivery: Sym: "0x1" "1"
 892064-892105 usb_power_delivery: Sym: "0x1" "1"
@@ -1058,7 +1058,7 @@
 892225-892265 usb_power_delivery: Sym: "0xF" "F"
 892265-892305 usb_power_delivery: Sym: "0xF" "F"
 891984-892305 usb_power_delivery: Data: "[0]ff018110" "D0"
-891984-892305 usb_power_delivery: payload: "REQ DP Status pos 1 SVID:ff01" "REQ DP Status pos 1 SVID:ff01"
+891984-892305 usb_power_delivery: payload: "[1] REQ DP Status pos 1 SVID:ff01" "[1] REQ DP Status pos 1 SVID:ff01"
 892305-892346 usb_power_delivery: Sym: "0x1" "1"
 892346-892386 usb_power_delivery: Sym: "0x0" "0"
 892386-892426 usb_power_delivery: Sym: "0x0" "0"
@@ -1068,7 +1068,7 @@
 892547-892587 usb_power_delivery: Sym: "0x0" "0"
 892587-892627 usb_power_delivery: Sym: "0x0" "0"
 892305-892627 usb_power_delivery: Data: "[1]00000001" "D1"
-892305-892627 usb_power_delivery: payload: "VDO:00000001" "VDO:00000001"
+892305-892627 usb_power_delivery: payload: "[2] VDO:00000001" "[2] VDO:00000001"
 892627-892667 usb_power_delivery: Sym: "0x6" "6"
 892667-892707 usb_power_delivery: Sym: "0x4" "4"
 892707-892748 usb_power_delivery: Sym: "0x3" "3"
@@ -1080,7 +1080,7 @@
 892627-892948 usb_power_delivery: CRC: "CRC:e05e5346" "CRC"
 892948-892988 usb_power_delivery: Sym: "EOP" "#"
 892948-892988 usb_power_delivery: EOP: "EOP" "E"
-891150-892988 usb_power_delivery: text: "#36   (371.312500ms): SRC[2]:VDM - REQ DP Status pos 1 SVID:ff01 - VDO:00000001" "..."
+891150-892988 usb_power_delivery: text: "#36   (371.312500ms): (r2) SRC[2]: VDM - [1] REQ DP Status pos 1 SVID:ff01 - [2] VDO:00000001" "..."
 893235-893749 usb_power_delivery: Preamble: "Preamble" "..."
 893749-893790 usb_power_delivery: Sym: "SYNC-1" "S1"
 893790-893830 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1092,7 +1092,7 @@
 893992-894032 usb_power_delivery: Sym: "0x4" "4"
 894032-894072 usb_power_delivery: Sym: "0x0" "0"
 893911-894072 usb_power_delivery: Head: "H:0441" "HD"
-893235-894435 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+893235-894435 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 894072-894113 usb_power_delivery: Sym: "0x2" "2"
 894113-894153 usb_power_delivery: Sym: "0xA" "A"
 894153-894193 usb_power_delivery: Sym: "0x8" "8"
@@ -1104,7 +1104,7 @@
 894072-894395 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 894395-894435 usb_power_delivery: Sym: "EOP" "#"
 894395-894435 usb_power_delivery: EOP: "EOP" "E"
-893235-894435 usb_power_delivery: text: "#37   (372.181250ms): SNK[2]:GOOD CRC" "..."
+893235-894435 usb_power_delivery: text: "#37   (372.181250ms): (r2) SNK[2]: GOOD CRC" "..."
 895103-895618 usb_power_delivery: Preamble: "Preamble" "..."
 895618-895659 usb_power_delivery: Sym: "SYNC-1" "S1"
 895659-895699 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1116,7 +1116,7 @@
 895860-895901 usb_power_delivery: Sym: "0xC" "C"
 895901-895941 usb_power_delivery: Sym: "0x2" "2"
 895780-895941 usb_power_delivery: Head: "H:2c4f" "HD"
-895103-896950 usb_power_delivery: snk: "SNK[6]:VDM" "VDM"
+895103-896950 usb_power_delivery: snk: "(r2) SNK[6]: VDM" "VDM"
 895941-895981 usb_power_delivery: Sym: "0x0" "0"
 895981-896022 usb_power_delivery: Sym: "0x5" "5"
 896022-896062 usb_power_delivery: Sym: "0x1" "1"
@@ -1126,7 +1126,7 @@
 896183-896224 usb_power_delivery: Sym: "0xF" "F"
 896224-896264 usb_power_delivery: Sym: "0xF" "F"
 895941-896264 usb_power_delivery: Data: "[0]ff018150" "D0"
-895941-896264 usb_power_delivery: payload: "ACK DP Status pos 1 SVID:ff01" "ACK DP Status pos 1 SVID:ff01"
+895941-896264 usb_power_delivery: payload: "[1] ACK DP Status pos 1 SVID:ff01" "[1] ACK DP Status pos 1 SVID:ff01"
 896264-896304 usb_power_delivery: Sym: "0xA" "A"
 896304-896345 usb_power_delivery: Sym: "0x1" "1"
 896345-896385 usb_power_delivery: Sym: "0x0" "0"
@@ -1136,7 +1136,7 @@
 896506-896546 usb_power_delivery: Sym: "0x0" "0"
 896546-896587 usb_power_delivery: Sym: "0x0" "0"
 896264-896587 usb_power_delivery: Data: "[1]0000001a" "D1"
-896264-896587 usb_power_delivery: payload: "VDO:0000001a" "VDO:0000001a"
+896264-896587 usb_power_delivery: payload: "[2] VDO:0000001a" "[2] VDO:0000001a"
 896587-896627 usb_power_delivery: Sym: "0xE" "E"
 896627-896667 usb_power_delivery: Sym: "0xB" "B"
 896667-896708 usb_power_delivery: Sym: "0x4" "4"
@@ -1148,7 +1148,7 @@
 896587-896910 usb_power_delivery: CRC: "CRC:ad25f4be" "CRC"
 896910-896950 usb_power_delivery: Sym: "EOP" "#"
 896910-896950 usb_power_delivery: EOP: "EOP" "E"
-895103-896950 usb_power_delivery: text: "#38   (372.959583ms): SNK[6]:VDM - ACK DP Status pos 1 SVID:ff01 - VDO:0000001a" "..."
+895103-896950 usb_power_delivery: text: "#38   (372.959583ms): (r2) SNK[6]: VDM - [1] ACK DP Status pos 1 SVID:ff01 - [2] VDO:0000001a" "..."
 897178-897691 usb_power_delivery: Preamble: "Preamble" "..."
 897691-897731 usb_power_delivery: Sym: "SYNC-1" "S1"
 897731-897771 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1160,7 +1160,7 @@
 897932-897972 usb_power_delivery: Sym: "0xD" "D"
 897972-898012 usb_power_delivery: Sym: "0x0" "0"
 897851-898012 usb_power_delivery: Head: "H:0d61" "HD"
-897178-898382 usb_power_delivery: src: "SRC[6]:GOOD CRC" "GOOD CRC"
+897178-898382 usb_power_delivery: src: "(r2) SRC[6]: GOOD CRC" "GOOD CRC"
 898012-898052 usb_power_delivery: Sym: "0x4" "4"
 898052-898092 usb_power_delivery: Sym: "0xA" "A"
 898092-898133 usb_power_delivery: Sym: "0x4" "4"
@@ -1172,7 +1172,7 @@
 898012-898334 usb_power_delivery: CRC: "CRC:438e34a4" "CRC"
 898334-898374 usb_power_delivery: Sym: "EOP" "#"
 898334-898374 usb_power_delivery: EOP: "EOP" "E"
-897178-898374 usb_power_delivery: text: "#39   (373.824167ms): SRC[6]:GOOD CRC" "..."
+897178-898374 usb_power_delivery: text: "#39   (373.824167ms): (r2) SRC[6]: GOOD CRC" "..."
 909163-909675 usb_power_delivery: Preamble: "Preamble" "..."
 909675-909716 usb_power_delivery: Sym: "SYNC-1" "S1"
 909716-909756 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1184,7 +1184,7 @@
 909916-909957 usb_power_delivery: Sym: "0x7" "7"
 909957-909997 usb_power_delivery: Sym: "0x2" "2"
 909836-909997 usb_power_delivery: Head: "H:276f" "HD"
-909163-911001 usb_power_delivery: src: "SRC[3]:VDM" "VDM"
+909163-911001 usb_power_delivery: src: "(r2) SRC[3]: VDM" "VDM"
 909997-910037 usb_power_delivery: Sym: "0x1" "1"
 910037-910077 usb_power_delivery: Sym: "0x1" "1"
 910077-910117 usb_power_delivery: Sym: "0x1" "1"
@@ -1194,7 +1194,7 @@
 910238-910278 usb_power_delivery: Sym: "0xF" "F"
 910278-910318 usb_power_delivery: Sym: "0xF" "F"
 909997-910318 usb_power_delivery: Data: "[0]ff018111" "D0"
-909997-910318 usb_power_delivery: payload: "REQ DP Configure pos 1 SVID:ff01" "REQ DP Configure pos 1 SVID:ff01"
+909997-910318 usb_power_delivery: payload: "[1] REQ DP Configure pos 1 SVID:ff01" "[1] REQ DP Configure pos 1 SVID:ff01"
 910318-910358 usb_power_delivery: Sym: "0x6" "6"
 910358-910399 usb_power_delivery: Sym: "0x0" "0"
 910399-910439 usb_power_delivery: Sym: "0x8" "8"
@@ -1204,7 +1204,7 @@
 910559-910600 usb_power_delivery: Sym: "0x0" "0"
 910600-910640 usb_power_delivery: Sym: "0x0" "0"
 910318-910640 usb_power_delivery: Data: "[1]00000806" "D1"
-910318-910640 usb_power_delivery: payload: "VDO:00000806" "VDO:00000806"
+910318-910640 usb_power_delivery: payload: "[2] VDO:00000806" "[2] VDO:00000806"
 910640-910680 usb_power_delivery: Sym: "0xF" "F"
 910680-910720 usb_power_delivery: Sym: "0x5" "5"
 910720-910760 usb_power_delivery: Sym: "0x2" "2"
@@ -1216,7 +1216,7 @@
 910640-910961 usb_power_delivery: CRC: "CRC:91c6125f" "CRC"
 910961-911001 usb_power_delivery: Sym: "EOP" "#"
 910961-911001 usb_power_delivery: EOP: "EOP" "E"
-909163-911001 usb_power_delivery: text: "#40   (378.817917ms): SRC[3]:VDM - REQ DP Configure pos 1 SVID:ff01 - VDO:00000806" "..."
+909163-911001 usb_power_delivery: text: "#40   (378.817917ms): (r2) SRC[3]: VDM - [1] REQ DP Configure pos 1 SVID:ff01 - [2] VDO:00000806" "..."
 911232-911747 usb_power_delivery: Preamble: "Preamble" "..."
 911747-911787 usb_power_delivery: Sym: "SYNC-1" "S1"
 911787-911827 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1228,7 +1228,7 @@
 911989-912029 usb_power_delivery: Sym: "0x6" "6"
 912029-912070 usb_power_delivery: Sym: "0x0" "0"
 911908-912070 usb_power_delivery: Head: "H:0641" "HD"
-911232-912433 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+911232-912433 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 912070-912110 usb_power_delivery: Sym: "0xE" "E"
 912110-912150 usb_power_delivery: Sym: "0x8" "8"
 912150-912191 usb_power_delivery: Sym: "0x9" "9"
@@ -1240,7 +1240,7 @@
 912070-912392 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 912392-912433 usb_power_delivery: Sym: "EOP" "#"
 912392-912433 usb_power_delivery: EOP: "EOP" "E"
-911232-912433 usb_power_delivery: text: "#41   (379.680000ms): SNK[3]:GOOD CRC" "..."
+911232-912433 usb_power_delivery: text: "#41   (379.680000ms): (r2) SNK[3]: GOOD CRC" "..."
 913247-913762 usb_power_delivery: Preamble: "Preamble" "..."
 913762-913803 usb_power_delivery: Sym: "SYNC-1" "S1"
 913803-913843 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1252,7 +1252,7 @@
 914004-914044 usb_power_delivery: Sym: "0xE" "E"
 914044-914085 usb_power_delivery: Sym: "0x1" "1"
 913923-914085 usb_power_delivery: Head: "H:1e4f" "HD"
-913247-914779 usb_power_delivery: snk: "SNK[7]:VDM" "VDM"
+913247-914779 usb_power_delivery: snk: "(r2) SNK[7]: VDM" "VDM"
 914085-914125 usb_power_delivery: Sym: "0x1" "1"
 914125-914165 usb_power_delivery: Sym: "0x5" "5"
 914165-914206 usb_power_delivery: Sym: "0x1" "1"
@@ -1262,7 +1262,7 @@
 914327-914367 usb_power_delivery: Sym: "0xF" "F"
 914367-914407 usb_power_delivery: Sym: "0xF" "F"
 914085-914407 usb_power_delivery: Data: "[0]ff018151" "D0"
-914085-914407 usb_power_delivery: payload: "ACK DP Configure pos 1 SVID:ff01" "ACK DP Configure pos 1 SVID:ff01"
+914085-914407 usb_power_delivery: payload: "[1] ACK DP Configure pos 1 SVID:ff01" "[1] ACK DP Configure pos 1 SVID:ff01"
 914407-914448 usb_power_delivery: Sym: "0x5" "5"
 914448-914488 usb_power_delivery: Sym: "0x4" "4"
 914488-914529 usb_power_delivery: Sym: "0x7" "7"
@@ -1274,7 +1274,7 @@
 914407-914730 usb_power_delivery: CRC: "CRC:3743f745" "CRC"
 914730-914771 usb_power_delivery: Sym: "EOP" "#"
 914730-914771 usb_power_delivery: EOP: "EOP" "E"
-913247-914771 usb_power_delivery: text: "#42   (380.519583ms): SNK[7]:VDM - ACK DP Configure pos 1 SVID:ff01" "..."
+913247-914771 usb_power_delivery: text: "#42   (380.519583ms): (r2) SNK[7]: VDM - [1] ACK DP Configure pos 1 SVID:ff01" "..."
 915010-915522 usb_power_delivery: Preamble: "Preamble" "..."
 915522-915563 usb_power_delivery: Sym: "SYNC-1" "S1"
 915563-915603 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1286,7 +1286,7 @@
 915763-915804 usb_power_delivery: Sym: "0xF" "F"
 915804-915844 usb_power_delivery: Sym: "0x0" "0"
 915683-915844 usb_power_delivery: Head: "H:0f61" "HD"
-915010-916205 usb_power_delivery: src: "SRC[7]:GOOD CRC" "GOOD CRC"
+915010-916205 usb_power_delivery: src: "(r2) SRC[7]: GOOD CRC" "GOOD CRC"
 915844-915884 usb_power_delivery: Sym: "0x8" "8"
 915884-915924 usb_power_delivery: Sym: "0x8" "8"
 915924-915964 usb_power_delivery: Sym: "0x5" "5"
@@ -1298,7 +1298,7 @@
 915844-916165 usb_power_delivery: CRC: "CRC:ad805588" "CRC"
 916165-916205 usb_power_delivery: Sym: "EOP" "#"
 916165-916205 usb_power_delivery: EOP: "EOP" "E"
-915010-916205 usb_power_delivery: text: "#43   (381.254167ms): SRC[7]:GOOD CRC" "..."
+915010-916205 usb_power_delivery: text: "#43   (381.254167ms): (r2) SRC[7]: GOOD CRC" "..."
 917318-917831 usb_power_delivery: Preamble: "Preamble" "..."
 917831-917871 usb_power_delivery: Sym: "SYNC-1" "S1"
 917871-917911 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1310,7 +1310,7 @@
 918072-918112 usb_power_delivery: Sym: "0x9" "9"
 918112-918152 usb_power_delivery: Sym: "0x1" "1"
 917991-918152 usb_power_delivery: Head: "H:196f" "HD"
-917318-918835 usb_power_delivery: src: "SRC[4]:VDM" "VDM"
+917318-918835 usb_power_delivery: src: "(r2) SRC[4]: VDM" "VDM"
 918152-918192 usb_power_delivery: Sym: "0x3" "3"
 918192-918233 usb_power_delivery: Sym: "0x0" "0"
 918233-918273 usb_power_delivery: Sym: "0x0" "0"
@@ -1320,7 +1320,7 @@
 918393-918433 usb_power_delivery: Sym: "0x5" "5"
 918433-918473 usb_power_delivery: Sym: "0x0" "0"
 918152-918473 usb_power_delivery: Data: "[0]05ac8003" "D0"
-918152-918473 usb_power_delivery: payload: "REQ Disc Mode  SVID:05ac" "REQ Disc Mode  SVID:05ac"
+918152-918473 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:05ac" "[1] REQ Disc Mode  SVID:05ac"
 918473-918514 usb_power_delivery: Sym: "0xB" "B"
 918514-918554 usb_power_delivery: Sym: "0xD" "D"
 918554-918594 usb_power_delivery: Sym: "0xA" "A"
@@ -1332,7 +1332,7 @@
 918473-918795 usb_power_delivery: CRC: "CRC:a4c85adb" "CRC"
 918795-918835 usb_power_delivery: Sym: "EOP" "#"
 918795-918835 usb_power_delivery: EOP: "EOP" "E"
-917318-918835 usb_power_delivery: text: "#44   (382.215833ms): SRC[4]:VDM - REQ Disc Mode  SVID:05ac" "..."
+917318-918835 usb_power_delivery: text: "#44   (382.215833ms): (r2) SRC[4]: VDM - [1] REQ Disc Mode  SVID:05ac" "..."
 919066-919581 usb_power_delivery: Preamble: "Preamble" "..."
 919581-919621 usb_power_delivery: Sym: "SYNC-1" "S1"
 919621-919661 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1344,7 +1344,7 @@
 919823-919863 usb_power_delivery: Sym: "0x8" "8"
 919863-919903 usb_power_delivery: Sym: "0x0" "0"
 919742-919903 usb_power_delivery: Head: "H:0841" "HD"
-919066-920275 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+919066-920275 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 919903-919944 usb_power_delivery: Sym: "0x9" "9"
 919944-919984 usb_power_delivery: Sym: "0x8" "8"
 919984-920025 usb_power_delivery: Sym: "0x4" "4"
@@ -1356,7 +1356,7 @@
 919903-920226 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 920226-920267 usb_power_delivery: Sym: "EOP" "#"
 920226-920267 usb_power_delivery: EOP: "EOP" "E"
-919066-920267 usb_power_delivery: text: "#45   (382.944167ms): SNK[4]:GOOD CRC" "..."
+919066-920267 usb_power_delivery: text: "#45   (382.944167ms): (r2) SNK[4]: GOOD CRC" "..."
 924559-925074 usb_power_delivery: Preamble: "Preamble" "..."
 925074-925115 usb_power_delivery: Sym: "SYNC-1" "S1"
 925115-925155 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1368,7 +1368,7 @@
 925316-925357 usb_power_delivery: Sym: "0x0" "0"
 925357-925397 usb_power_delivery: Sym: "0x3" "3"
 925235-925397 usb_power_delivery: Head: "H:304f" "HD"
-924559-926737 usb_power_delivery: snk: "SNK[0]:VDM" "VDM"
+924559-926737 usb_power_delivery: snk: "(r2) SNK[0]: VDM" "VDM"
 925397-925437 usb_power_delivery: Sym: "0x3" "3"
 925437-925478 usb_power_delivery: Sym: "0x4" "4"
 925478-925518 usb_power_delivery: Sym: "0x0" "0"
@@ -1378,7 +1378,7 @@
 925639-925679 usb_power_delivery: Sym: "0x5" "5"
 925679-925720 usb_power_delivery: Sym: "0x0" "0"
 925397-925720 usb_power_delivery: Data: "[0]05ac8043" "D0"
-925397-925720 usb_power_delivery: payload: "ACK Disc Mode  SVID:05ac" "ACK Disc Mode  SVID:05ac"
+925397-925720 usb_power_delivery: payload: "[1] ACK Disc Mode  SVID:05ac" "[1] ACK Disc Mode  SVID:05ac"
 925720-925760 usb_power_delivery: Sym: "0x2" "2"
 925760-925801 usb_power_delivery: Sym: "0x0" "0"
 925801-925841 usb_power_delivery: Sym: "0x0" "0"
@@ -1388,7 +1388,7 @@
 925962-926002 usb_power_delivery: Sym: "0x0" "0"
 926002-926043 usb_power_delivery: Sym: "0x0" "0"
 925720-926043 usb_power_delivery: Data: "[1]00000002" "D1"
-925720-926043 usb_power_delivery: payload: "VDO:00000002" "VDO:00000002"
+925720-926043 usb_power_delivery: payload: "[2] VDO:00000002" "[2] VDO:00000002"
 926043-926083 usb_power_delivery: Sym: "0x1" "1"
 926083-926123 usb_power_delivery: Sym: "0x0" "0"
 926123-926164 usb_power_delivery: Sym: "0x0" "0"
@@ -1398,7 +1398,7 @@
 926285-926325 usb_power_delivery: Sym: "0x0" "0"
 926325-926365 usb_power_delivery: Sym: "0x0" "0"
 926043-926365 usb_power_delivery: Data: "[2]00000001" "D2"
-926043-926365 usb_power_delivery: payload: "VDO:00000001" "VDO:00000001"
+926043-926365 usb_power_delivery: payload: "[3] VDO:00000001" "[3] VDO:00000001"
 926365-926406 usb_power_delivery: Sym: "0x8" "8"
 926406-926446 usb_power_delivery: Sym: "0x7" "7"
 926446-926486 usb_power_delivery: Sym: "0x8" "8"
@@ -1410,7 +1410,7 @@
 926365-926688 usb_power_delivery: CRC: "CRC:f2994878" "CRC"
 926688-926729 usb_power_delivery: Sym: "EOP" "#"
 926688-926729 usb_power_delivery: EOP: "EOP" "E"
-924559-926729 usb_power_delivery: text: "#46   (385.232917ms): SNK[0]:VDM - ACK Disc Mode  SVID:05ac - VDO:00000002 - VDO:00000001" "..."
+924559-926729 usb_power_delivery: text: "#46   (385.232917ms): (r2) SNK[0]: VDM - [1] ACK Disc Mode  SVID:05ac - [2] VDO:00000002 - [3] VDO:00000001" "..."
 926965-927478 usb_power_delivery: Preamble: "Preamble" "..."
 927478-927518 usb_power_delivery: Sym: "SYNC-1" "S1"
 927518-927558 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1422,7 +1422,7 @@
 927719-927759 usb_power_delivery: Sym: "0x1" "1"
 927759-927799 usb_power_delivery: Sym: "0x0" "0"
 927638-927799 usb_power_delivery: Head: "H:0161" "HD"
-926965-928169 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+926965-928169 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 927799-927839 usb_power_delivery: Sym: "0xF" "F"
 927839-927880 usb_power_delivery: Sym: "0x8" "8"
 927880-927920 usb_power_delivery: Sym: "0x8" "8"
@@ -1434,7 +1434,7 @@
 927799-928121 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 928121-928161 usb_power_delivery: Sym: "EOP" "#"
 928121-928161 usb_power_delivery: EOP: "EOP" "E"
-926965-928161 usb_power_delivery: text: "#47   (386.235417ms): SRC[0]:GOOD CRC" "..."
+926965-928161 usb_power_delivery: text: "#47   (386.235417ms): (r2) SRC[0]: GOOD CRC" "..."
 929385-929897 usb_power_delivery: Preamble: "Preamble" "..."
 929897-929938 usb_power_delivery: Sym: "SYNC-1" "S1"
 929938-929978 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1446,7 +1446,7 @@
 930139-930179 usb_power_delivery: Sym: "0xB" "B"
 930179-930219 usb_power_delivery: Sym: "0x1" "1"
 930058-930219 usb_power_delivery: Head: "H:1b6f" "HD"
-929385-930910 usb_power_delivery: src: "SRC[5]:VDM" "VDM"
+929385-930910 usb_power_delivery: src: "(r2) SRC[5]: VDM" "VDM"
 930219-930259 usb_power_delivery: Sym: "0x4" "4"
 930259-930299 usb_power_delivery: Sym: "0x0" "0"
 930299-930340 usb_power_delivery: Sym: "0x1" "1"
@@ -1456,7 +1456,7 @@
 930460-930500 usb_power_delivery: Sym: "0x5" "5"
 930500-930541 usb_power_delivery: Sym: "0x0" "0"
 930219-930541 usb_power_delivery: Data: "[0]05ac8104" "D0"
-930219-930541 usb_power_delivery: payload: "REQ Enter Mode pos 1 SVID:05ac" "REQ Enter Mode pos 1 SVID:05ac"
+930219-930541 usb_power_delivery: payload: "[1] REQ Enter Mode pos 1 SVID:05ac" "[1] REQ Enter Mode pos 1 SVID:05ac"
 930541-930581 usb_power_delivery: Sym: "0x5" "5"
 930581-930621 usb_power_delivery: Sym: "0x3" "3"
 930621-930661 usb_power_delivery: Sym: "0xB" "B"
@@ -1468,7 +1468,7 @@
 930541-930862 usb_power_delivery: CRC: "CRC:421d5b35" "CRC"
 930862-930902 usb_power_delivery: Sym: "EOP" "#"
 930862-930902 usb_power_delivery: EOP: "EOP" "E"
-929385-930902 usb_power_delivery: text: "#48   (387.243750ms): SRC[5]:VDM - REQ Enter Mode pos 1 SVID:05ac" "..."
+929385-930902 usb_power_delivery: text: "#48   (387.243750ms): (r2) SRC[5]: VDM - [1] REQ Enter Mode pos 1 SVID:05ac" "..."
 931176-931691 usb_power_delivery: Preamble: "Preamble" "..."
 931691-931731 usb_power_delivery: Sym: "SYNC-1" "S1"
 931731-931772 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1480,7 +1480,7 @@
 931933-931973 usb_power_delivery: Sym: "0xA" "A"
 931973-932014 usb_power_delivery: Sym: "0x0" "0"
 931852-932014 usb_power_delivery: Head: "H:0a41" "HD"
-931176-932377 usb_power_delivery: snk: "SNK[5]:GOOD CRC" "GOOD CRC"
+931176-932377 usb_power_delivery: snk: "(r2) SNK[5]: GOOD CRC" "GOOD CRC"
 932014-932054 usb_power_delivery: Sym: "0x5" "5"
 932054-932095 usb_power_delivery: Sym: "0xA" "A"
 932095-932135 usb_power_delivery: Sym: "0x5" "5"
@@ -1492,7 +1492,7 @@
 932014-932337 usb_power_delivery: CRC: "CRC:486e85a5" "CRC"
 932337-932377 usb_power_delivery: Sym: "EOP" "#"
 932337-932377 usb_power_delivery: EOP: "EOP" "E"
-931176-932377 usb_power_delivery: text: "#49   (387.990000ms): SNK[5]:GOOD CRC" "..."
+931176-932377 usb_power_delivery: text: "#49   (387.990000ms): (r2) SNK[5]: GOOD CRC" "..."
 932850-933365 usb_power_delivery: Preamble: "Preamble" "..."
 933365-933405 usb_power_delivery: Sym: "SYNC-1" "S1"
 933405-933445 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1504,7 +1504,7 @@
 933607-933647 usb_power_delivery: Sym: "0x2" "2"
 933647-933688 usb_power_delivery: Sym: "0x1" "1"
 933526-933688 usb_power_delivery: Head: "H:124f" "HD"
-932850-934374 usb_power_delivery: snk: "SNK[1]:VDM" "VDM"
+932850-934374 usb_power_delivery: snk: "(r2) SNK[1]: VDM" "VDM"
 933688-933728 usb_power_delivery: Sym: "0x4" "4"
 933728-933768 usb_power_delivery: Sym: "0x4" "4"
 933768-933809 usb_power_delivery: Sym: "0x1" "1"
@@ -1514,7 +1514,7 @@
 933930-933970 usb_power_delivery: Sym: "0x5" "5"
 933970-934011 usb_power_delivery: Sym: "0x0" "0"
 933688-934011 usb_power_delivery: Data: "[0]05ac8144" "D0"
-933688-934011 usb_power_delivery: payload: "ACK Enter Mode pos 1 SVID:05ac" "ACK Enter Mode pos 1 SVID:05ac"
+933688-934011 usb_power_delivery: payload: "[1] ACK Enter Mode pos 1 SVID:05ac" "[1] ACK Enter Mode pos 1 SVID:05ac"
 934011-934051 usb_power_delivery: Sym: "0xF" "F"
 934051-934091 usb_power_delivery: Sym: "0x4" "4"
 934091-934132 usb_power_delivery: Sym: "0x4" "4"
@@ -1526,7 +1526,7 @@
 934011-934333 usb_power_delivery: CRC: "CRC:d3b5644f" "CRC"
 934333-934374 usb_power_delivery: Sym: "EOP" "#"
 934333-934374 usb_power_delivery: EOP: "EOP" "E"
-932850-934374 usb_power_delivery: text: "#50   (388.687500ms): SNK[1]:VDM - ACK Enter Mode pos 1 SVID:05ac" "..."
+932850-934374 usb_power_delivery: text: "#50   (388.687500ms): (r2) SNK[1]: VDM - [1] ACK Enter Mode pos 1 SVID:05ac" "..."
 934603-935116 usb_power_delivery: Preamble: "Preamble" "..."
 935116-935156 usb_power_delivery: Sym: "SYNC-1" "S1"
 935156-935196 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1538,7 +1538,7 @@
 935357-935397 usb_power_delivery: Sym: "0x3" "3"
 935397-935437 usb_power_delivery: Sym: "0x0" "0"
 935276-935437 usb_power_delivery: Head: "H:0361" "HD"
-934603-935799 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+934603-935799 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 935437-935477 usb_power_delivery: Sym: "0x3" "3"
 935477-935517 usb_power_delivery: Sym: "0xA" "A"
 935517-935558 usb_power_delivery: Sym: "0x9" "9"
@@ -1550,7 +1550,7 @@
 935437-935758 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 935758-935799 usb_power_delivery: Sym: "EOP" "#"
 935758-935799 usb_power_delivery: EOP: "EOP" "E"
-934603-935799 usb_power_delivery: text: "#51   (389.417917ms): SRC[1]:GOOD CRC" "..."
+934603-935799 usb_power_delivery: text: "#51   (389.417917ms): (r2) SRC[1]: GOOD CRC" "..."
 936662-937175 usb_power_delivery: Preamble: "Preamble" "..."
 937175-937215 usb_power_delivery: Sym: "SYNC-1" "S1"
 937215-937255 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1562,7 +1562,7 @@
 937416-937456 usb_power_delivery: Sym: "0xD" "D"
 937456-937496 usb_power_delivery: Sym: "0x2" "2"
 937336-937496 usb_power_delivery: Head: "H:2d6f" "HD"
-936662-938501 usb_power_delivery: src: "SRC[6]:VDM" "VDM"
+936662-938501 usb_power_delivery: src: "(r2) SRC[6]: VDM" "VDM"
 937496-937536 usb_power_delivery: Sym: "0x1" "1"
 937536-937577 usb_power_delivery: Sym: "0x0" "0"
 937577-937617 usb_power_delivery: Sym: "0x1" "1"
@@ -1572,7 +1572,7 @@
 937737-937777 usb_power_delivery: Sym: "0x5" "5"
 937777-937818 usb_power_delivery: Sym: "0x0" "0"
 937496-937818 usb_power_delivery: Data: "[0]05ac0101" "D0"
-937496-937818 usb_power_delivery: payload: "unstruct [0101] SVID:05ac" "unstruct [0101] SVID:05ac"
+937496-937818 usb_power_delivery: payload: "[1] unstruct [0101] SVID:05ac" "[1] unstruct [0101] SVID:05ac"
 937818-937858 usb_power_delivery: Sym: "0x0" "0"
 937858-937898 usb_power_delivery: Sym: "0x0" "0"
 937898-937938 usb_power_delivery: Sym: "0x0" "0"
@@ -1582,7 +1582,7 @@
 938059-938099 usb_power_delivery: Sym: "0x0" "0"
 938099-938139 usb_power_delivery: Sym: "0x0" "0"
 937818-938139 usb_power_delivery: Data: "[1]00000000" "D1"
-937818-938139 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+937818-938139 usb_power_delivery: payload: "[2] VDO:00000000" "[2] VDO:00000000"
 938139-938179 usb_power_delivery: Sym: "0x0" "0"
 938179-938219 usb_power_delivery: Sym: "0xB" "B"
 938219-938260 usb_power_delivery: Sym: "0x7" "7"
@@ -1594,7 +1594,7 @@
 938139-938460 usb_power_delivery: CRC: "CRC:7c3b07b0" "CRC"
 938460-938501 usb_power_delivery: Sym: "EOP" "#"
 938460-938501 usb_power_delivery: EOP: "EOP" "E"
-936662-938501 usb_power_delivery: text: "#52   (390.275833ms): SRC[6]:VDM - unstruct [0101] SVID:05ac - VDO:00000000" "..."
+936662-938501 usb_power_delivery: text: "#52   (390.275833ms): (r2) SRC[6]: VDM - [1] unstruct [0101] SVID:05ac - [2] VDO:00000000" "..."
 938747-939262 usb_power_delivery: Preamble: "Preamble" "..."
 939262-939302 usb_power_delivery: Sym: "SYNC-1" "S1"
 939302-939343 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1606,7 +1606,7 @@
 939504-939544 usb_power_delivery: Sym: "0xC" "C"
 939544-939585 usb_power_delivery: Sym: "0x0" "0"
 939423-939585 usb_power_delivery: Head: "H:0c41" "HD"
-938747-939956 usb_power_delivery: snk: "SNK[6]:GOOD CRC" "GOOD CRC"
+938747-939956 usb_power_delivery: snk: "(r2) SNK[6]: GOOD CRC" "GOOD CRC"
 939585-939625 usb_power_delivery: Sym: "0x0" "0"
 939625-939665 usb_power_delivery: Sym: "0x9" "9"
 939665-939706 usb_power_delivery: Sym: "0x0" "0"
@@ -1618,7 +1618,7 @@
 939585-939908 usb_power_delivery: CRC: "CRC:a10d2090" "CRC"
 939908-939948 usb_power_delivery: Sym: "EOP" "#"
 939908-939948 usb_power_delivery: EOP: "EOP" "E"
-938747-939948 usb_power_delivery: text: "#53   (391.144583ms): SNK[6]:GOOD CRC" "..."
+938747-939948 usb_power_delivery: text: "#53   (391.144583ms): (r2) SNK[6]: GOOD CRC" "..."
 941206-941720 usb_power_delivery: Preamble: "Preamble" "..."
 941720-941761 usb_power_delivery: Sym: "SYNC-1" "S1"
 941761-941801 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1630,7 +1630,7 @@
 941962-942003 usb_power_delivery: Sym: "0x4" "4"
 942003-942043 usb_power_delivery: Sym: "0x2" "2"
 941882-942043 usb_power_delivery: Head: "H:244f" "HD"
-941206-943060 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+941206-943060 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 942043-942084 usb_power_delivery: Sym: "0x1" "1"
 942084-942124 usb_power_delivery: Sym: "0x1" "1"
 942124-942164 usb_power_delivery: Sym: "0x1" "1"
@@ -1640,7 +1640,7 @@
 942285-942326 usb_power_delivery: Sym: "0x5" "5"
 942326-942366 usb_power_delivery: Sym: "0x0" "0"
 942043-942366 usb_power_delivery: Data: "[0]05ac0111" "D0"
-942043-942366 usb_power_delivery: payload: "unstruct [0111] SVID:05ac" "unstruct [0111] SVID:05ac"
+942043-942366 usb_power_delivery: payload: "[1] unstruct [0111] SVID:05ac" "[1] unstruct [0111] SVID:05ac"
 942366-942407 usb_power_delivery: Sym: "0x6" "6"
 942407-942447 usb_power_delivery: Sym: "0x0" "0"
 942447-942487 usb_power_delivery: Sym: "0x0" "0"
@@ -1650,7 +1650,7 @@
 942608-942649 usb_power_delivery: Sym: "0x0" "0"
 942649-942689 usb_power_delivery: Sym: "0x2" "2"
 942366-942689 usb_power_delivery: Data: "[1]20000006" "D1"
-942366-942689 usb_power_delivery: payload: "VDO:20000006" "VDO:20000006"
+942366-942689 usb_power_delivery: payload: "[2] VDO:20000006" "[2] VDO:20000006"
 942689-942729 usb_power_delivery: Sym: "0x4" "4"
 942729-942770 usb_power_delivery: Sym: "0x0" "0"
 942770-942810 usb_power_delivery: Sym: "0xC" "C"
@@ -1662,7 +1662,7 @@
 942689-943012 usb_power_delivery: CRC: "CRC:fd7bfc04" "CRC"
 943012-943052 usb_power_delivery: Sym: "EOP" "#"
 943012-943052 usb_power_delivery: EOP: "EOP" "E"
-941206-943052 usb_power_delivery: text: "#54   (392.169167ms): SNK[2]:VDM - unstruct [0111] SVID:05ac - VDO:20000006" "..."
+941206-943052 usb_power_delivery: text: "#54   (392.169167ms): (r2) SNK[2]: VDM - [1] unstruct [0111] SVID:05ac - [2] VDO:20000006" "..."
 943303-943815 usb_power_delivery: Preamble: "Preamble" "..."
 943815-943855 usb_power_delivery: Sym: "SYNC-1" "S1"
 943855-943896 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1674,7 +1674,7 @@
 944056-944097 usb_power_delivery: Sym: "0x5" "5"
 944097-944137 usb_power_delivery: Sym: "0x0" "0"
 943976-944137 usb_power_delivery: Head: "H:0561" "HD"
-943303-944506 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+943303-944506 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 944137-944177 usb_power_delivery: Sym: "0x6" "6"
 944177-944217 usb_power_delivery: Sym: "0x9" "9"
 944217-944257 usb_power_delivery: Sym: "0xC" "C"
@@ -1686,7 +1686,7 @@
 944137-944458 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 944458-944498 usb_power_delivery: Sym: "EOP" "#"
 944458-944498 usb_power_delivery: EOP: "EOP" "E"
-943303-944498 usb_power_delivery: text: "#55   (393.042917ms): SRC[2]:GOOD CRC" "..."
+943303-944498 usb_power_delivery: text: "#55   (393.042917ms): (r2) SRC[2]: GOOD CRC" "..."
 945276-945789 usb_power_delivery: Preamble: "Preamble" "..."
 945789-945829 usb_power_delivery: Sym: "SYNC-1" "S1"
 945829-945869 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1698,7 +1698,7 @@
 946030-946070 usb_power_delivery: Sym: "0xF" "F"
 946070-946110 usb_power_delivery: Sym: "0x2" "2"
 945949-946110 usb_power_delivery: Head: "H:2f6f" "HD"
-945276-947114 usb_power_delivery: src: "SRC[7]:VDM" "VDM"
+945276-947114 usb_power_delivery: src: "(r2) SRC[7]: VDM" "VDM"
 946110-946150 usb_power_delivery: Sym: "0x1" "1"
 946150-946190 usb_power_delivery: Sym: "0x0" "0"
 946190-946231 usb_power_delivery: Sym: "0x1" "1"
@@ -1708,7 +1708,7 @@
 946351-946391 usb_power_delivery: Sym: "0x5" "5"
 946391-946431 usb_power_delivery: Sym: "0x0" "0"
 946110-946431 usb_power_delivery: Data: "[0]05ac0101" "D0"
-946110-946431 usb_power_delivery: payload: "unstruct [0101] SVID:05ac" "unstruct [0101] SVID:05ac"
+946110-946431 usb_power_delivery: payload: "[1] unstruct [0101] SVID:05ac" "[1] unstruct [0101] SVID:05ac"
 946431-946472 usb_power_delivery: Sym: "0x4" "4"
 946472-946512 usb_power_delivery: Sym: "0x0" "0"
 946512-946552 usb_power_delivery: Sym: "0x0" "0"
@@ -1718,7 +1718,7 @@
 946672-946713 usb_power_delivery: Sym: "0x0" "0"
 946713-946753 usb_power_delivery: Sym: "0x0" "0"
 946431-946753 usb_power_delivery: Data: "[1]00000004" "D1"
-946431-946753 usb_power_delivery: payload: "VDO:00000004" "VDO:00000004"
+946431-946753 usb_power_delivery: payload: "[2] VDO:00000004" "[2] VDO:00000004"
 946753-946793 usb_power_delivery: Sym: "0x1" "1"
 946793-946833 usb_power_delivery: Sym: "0x6" "6"
 946833-946873 usb_power_delivery: Sym: "0x8" "8"
@@ -1730,7 +1730,7 @@
 946753-947074 usb_power_delivery: CRC: "CRC:ddafb861" "CRC"
 947074-947114 usb_power_delivery: Sym: "EOP" "#"
 947074-947114 usb_power_delivery: EOP: "EOP" "E"
-945276-947114 usb_power_delivery: text: "#56   (393.865000ms): SRC[7]:VDM - unstruct [0101] SVID:05ac - VDO:00000004" "..."
+945276-947114 usb_power_delivery: text: "#56   (393.865000ms): (r2) SRC[7]: VDM - [1] unstruct [0101] SVID:05ac - [2] VDO:00000004" "..."
 947345-947860 usb_power_delivery: Preamble: "Preamble" "..."
 947860-947900 usb_power_delivery: Sym: "SYNC-1" "S1"
 947900-947941 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1742,7 +1742,7 @@
 948102-948142 usb_power_delivery: Sym: "0xE" "E"
 948142-948183 usb_power_delivery: Sym: "0x0" "0"
 948021-948183 usb_power_delivery: Head: "H:0e41" "HD"
-947345-948554 usb_power_delivery: snk: "SNK[7]:GOOD CRC" "GOOD CRC"
+947345-948554 usb_power_delivery: snk: "(r2) SNK[7]: GOOD CRC" "GOOD CRC"
 948183-948223 usb_power_delivery: Sym: "0xC" "C"
 948223-948264 usb_power_delivery: Sym: "0xB" "B"
 948264-948304 usb_power_delivery: Sym: "0x1" "1"
@@ -1754,7 +1754,7 @@
 948183-948506 usb_power_delivery: CRC: "CRC:4f0341bc" "CRC"
 948506-948546 usb_power_delivery: Sym: "EOP" "#"
 948506-948546 usb_power_delivery: EOP: "EOP" "E"
-947345-948546 usb_power_delivery: text: "#57   (394.727083ms): SNK[7]:GOOD CRC" "..."
+947345-948546 usb_power_delivery: text: "#57   (394.727083ms): (r2) SNK[7]: GOOD CRC" "..."
 949230-949745 usb_power_delivery: Preamble: "Preamble" "..."
 949745-949786 usb_power_delivery: Sym: "SYNC-1" "S1"
 949786-949826 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1766,7 +1766,7 @@
 949987-950028 usb_power_delivery: Sym: "0x6" "6"
 950028-950068 usb_power_delivery: Sym: "0x2" "2"
 949907-950068 usb_power_delivery: Head: "H:264f" "HD"
-949230-951077 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+949230-951077 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 950068-950108 usb_power_delivery: Sym: "0x1" "1"
 950108-950149 usb_power_delivery: Sym: "0x1" "1"
 950149-950189 usb_power_delivery: Sym: "0x1" "1"
@@ -1776,7 +1776,7 @@
 950310-950351 usb_power_delivery: Sym: "0x5" "5"
 950351-950391 usb_power_delivery: Sym: "0x0" "0"
 950068-950391 usb_power_delivery: Data: "[0]05ac0111" "D0"
-950068-950391 usb_power_delivery: payload: "unstruct [0111] SVID:05ac" "unstruct [0111] SVID:05ac"
+950068-950391 usb_power_delivery: payload: "[1] unstruct [0111] SVID:05ac" "[1] unstruct [0111] SVID:05ac"
 950391-950431 usb_power_delivery: Sym: "0x8" "8"
 950431-950472 usb_power_delivery: Sym: "0x9" "9"
 950472-950512 usb_power_delivery: Sym: "0x0" "0"
@@ -1786,7 +1786,7 @@
 950633-950674 usb_power_delivery: Sym: "0x0" "0"
 950674-950714 usb_power_delivery: Sym: "0x0" "0"
 950391-950714 usb_power_delivery: Data: "[1]00060098" "D1"
-950391-950714 usb_power_delivery: payload: "VDO:00060098" "VDO:00060098"
+950391-950714 usb_power_delivery: payload: "[2] VDO:00060098" "[2] VDO:00060098"
 950714-950754 usb_power_delivery: Sym: "0xB" "B"
 950754-950795 usb_power_delivery: Sym: "0x5" "5"
 950795-950835 usb_power_delivery: Sym: "0x5" "5"
@@ -1798,7 +1798,7 @@
 950714-951037 usb_power_delivery: CRC: "CRC:e326c55b" "CRC"
 951037-951077 usb_power_delivery: Sym: "EOP" "#"
 951037-951077 usb_power_delivery: EOP: "EOP" "E"
-949230-951077 usb_power_delivery: text: "#58   (395.512500ms): SNK[3]:VDM - unstruct [0111] SVID:05ac - VDO:00060098" "..."
+949230-951077 usb_power_delivery: text: "#58   (395.512500ms): (r2) SNK[3]: VDM - [1] unstruct [0111] SVID:05ac - [2] VDO:00060098" "..."
 951306-951819 usb_power_delivery: Preamble: "Preamble" "..."
 951819-951859 usb_power_delivery: Sym: "SYNC-1" "S1"
 951859-951899 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1810,7 +1810,7 @@
 952060-952100 usb_power_delivery: Sym: "0x7" "7"
 952100-952140 usb_power_delivery: Sym: "0x0" "0"
 951979-952140 usb_power_delivery: Head: "H:0761" "HD"
-951306-952510 usb_power_delivery: src: "SRC[3]:GOOD CRC" "GOOD CRC"
+951306-952510 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
 952140-952180 usb_power_delivery: Sym: "0xA" "A"
 952180-952220 usb_power_delivery: Sym: "0xB" "B"
 952220-952261 usb_power_delivery: Sym: "0xD" "D"
@@ -1822,7 +1822,7 @@
 952140-952462 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
 952462-952502 usb_power_delivery: Sym: "EOP" "#"
 952462-952502 usb_power_delivery: EOP: "EOP" "E"
-951306-952502 usb_power_delivery: text: "#59   (396.377500ms): SRC[3]:GOOD CRC" "..."
+951306-952502 usb_power_delivery: text: "#59   (396.377500ms): (r2) SRC[3]: GOOD CRC" "..."
 953122-953634 usb_power_delivery: Preamble: "Preamble" "..."
 953634-953675 usb_power_delivery: Sym: "SYNC-1" "S1"
 953675-953715 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1834,7 +1834,7 @@
 953876-953916 usb_power_delivery: Sym: "0x1" "1"
 953916-953956 usb_power_delivery: Sym: "0x2" "2"
 953795-953956 usb_power_delivery: Head: "H:216f" "HD"
-953122-954968 usb_power_delivery: src: "SRC[0]:VDM" "VDM"
+953122-954968 usb_power_delivery: src: "(r2) SRC[0]: VDM" "VDM"
 953956-953996 usb_power_delivery: Sym: "0x1" "1"
 953996-954036 usb_power_delivery: Sym: "0x0" "0"
 954036-954076 usb_power_delivery: Sym: "0x1" "1"
@@ -1844,7 +1844,7 @@
 954197-954237 usb_power_delivery: Sym: "0x5" "5"
 954237-954277 usb_power_delivery: Sym: "0x0" "0"
 953956-954277 usb_power_delivery: Data: "[0]05ac0101" "D0"
-953956-954277 usb_power_delivery: payload: "unstruct [0101] SVID:05ac" "unstruct [0101] SVID:05ac"
+953956-954277 usb_power_delivery: payload: "[1] unstruct [0101] SVID:05ac" "[1] unstruct [0101] SVID:05ac"
 954277-954317 usb_power_delivery: Sym: "0x0" "0"
 954317-954358 usb_power_delivery: Sym: "0x0" "0"
 954358-954398 usb_power_delivery: Sym: "0x0" "0"
@@ -1854,7 +1854,7 @@
 954518-954559 usb_power_delivery: Sym: "0x1" "1"
 954559-954599 usb_power_delivery: Sym: "0x0" "0"
 954277-954599 usb_power_delivery: Data: "[1]01000000" "D1"
-954277-954599 usb_power_delivery: payload: "VDO:01000000" "VDO:01000000"
+954277-954599 usb_power_delivery: payload: "[2] VDO:01000000" "[2] VDO:01000000"
 954599-954639 usb_power_delivery: Sym: "0x2" "2"
 954639-954679 usb_power_delivery: Sym: "0x3" "3"
 954679-954719 usb_power_delivery: Sym: "0x4" "4"
@@ -1866,7 +1866,7 @@
 954599-954920 usb_power_delivery: CRC: "CRC:ed08c432" "CRC"
 954920-954960 usb_power_delivery: Sym: "EOP" "#"
 954920-954960 usb_power_delivery: EOP: "EOP" "E"
-953122-954960 usb_power_delivery: text: "#60   (397.134167ms): SRC[0]:VDM - unstruct [0101] SVID:05ac - VDO:01000000" "..."
+953122-954960 usb_power_delivery: text: "#60   (397.134167ms): (r2) SRC[0]: VDM - [1] unstruct [0101] SVID:05ac - [2] VDO:01000000" "..."
 955233-955748 usb_power_delivery: Preamble: "Preamble" "..."
 955748-955789 usb_power_delivery: Sym: "SYNC-1" "S1"
 955789-955829 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1878,7 +1878,7 @@
 955990-956031 usb_power_delivery: Sym: "0x0" "0"
 956031-956071 usb_power_delivery: Sym: "0x0" "0"
 955910-956071 usb_power_delivery: Head: "H:0041" "HD"
-955233-956442 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+955233-956442 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 956071-956112 usb_power_delivery: Sym: "0xB" "B"
 956112-956152 usb_power_delivery: Sym: "0xB" "B"
 956152-956192 usb_power_delivery: Sym: "0xC" "C"
@@ -1890,7 +1890,7 @@
 956071-956394 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 956394-956434 usb_power_delivery: Sym: "EOP" "#"
 956394-956434 usb_power_delivery: EOP: "EOP" "E"
-955233-956434 usb_power_delivery: text: "#61   (398.013750ms): SNK[0]:GOOD CRC" "..."
+955233-956434 usb_power_delivery: text: "#61   (398.013750ms): (r2) SNK[0]: GOOD CRC" "..."
 957271-957786 usb_power_delivery: Preamble: "Preamble" "..."
 957786-957827 usb_power_delivery: Sym: "SYNC-1" "S1"
 957827-957867 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1902,7 +1902,7 @@
 958028-958069 usb_power_delivery: Sym: "0x8" "8"
 958069-958109 usb_power_delivery: Sym: "0x2" "2"
 957948-958109 usb_power_delivery: Head: "H:284f" "HD"
-957271-959126 usb_power_delivery: snk: "SNK[4]:VDM" "VDM"
+957271-959126 usb_power_delivery: snk: "(r2) SNK[4]: VDM" "VDM"
 958109-958150 usb_power_delivery: Sym: "0x1" "1"
 958150-958190 usb_power_delivery: Sym: "0x1" "1"
 958190-958230 usb_power_delivery: Sym: "0x1" "1"
@@ -1912,7 +1912,7 @@
 958351-958392 usb_power_delivery: Sym: "0x5" "5"
 958392-958432 usb_power_delivery: Sym: "0x0" "0"
 958109-958432 usb_power_delivery: Data: "[0]05ac0111" "D0"
-958109-958432 usb_power_delivery: payload: "unstruct [0111] SVID:05ac" "unstruct [0111] SVID:05ac"
+958109-958432 usb_power_delivery: payload: "[1] unstruct [0111] SVID:05ac" "[1] unstruct [0111] SVID:05ac"
 958432-958472 usb_power_delivery: Sym: "0x4" "4"
 958472-958513 usb_power_delivery: Sym: "0x0" "0"
 958513-958553 usb_power_delivery: Sym: "0x0" "0"
@@ -1922,7 +1922,7 @@
 958674-958714 usb_power_delivery: Sym: "0x0" "0"
 958714-958755 usb_power_delivery: Sym: "0x0" "0"
 958432-958755 usb_power_delivery: Data: "[1]00000004" "D1"
-958432-958755 usb_power_delivery: payload: "VDO:00000004" "VDO:00000004"
+958432-958755 usb_power_delivery: payload: "[2] VDO:00000004" "[2] VDO:00000004"
 958755-958795 usb_power_delivery: Sym: "0x3" "3"
 958795-958836 usb_power_delivery: Sym: "0x5" "5"
 958836-958876 usb_power_delivery: Sym: "0x7" "7"
@@ -1934,7 +1934,7 @@
 958755-959078 usb_power_delivery: CRC: "CRC:8a28e753" "CRC"
 959078-959118 usb_power_delivery: Sym: "EOP" "#"
 959078-959118 usb_power_delivery: EOP: "EOP" "E"
-957271-959118 usb_power_delivery: text: "#62   (398.862917ms): SNK[4]:VDM - unstruct [0111] SVID:05ac - VDO:00000004" "..."
+957271-959118 usb_power_delivery: text: "#62   (398.862917ms): (r2) SNK[4]: VDM - [1] unstruct [0111] SVID:05ac - [2] VDO:00000004" "..."
 959377-959889 usb_power_delivery: Preamble: "Preamble" "..."
 959889-959930 usb_power_delivery: Sym: "SYNC-1" "S1"
 959930-959970 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1946,7 +1946,7 @@
 960130-960171 usb_power_delivery: Sym: "0x9" "9"
 960171-960211 usb_power_delivery: Sym: "0x0" "0"
 960050-960211 usb_power_delivery: Head: "H:0961" "HD"
-959377-960572 usb_power_delivery: src: "SRC[4]:GOOD CRC" "GOOD CRC"
+959377-960572 usb_power_delivery: src: "(r2) SRC[4]: GOOD CRC" "GOOD CRC"
 960211-960251 usb_power_delivery: Sym: "0xD" "D"
 960251-960291 usb_power_delivery: Sym: "0xB" "B"
 960291-960331 usb_power_delivery: Sym: "0x0" "0"
@@ -1958,7 +1958,7 @@
 960211-960532 usb_power_delivery: CRC: "CRC:44e3f0bd" "CRC"
 960532-960572 usb_power_delivery: Sym: "EOP" "#"
 960532-960572 usb_power_delivery: EOP: "EOP" "E"
-959377-960572 usb_power_delivery: text: "#63   (399.740417ms): SRC[4]:GOOD CRC" "..."
+959377-960572 usb_power_delivery: text: "#63   (399.740417ms): (r2) SRC[4]: GOOD CRC" "..."
 961423-961935 usb_power_delivery: Preamble: "Preamble" "..."
 961935-961975 usb_power_delivery: Sym: "SYNC-1" "S1"
 961975-962015 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1970,7 +1970,7 @@
 962176-962217 usb_power_delivery: Sym: "0x3" "3"
 962217-962257 usb_power_delivery: Sym: "0x2" "2"
 962096-962257 usb_power_delivery: Head: "H:236f" "HD"
-961423-963261 usb_power_delivery: src: "SRC[1]:VDM" "VDM"
+961423-963261 usb_power_delivery: src: "(r2) SRC[1]: VDM" "VDM"
 962257-962297 usb_power_delivery: Sym: "0x1" "1"
 962297-962337 usb_power_delivery: Sym: "0x0" "0"
 962337-962377 usb_power_delivery: Sym: "0x1" "1"
@@ -1980,7 +1980,7 @@
 962498-962538 usb_power_delivery: Sym: "0x5" "5"
 962538-962578 usb_power_delivery: Sym: "0x0" "0"
 962257-962578 usb_power_delivery: Data: "[0]05ac0101" "D0"
-962257-962578 usb_power_delivery: payload: "unstruct [0101] SVID:05ac" "unstruct [0101] SVID:05ac"
+962257-962578 usb_power_delivery: payload: "[1] unstruct [0101] SVID:05ac" "[1] unstruct [0101] SVID:05ac"
 962578-962618 usb_power_delivery: Sym: "0x4" "4"
 962618-962659 usb_power_delivery: Sym: "0x0" "0"
 962659-962699 usb_power_delivery: Sym: "0x0" "0"
@@ -1990,7 +1990,7 @@
 962819-962859 usb_power_delivery: Sym: "0x1" "1"
 962859-962900 usb_power_delivery: Sym: "0x0" "0"
 962578-962900 usb_power_delivery: Data: "[1]01000004" "D1"
-962578-962900 usb_power_delivery: payload: "VDO:01000004" "VDO:01000004"
+962578-962900 usb_power_delivery: payload: "[2] VDO:01000004" "[2] VDO:01000004"
 962900-962940 usb_power_delivery: Sym: "0x3" "3"
 962940-962980 usb_power_delivery: Sym: "0xE" "E"
 962980-963020 usb_power_delivery: Sym: "0xB" "B"
@@ -2002,7 +2002,7 @@
 962900-963221 usb_power_delivery: CRC: "CRC:4c9c7be3" "CRC"
 963221-963261 usb_power_delivery: Sym: "EOP" "#"
 963221-963261 usb_power_delivery: EOP: "EOP" "E"
-961423-963261 usb_power_delivery: text: "#64   (400.592917ms): SRC[1]:VDM - unstruct [0101] SVID:05ac - VDO:01000004" "..."
+961423-963261 usb_power_delivery: text: "#64   (400.592917ms): (r2) SRC[1]: VDM - [1] unstruct [0101] SVID:05ac - [2] VDO:01000004" "..."
 963507-964022 usb_power_delivery: Preamble: "Preamble" "..."
 964022-964063 usb_power_delivery: Sym: "SYNC-1" "S1"
 964063-964103 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2014,7 +2014,7 @@
 964264-964305 usb_power_delivery: Sym: "0x2" "2"
 964305-964345 usb_power_delivery: Sym: "0x0" "0"
 964184-964345 usb_power_delivery: Head: "H:0241" "HD"
-963507-964716 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+963507-964716 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 964345-964386 usb_power_delivery: Sym: "0x7" "7"
 964386-964426 usb_power_delivery: Sym: "0x9" "9"
 964426-964466 usb_power_delivery: Sym: "0xD" "D"
@@ -2026,7 +2026,7 @@
 964345-964668 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 964668-964708 usb_power_delivery: Sym: "EOP" "#"
 964668-964708 usb_power_delivery: EOP: "EOP" "E"
-963507-964708 usb_power_delivery: text: "#65   (401.461250ms): SNK[1]:GOOD CRC" "..."
+963507-964708 usb_power_delivery: text: "#65   (401.461250ms): (r2) SNK[1]: GOOD CRC" "..."
 965309-965824 usb_power_delivery: Preamble: "Preamble" "..."
 965824-965864 usb_power_delivery: Sym: "SYNC-1" "S1"
 965864-965905 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2038,7 +2038,7 @@
 966066-966106 usb_power_delivery: Sym: "0xA" "A"
 966106-966147 usb_power_delivery: Sym: "0x2" "2"
 965985-966147 usb_power_delivery: Head: "H:2a4f" "HD"
-965309-967156 usb_power_delivery: snk: "SNK[5]:VDM" "VDM"
+965309-967156 usb_power_delivery: snk: "(r2) SNK[5]: VDM" "VDM"
 966147-966187 usb_power_delivery: Sym: "0x1" "1"
 966187-966228 usb_power_delivery: Sym: "0x1" "1"
 966228-966268 usb_power_delivery: Sym: "0x1" "1"
@@ -2048,7 +2048,7 @@
 966389-966429 usb_power_delivery: Sym: "0x5" "5"
 966429-966470 usb_power_delivery: Sym: "0x0" "0"
 966147-966470 usb_power_delivery: Data: "[0]05ac0111" "D0"
-966147-966470 usb_power_delivery: payload: "unstruct [0111] SVID:05ac" "unstruct [0111] SVID:05ac"
+966147-966470 usb_power_delivery: payload: "[1] unstruct [0111] SVID:05ac" "[1] unstruct [0111] SVID:05ac"
 966470-966510 usb_power_delivery: Sym: "0x8" "8"
 966510-966550 usb_power_delivery: Sym: "0x0" "0"
 966550-966591 usb_power_delivery: Sym: "0x1" "1"
@@ -2058,7 +2058,7 @@
 966712-966752 usb_power_delivery: Sym: "0x0" "0"
 966752-966793 usb_power_delivery: Sym: "0x0" "0"
 966470-966793 usb_power_delivery: Data: "[1]00000108" "D1"
-966470-966793 usb_power_delivery: payload: "VDO:00000108" "VDO:00000108"
+966470-966793 usb_power_delivery: payload: "[2] VDO:00000108" "[2] VDO:00000108"
 966793-966833 usb_power_delivery: Sym: "0xA" "A"
 966833-966873 usb_power_delivery: Sym: "0x5" "5"
 966873-966914 usb_power_delivery: Sym: "0xA" "A"
@@ -2070,7 +2070,7 @@
 966793-967115 usb_power_delivery: CRC: "CRC:efca1a5a" "CRC"
 967115-967156 usb_power_delivery: Sym: "EOP" "#"
 967115-967156 usb_power_delivery: EOP: "EOP" "E"
-965309-967156 usb_power_delivery: text: "#66   (402.212083ms): SNK[5]:VDM - unstruct [0111] SVID:05ac - VDO:00000108" "..."
+965309-967156 usb_power_delivery: text: "#66   (402.212083ms): (r2) SNK[5]: VDM - [1] unstruct [0111] SVID:05ac - [2] VDO:00000108" "..."
 967384-967897 usb_power_delivery: Preamble: "Preamble" "..."
 967897-967937 usb_power_delivery: Sym: "SYNC-1" "S1"
 967937-967977 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2082,7 +2082,7 @@
 968138-968178 usb_power_delivery: Sym: "0xB" "B"
 968178-968218 usb_power_delivery: Sym: "0x0" "0"
 968057-968218 usb_power_delivery: Head: "H:0b61" "HD"
-967384-968580 usb_power_delivery: src: "SRC[5]:GOOD CRC" "GOOD CRC"
+967384-968580 usb_power_delivery: src: "(r2) SRC[5]: GOOD CRC" "GOOD CRC"
 968218-968258 usb_power_delivery: Sym: "0x1" "1"
 968258-968298 usb_power_delivery: Sym: "0x9" "9"
 968298-968339 usb_power_delivery: Sym: "0x1" "1"
@@ -2094,7 +2094,7 @@
 968218-968539 usb_power_delivery: CRC: "CRC:aaed9191" "CRC"
 968539-968580 usb_power_delivery: Sym: "EOP" "#"
 968539-968580 usb_power_delivery: EOP: "EOP" "E"
-967384-968580 usb_power_delivery: text: "#67   (403.076667ms): SRC[5]:GOOD CRC" "..."
+967384-968580 usb_power_delivery: text: "#67   (403.076667ms): (r2) SRC[5]: GOOD CRC" "..."
 969367-969880 usb_power_delivery: Preamble: "Preamble" "..."
 969880-969920 usb_power_delivery: Sym: "SYNC-1" "S1"
 969920-969960 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2106,7 +2106,7 @@
 970121-970161 usb_power_delivery: Sym: "0x5" "5"
 970161-970201 usb_power_delivery: Sym: "0x2" "2"
 970040-970201 usb_power_delivery: Head: "H:256f" "HD"
-969367-971206 usb_power_delivery: src: "SRC[2]:VDM" "VDM"
+969367-971206 usb_power_delivery: src: "(r2) SRC[2]: VDM" "VDM"
 970201-970242 usb_power_delivery: Sym: "0x1" "1"
 970242-970282 usb_power_delivery: Sym: "0x0" "0"
 970282-970322 usb_power_delivery: Sym: "0x1" "1"
@@ -2116,7 +2116,7 @@
 970442-970482 usb_power_delivery: Sym: "0x5" "5"
 970482-970523 usb_power_delivery: Sym: "0x0" "0"
 970201-970523 usb_power_delivery: Data: "[0]05ac0101" "D0"
-970201-970523 usb_power_delivery: payload: "unstruct [0101] SVID:05ac" "unstruct [0101] SVID:05ac"
+970201-970523 usb_power_delivery: payload: "[1] unstruct [0101] SVID:05ac" "[1] unstruct [0101] SVID:05ac"
 970523-970563 usb_power_delivery: Sym: "0x0" "0"
 970563-970603 usb_power_delivery: Sym: "0x0" "0"
 970603-970643 usb_power_delivery: Sym: "0x0" "0"
@@ -2126,7 +2126,7 @@
 970764-970804 usb_power_delivery: Sym: "0x2" "2"
 970804-970844 usb_power_delivery: Sym: "0x0" "0"
 970523-970844 usb_power_delivery: Data: "[1]02000000" "D1"
-970523-970844 usb_power_delivery: payload: "VDO:02000000" "VDO:02000000"
+970523-970844 usb_power_delivery: payload: "[2] VDO:02000000" "[2] VDO:02000000"
 970844-970884 usb_power_delivery: Sym: "0x4" "4"
 970884-970925 usb_power_delivery: Sym: "0x8" "8"
 970925-970965 usb_power_delivery: Sym: "0x4" "4"
@@ -2138,7 +2138,7 @@
 970844-971165 usb_power_delivery: CRC: "CRC:29edc484" "CRC"
 971165-971206 usb_power_delivery: Sym: "EOP" "#"
 971165-971206 usb_power_delivery: EOP: "EOP" "E"
-969367-971206 usb_power_delivery: text: "#68   (403.902917ms): SRC[2]:VDM - unstruct [0101] SVID:05ac - VDO:02000000" "..."
+969367-971206 usb_power_delivery: text: "#68   (403.902917ms): (r2) SRC[2]: VDM - [1] unstruct [0101] SVID:05ac - [2] VDO:02000000" "..."
 971452-971967 usb_power_delivery: Preamble: "Preamble" "..."
 971967-972008 usb_power_delivery: Sym: "SYNC-1" "S1"
 972008-972048 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2150,7 +2150,7 @@
 972209-972250 usb_power_delivery: Sym: "0x4" "4"
 972250-972290 usb_power_delivery: Sym: "0x0" "0"
 972128-972290 usb_power_delivery: Head: "H:0441" "HD"
-971452-972653 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+971452-972653 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 972290-972330 usb_power_delivery: Sym: "0x2" "2"
 972330-972371 usb_power_delivery: Sym: "0xA" "A"
 972371-972411 usb_power_delivery: Sym: "0x8" "8"
@@ -2162,7 +2162,7 @@
 972290-972613 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 972613-972653 usb_power_delivery: Sym: "EOP" "#"
 972613-972653 usb_power_delivery: EOP: "EOP" "E"
-971452-972653 usb_power_delivery: text: "#69   (404.771667ms): SNK[2]:GOOD CRC" "..."
+971452-972653 usb_power_delivery: text: "#69   (404.771667ms): (r2) SNK[2]: GOOD CRC" "..."
 973317-973832 usb_power_delivery: Preamble: "Preamble" "..."
 973832-973872 usb_power_delivery: Sym: "SYNC-1" "S1"
 973872-973912 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2174,7 +2174,7 @@
 974074-974114 usb_power_delivery: Sym: "0xC" "C"
 974114-974155 usb_power_delivery: Sym: "0x2" "2"
 973993-974155 usb_power_delivery: Head: "H:2c4f" "HD"
-973317-975163 usb_power_delivery: snk: "SNK[6]:VDM" "VDM"
+973317-975163 usb_power_delivery: snk: "(r2) SNK[6]: VDM" "VDM"
 974155-974195 usb_power_delivery: Sym: "0x1" "1"
 974195-974235 usb_power_delivery: Sym: "0x2" "2"
 974235-974276 usb_power_delivery: Sym: "0x1" "1"
@@ -2184,7 +2184,7 @@
 974397-974437 usb_power_delivery: Sym: "0x5" "5"
 974437-974477 usb_power_delivery: Sym: "0x0" "0"
 974155-974477 usb_power_delivery: Data: "[0]05ac0121" "D0"
-974155-974477 usb_power_delivery: payload: "unstruct [0121] SVID:05ac" "unstruct [0121] SVID:05ac"
+974155-974477 usb_power_delivery: payload: "[1] unstruct [0121] SVID:05ac" "[1] unstruct [0121] SVID:05ac"
 974477-974518 usb_power_delivery: Sym: "0x0" "0"
 974518-974558 usb_power_delivery: Sym: "0x0" "0"
 974558-974598 usb_power_delivery: Sym: "0x0" "0"
@@ -2194,7 +2194,7 @@
 974719-974760 usb_power_delivery: Sym: "0x0" "0"
 974760-974800 usb_power_delivery: Sym: "0x0" "0"
 974477-974800 usb_power_delivery: Data: "[1]00000000" "D1"
-974477-974800 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+974477-974800 usb_power_delivery: payload: "[2] VDO:00000000" "[2] VDO:00000000"
 974800-974840 usb_power_delivery: Sym: "0x5" "5"
 974840-974881 usb_power_delivery: Sym: "0x7" "7"
 974881-974921 usb_power_delivery: Sym: "0x2" "2"
@@ -2206,7 +2206,7 @@
 974800-975123 usb_power_delivery: CRC: "CRC:dd6b7275" "CRC"
 975123-975163 usb_power_delivery: Sym: "EOP" "#"
 975123-975163 usb_power_delivery: EOP: "EOP" "E"
-973317-975163 usb_power_delivery: text: "#70   (405.548750ms): SNK[6]:VDM - unstruct [0121] SVID:05ac - VDO:00000000" "..."
+973317-975163 usb_power_delivery: text: "#70   (405.548750ms): (r2) SNK[6]: VDM - [1] unstruct [0121] SVID:05ac - [2] VDO:00000000" "..."
 975391-975904 usb_power_delivery: Preamble: "Preamble" "..."
 975904-975944 usb_power_delivery: Sym: "SYNC-1" "S1"
 975944-975984 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2218,7 +2218,7 @@
 976145-976185 usb_power_delivery: Sym: "0xD" "D"
 976185-976226 usb_power_delivery: Sym: "0x0" "0"
 976065-976226 usb_power_delivery: Head: "H:0d61" "HD"
-975391-976595 usb_power_delivery: src: "SRC[6]:GOOD CRC" "GOOD CRC"
+975391-976595 usb_power_delivery: src: "(r2) SRC[6]: GOOD CRC" "GOOD CRC"
 976226-976266 usb_power_delivery: Sym: "0x4" "4"
 976266-976306 usb_power_delivery: Sym: "0xA" "A"
 976306-976346 usb_power_delivery: Sym: "0x4" "4"
@@ -2230,7 +2230,7 @@
 976226-976547 usb_power_delivery: CRC: "CRC:438e34a4" "CRC"
 976547-976587 usb_power_delivery: Sym: "EOP" "#"
 976547-976587 usb_power_delivery: EOP: "EOP" "E"
-975391-976587 usb_power_delivery: text: "#71   (406.412917ms): SRC[6]:GOOD CRC" "..."
+975391-976587 usb_power_delivery: text: "#71   (406.412917ms): (r2) SRC[6]: GOOD CRC" "..."
 977206-977719 usb_power_delivery: Preamble: "Preamble" "..."
 977719-977759 usb_power_delivery: Sym: "SYNC-1" "S1"
 977759-977799 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2242,7 +2242,7 @@
 977960-978000 usb_power_delivery: Sym: "0x7" "7"
 978000-978040 usb_power_delivery: Sym: "0x2" "2"
 977879-978040 usb_power_delivery: Head: "H:276f" "HD"
-977206-979053 usb_power_delivery: src: "SRC[3]:VDM" "VDM"
+977206-979053 usb_power_delivery: src: "(r2) SRC[3]: VDM" "VDM"
 978040-978080 usb_power_delivery: Sym: "0x1" "1"
 978080-978121 usb_power_delivery: Sym: "0x0" "0"
 978121-978161 usb_power_delivery: Sym: "0x1" "1"
@@ -2252,7 +2252,7 @@
 978281-978321 usb_power_delivery: Sym: "0x5" "5"
 978321-978362 usb_power_delivery: Sym: "0x0" "0"
 978040-978362 usb_power_delivery: Data: "[0]05ac0101" "D0"
-978040-978362 usb_power_delivery: payload: "unstruct [0101] SVID:05ac" "unstruct [0101] SVID:05ac"
+978040-978362 usb_power_delivery: payload: "[1] unstruct [0101] SVID:05ac" "[1] unstruct [0101] SVID:05ac"
 978362-978402 usb_power_delivery: Sym: "0x4" "4"
 978402-978442 usb_power_delivery: Sym: "0x0" "0"
 978442-978482 usb_power_delivery: Sym: "0x0" "0"
@@ -2262,7 +2262,7 @@
 978603-978643 usb_power_delivery: Sym: "0x2" "2"
 978643-978683 usb_power_delivery: Sym: "0x0" "0"
 978362-978683 usb_power_delivery: Data: "[1]02000004" "D1"
-978362-978683 usb_power_delivery: payload: "VDO:02000004" "VDO:02000004"
+978362-978683 usb_power_delivery: payload: "[2] VDO:02000004" "[2] VDO:02000004"
 978683-978723 usb_power_delivery: Sym: "0x5" "5"
 978723-978764 usb_power_delivery: Sym: "0x5" "5"
 978764-978804 usb_power_delivery: Sym: "0xB" "B"
@@ -2274,7 +2274,7 @@
 978683-979005 usb_power_delivery: CRC: "CRC:88797b55" "CRC"
 979005-979045 usb_power_delivery: Sym: "EOP" "#"
 979005-979045 usb_power_delivery: EOP: "EOP" "E"
-977206-979045 usb_power_delivery: text: "#72   (407.169167ms): SRC[3]:VDM - unstruct [0101] SVID:05ac - VDO:02000004" "..."
+977206-979045 usb_power_delivery: text: "#72   (407.169167ms): (r2) SRC[3]: VDM - [1] unstruct [0101] SVID:05ac - [2] VDO:02000004" "..."
 979313-979828 usb_power_delivery: Preamble: "Preamble" "..."
 979828-979869 usb_power_delivery: Sym: "SYNC-1" "S1"
 979869-979909 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2286,7 +2286,7 @@
 980070-980111 usb_power_delivery: Sym: "0x6" "6"
 980111-980151 usb_power_delivery: Sym: "0x0" "0"
 979990-980151 usb_power_delivery: Head: "H:0641" "HD"
-979313-980514 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+979313-980514 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 980151-980192 usb_power_delivery: Sym: "0xE" "E"
 980192-980232 usb_power_delivery: Sym: "0x8" "8"
 980232-980272 usb_power_delivery: Sym: "0x9" "9"
@@ -2298,7 +2298,7 @@
 980151-980474 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 980474-980514 usb_power_delivery: Sym: "EOP" "#"
 980474-980514 usb_power_delivery: EOP: "EOP" "E"
-979313-980514 usb_power_delivery: text: "#73   (408.047083ms): SNK[3]:GOOD CRC" "..."
+979313-980514 usb_power_delivery: text: "#73   (408.047083ms): (r2) SNK[3]: GOOD CRC" "..."
 981350-981865 usb_power_delivery: Preamble: "Preamble" "..."
 981865-981906 usb_power_delivery: Sym: "SYNC-1" "S1"
 981906-981946 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2310,7 +2310,7 @@
 982107-982148 usb_power_delivery: Sym: "0xE" "E"
 982148-982188 usb_power_delivery: Sym: "0x2" "2"
 982027-982188 usb_power_delivery: Head: "H:2e4f" "HD"
-981350-983205 usb_power_delivery: snk: "SNK[7]:VDM" "VDM"
+981350-983205 usb_power_delivery: snk: "(r2) SNK[7]: VDM" "VDM"
 982188-982228 usb_power_delivery: Sym: "0x1" "1"
 982228-982269 usb_power_delivery: Sym: "0x2" "2"
 982269-982309 usb_power_delivery: Sym: "0x1" "1"
@@ -2320,7 +2320,7 @@
 982430-982471 usb_power_delivery: Sym: "0x5" "5"
 982471-982511 usb_power_delivery: Sym: "0x0" "0"
 982188-982511 usb_power_delivery: Data: "[0]05ac0121" "D0"
-982188-982511 usb_power_delivery: payload: "unstruct [0121] SVID:05ac" "unstruct [0121] SVID:05ac"
+982188-982511 usb_power_delivery: payload: "[1] unstruct [0121] SVID:05ac" "[1] unstruct [0121] SVID:05ac"
 982511-982551 usb_power_delivery: Sym: "0x0" "0"
 982551-982591 usb_power_delivery: Sym: "0x0" "0"
 982591-982632 usb_power_delivery: Sym: "0x0" "0"
@@ -2330,7 +2330,7 @@
 982753-982793 usb_power_delivery: Sym: "0x0" "0"
 982793-982834 usb_power_delivery: Sym: "0x0" "0"
 982511-982834 usb_power_delivery: Data: "[1]00000000" "D1"
-982511-982834 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+982511-982834 usb_power_delivery: payload: "[2] VDO:00000000" "[2] VDO:00000000"
 982834-982874 usb_power_delivery: Sym: "0x3" "3"
 982874-982915 usb_power_delivery: Sym: "0xF" "F"
 982915-982955 usb_power_delivery: Sym: "0xA" "A"
@@ -2342,7 +2342,7 @@
 982834-983157 usb_power_delivery: CRC: "CRC:f39d5af3" "CRC"
 983157-983197 usb_power_delivery: Sym: "EOP" "#"
 983157-983197 usb_power_delivery: EOP: "EOP" "E"
-981350-983197 usb_power_delivery: text: "#74   (408.895833ms): SNK[7]:VDM - unstruct [0121] SVID:05ac - VDO:00000000" "..."
+981350-983197 usb_power_delivery: text: "#74   (408.895833ms): (r2) SNK[7]: VDM - [1] unstruct [0121] SVID:05ac - [2] VDO:00000000" "..."
 983433-983946 usb_power_delivery: Preamble: "Preamble" "..."
 983946-983986 usb_power_delivery: Sym: "SYNC-1" "S1"
 983986-984026 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2354,7 +2354,7 @@
 984187-984227 usb_power_delivery: Sym: "0xF" "F"
 984227-984267 usb_power_delivery: Sym: "0x0" "0"
 984107-984267 usb_power_delivery: Head: "H:0f61" "HD"
-983433-984629 usb_power_delivery: src: "SRC[7]:GOOD CRC" "GOOD CRC"
+983433-984629 usb_power_delivery: src: "(r2) SRC[7]: GOOD CRC" "GOOD CRC"
 984267-984308 usb_power_delivery: Sym: "0x8" "8"
 984308-984348 usb_power_delivery: Sym: "0x8" "8"
 984348-984388 usb_power_delivery: Sym: "0x5" "5"
@@ -2366,7 +2366,7 @@
 984267-984589 usb_power_delivery: CRC: "CRC:ad805588" "CRC"
 984589-984629 usb_power_delivery: Sym: "EOP" "#"
 984589-984629 usb_power_delivery: EOP: "EOP" "E"
-983433-984629 usb_power_delivery: text: "#75   (409.763750ms): SRC[7]:GOOD CRC" "..."
+983433-984629 usb_power_delivery: text: "#75   (409.763750ms): (r2) SRC[7]: GOOD CRC" "..."
 985427-985939 usb_power_delivery: Preamble: "Preamble" "..."
 985939-985980 usb_power_delivery: Sym: "SYNC-1" "S1"
 985980-986020 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2378,7 +2378,7 @@
 986181-986221 usb_power_delivery: Sym: "0x9" "9"
 986221-986261 usb_power_delivery: Sym: "0x1" "1"
 986100-986261 usb_power_delivery: Head: "H:196f" "HD"
-985427-986944 usb_power_delivery: src: "SRC[4]:VDM" "VDM"
+985427-986944 usb_power_delivery: src: "(r2) SRC[4]: VDM" "VDM"
 986261-986301 usb_power_delivery: Sym: "0x5" "5"
 986301-986341 usb_power_delivery: Sym: "0x0" "0"
 986341-986381 usb_power_delivery: Sym: "0x0" "0"
@@ -2388,7 +2388,7 @@
 986502-986542 usb_power_delivery: Sym: "0x5" "5"
 986542-986582 usb_power_delivery: Sym: "0x0" "0"
 986261-986582 usb_power_delivery: Data: "[0]05ac0005" "D0"
-986261-986582 usb_power_delivery: payload: "unstruct [0005] SVID:05ac" "unstruct [0005] SVID:05ac"
+986261-986582 usb_power_delivery: payload: "[1] unstruct [0005] SVID:05ac" "[1] unstruct [0005] SVID:05ac"
 986582-986623 usb_power_delivery: Sym: "0x7" "7"
 986623-986663 usb_power_delivery: Sym: "0x8" "8"
 986663-986703 usb_power_delivery: Sym: "0xE" "E"
@@ -2400,7 +2400,7 @@
 986582-986904 usb_power_delivery: CRC: "CRC:60961e87" "CRC"
 986904-986944 usb_power_delivery: Sym: "EOP" "#"
 986904-986944 usb_power_delivery: EOP: "EOP" "E"
-985427-986944 usb_power_delivery: text: "#76   (410.594583ms): SRC[4]:VDM - unstruct [0005] SVID:05ac" "..."
+985427-986944 usb_power_delivery: text: "#76   (410.594583ms): (r2) SRC[4]: VDM - [1] unstruct [0005] SVID:05ac" "..."
 987175-987690 usb_power_delivery: Preamble: "Preamble" "..."
 987690-987730 usb_power_delivery: Sym: "SYNC-1" "S1"
 987730-987770 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2412,7 +2412,7 @@
 987932-987972 usb_power_delivery: Sym: "0x8" "8"
 987972-988012 usb_power_delivery: Sym: "0x0" "0"
 987851-988012 usb_power_delivery: Head: "H:0841" "HD"
-987175-988384 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+987175-988384 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 988012-988053 usb_power_delivery: Sym: "0x9" "9"
 988053-988093 usb_power_delivery: Sym: "0x8" "8"
 988093-988134 usb_power_delivery: Sym: "0x4" "4"
@@ -2424,7 +2424,7 @@
 988012-988336 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 988336-988376 usb_power_delivery: Sym: "EOP" "#"
 988336-988376 usb_power_delivery: EOP: "EOP" "E"
-987175-988376 usb_power_delivery: text: "#77   (411.322917ms): SNK[4]:GOOD CRC" "..."
+987175-988376 usb_power_delivery: text: "#77   (411.322917ms): (r2) SNK[4]: GOOD CRC" "..."
 988981-989496 usb_power_delivery: Preamble: "Preamble" "..."
 989496-989536 usb_power_delivery: Sym: "SYNC-1" "S1"
 989536-989576 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2436,7 +2436,7 @@
 989738-989778 usb_power_delivery: Sym: "0x0" "0"
 989778-989818 usb_power_delivery: Sym: "0x1" "1"
 989657-989818 usb_power_delivery: Head: "H:104f" "HD"
-988981-990504 usb_power_delivery: snk: "SNK[0]:VDM" "VDM"
+988981-990504 usb_power_delivery: snk: "(r2) SNK[0]: VDM" "VDM"
 989818-989859 usb_power_delivery: Sym: "0x5" "5"
 989859-989899 usb_power_delivery: Sym: "0x1" "1"
 989899-989939 usb_power_delivery: Sym: "0x0" "0"
@@ -2446,7 +2446,7 @@
 990061-990101 usb_power_delivery: Sym: "0x5" "5"
 990101-990141 usb_power_delivery: Sym: "0x0" "0"
 989818-990141 usb_power_delivery: Data: "[0]05ac0015" "D0"
-989818-990141 usb_power_delivery: payload: "unstruct [0015] SVID:05ac" "unstruct [0015] SVID:05ac"
+989818-990141 usb_power_delivery: payload: "[1] unstruct [0015] SVID:05ac" "[1] unstruct [0015] SVID:05ac"
 990141-990182 usb_power_delivery: Sym: "0xF" "F"
 990182-990222 usb_power_delivery: Sym: "0x5" "5"
 990222-990262 usb_power_delivery: Sym: "0xE" "E"
@@ -2458,7 +2458,7 @@
 990141-990464 usb_power_delivery: CRC: "CRC:3a332e5f" "CRC"
 990464-990504 usb_power_delivery: Sym: "EOP" "#"
 990464-990504 usb_power_delivery: EOP: "EOP" "E"
-988981-990504 usb_power_delivery: text: "#78   (412.075417ms): SNK[0]:VDM - unstruct [0015] SVID:05ac" "..."
+988981-990504 usb_power_delivery: text: "#78   (412.075417ms): (r2) SNK[0]: VDM - [1] unstruct [0015] SVID:05ac" "..."
 990736-991249 usb_power_delivery: Preamble: "Preamble" "..."
 991249-991289 usb_power_delivery: Sym: "SYNC-1" "S1"
 991289-991329 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2470,7 +2470,7 @@
 991490-991530 usb_power_delivery: Sym: "0x1" "1"
 991530-991570 usb_power_delivery: Sym: "0x0" "0"
 991409-991570 usb_power_delivery: Head: "H:0161" "HD"
-990736-991940 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+990736-991940 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 991570-991610 usb_power_delivery: Sym: "0xF" "F"
 991610-991651 usb_power_delivery: Sym: "0x8" "8"
 991651-991691 usb_power_delivery: Sym: "0x8" "8"
@@ -2482,7 +2482,7 @@
 991570-991892 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 991892-991932 usb_power_delivery: Sym: "EOP" "#"
 991892-991932 usb_power_delivery: EOP: "EOP" "E"
-990736-991932 usb_power_delivery: text: "#79   (412.806667ms): SRC[0]:GOOD CRC" "..."
+990736-991932 usb_power_delivery: text: "#79   (412.806667ms): (r2) SRC[0]: GOOD CRC" "..."
 1513286-1513801 usb_power_delivery: Preamble: "Preamble" "..."
 1513801-1513842 usb_power_delivery: Sym: "SYNC-1" "S1"
 1513842-1513882 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2494,7 +2494,7 @@
 1514043-1514084 usb_power_delivery: Sym: "0x2" "2"
 1514084-1514124 usb_power_delivery: Sym: "0x2" "2"
 1513963-1514124 usb_power_delivery: Head: "H:224f" "HD"
-1513286-1515141 usb_power_delivery: snk: "SNK[1]:VDM" "VDM"
+1513286-1515141 usb_power_delivery: snk: "(r2) SNK[1]: VDM" "VDM"
 1514124-1514164 usb_power_delivery: Sym: "0x6" "6"
 1514164-1514205 usb_power_delivery: Sym: "0x0" "0"
 1514205-1514245 usb_power_delivery: Sym: "0x1" "1"
@@ -2504,7 +2504,7 @@
 1514366-1514407 usb_power_delivery: Sym: "0xF" "F"
 1514407-1514447 usb_power_delivery: Sym: "0xF" "F"
 1514124-1514447 usb_power_delivery: Data: "[0]ff018106" "D0"
-1514124-1514447 usb_power_delivery: payload: "REQ Attention pos 1 SVID:ff01" "REQ Attention pos 1 SVID:ff01"
+1514124-1514447 usb_power_delivery: payload: "[1] REQ Attention pos 1 SVID:ff01" "[1] REQ Attention pos 1 SVID:ff01"
 1514447-1514488 usb_power_delivery: Sym: "0xA" "A"
 1514488-1514528 usb_power_delivery: Sym: "0x9" "9"
 1514528-1514568 usb_power_delivery: Sym: "0x0" "0"
@@ -2514,7 +2514,7 @@
 1514689-1514729 usb_power_delivery: Sym: "0x0" "0"
 1514729-1514770 usb_power_delivery: Sym: "0x0" "0"
 1514447-1514770 usb_power_delivery: Data: "[1]0000009a" "D1"
-1514447-1514770 usb_power_delivery: payload: "VDO:0000009a" "VDO:0000009a"
+1514447-1514770 usb_power_delivery: payload: "[2] VDO:0000009a" "[2] VDO:0000009a"
 1514770-1514810 usb_power_delivery: Sym: "0x6" "6"
 1514810-1514851 usb_power_delivery: Sym: "0x5" "5"
 1514851-1514891 usb_power_delivery: Sym: "0x3" "3"
@@ -2526,7 +2526,7 @@
 1514770-1515093 usb_power_delivery: CRC: "CRC:1bf76356" "CRC"
 1515093-1515133 usb_power_delivery: Sym: "EOP" "#"
 1515093-1515133 usb_power_delivery: EOP: "EOP" "E"
-1513286-1515133 usb_power_delivery: text: "#80   (630.535833ms): SNK[1]:VDM - REQ Attention pos 1 SVID:ff01 - VDO:0000009a" "..."
+1513286-1515133 usb_power_delivery: text: "#80   (630.535833ms): (r2) SNK[1]: VDM - [1] REQ Attention pos 1 SVID:ff01 - [2] VDO:0000009a" "..."
 1515401-1515914 usb_power_delivery: Preamble: "Preamble" "..."
 1515914-1515954 usb_power_delivery: Sym: "SYNC-1" "S1"
 1515954-1515994 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2538,7 +2538,7 @@
 1516155-1516195 usb_power_delivery: Sym: "0x3" "3"
 1516195-1516235 usb_power_delivery: Sym: "0x0" "0"
 1516074-1516235 usb_power_delivery: Head: "H:0361" "HD"
-1515401-1516597 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+1515401-1516597 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 1516235-1516275 usb_power_delivery: Sym: "0x3" "3"
 1516275-1516315 usb_power_delivery: Sym: "0xA" "A"
 1516315-1516356 usb_power_delivery: Sym: "0x9" "9"
@@ -2550,7 +2550,7 @@
 1516235-1516556 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 1516556-1516597 usb_power_delivery: Sym: "EOP" "#"
 1516556-1516597 usb_power_delivery: EOP: "EOP" "E"
-1515401-1516597 usb_power_delivery: text: "#81   (631.417083ms): SRC[1]:GOOD CRC" "..."
+1515401-1516597 usb_power_delivery: text: "#81   (631.417083ms): (r2) SRC[1]: GOOD CRC" "..."
 1966996-1967511 usb_power_delivery: Preamble: "Preamble" "..."
 1967511-1967552 usb_power_delivery: Sym: "SYNC-1" "S1"
 1967552-1967592 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2562,7 +2562,7 @@
 1967753-1967794 usb_power_delivery: Sym: "0x4" "4"
 1967794-1967834 usb_power_delivery: Sym: "0x2" "2"
 1967672-1967834 usb_power_delivery: Head: "H:244f" "HD"
-1966996-1968843 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+1966996-1968843 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 1967834-1967874 usb_power_delivery: Sym: "0x6" "6"
 1967874-1967915 usb_power_delivery: Sym: "0x0" "0"
 1967915-1967955 usb_power_delivery: Sym: "0x1" "1"
@@ -2572,7 +2572,7 @@
 1968076-1968116 usb_power_delivery: Sym: "0xF" "F"
 1968116-1968157 usb_power_delivery: Sym: "0xF" "F"
 1967834-1968157 usb_power_delivery: Data: "[0]ff018106" "D0"
-1967834-1968157 usb_power_delivery: payload: "REQ Attention pos 1 SVID:ff01" "REQ Attention pos 1 SVID:ff01"
+1967834-1968157 usb_power_delivery: payload: "[1] REQ Attention pos 1 SVID:ff01" "[1] REQ Attention pos 1 SVID:ff01"
 1968157-1968197 usb_power_delivery: Sym: "0xA" "A"
 1968197-1968238 usb_power_delivery: Sym: "0x9" "9"
 1968238-1968278 usb_power_delivery: Sym: "0x1" "1"
@@ -2582,7 +2582,7 @@
 1968399-1968439 usb_power_delivery: Sym: "0x0" "0"
 1968439-1968480 usb_power_delivery: Sym: "0x0" "0"
 1968157-1968480 usb_power_delivery: Data: "[1]0000019a" "D1"
-1968157-1968480 usb_power_delivery: payload: "VDO:0000019a" "VDO:0000019a"
+1968157-1968480 usb_power_delivery: payload: "[2] VDO:0000019a" "[2] VDO:0000019a"
 1968480-1968520 usb_power_delivery: Sym: "0xB" "B"
 1968520-1968560 usb_power_delivery: Sym: "0xE" "E"
 1968560-1968601 usb_power_delivery: Sym: "0x0" "0"
@@ -2594,7 +2594,7 @@
 1968480-1968802 usb_power_delivery: CRC: "CRC:692f70eb" "CRC"
 1968802-1968843 usb_power_delivery: Sym: "EOP" "#"
 1968802-1968843 usb_power_delivery: EOP: "EOP" "E"
-1966996-1968843 usb_power_delivery: text: "#82   (819.581667ms): SNK[2]:VDM - REQ Attention pos 1 SVID:ff01 - VDO:0000019a" "..."
+1966996-1968843 usb_power_delivery: text: "#82   (819.581667ms): (r2) SNK[2]: VDM - [1] REQ Attention pos 1 SVID:ff01 - [2] VDO:0000019a" "..."
 1969103-1969615 usb_power_delivery: Preamble: "Preamble" "..."
 1969615-1969655 usb_power_delivery: Sym: "SYNC-1" "S1"
 1969655-1969695 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2606,7 +2606,7 @@
 1969856-1969896 usb_power_delivery: Sym: "0x5" "5"
 1969896-1969936 usb_power_delivery: Sym: "0x0" "0"
 1969776-1969936 usb_power_delivery: Head: "H:0561" "HD"
-1969103-1970306 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+1969103-1970306 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 1969936-1969977 usb_power_delivery: Sym: "0x6" "6"
 1969977-1970017 usb_power_delivery: Sym: "0x9" "9"
 1970017-1970057 usb_power_delivery: Sym: "0xC" "C"
@@ -2618,7 +2618,7 @@
 1969936-1970258 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 1970258-1970298 usb_power_delivery: Sym: "EOP" "#"
 1970258-1970298 usb_power_delivery: EOP: "EOP" "E"
-1969103-1970298 usb_power_delivery: text: "#83   (820.459583ms): SRC[2]:GOOD CRC" "..."
+1969103-1970298 usb_power_delivery: text: "#83   (820.459583ms): (r2) SRC[2]: GOOD CRC" "..."
 1977881-1978396 usb_power_delivery: Preamble: "Preamble" "..."
 1978396-1978436 usb_power_delivery: Sym: "SYNC-1" "S1"
 1978436-1978476 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2630,7 +2630,7 @@
 1978638-1978678 usb_power_delivery: Sym: "0x6" "6"
 1978678-1978719 usb_power_delivery: Sym: "0x2" "2"
 1978557-1978719 usb_power_delivery: Head: "H:264f" "HD"
-1977881-1979735 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+1977881-1979735 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 1978719-1978759 usb_power_delivery: Sym: "0x6" "6"
 1978759-1978799 usb_power_delivery: Sym: "0x0" "0"
 1978799-1978840 usb_power_delivery: Sym: "0x1" "1"
@@ -2640,7 +2640,7 @@
 1978960-1979001 usb_power_delivery: Sym: "0xF" "F"
 1979001-1979041 usb_power_delivery: Sym: "0xF" "F"
 1978719-1979041 usb_power_delivery: Data: "[0]ff018106" "D0"
-1978719-1979041 usb_power_delivery: payload: "REQ Attention pos 1 SVID:ff01" "REQ Attention pos 1 SVID:ff01"
+1978719-1979041 usb_power_delivery: payload: "[1] REQ Attention pos 1 SVID:ff01" "[1] REQ Attention pos 1 SVID:ff01"
 1979041-1979081 usb_power_delivery: Sym: "0xA" "A"
 1979081-1979122 usb_power_delivery: Sym: "0x9" "9"
 1979122-1979162 usb_power_delivery: Sym: "0x1" "1"
@@ -2650,7 +2650,7 @@
 1979283-1979324 usb_power_delivery: Sym: "0x0" "0"
 1979324-1979364 usb_power_delivery: Sym: "0x0" "0"
 1979041-1979364 usb_power_delivery: Data: "[1]0000019a" "D1"
-1979041-1979364 usb_power_delivery: payload: "VDO:0000019a" "VDO:0000019a"
+1979041-1979364 usb_power_delivery: payload: "[2] VDO:0000019a" "[2] VDO:0000019a"
 1979364-1979404 usb_power_delivery: Sym: "0xD" "D"
 1979404-1979445 usb_power_delivery: Sym: "0x6" "6"
 1979445-1979485 usb_power_delivery: Sym: "0x8" "8"
@@ -2662,7 +2662,7 @@
 1979364-1979687 usb_power_delivery: CRC: "CRC:47d9586d" "CRC"
 1979687-1979727 usb_power_delivery: Sym: "EOP" "#"
 1979687-1979727 usb_power_delivery: EOP: "EOP" "E"
-1977881-1979727 usb_power_delivery: text: "#84   (824.117083ms): SNK[3]:VDM - REQ Attention pos 1 SVID:ff01 - VDO:0000019a" "..."
+1977881-1979727 usb_power_delivery: text: "#84   (824.117083ms): (r2) SNK[3]: VDM - [1] REQ Attention pos 1 SVID:ff01 - [2] VDO:0000019a" "..."
 1979995-1980507 usb_power_delivery: Preamble: "Preamble" "..."
 1980507-1980548 usb_power_delivery: Sym: "SYNC-1" "S1"
 1980548-1980588 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -2674,7 +2674,7 @@
 1980749-1980789 usb_power_delivery: Sym: "0x7" "7"
 1980789-1980829 usb_power_delivery: Sym: "0x0" "0"
 1980668-1980829 usb_power_delivery: Head: "H:0761" "HD"
-1979995-1981198 usb_power_delivery: src: "SRC[3]:GOOD CRC" "GOOD CRC"
+1979995-1981198 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
 1980829-1980869 usb_power_delivery: Sym: "0xA" "A"
 1980869-1980909 usb_power_delivery: Sym: "0xB" "B"
 1980909-1980949 usb_power_delivery: Sym: "0xD" "D"
@@ -2686,4 +2686,4 @@
 1980829-1981150 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
 1981150-1981190 usb_power_delivery: Sym: "EOP" "#"
 1981150-1981190 usb_power_delivery: EOP: "EOP" "E"
-1979995-1981190 usb_power_delivery: text: "#85   (824.997917ms): SRC[3]:GOOD CRC" "..."
+1979995-1981190 usb_power_delivery: text: "#85   (824.997917ms): (r2) SRC[3]: GOOD CRC" "..."