usb_power_delivery: Update tests to match new output of decoder

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" "..."

diff --git a/decoder/test/usb_power_delivery/macbook2015_supply.output b/decoder/test/usb_power_delivery/macbook2015_supply.output
index ce1835ca0d1fe55b51bd3e43a5defb611820a8c9..82fa289dbfe279c65c908d09f256c305fe8beba9 100644 (file)
--- a/decoder/test/usb_power_delivery/macbook2015_supply.output
+++ b/decoder/test/usb_power_delivery/macbook2015_supply.output
@@ -9,7 +9,7 @@
 42508-42548 usb_power_delivery: Sym: "0x1" "1"
 42548-42589 usb_power_delivery: Sym: "0x2" "2"
 42427-42589 usb_power_delivery: Head: "H:2161" "HD"
-41753-43603 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+41753-43603 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 42589-42629 usb_power_delivery: Sym: "0x0" "0"
 42629-42670 usb_power_delivery: Sym: "0xF" "F"
 42670-42709 usb_power_delivery: Sym: "0x0" "0"
@@ -19,7 +19,7 @@
 42830-42871 usb_power_delivery: Sym: "0x8" "8"
 42871-42911 usb_power_delivery: Sym: "0x0" "0"
 42589-42911 usb_power_delivery: Data: "[0]080190f0" "D0"
-42589-42911 usb_power_delivery: payload: "5.0V 2.4A ext" "5.0V 2.4A ext"
+42589-42911 usb_power_delivery: payload: "[1] [Fixed] 5V 2.4A (12W) [unconstrained]" "[1] [Fixed] 5V 2.4A (12W) [unconstrained]"
 42911-42952 usb_power_delivery: Sym: "0x8" "8"
 42952-42992 usb_power_delivery: Sym: "0xC" "C"
 42992-43031 usb_power_delivery: Sym: "0x0" "0"
@@ -29,7 +29,7 @@
 43152-43193 usb_power_delivery: Sym: "0x0" "0"
 43193-43233 usb_power_delivery: Sym: "0x0" "0"
 42911-43233 usb_power_delivery: Data: "[1]0004a0c8" "D1"
-42911-43233 usb_power_delivery: payload: "14.8V 2.0A" "14.8V 2.0A"
+42911-43233 usb_power_delivery: payload: "[2] [Fixed] 14.8V 2A (29.6W)" "[2] [Fixed] 14.8V 2A (29.6W)"
 43233-43274 usb_power_delivery: Sym: "0x7" "7"
 43274-43313 usb_power_delivery: Sym: "0x4" "4"
 43313-43354 usb_power_delivery: Sym: "0x5" "5"
@@ -41,7 +41,7 @@
 43233-43556 usb_power_delivery: CRC: "CRC:ad473547" "CRC"
 43556-43596 usb_power_delivery: Sym: "EOP" "#"
 43556-43596 usb_power_delivery: EOP: "EOP" "E"
-41753-43596 usb_power_delivery: text: "#1    (17.397083ms): SRC[0]:SOURCE CAP - 5.0V 2.4A ext - 14.8V 2.0A" "..."
+41753-43596 usb_power_delivery: text: "#1    (17.397083ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 2.4A (12W) [unconstrained] - [2] [Fixed] 14.8V 2A (29.6W)" "..."
 47651-48158 usb_power_delivery: Preamble: "Preamble" "..."
 48158-48199 usb_power_delivery: Sym: "SYNC-1" "S1"
 48199-48238 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -53,7 +53,7 @@
 48400-48440 usb_power_delivery: Sym: "0x1" "1"
 48440-48481 usb_power_delivery: Sym: "0x2" "2"
 48319-48481 usb_power_delivery: Head: "H:2161" "HD"
-47651-49495 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+47651-49495 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 48481-48520 usb_power_delivery: Sym: "0x0" "0"
 48520-48561 usb_power_delivery: Sym: "0xF" "F"
 48561-48601 usb_power_delivery: Sym: "0x0" "0"
@@ -63,7 +63,7 @@
 48722-48763 usb_power_delivery: Sym: "0x8" "8"
 48763-48802 usb_power_delivery: Sym: "0x0" "0"
 48481-48802 usb_power_delivery: Data: "[0]080190f0" "D0"
-48481-48802 usb_power_delivery: payload: "5.0V 2.4A ext" "5.0V 2.4A ext"
+48481-48802 usb_power_delivery: payload: "[1] [Fixed] 5V 2.4A (12W) [unconstrained]" "[1] [Fixed] 5V 2.4A (12W) [unconstrained]"
 48802-48843 usb_power_delivery: Sym: "0x8" "8"
 48843-48884 usb_power_delivery: Sym: "0xC" "C"
 48884-48923 usb_power_delivery: Sym: "0x0" "0"
@@ -73,7 +73,7 @@
 49044-49085 usb_power_delivery: Sym: "0x0" "0"
 49085-49125 usb_power_delivery: Sym: "0x0" "0"
 48802-49125 usb_power_delivery: Data: "[1]0004a0c8" "D1"
-48802-49125 usb_power_delivery: payload: "14.8V 2.0A" "14.8V 2.0A"
+48802-49125 usb_power_delivery: payload: "[2] [Fixed] 14.8V 2A (29.6W)" "[2] [Fixed] 14.8V 2A (29.6W)"
 49125-49166 usb_power_delivery: Sym: "0x7" "7"
 49166-49205 usb_power_delivery: Sym: "0x4" "4"
 49205-49245 usb_power_delivery: Sym: "0x5" "5"
@@ -85,7 +85,7 @@
 49125-49447 usb_power_delivery: CRC: "CRC:ad473547" "CRC"
 49447-49488 usb_power_delivery: Sym: "EOP" "#"
 49447-49488 usb_power_delivery: EOP: "EOP" "E"
-47651-49488 usb_power_delivery: text: "#2    (19.854583ms): SRC[0]:SOURCE CAP - 5.0V 2.4A ext - 14.8V 2.0A" "..."
+47651-49488 usb_power_delivery: text: "#2    (19.854583ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 2.4A (12W) [unconstrained] - [2] [Fixed] 14.8V 2A (29.6W)" "..."
 52495-53002 usb_power_delivery: Preamble: "Preamble" "..."
 53002-53043 usb_power_delivery: Sym: "SYNC-1" "S1"
 53043-53083 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -97,7 +97,7 @@
 53245-53284 usb_power_delivery: Sym: "0x1" "1"
 53284-53325 usb_power_delivery: Sym: "0x2" "2"
 53163-53325 usb_power_delivery: Head: "H:2161" "HD"
-52495-54339 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+52495-54339 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 53325-53365 usb_power_delivery: Sym: "0x0" "0"
 53365-53406 usb_power_delivery: Sym: "0xF" "F"
 53406-53445 usb_power_delivery: Sym: "0x0" "0"
@@ -107,7 +107,7 @@
 53566-53607 usb_power_delivery: Sym: "0x8" "8"
 53607-53647 usb_power_delivery: Sym: "0x0" "0"
 53325-53647 usb_power_delivery: Data: "[0]080190f0" "D0"
-53325-53647 usb_power_delivery: payload: "5.0V 2.4A ext" "5.0V 2.4A ext"
+53325-53647 usb_power_delivery: payload: "[1] [Fixed] 5V 2.4A (12W) [unconstrained]" "[1] [Fixed] 5V 2.4A (12W) [unconstrained]"
 53647-53688 usb_power_delivery: Sym: "0x8" "8"
 53688-53728 usb_power_delivery: Sym: "0xC" "C"
 53728-53768 usb_power_delivery: Sym: "0x0" "0"
@@ -117,7 +117,7 @@
 53888-53929 usb_power_delivery: Sym: "0x0" "0"
 53929-53969 usb_power_delivery: Sym: "0x0" "0"
 53647-53969 usb_power_delivery: Data: "[1]0004a0c8" "D1"
-53647-53969 usb_power_delivery: payload: "14.8V 2.0A" "14.8V 2.0A"
+53647-53969 usb_power_delivery: payload: "[2] [Fixed] 14.8V 2A (29.6W)" "[2] [Fixed] 14.8V 2A (29.6W)"
 53969-54010 usb_power_delivery: Sym: "0x7" "7"
 54010-54049 usb_power_delivery: Sym: "0x4" "4"
 54049-54090 usb_power_delivery: Sym: "0x5" "5"
@@ -129,7 +129,7 @@
 53969-54292 usb_power_delivery: CRC: "CRC:ad473547" "CRC"
 54292-54332 usb_power_delivery: Sym: "EOP" "#"
 54292-54332 usb_power_delivery: EOP: "EOP" "E"
-52495-54332 usb_power_delivery: text: "#3    (21.872917ms): SRC[0]:SOURCE CAP - 5.0V 2.4A ext - 14.8V 2.0A" "..."
+52495-54332 usb_power_delivery: text: "#3    (21.872917ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 2.4A (12W) [unconstrained] - [2] [Fixed] 14.8V 2A (29.6W)" "..."
 422056-422563 usb_power_delivery: Preamble: "Preamble" "..."
 422563-422604 usb_power_delivery: Sym: "SYNC-1" "S1"
 422604-422644 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -141,7 +141,7 @@
 422806-422845 usb_power_delivery: Sym: "0x1" "1"
 422845-422886 usb_power_delivery: Sym: "0x2" "2"
 422724-422886 usb_power_delivery: Head: "H:2161" "HD"
-422056-423901 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+422056-423901 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 422886-422926 usb_power_delivery: Sym: "0x0" "0"
 422926-422967 usb_power_delivery: Sym: "0xF" "F"
 422967-423006 usb_power_delivery: Sym: "0x0" "0"
@@ -151,7 +151,7 @@
 423127-423168 usb_power_delivery: Sym: "0x8" "8"
 423168-423208 usb_power_delivery: Sym: "0x0" "0"
 422886-423208 usb_power_delivery: Data: "[0]080190f0" "D0"
-422886-423208 usb_power_delivery: payload: "5.0V 2.4A ext" "5.0V 2.4A ext"
+422886-423208 usb_power_delivery: payload: "[1] [Fixed] 5V 2.4A (12W) [unconstrained]" "[1] [Fixed] 5V 2.4A (12W) [unconstrained]"
 423208-423249 usb_power_delivery: Sym: "0x8" "8"
 423249-423289 usb_power_delivery: Sym: "0xC" "C"
 423289-423329 usb_power_delivery: Sym: "0x0" "0"
@@ -161,7 +161,7 @@
 423450-423491 usb_power_delivery: Sym: "0x0" "0"
 423491-423530 usb_power_delivery: Sym: "0x0" "0"
 423208-423530 usb_power_delivery: Data: "[1]0004a0c8" "D1"
-423208-423530 usb_power_delivery: payload: "14.8V 2.0A" "14.8V 2.0A"
+423208-423530 usb_power_delivery: payload: "[2] [Fixed] 14.8V 2A (29.6W)" "[2] [Fixed] 14.8V 2A (29.6W)"
 423530-423571 usb_power_delivery: Sym: "0x7" "7"
 423571-423611 usb_power_delivery: Sym: "0x4" "4"
 423611-423651 usb_power_delivery: Sym: "0x5" "5"
@@ -173,7 +173,7 @@
 423530-423853 usb_power_delivery: CRC: "CRC:ad473547" "CRC"
 423853-423893 usb_power_delivery: Sym: "EOP" "#"
 423853-423893 usb_power_delivery: EOP: "EOP" "E"
-422056-423893 usb_power_delivery: text: "#4    (175.856667ms): SRC[0]:SOURCE CAP - 5.0V 2.4A ext - 14.8V 2.0A" "..."
+422056-423893 usb_power_delivery: text: "#4    (175.856667ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 2.4A (12W) [unconstrained] - [2] [Fixed] 14.8V 2A (29.6W)" "..."
 424129-424642 usb_power_delivery: Preamble: "Preamble" "..."
 424642-424682 usb_power_delivery: Sym: "SYNC-1" "S1"
 424682-424722 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -185,7 +185,7 @@
 424883-424923 usb_power_delivery: Sym: "0x0" "0"
 424923-424963 usb_power_delivery: Sym: "0x0" "0"
 424802-424963 usb_power_delivery: Head: "H:0041" "HD"
-424129-425333 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+424129-425333 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 424963-425003 usb_power_delivery: Sym: "0xB" "B"
 425003-425043 usb_power_delivery: Sym: "0xB" "B"
 425043-425084 usb_power_delivery: Sym: "0xC" "C"
@@ -197,7 +197,7 @@
 424963-425285 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 425285-425325 usb_power_delivery: Sym: "EOP" "#"
 425285-425325 usb_power_delivery: EOP: "EOP" "E"
-424129-425325 usb_power_delivery: text: "#5    (176.720417ms): SNK[0]:GOOD CRC" "..."
+424129-425325 usb_power_delivery: text: "#5    (176.720417ms): (r2) SNK[0]: GOOD CRC" "..."
 426441-426953 usb_power_delivery: Preamble: "Preamble" "..."
 426953-426994 usb_power_delivery: Sym: "SYNC-1" "S1"
 426994-427034 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -209,7 +209,7 @@
 427195-427235 usb_power_delivery: Sym: "0x0" "0"
 427235-427275 usb_power_delivery: Sym: "0x1" "1"
 427114-427275 usb_power_delivery: Head: "H:1042" "HD"
-426441-427966 usb_power_delivery: snk: "SNK[0]:REQUEST" "REQUEST"
+426441-427966 usb_power_delivery: snk: "(r2) SNK[0]: REQUEST" "REQUEST"
 427275-427315 usb_power_delivery: Sym: "0x8" "8"
 427315-427355 usb_power_delivery: Sym: "0xC" "C"
 427355-427396 usb_power_delivery: Sym: "0x0" "0"
@@ -219,7 +219,7 @@
 427516-427556 usb_power_delivery: Sym: "0x3" "3"
 427556-427597 usb_power_delivery: Sym: "0x2" "2"
 427275-427597 usb_power_delivery: Data: "[0]230320c8" "D0"
-427275-427597 usb_power_delivery: payload: "[2]2000/2000 mA comm_cap no_suspend" "[2]2000/2000 mA comm_cap no_suspend"
+427275-427597 usb_power_delivery: payload: "[1] (PDO #2: Fixed 14.8V) 2A (operating) / 2A (max) [comm_cap] [no_suspend]" "[1] (PDO #2: Fixed 14.8V) 2A (operating) / 2A (max) [comm_cap] [no_suspend]"
 427597-427637 usb_power_delivery: Sym: "0xE" "E"
 427637-427677 usb_power_delivery: Sym: "0xF" "F"
 427677-427717 usb_power_delivery: Sym: "0xF" "F"
@@ -231,7 +231,7 @@
 427597-427918 usb_power_delivery: CRC: "CRC:914c3ffe" "CRC"
 427918-427958 usb_power_delivery: Sym: "EOP" "#"
 427918-427958 usb_power_delivery: EOP: "EOP" "E"
-426441-427958 usb_power_delivery: text: "#6    (177.683750ms): SNK[0]:REQUEST - [2]2000/2000 mA comm_cap no_suspend" "..."
+426441-427958 usb_power_delivery: text: "#6    (177.683750ms): (r2) SNK[0]: REQUEST - [1] (PDO #2: Fixed 14.8V) 2A (operating) / 2A (max) [comm_cap] [no_suspend]" "..."
 428133-428647 usb_power_delivery: Preamble: "Preamble" "..."
 428647-428687 usb_power_delivery: Sym: "SYNC-1" "S1"
 428687-428727 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -243,7 +243,7 @@
 428888-428929 usb_power_delivery: Sym: "0x1" "1"
 428929-428969 usb_power_delivery: Sym: "0x0" "0"
 428808-428969 usb_power_delivery: Head: "H:0161" "HD"
-428133-429340 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+428133-429340 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 428969-429009 usb_power_delivery: Sym: "0xF" "F"
 429009-429050 usb_power_delivery: Sym: "0x8" "8"
 429050-429090 usb_power_delivery: Sym: "0x8" "8"
@@ -255,7 +255,7 @@
 428969-429291 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 429291-429332 usb_power_delivery: Sym: "EOP" "#"
 429291-429332 usb_power_delivery: EOP: "EOP" "E"
-428133-429332 usb_power_delivery: text: "#7    (178.388750ms): SRC[0]:GOOD CRC" "..."
+428133-429332 usb_power_delivery: text: "#7    (178.388750ms): (r2) SRC[0]: GOOD CRC" "..."
 430620-431127 usb_power_delivery: Preamble: "Preamble" "..."
 431127-431168 usb_power_delivery: Sym: "SYNC-1" "S1"
 431168-431208 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -267,7 +267,7 @@
 431369-431409 usb_power_delivery: Sym: "0x3" "3"
 431409-431450 usb_power_delivery: Sym: "0x0" "0"
 431289-431450 usb_power_delivery: Head: "H:0363" "HD"
-430620-431820 usb_power_delivery: src: "SRC[1]:ACCEPT" "ACCEPT"
+430620-431820 usb_power_delivery: src: "(r2) SRC[1]: ACCEPT" "ACCEPT"
 431450-431490 usb_power_delivery: Sym: "0x1" "1"
 431490-431530 usb_power_delivery: Sym: "0x2" "2"
 431530-431571 usb_power_delivery: Sym: "0xB" "B"
@@ -279,7 +279,7 @@
 431450-431772 usb_power_delivery: CRC: "CRC:96007b21" "CRC"
 431772-431812 usb_power_delivery: Sym: "EOP" "#"
 431772-431812 usb_power_delivery: EOP: "EOP" "E"
-430620-431812 usb_power_delivery: text: "#8    (179.425000ms): SRC[1]:ACCEPT" "..."
+430620-431812 usb_power_delivery: text: "#8    (179.425000ms): (r2) SRC[1]: ACCEPT" "..."
 432048-432561 usb_power_delivery: Preamble: "Preamble" "..."
 432561-432601 usb_power_delivery: Sym: "SYNC-1" "S1"
 432601-432642 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -291,7 +291,7 @@
 432802-432843 usb_power_delivery: Sym: "0x2" "2"
 432843-432883 usb_power_delivery: Sym: "0x0" "0"
 432722-432883 usb_power_delivery: Head: "H:0241" "HD"
-432048-433252 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+432048-433252 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 432883-432923 usb_power_delivery: Sym: "0x7" "7"
 432923-432963 usb_power_delivery: Sym: "0x9" "9"
 432963-433003 usb_power_delivery: Sym: "0xD" "D"
@@ -303,7 +303,7 @@
 432883-433204 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 433204-433244 usb_power_delivery: Sym: "EOP" "#"
 433204-433244 usb_power_delivery: EOP: "EOP" "E"
-432048-433244 usb_power_delivery: text: "#9    (180.020000ms): SNK[1]:GOOD CRC" "..."
+432048-433244 usb_power_delivery: text: "#9    (180.020000ms): (r2) SNK[1]: GOOD CRC" "..."
 654735-655242 usb_power_delivery: Preamble: "Preamble" "..."
 655242-655283 usb_power_delivery: Sym: "SYNC-1" "S1"
 655283-655323 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -315,7 +315,7 @@
 655484-655524 usb_power_delivery: Sym: "0x5" "5"
 655524-655565 usb_power_delivery: Sym: "0x0" "0"
 655403-655565 usb_power_delivery: Head: "H:0566" "HD"
-654735-655935 usb_power_delivery: src: "SRC[2]:PS RDY" "PS RDY"
+654735-655935 usb_power_delivery: src: "(r2) SRC[2]: PS RDY" "PS RDY"
 655565-655605 usb_power_delivery: Sym: "0x1" "1"
 655605-655645 usb_power_delivery: Sym: "0x5" "5"
 655645-655685 usb_power_delivery: Sym: "0xA" "A"
@@ -327,7 +327,7 @@
 655565-655887 usb_power_delivery: CRC: "CRC:02142a51" "CRC"
 655887-655927 usb_power_delivery: Sym: "EOP" "#"
 655887-655927 usb_power_delivery: EOP: "EOP" "E"
-654735-655927 usb_power_delivery: text: "#10   (272.806250ms): SRC[2]:PS RDY" "..."
+654735-655927 usb_power_delivery: text: "#10   (272.806250ms): (r2) SRC[2]: PS RDY" "..."
 656178-656690 usb_power_delivery: Preamble: "Preamble" "..."
 656690-656731 usb_power_delivery: Sym: "SYNC-1" "S1"
 656731-656771 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -339,7 +339,7 @@
 656932-656972 usb_power_delivery: Sym: "0x4" "4"
 656972-657012 usb_power_delivery: Sym: "0x0" "0"
 656851-657012 usb_power_delivery: Head: "H:0441" "HD"
-656178-657374 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+656178-657374 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 657012-657052 usb_power_delivery: Sym: "0x2" "2"
 657052-657092 usb_power_delivery: Sym: "0xA" "A"
 657092-657133 usb_power_delivery: Sym: "0x8" "8"
@@ -351,7 +351,7 @@
 657012-657334 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 657334-657374 usb_power_delivery: Sym: "EOP" "#"
 657334-657374 usb_power_delivery: EOP: "EOP" "E"
-656178-657374 usb_power_delivery: text: "#11   (273.407500ms): SNK[2]:GOOD CRC" "..."
+656178-657374 usb_power_delivery: text: "#11   (273.407500ms): (r2) SNK[2]: GOOD CRC" "..."
 657634-658147 usb_power_delivery: Preamble: "Preamble" "..."
 658147-658188 usb_power_delivery: Sym: "SYNC-1" "S1"
 658188-658228 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -363,7 +363,7 @@
 658389-658429 usb_power_delivery: Sym: "0x7" "7"
 658429-658470 usb_power_delivery: Sym: "0x1" "1"
 658308-658470 usb_power_delivery: Head: "H:176f" "HD"
-657634-659162 usb_power_delivery: src: "SRC[3]:VDM" "VDM"
+657634-659162 usb_power_delivery: src: "(r2) SRC[3]: VDM" "VDM"
 658470-658510 usb_power_delivery: Sym: "0x1" "1"
 658510-658550 usb_power_delivery: Sym: "0x0" "0"
 658550-658590 usb_power_delivery: Sym: "0x0" "0"
@@ -373,7 +373,7 @@
 658711-658751 usb_power_delivery: Sym: "0xF" "F"
 658751-658792 usb_power_delivery: Sym: "0xF" "F"
 658470-658792 usb_power_delivery: Data: "[0]ff008001" "D0"
-658470-658792 usb_power_delivery: payload: "REQ Disc Ident  SVID:ff00" "REQ Disc Ident  SVID:ff00"
+658470-658792 usb_power_delivery: payload: "[1] REQ Disc Ident  SVID:ff00" "[1] REQ Disc Ident  SVID:ff00"
 658792-658832 usb_power_delivery: Sym: "0x6" "6"
 658832-658872 usb_power_delivery: Sym: "0xD" "D"
 658872-658913 usb_power_delivery: Sym: "0x4" "4"
@@ -385,7 +385,7 @@
 658792-659114 usb_power_delivery: CRC: "CRC:ee2bc4d6" "CRC"
 659114-659154 usb_power_delivery: Sym: "EOP" "#"
 659114-659154 usb_power_delivery: EOP: "EOP" "E"
-657634-659154 usb_power_delivery: text: "#12   (274.014167ms): SRC[3]:VDM - REQ Disc Ident  SVID:ff00" "..."
+657634-659154 usb_power_delivery: text: "#12   (274.014167ms): (r2) SRC[3]: VDM - [1] REQ Disc Ident  SVID:ff00" "..."
 659423-659936 usb_power_delivery: Preamble: "Preamble" "..."
 659936-659976 usb_power_delivery: Sym: "SYNC-1" "S1"
 659976-660016 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -397,7 +397,7 @@
 660177-660217 usb_power_delivery: Sym: "0x6" "6"
 660217-660257 usb_power_delivery: Sym: "0x0" "0"
 660097-660257 usb_power_delivery: Head: "H:0641" "HD"
-659423-660619 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+659423-660619 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 660257-660298 usb_power_delivery: Sym: "0xE" "E"
 660298-660338 usb_power_delivery: Sym: "0x8" "8"
 660338-660378 usb_power_delivery: Sym: "0x9" "9"
@@ -409,7 +409,7 @@
 660257-660579 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 660579-660619 usb_power_delivery: Sym: "EOP" "#"
 660579-660619 usb_power_delivery: EOP: "EOP" "E"
-659423-660619 usb_power_delivery: text: "#13   (274.759583ms): SNK[3]:GOOD CRC" "..."
+659423-660619 usb_power_delivery: text: "#13   (274.759583ms): (r2) SNK[3]: GOOD CRC" "..."
 661727-662240 usb_power_delivery: Preamble: "Preamble" "..."
 662240-662280 usb_power_delivery: Sym: "SYNC-1" "S1"
 662280-662320 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -421,7 +421,7 @@
 662481-662521 usb_power_delivery: Sym: "0x2" "2"
 662521-662561 usb_power_delivery: Sym: "0x4" "4"
 662401-662561 usb_power_delivery: Head: "H:424f" "HD"
-661727-664210 usb_power_delivery: snk: "SNK[1]:VDM" "VDM"
+661727-664210 usb_power_delivery: snk: "(r2) SNK[1]: VDM" "VDM"
 662561-662602 usb_power_delivery: Sym: "0x1" "1"
 662602-662642 usb_power_delivery: Sym: "0x4" "4"
 662642-662682 usb_power_delivery: Sym: "0x0" "0"
@@ -431,7 +431,7 @@
 662803-662843 usb_power_delivery: Sym: "0xF" "F"
 662843-662883 usb_power_delivery: Sym: "0xF" "F"
 662561-662883 usb_power_delivery: Data: "[0]ff008041" "D0"
-662561-662883 usb_power_delivery: payload: "ACK Disc Ident  SVID:ff00" "ACK Disc Ident  SVID:ff00"
+662561-662883 usb_power_delivery: payload: "[1] ACK Disc Ident  SVID:ff00" "[1] ACK Disc Ident  SVID:ff00"
 662883-662923 usb_power_delivery: Sym: "0xC" "C"
 662923-662963 usb_power_delivery: Sym: "0xA" "A"
 662963-663004 usb_power_delivery: Sym: "0x5" "5"
@@ -441,7 +441,7 @@
 663124-663164 usb_power_delivery: Sym: "0x4" "4"
 663164-663205 usb_power_delivery: Sym: "0x9" "9"
 662883-663205 usb_power_delivery: Data: "[1]940005ac" "D1"
-662883-663205 usb_power_delivery: payload: "VDO:940005ac" "VDO:940005ac"
+662883-663205 usb_power_delivery: payload: "[2] VDO:940005ac" "[2] VDO:940005ac"
 663205-663245 usb_power_delivery: Sym: "0x0" "0"
 663245-663285 usb_power_delivery: Sym: "0x0" "0"
 663285-663325 usb_power_delivery: Sym: "0x0" "0"
@@ -451,7 +451,7 @@
 663446-663486 usb_power_delivery: Sym: "0x0" "0"
 663486-663526 usb_power_delivery: Sym: "0x0" "0"
 663205-663526 usb_power_delivery: Data: "[2]00000000" "D2"
-663205-663526 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+663205-663526 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 663526-663567 usb_power_delivery: Sym: "0x8" "8"
 663567-663607 usb_power_delivery: Sym: "0x1" "1"
 663607-663647 usb_power_delivery: Sym: "0x2" "2"
@@ -461,7 +461,7 @@
 663768-663808 usb_power_delivery: Sym: "0x3" "3"
 663808-663848 usb_power_delivery: Sym: "0x1" "1"
 663526-663848 usb_power_delivery: Data: "[3]13900218" "D3"
-663526-663848 usb_power_delivery: payload: "VDO:13900218" "VDO:13900218"
+663526-663848 usb_power_delivery: payload: "[4] VDO:13900218" "[4] VDO:13900218"
 663848-663888 usb_power_delivery: Sym: "0x3" "3"
 663888-663928 usb_power_delivery: Sym: "0x3" "3"
 663928-663968 usb_power_delivery: Sym: "0x3" "3"
@@ -473,7 +473,7 @@
 663848-664169 usb_power_delivery: CRC: "CRC:a9e8d333" "CRC"
 664169-664210 usb_power_delivery: Sym: "EOP" "#"
 664169-664210 usb_power_delivery: EOP: "EOP" "E"
-661727-664210 usb_power_delivery: text: "#14   (275.719583ms): SNK[1]:VDM - ACK Disc Ident  SVID:ff00 - VDO:940005ac - VDO:00000000 - VDO:13900218" "..."
+661727-664210 usb_power_delivery: text: "#14   (275.719583ms): (r2) SNK[1]: VDM - [1] ACK Disc Ident  SVID:ff00 - [2] VDO:940005ac - [3] VDO:00000000 - [4] VDO:13900218" "..."
 664373-664893 usb_power_delivery: Preamble: "Preamble" "..."
 664893-664933 usb_power_delivery: Sym: "SYNC-1" "S1"
 664933-664973 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -485,7 +485,7 @@
 665134-665175 usb_power_delivery: Sym: "0x3" "3"
 665175-665215 usb_power_delivery: Sym: "0x0" "0"
 665054-665215 usb_power_delivery: Head: "H:0361" "HD"
-664373-665577 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+664373-665577 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 665215-665255 usb_power_delivery: Sym: "0x3" "3"
 665255-665295 usb_power_delivery: Sym: "0xA" "A"
 665295-665336 usb_power_delivery: Sym: "0x9" "9"
@@ -497,7 +497,7 @@
 665215-665537 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 665537-665577 usb_power_delivery: Sym: "EOP" "#"
 665537-665577 usb_power_delivery: EOP: "EOP" "E"
-664373-665577 usb_power_delivery: text: "#15   (276.822083ms): SRC[1]:GOOD CRC" "..."
+664373-665577 usb_power_delivery: text: "#15   (276.822083ms): (r2) SRC[1]: GOOD CRC" "..."
 666884-667390 usb_power_delivery: Preamble: "Preamble" "..."
 667390-667431 usb_power_delivery: Sym: "SYNC-1" "S1"
 667431-667471 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -509,7 +509,7 @@
 667633-667673 usb_power_delivery: Sym: "0x9" "9"
 667673-667713 usb_power_delivery: Sym: "0x1" "1"
 667552-667713 usb_power_delivery: Head: "H:196f" "HD"
-666884-668398 usb_power_delivery: src: "SRC[4]:VDM" "VDM"
+666884-668398 usb_power_delivery: src: "(r2) SRC[4]: VDM" "VDM"
 667713-667753 usb_power_delivery: Sym: "0x2" "2"
 667753-667793 usb_power_delivery: Sym: "0x0" "0"
 667793-667834 usb_power_delivery: Sym: "0x0" "0"
@@ -519,7 +519,7 @@
 667954-667995 usb_power_delivery: Sym: "0xF" "F"
 667995-668035 usb_power_delivery: Sym: "0xF" "F"
 667713-668035 usb_power_delivery: Data: "[0]ff008002" "D0"
-667713-668035 usb_power_delivery: payload: "REQ Disc SVID  SVID:ff00" "REQ Disc SVID  SVID:ff00"
+667713-668035 usb_power_delivery: payload: "[1] REQ Disc SVID  SVID:ff00" "[1] REQ Disc SVID  SVID:ff00"
 668035-668075 usb_power_delivery: Sym: "0x9" "9"
 668075-668116 usb_power_delivery: Sym: "0x5" "5"
 668116-668156 usb_power_delivery: Sym: "0x5" "5"
@@ -531,7 +531,7 @@
 668035-668357 usb_power_delivery: CRC: "CRC:43aed559" "CRC"
 668357-668398 usb_power_delivery: Sym: "EOP" "#"
 668357-668398 usb_power_delivery: EOP: "EOP" "E"
-666884-668398 usb_power_delivery: text: "#16   (277.868333ms): SRC[4]:VDM - REQ Disc SVID  SVID:ff00" "..."
+666884-668398 usb_power_delivery: text: "#16   (277.868333ms): (r2) SRC[4]: VDM - [1] REQ Disc SVID  SVID:ff00" "..."
 668627-669140 usb_power_delivery: Preamble: "Preamble" "..."
 669140-669180 usb_power_delivery: Sym: "SYNC-1" "S1"
 669180-669220 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -543,7 +543,7 @@
 669381-669421 usb_power_delivery: Sym: "0x8" "8"
 669421-669461 usb_power_delivery: Sym: "0x0" "0"
 669300-669461 usb_power_delivery: Head: "H:0841" "HD"
-668627-669831 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+668627-669831 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 669461-669501 usb_power_delivery: Sym: "0x9" "9"
 669501-669542 usb_power_delivery: Sym: "0x8" "8"
 669542-669582 usb_power_delivery: Sym: "0x4" "4"
@@ -555,7 +555,7 @@
 669461-669783 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 669783-669823 usb_power_delivery: Sym: "EOP" "#"
 669783-669823 usb_power_delivery: EOP: "EOP" "E"
-668627-669823 usb_power_delivery: text: "#17   (278.594583ms): SNK[4]:GOOD CRC" "..."
+668627-669823 usb_power_delivery: text: "#17   (278.594583ms): (r2) SNK[4]: GOOD CRC" "..."
 670548-671061 usb_power_delivery: Preamble: "Preamble" "..."
 671061-671101 usb_power_delivery: Sym: "SYNC-1" "S1"
 671101-671141 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -567,7 +567,7 @@
 671302-671342 usb_power_delivery: Sym: "0x4" "4"
 671342-671382 usb_power_delivery: Sym: "0x3" "3"
 671221-671382 usb_power_delivery: Head: "H:344f" "HD"
-670548-672717 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+670548-672717 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 671382-671422 usb_power_delivery: Sym: "0x2" "2"
 671422-671463 usb_power_delivery: Sym: "0x4" "4"
 671463-671503 usb_power_delivery: Sym: "0x0" "0"
@@ -577,7 +577,7 @@
 671623-671664 usb_power_delivery: Sym: "0xF" "F"
 671664-671704 usb_power_delivery: Sym: "0xF" "F"
 671382-671704 usb_power_delivery: Data: "[0]ff008042" "D0"
-671382-671704 usb_power_delivery: payload: "ACK Disc SVID  SVID:ff00" "ACK Disc SVID  SVID:ff00"
+671382-671704 usb_power_delivery: payload: "[1] ACK Disc SVID  SVID:ff00" "[1] ACK Disc SVID  SVID:ff00"
 671704-671744 usb_power_delivery: Sym: "0xC" "C"
 671744-671784 usb_power_delivery: Sym: "0xA" "A"
 671784-671824 usb_power_delivery: Sym: "0x5" "5"
@@ -587,7 +587,7 @@
 671945-671985 usb_power_delivery: Sym: "0xF" "F"
 671985-672025 usb_power_delivery: Sym: "0xF" "F"
 671704-672025 usb_power_delivery: Data: "[1]ff0105ac" "D1"
-671704-672025 usb_power_delivery: payload: "VDO:ff0105ac" "VDO:ff0105ac"
+671704-672025 usb_power_delivery: payload: "[2] VDO:ff0105ac" "[2] VDO:ff0105ac"
 672025-672066 usb_power_delivery: Sym: "0x0" "0"
 672066-672106 usb_power_delivery: Sym: "0x0" "0"
 672106-672146 usb_power_delivery: Sym: "0x0" "0"
@@ -597,7 +597,7 @@
 672267-672307 usb_power_delivery: Sym: "0x0" "0"
 672307-672347 usb_power_delivery: Sym: "0x0" "0"
 672025-672347 usb_power_delivery: Data: "[2]00000000" "D2"
-672025-672347 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+672025-672347 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 672347-672387 usb_power_delivery: Sym: "0xF" "F"
 672387-672427 usb_power_delivery: Sym: "0x8" "8"
 672427-672468 usb_power_delivery: Sym: "0x4" "4"
@@ -609,7 +609,7 @@
 672347-672669 usb_power_delivery: CRC: "CRC:4d42648f" "CRC"
 672669-672709 usb_power_delivery: Sym: "EOP" "#"
 672669-672709 usb_power_delivery: EOP: "EOP" "E"
-670548-672709 usb_power_delivery: text: "#18   (279.395000ms): SNK[2]:VDM - ACK Disc SVID  SVID:ff00 - VDO:ff0105ac - VDO:00000000" "..."
+670548-672709 usb_power_delivery: text: "#18   (279.395000ms): (r2) SNK[2]: VDM - [1] ACK Disc SVID  SVID:ff00 - [2] VDO:ff0105ac - [3] VDO:00000000" "..."
 672882-673396 usb_power_delivery: Preamble: "Preamble" "..."
 673396-673436 usb_power_delivery: Sym: "SYNC-1" "S1"
 673436-673476 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -621,7 +621,7 @@
 673638-673678 usb_power_delivery: Sym: "0x5" "5"
 673678-673718 usb_power_delivery: Sym: "0x0" "0"
 673557-673718 usb_power_delivery: Head: "H:0561" "HD"
-672882-674089 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+672882-674089 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 673718-673759 usb_power_delivery: Sym: "0x6" "6"
 673759-673799 usb_power_delivery: Sym: "0x9" "9"
 673799-673839 usb_power_delivery: Sym: "0xC" "C"
@@ -633,7 +633,7 @@
 673718-674041 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 674041-674081 usb_power_delivery: Sym: "EOP" "#"
 674041-674081 usb_power_delivery: EOP: "EOP" "E"
-672882-674081 usb_power_delivery: text: "#19   (280.367500ms): SRC[2]:GOOD CRC" "..."
+672882-674081 usb_power_delivery: text: "#19   (280.367500ms): (r2) SRC[2]: GOOD CRC" "..."
 674373-674880 usb_power_delivery: Preamble: "Preamble" "..."
 674880-674921 usb_power_delivery: Sym: "SYNC-1" "S1"
 674921-674961 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -645,7 +645,7 @@
 675122-675162 usb_power_delivery: Sym: "0xB" "B"
 675162-675203 usb_power_delivery: Sym: "0x1" "1"
 675041-675203 usb_power_delivery: Head: "H:1b6f" "HD"
-674373-675895 usb_power_delivery: src: "SRC[5]:VDM" "VDM"
+674373-675895 usb_power_delivery: src: "(r2) SRC[5]: VDM" "VDM"
 675203-675243 usb_power_delivery: Sym: "0x3" "3"
 675243-675283 usb_power_delivery: Sym: "0x0" "0"
 675283-675323 usb_power_delivery: Sym: "0x0" "0"
@@ -655,7 +655,7 @@
 675444-675484 usb_power_delivery: Sym: "0x5" "5"
 675484-675525 usb_power_delivery: Sym: "0x0" "0"
 675203-675525 usb_power_delivery: Data: "[0]05ac8003" "D0"
-675203-675525 usb_power_delivery: payload: "REQ Disc Mode  SVID:05ac" "REQ Disc Mode  SVID:05ac"
+675203-675525 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:05ac" "[1] REQ Disc Mode  SVID:05ac"
 675525-675565 usb_power_delivery: Sym: "0xB" "B"
 675565-675605 usb_power_delivery: Sym: "0xB" "B"
 675605-675646 usb_power_delivery: Sym: "0x9" "9"
@@ -667,7 +667,7 @@
 675525-675847 usb_power_delivery: CRC: "CRC:de0809bb" "CRC"
 675847-675888 usb_power_delivery: Sym: "EOP" "#"
 675847-675888 usb_power_delivery: EOP: "EOP" "E"
-674373-675888 usb_power_delivery: text: "#20   (280.988750ms): SRC[5]:VDM - REQ Disc Mode  SVID:05ac" "..."
+674373-675888 usb_power_delivery: text: "#20   (280.988750ms): (r2) SRC[5]: VDM - [1] REQ Disc Mode  SVID:05ac" "..."
 676124-676637 usb_power_delivery: Preamble: "Preamble" "..."
 676637-676677 usb_power_delivery: Sym: "SYNC-1" "S1"
 676677-676718 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -679,7 +679,7 @@
 676878-676919 usb_power_delivery: Sym: "0xA" "A"
 676919-676959 usb_power_delivery: Sym: "0x0" "0"
 676798-676959 usb_power_delivery: Head: "H:0a41" "HD"
-676124-677321 usb_power_delivery: snk: "SNK[5]:GOOD CRC" "GOOD CRC"
+676124-677321 usb_power_delivery: snk: "(r2) SNK[5]: GOOD CRC" "GOOD CRC"
 676959-676999 usb_power_delivery: Sym: "0x5" "5"
 676999-677039 usb_power_delivery: Sym: "0xA" "A"
 677039-677079 usb_power_delivery: Sym: "0x5" "5"
@@ -691,7 +691,7 @@
 676959-677280 usb_power_delivery: CRC: "CRC:486e85a5" "CRC"
 677280-677321 usb_power_delivery: Sym: "EOP" "#"
 677280-677321 usb_power_delivery: EOP: "EOP" "E"
-676124-677321 usb_power_delivery: text: "#21   (281.718333ms): SNK[5]:GOOD CRC" "..."
+676124-677321 usb_power_delivery: text: "#21   (281.718333ms): (r2) SNK[5]: GOOD CRC" "..."
 678006-678518 usb_power_delivery: Preamble: "Preamble" "..."
 678518-678559 usb_power_delivery: Sym: "SYNC-1" "S1"
 678559-678599 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -703,7 +703,7 @@
 678760-678800 usb_power_delivery: Sym: "0x6" "6"
 678800-678840 usb_power_delivery: Sym: "0x3" "3"
 678679-678840 usb_power_delivery: Head: "H:364f" "HD"
-678006-680175 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+678006-680175 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 678840-678880 usb_power_delivery: Sym: "0x3" "3"
 678880-678921 usb_power_delivery: Sym: "0x4" "4"
 678921-678961 usb_power_delivery: Sym: "0x0" "0"
@@ -713,7 +713,7 @@
 679081-679122 usb_power_delivery: Sym: "0x5" "5"
 679122-679162 usb_power_delivery: Sym: "0x0" "0"
 678840-679162 usb_power_delivery: Data: "[0]05ac8043" "D0"
-678840-679162 usb_power_delivery: payload: "ACK Disc Mode  SVID:05ac" "ACK Disc Mode  SVID:05ac"
+678840-679162 usb_power_delivery: payload: "[1] ACK Disc Mode  SVID:05ac" "[1] ACK Disc Mode  SVID:05ac"
 679162-679202 usb_power_delivery: Sym: "0x2" "2"
 679202-679242 usb_power_delivery: Sym: "0x0" "0"
 679242-679282 usb_power_delivery: Sym: "0x0" "0"
@@ -723,7 +723,7 @@
 679403-679443 usb_power_delivery: Sym: "0x0" "0"
 679443-679483 usb_power_delivery: Sym: "0x0" "0"
 679162-679483 usb_power_delivery: Data: "[1]00000002" "D1"
-679162-679483 usb_power_delivery: payload: "VDO:00000002" "VDO:00000002"
+679162-679483 usb_power_delivery: payload: "[2] VDO:00000002" "[2] VDO:00000002"
 679483-679524 usb_power_delivery: Sym: "0x1" "1"
 679524-679564 usb_power_delivery: Sym: "0x0" "0"
 679564-679604 usb_power_delivery: Sym: "0x0" "0"
@@ -733,7 +733,7 @@
 679725-679765 usb_power_delivery: Sym: "0x0" "0"
 679765-679805 usb_power_delivery: Sym: "0x0" "0"
 679483-679805 usb_power_delivery: Data: "[2]00000001" "D2"
-679483-679805 usb_power_delivery: payload: "VDO:00000001" "VDO:00000001"
+679483-679805 usb_power_delivery: payload: "[3] VDO:00000001" "[3] VDO:00000001"
 679805-679845 usb_power_delivery: Sym: "0x5" "5"
 679845-679885 usb_power_delivery: Sym: "0xA" "A"
 679885-679926 usb_power_delivery: Sym: "0x7" "7"
@@ -745,7 +745,7 @@
 679805-680127 usb_power_delivery: CRC: "CRC:527c97a5" "CRC"
 680127-680167 usb_power_delivery: Sym: "EOP" "#"
 680127-680167 usb_power_delivery: EOP: "EOP" "E"
-678006-680167 usb_power_delivery: text: "#22   (282.502500ms): SNK[3]:VDM - ACK Disc Mode  SVID:05ac - VDO:00000002 - VDO:00000001" "..."
+678006-680167 usb_power_delivery: text: "#22   (282.502500ms): (r2) SNK[3]: VDM - [1] ACK Disc Mode  SVID:05ac - [2] VDO:00000002 - [3] VDO:00000001" "..."
 680332-680850 usb_power_delivery: Preamble: "Preamble" "..."
 680850-680891 usb_power_delivery: Sym: "SYNC-1" "S1"
 680891-680930 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -757,7 +757,7 @@
 681092-681132 usb_power_delivery: Sym: "0x7" "7"
 681132-681172 usb_power_delivery: Sym: "0x0" "0"
 681011-681172 usb_power_delivery: Head: "H:0761" "HD"
-680332-681543 usb_power_delivery: src: "SRC[3]:GOOD CRC" "GOOD CRC"
+680332-681543 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
 681172-681213 usb_power_delivery: Sym: "0xA" "A"
 681213-681253 usb_power_delivery: Sym: "0xB" "B"
 681253-681293 usb_power_delivery: Sym: "0xD" "D"
@@ -769,7 +769,7 @@
 681172-681495 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
 681495-681535 usb_power_delivery: Sym: "EOP" "#"
 681495-681535 usb_power_delivery: EOP: "EOP" "E"
-680332-681535 usb_power_delivery: text: "#23   (283.471667ms): SRC[3]:GOOD CRC" "..."
+680332-681535 usb_power_delivery: text: "#23   (283.471667ms): (r2) SRC[3]: GOOD CRC" "..."
 683050-683557 usb_power_delivery: Preamble: "Preamble" "..."
 683557-683598 usb_power_delivery: Sym: "SYNC-1" "S1"
 683598-683638 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -781,7 +781,7 @@
 683800-683839 usb_power_delivery: Sym: "0xD" "D"
 683839-683880 usb_power_delivery: Sym: "0x1" "1"
 683719-683880 usb_power_delivery: Head: "H:1d6f" "HD"
-683050-684565 usb_power_delivery: src: "SRC[6]:VDM" "VDM"
+683050-684565 usb_power_delivery: src: "(r2) SRC[6]: VDM" "VDM"
 683880-683920 usb_power_delivery: Sym: "0x4" "4"
 683920-683960 usb_power_delivery: Sym: "0x0" "0"
 683960-684001 usb_power_delivery: Sym: "0x1" "1"
@@ -791,7 +791,7 @@
 684122-684162 usb_power_delivery: Sym: "0x5" "5"
 684162-684202 usb_power_delivery: Sym: "0x0" "0"
 683880-684202 usb_power_delivery: Data: "[0]05ac8104" "D0"
-683880-684202 usb_power_delivery: payload: "REQ Enter Mode pos 1 SVID:05ac" "REQ Enter Mode pos 1 SVID:05ac"
+683880-684202 usb_power_delivery: payload: "[1] REQ Enter Mode pos 1 SVID:05ac" "[1] REQ Enter Mode pos 1 SVID:05ac"
 684202-684242 usb_power_delivery: Sym: "0x5" "5"
 684242-684282 usb_power_delivery: Sym: "0x9" "9"
 684282-684323 usb_power_delivery: Sym: "0xE" "E"
@@ -803,7 +803,7 @@
 684202-684524 usb_power_delivery: CRC: "CRC:cd5dae95" "CRC"
 684524-684565 usb_power_delivery: Sym: "EOP" "#"
 684524-684565 usb_power_delivery: EOP: "EOP" "E"
-683050-684565 usb_power_delivery: text: "#24   (284.604167ms): SRC[6]:VDM - REQ Enter Mode pos 1 SVID:05ac" "..."
+683050-684565 usb_power_delivery: text: "#24   (284.604167ms): (r2) SRC[6]: VDM - [1] REQ Enter Mode pos 1 SVID:05ac" "..."
 684793-685306 usb_power_delivery: Preamble: "Preamble" "..."
 685306-685346 usb_power_delivery: Sym: "SYNC-1" "S1"
 685346-685386 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -815,7 +815,7 @@
 685547-685587 usb_power_delivery: Sym: "0xC" "C"
 685587-685627 usb_power_delivery: Sym: "0x0" "0"
 685466-685627 usb_power_delivery: Head: "H:0c41" "HD"
-684793-685997 usb_power_delivery: snk: "SNK[6]:GOOD CRC" "GOOD CRC"
+684793-685997 usb_power_delivery: snk: "(r2) SNK[6]: GOOD CRC" "GOOD CRC"
 685627-685667 usb_power_delivery: Sym: "0x0" "0"
 685667-685708 usb_power_delivery: Sym: "0x9" "9"
 685708-685748 usb_power_delivery: Sym: "0x0" "0"
@@ -827,7 +827,7 @@
 685627-685949 usb_power_delivery: CRC: "CRC:a10d2090" "CRC"
 685949-685989 usb_power_delivery: Sym: "EOP" "#"
 685949-685989 usb_power_delivery: EOP: "EOP" "E"
-684793-685989 usb_power_delivery: text: "#25   (285.330417ms): SNK[6]:GOOD CRC" "..."
+684793-685989 usb_power_delivery: text: "#25   (285.330417ms): (r2) SNK[6]: GOOD CRC" "..."
 686683-687196 usb_power_delivery: Preamble: "Preamble" "..."
 687196-687237 usb_power_delivery: Sym: "SYNC-1" "S1"
 687237-687277 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -839,7 +839,7 @@
 687438-687478 usb_power_delivery: Sym: "0x8" "8"
 687478-687518 usb_power_delivery: Sym: "0x1" "1"
 687357-687518 usb_power_delivery: Head: "H:184f" "HD"
-686683-688210 usb_power_delivery: snk: "SNK[4]:VDM" "VDM"
+686683-688210 usb_power_delivery: snk: "(r2) SNK[4]: VDM" "VDM"
 687518-687558 usb_power_delivery: Sym: "0x4" "4"
 687558-687599 usb_power_delivery: Sym: "0x4" "4"
 687599-687639 usb_power_delivery: Sym: "0x1" "1"
@@ -849,7 +849,7 @@
 687759-687799 usb_power_delivery: Sym: "0x5" "5"
 687799-687840 usb_power_delivery: Sym: "0x0" "0"
 687518-687840 usb_power_delivery: Data: "[0]05ac8144" "D0"
-687518-687840 usb_power_delivery: payload: "ACK Enter Mode pos 1 SVID:05ac" "ACK Enter Mode pos 1 SVID:05ac"
+687518-687840 usb_power_delivery: payload: "[1] ACK Enter Mode pos 1 SVID:05ac" "[1] ACK Enter Mode pos 1 SVID:05ac"
 687840-687880 usb_power_delivery: Sym: "0xE" "E"
 687880-687920 usb_power_delivery: Sym: "0xE" "E"
 687920-687960 usb_power_delivery: Sym: "0xC" "C"
@@ -861,7 +861,7 @@
 687840-688161 usb_power_delivery: CRC: "CRC:99057cee" "CRC"
 688161-688202 usb_power_delivery: Sym: "EOP" "#"
 688161-688202 usb_power_delivery: EOP: "EOP" "E"
-686683-688202 usb_power_delivery: text: "#26   (286.117917ms): SNK[4]:VDM - ACK Enter Mode pos 1 SVID:05ac" "..."
+686683-688202 usb_power_delivery: text: "#26   (286.117917ms): (r2) SNK[4]: VDM - [1] ACK Enter Mode pos 1 SVID:05ac" "..."
 688376-688890 usb_power_delivery: Preamble: "Preamble" "..."
 688890-688931 usb_power_delivery: Sym: "SYNC-1" "S1"
 688931-688971 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -873,7 +873,7 @@
 689132-689173 usb_power_delivery: Sym: "0x9" "9"
 689173-689213 usb_power_delivery: Sym: "0x0" "0"
 689051-689213 usb_power_delivery: Head: "H:0961" "HD"
-688376-689575 usb_power_delivery: src: "SRC[4]:GOOD CRC" "GOOD CRC"
+688376-689575 usb_power_delivery: src: "(r2) SRC[4]: GOOD CRC" "GOOD CRC"
 689213-689253 usb_power_delivery: Sym: "0xD" "D"
 689253-689293 usb_power_delivery: Sym: "0xB" "B"
 689293-689334 usb_power_delivery: Sym: "0x0" "0"
@@ -885,7 +885,7 @@
 689213-689535 usb_power_delivery: CRC: "CRC:44e3f0bd" "CRC"
 689535-689575 usb_power_delivery: Sym: "EOP" "#"
 689535-689575 usb_power_delivery: EOP: "EOP" "E"
-688376-689575 usb_power_delivery: text: "#27   (286.823333ms): SRC[4]:GOOD CRC" "..."
+688376-689575 usb_power_delivery: text: "#27   (286.823333ms): (r2) SRC[4]: GOOD CRC" "..."
 690947-691454 usb_power_delivery: Preamble: "Preamble" "..."
 691454-691494 usb_power_delivery: Sym: "SYNC-1" "S1"
 691494-691534 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -897,7 +897,7 @@
 691696-691736 usb_power_delivery: Sym: "0xF" "F"
 691736-691777 usb_power_delivery: Sym: "0x1" "1"
 691615-691777 usb_power_delivery: Head: "H:1f6f" "HD"
-690947-692461 usb_power_delivery: src: "SRC[7]:VDM" "VDM"
+690947-692461 usb_power_delivery: src: "(r2) SRC[7]: VDM" "VDM"
 691777-691817 usb_power_delivery: Sym: "0x5" "5"
 691817-691857 usb_power_delivery: Sym: "0x0" "0"
 691857-691897 usb_power_delivery: Sym: "0x0" "0"
@@ -907,7 +907,7 @@
 692018-692058 usb_power_delivery: Sym: "0x5" "5"
 692058-692099 usb_power_delivery: Sym: "0x0" "0"
 691777-692099 usb_power_delivery: Data: "[0]05ac0005" "D0"
-691777-692099 usb_power_delivery: payload: "unstruct [0005] SVID:05ac" "unstruct [0005] SVID:05ac"
+691777-692099 usb_power_delivery: payload: "[1] unstruct [0005] SVID:05ac" "[1] unstruct [0005] SVID:05ac"
 692099-692139 usb_power_delivery: Sym: "0x7" "7"
 692139-692179 usb_power_delivery: Sym: "0x2" "2"
 692179-692219 usb_power_delivery: Sym: "0xB" "B"
@@ -919,7 +919,7 @@
 692099-692421 usb_power_delivery: CRC: "CRC:efd6eb27" "CRC"
 692421-692461 usb_power_delivery: Sym: "EOP" "#"
 692421-692461 usb_power_delivery: EOP: "EOP" "E"
-690947-692461 usb_power_delivery: text: "#28   (287.894583ms): SRC[7]:VDM - unstruct [0005] SVID:05ac" "..."
+690947-692461 usb_power_delivery: text: "#28   (287.894583ms): (r2) SRC[7]: VDM - [1] unstruct [0005] SVID:05ac" "..."
 692690-693203 usb_power_delivery: Preamble: "Preamble" "..."
 693203-693244 usb_power_delivery: Sym: "SYNC-1" "S1"
 693244-693284 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -931,7 +931,7 @@
 693445-693485 usb_power_delivery: Sym: "0xE" "E"
 693485-693525 usb_power_delivery: Sym: "0x0" "0"
 693364-693525 usb_power_delivery: Head: "H:0e41" "HD"
-692690-693895 usb_power_delivery: snk: "SNK[7]:GOOD CRC" "GOOD CRC"
+692690-693895 usb_power_delivery: snk: "(r2) SNK[7]: GOOD CRC" "GOOD CRC"
 693525-693565 usb_power_delivery: Sym: "0xC" "C"
 693565-693605 usb_power_delivery: Sym: "0xB" "B"
 693605-693646 usb_power_delivery: Sym: "0x1" "1"
@@ -943,7 +943,7 @@
 693525-693847 usb_power_delivery: CRC: "CRC:4f0341bc" "CRC"
 693847-693887 usb_power_delivery: Sym: "EOP" "#"
 693847-693887 usb_power_delivery: EOP: "EOP" "E"
-692690-693887 usb_power_delivery: text: "#29   (288.620833ms): SNK[7]:GOOD CRC" "..."
+692690-693887 usb_power_delivery: text: "#29   (288.620833ms): (r2) SNK[7]: GOOD CRC" "..."
 694433-694946 usb_power_delivery: Preamble: "Preamble" "..."
 694946-694986 usb_power_delivery: Sym: "SYNC-1" "S1"
 694986-695026 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -955,7 +955,7 @@
 695187-695227 usb_power_delivery: Sym: "0xA" "A"
 695227-695267 usb_power_delivery: Sym: "0x1" "1"
 695106-695267 usb_power_delivery: Head: "H:1a4f" "HD"
-694433-695958 usb_power_delivery: snk: "SNK[5]:VDM" "VDM"
+694433-695958 usb_power_delivery: snk: "(r2) SNK[5]: VDM" "VDM"
 695267-695307 usb_power_delivery: Sym: "0x5" "5"
 695307-695348 usb_power_delivery: Sym: "0x1" "1"
 695348-695388 usb_power_delivery: Sym: "0x0" "0"
@@ -965,7 +965,7 @@
 695508-695549 usb_power_delivery: Sym: "0x5" "5"
 695549-695589 usb_power_delivery: Sym: "0x0" "0"
 695267-695589 usb_power_delivery: Data: "[0]05ac0015" "D0"
-695267-695589 usb_power_delivery: payload: "unstruct [0015] SVID:05ac" "unstruct [0015] SVID:05ac"
+695267-695589 usb_power_delivery: payload: "[1] unstruct [0015] SVID:05ac" "[1] unstruct [0015] SVID:05ac"
 695589-695629 usb_power_delivery: Sym: "0xE" "E"
 695629-695669 usb_power_delivery: Sym: "0xF" "F"
 695669-695709 usb_power_delivery: Sym: "0x6" "6"
@@ -977,7 +977,7 @@
 695589-695910 usb_power_delivery: CRC: "CRC:708336fe" "CRC"
 695910-695950 usb_power_delivery: Sym: "EOP" "#"
 695910-695950 usb_power_delivery: EOP: "EOP" "E"
-694433-695950 usb_power_delivery: text: "#30   (289.347083ms): SNK[5]:VDM - unstruct [0015] SVID:05ac" "..."
+694433-695950 usb_power_delivery: text: "#30   (289.347083ms): (r2) SNK[5]: VDM - [1] unstruct [0015] SVID:05ac" "..."
 696125-696639 usb_power_delivery: Preamble: "Preamble" "..."
 696639-696679 usb_power_delivery: Sym: "SYNC-1" "S1"
 696679-696719 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -989,7 +989,7 @@
 696881-696921 usb_power_delivery: Sym: "0xB" "B"
 696921-696961 usb_power_delivery: Sym: "0x0" "0"
 696800-696961 usb_power_delivery: Head: "H:0b61" "HD"
-696125-697324 usb_power_delivery: src: "SRC[5]:GOOD CRC" "GOOD CRC"
+696125-697324 usb_power_delivery: src: "(r2) SRC[5]: GOOD CRC" "GOOD CRC"
 696961-697001 usb_power_delivery: Sym: "0x1" "1"
 697001-697041 usb_power_delivery: Sym: "0x9" "9"
 697041-697082 usb_power_delivery: Sym: "0x1" "1"
@@ -1001,7 +1001,7 @@
 696961-697283 usb_power_delivery: CRC: "CRC:aaed9191" "CRC"
 697283-697324 usb_power_delivery: Sym: "EOP" "#"
 697283-697324 usb_power_delivery: EOP: "EOP" "E"
-696125-697324 usb_power_delivery: text: "#31   (290.052083ms): SRC[5]:GOOD CRC" "..."
+696125-697324 usb_power_delivery: text: "#31   (290.052083ms): (r2) SRC[5]: GOOD CRC" "..."
 697964-698477 usb_power_delivery: Preamble: "Preamble" "..."
 698477-698517 usb_power_delivery: Sym: "SYNC-1" "S1"
 698517-698557 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1013,7 +1013,7 @@
 698718-698758 usb_power_delivery: Sym: "0xC" "C"
 698758-698799 usb_power_delivery: Sym: "0x3" "3"
 698638-698799 usb_power_delivery: Head: "H:3c4f" "HD"
-697964-700125 usb_power_delivery: snk: "SNK[6]:VDM" "VDM"
+697964-700125 usb_power_delivery: snk: "(r2) SNK[6]: VDM" "VDM"
 698799-698839 usb_power_delivery: Sym: "0x6" "6"
 698839-698879 usb_power_delivery: Sym: "0x0" "0"
 698879-698919 usb_power_delivery: Sym: "0x0" "0"
@@ -1023,7 +1023,7 @@
 699040-699080 usb_power_delivery: Sym: "0x5" "5"
 699080-699120 usb_power_delivery: Sym: "0x0" "0"
 698799-699120 usb_power_delivery: Data: "[0]05ac8006" "D0"
-698799-699120 usb_power_delivery: payload: "REQ Attention  SVID:05ac" "REQ Attention  SVID:05ac"
+698799-699120 usb_power_delivery: payload: "[1] REQ Attention  SVID:05ac" "[1] REQ Attention  SVID:05ac"
 699120-699161 usb_power_delivery: Sym: "0x2" "2"
 699161-699201 usb_power_delivery: Sym: "0x0" "0"
 699201-699241 usb_power_delivery: Sym: "0x1" "1"
@@ -1033,7 +1033,7 @@
 699361-699402 usb_power_delivery: Sym: "0x5" "5"
 699402-699442 usb_power_delivery: Sym: "0x0" "0"
 699120-699442 usb_power_delivery: Data: "[1]05ac0102" "D1"
-699120-699442 usb_power_delivery: payload: "VDO:05ac0102" "VDO:05ac0102"
+699120-699442 usb_power_delivery: payload: "[2] VDO:05ac0102" "[2] VDO:05ac0102"
 699442-699482 usb_power_delivery: Sym: "0x0" "0"
 699482-699522 usb_power_delivery: Sym: "0x0" "0"
 699522-699562 usb_power_delivery: Sym: "0x0" "0"
@@ -1043,7 +1043,7 @@
 699683-699723 usb_power_delivery: Sym: "0x0" "0"
 699723-699763 usb_power_delivery: Sym: "0x0" "0"
 699442-699763 usb_power_delivery: Data: "[2]00000000" "D2"
-699442-699763 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+699442-699763 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 699763-699804 usb_power_delivery: Sym: "0x7" "7"
 699804-699844 usb_power_delivery: Sym: "0x5" "5"
 699844-699884 usb_power_delivery: Sym: "0x3" "3"
@@ -1055,7 +1055,7 @@
 699763-700085 usb_power_delivery: CRC: "CRC:78160357" "CRC"
 700085-700125 usb_power_delivery: Sym: "EOP" "#"
 700085-700125 usb_power_delivery: EOP: "EOP" "E"
-697964-700125 usb_power_delivery: text: "#32   (290.818333ms): SNK[6]:VDM - REQ Attention  SVID:05ac - VDO:05ac0102 - VDO:00000000" "..."
+697964-700125 usb_power_delivery: text: "#32   (290.818333ms): (r2) SNK[6]: VDM - [1] REQ Attention  SVID:05ac - [2] VDO:05ac0102 - [3] VDO:00000000" "..."
 700304-700817 usb_power_delivery: Preamble: "Preamble" "..."
 700817-700858 usb_power_delivery: Sym: "SYNC-1" "S1"
 700858-700898 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1067,7 +1067,7 @@
 701059-701099 usb_power_delivery: Sym: "0xD" "D"
 701099-701140 usb_power_delivery: Sym: "0x0" "0"
 700979-701140 usb_power_delivery: Head: "H:0d61" "HD"
-700304-701510 usb_power_delivery: src: "SRC[6]:GOOD CRC" "GOOD CRC"
+700304-701510 usb_power_delivery: src: "(r2) SRC[6]: GOOD CRC" "GOOD CRC"
 701140-701180 usb_power_delivery: Sym: "0x4" "4"
 701180-701220 usb_power_delivery: Sym: "0xA" "A"
 701220-701261 usb_power_delivery: Sym: "0x4" "4"
@@ -1079,7 +1079,7 @@
 701140-701462 usb_power_delivery: CRC: "CRC:438e34a4" "CRC"
 701462-701502 usb_power_delivery: Sym: "EOP" "#"
 701462-701502 usb_power_delivery: EOP: "EOP" "E"
-700304-701502 usb_power_delivery: text: "#33   (291.793333ms): SRC[6]:GOOD CRC" "..."
+700304-701502 usb_power_delivery: text: "#33   (291.793333ms): (r2) SRC[6]: GOOD CRC" "..."
 702939-703446 usb_power_delivery: Preamble: "Preamble" "..."
 703446-703487 usb_power_delivery: Sym: "SYNC-1" "S1"
 703487-703527 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1091,7 +1091,7 @@
 703688-703728 usb_power_delivery: Sym: "0x1" "1"
 703728-703768 usb_power_delivery: Sym: "0x2" "2"
 703607-703768 usb_power_delivery: Head: "H:216f" "HD"
-702939-704775 usb_power_delivery: src: "SRC[0]:VDM" "VDM"
+702939-704775 usb_power_delivery: src: "(r2) SRC[0]: VDM" "VDM"
 703768-703809 usb_power_delivery: Sym: "0x2" "2"
 703809-703849 usb_power_delivery: Sym: "0x0" "0"
 703849-703889 usb_power_delivery: Sym: "0x1" "1"
@@ -1101,7 +1101,7 @@
 704010-704051 usb_power_delivery: Sym: "0x5" "5"
 704051-704091 usb_power_delivery: Sym: "0x0" "0"
 703768-704091 usb_power_delivery: Data: "[0]05ac0102" "D0"
-703768-704091 usb_power_delivery: payload: "unstruct [0102] SVID:05ac" "unstruct [0102] SVID:05ac"
+703768-704091 usb_power_delivery: payload: "[1] unstruct [0102] SVID:05ac" "[1] unstruct [0102] SVID:05ac"
 704091-704131 usb_power_delivery: Sym: "0x2" "2"
 704131-704171 usb_power_delivery: Sym: "0x0" "0"
 704171-704212 usb_power_delivery: Sym: "0x0" "0"
@@ -1111,7 +1111,7 @@
 704332-704373 usb_power_delivery: Sym: "0x0" "0"
 704373-704413 usb_power_delivery: Sym: "0x2" "2"
 704091-704413 usb_power_delivery: Data: "[1]20000002" "D1"
-704091-704413 usb_power_delivery: payload: "VDO:20000002" "VDO:20000002"
+704091-704413 usb_power_delivery: payload: "[2] VDO:20000002" "[2] VDO:20000002"
 704413-704453 usb_power_delivery: Sym: "0x4" "4"
 704453-704493 usb_power_delivery: Sym: "0x0" "0"
 704493-704534 usb_power_delivery: Sym: "0xB" "B"
@@ -1123,7 +1123,7 @@
 704413-704735 usb_power_delivery: CRC: "CRC:85e71b04" "CRC"
 704735-704775 usb_power_delivery: Sym: "EOP" "#"
 704735-704775 usb_power_delivery: EOP: "EOP" "E"
-702939-704775 usb_power_delivery: text: "#34   (292.891250ms): SRC[0]:VDM - unstruct [0102] SVID:05ac - VDO:20000002" "..."
+702939-704775 usb_power_delivery: text: "#34   (292.891250ms): (r2) SRC[0]: VDM - [1] unstruct [0102] SVID:05ac - [2] VDO:20000002" "..."
 705004-705516 usb_power_delivery: Preamble: "Preamble" "..."
 705516-705557 usb_power_delivery: Sym: "SYNC-1" "S1"
 705557-705597 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1135,7 +1135,7 @@
 705758-705798 usb_power_delivery: Sym: "0x0" "0"
 705798-705838 usb_power_delivery: Sym: "0x0" "0"
 705677-705838 usb_power_delivery: Head: "H:0041" "HD"
-705004-706208 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+705004-706208 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 705838-705878 usb_power_delivery: Sym: "0xB" "B"
 705878-705918 usb_power_delivery: Sym: "0xB" "B"
 705918-705959 usb_power_delivery: Sym: "0xC" "C"
@@ -1147,7 +1147,7 @@
 705838-706160 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 706160-706200 usb_power_delivery: Sym: "EOP" "#"
 706160-706200 usb_power_delivery: EOP: "EOP" "E"
-705004-706200 usb_power_delivery: text: "#35   (293.751667ms): SNK[0]:GOOD CRC" "..."
+705004-706200 usb_power_delivery: text: "#35   (293.751667ms): (r2) SNK[0]: GOOD CRC" "..."
 706925-707438 usb_power_delivery: Preamble: "Preamble" "..."
 707438-707479 usb_power_delivery: Sym: "SYNC-1" "S1"
 707479-707519 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1159,7 +1159,7 @@
 707679-707720 usb_power_delivery: Sym: "0xE" "E"
 707720-707760 usb_power_delivery: Sym: "0x1" "1"
 707599-707760 usb_power_delivery: Head: "H:1e4f" "HD"
-706925-708451 usb_power_delivery: snk: "SNK[7]:VDM" "VDM"
+706925-708451 usb_power_delivery: snk: "(r2) SNK[7]: VDM" "VDM"
 707760-707800 usb_power_delivery: Sym: "0x2" "2"
 707800-707840 usb_power_delivery: Sym: "0x1" "1"
 707840-707880 usb_power_delivery: Sym: "0x0" "0"
@@ -1169,7 +1169,7 @@
 708001-708041 usb_power_delivery: Sym: "0x5" "5"
 708041-708082 usb_power_delivery: Sym: "0x0" "0"
 707760-708082 usb_power_delivery: Data: "[0]05ac0012" "D0"
-707760-708082 usb_power_delivery: payload: "unstruct [0012] SVID:05ac" "unstruct [0012] SVID:05ac"
+707760-708082 usb_power_delivery: payload: "[1] unstruct [0012] SVID:05ac" "[1] unstruct [0012] SVID:05ac"
 708082-708122 usb_power_delivery: Sym: "0x7" "7"
 708122-708162 usb_power_delivery: Sym: "0x8" "8"
 708162-708202 usb_power_delivery: Sym: "0x8" "8"
@@ -1181,7 +1181,7 @@
 708082-708403 usb_power_delivery: CRC: "CRC:18d4a887" "CRC"
 708403-708443 usb_power_delivery: Sym: "EOP" "#"
 708403-708443 usb_power_delivery: EOP: "EOP" "E"
-706925-708443 usb_power_delivery: text: "#36   (294.552083ms): SNK[7]:VDM - unstruct [0012] SVID:05ac" "..."
+706925-708443 usb_power_delivery: text: "#36   (294.552083ms): (r2) SNK[7]: VDM - [1] unstruct [0012] SVID:05ac" "..."
 708618-709132 usb_power_delivery: Preamble: "Preamble" "..."
 709132-709172 usb_power_delivery: Sym: "SYNC-1" "S1"
 709172-709212 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1193,7 +1193,7 @@
 709374-709414 usb_power_delivery: Sym: "0xF" "F"
 709414-709454 usb_power_delivery: Sym: "0x0" "0"
 709293-709454 usb_power_delivery: Head: "H:0f61" "HD"
-708618-709817 usb_power_delivery: src: "SRC[7]:GOOD CRC" "GOOD CRC"
+708618-709817 usb_power_delivery: src: "(r2) SRC[7]: GOOD CRC" "GOOD CRC"
 709454-709494 usb_power_delivery: Sym: "0x8" "8"
 709494-709535 usb_power_delivery: Sym: "0x8" "8"
 709535-709575 usb_power_delivery: Sym: "0x5" "5"
@@ -1205,7 +1205,7 @@
 709454-709776 usb_power_delivery: CRC: "CRC:ad805588" "CRC"
 709776-709817 usb_power_delivery: Sym: "EOP" "#"
 709776-709817 usb_power_delivery: EOP: "EOP" "E"
-708618-709817 usb_power_delivery: text: "#37   (295.257500ms): SRC[7]:GOOD CRC" "..."
+708618-709817 usb_power_delivery: text: "#37   (295.257500ms): (r2) SRC[7]: GOOD CRC" "..."
 710440-710953 usb_power_delivery: Preamble: "Preamble" "..."
 710953-710993 usb_power_delivery: Sym: "SYNC-1" "S1"
 710993-711033 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1217,7 +1217,7 @@
 711194-711234 usb_power_delivery: Sym: "0x0" "0"
 711234-711274 usb_power_delivery: Sym: "0x3" "3"
 711113-711274 usb_power_delivery: Head: "H:304f" "HD"
-710440-712609 usb_power_delivery: snk: "SNK[0]:VDM" "VDM"
+710440-712609 usb_power_delivery: snk: "(r2) SNK[0]: VDM" "VDM"
 711274-711314 usb_power_delivery: Sym: "0x6" "6"
 711314-711355 usb_power_delivery: Sym: "0x0" "0"
 711355-711395 usb_power_delivery: Sym: "0x0" "0"
@@ -1227,7 +1227,7 @@
 711515-711556 usb_power_delivery: Sym: "0x5" "5"
 711556-711596 usb_power_delivery: Sym: "0x0" "0"
 711274-711596 usb_power_delivery: Data: "[0]05ac8006" "D0"
-711274-711596 usb_power_delivery: payload: "REQ Attention  SVID:05ac" "REQ Attention  SVID:05ac"
+711274-711596 usb_power_delivery: payload: "[1] REQ Attention  SVID:05ac" "[1] REQ Attention  SVID:05ac"
 711596-711636 usb_power_delivery: Sym: "0x2" "2"
 711636-711676 usb_power_delivery: Sym: "0x0" "0"
 711676-711716 usb_power_delivery: Sym: "0x1" "1"
@@ -1237,7 +1237,7 @@
 711837-711877 usb_power_delivery: Sym: "0x5" "5"
 711877-711917 usb_power_delivery: Sym: "0x0" "0"
 711596-711917 usb_power_delivery: Data: "[1]05ac0102" "D1"
-711596-711917 usb_power_delivery: payload: "VDO:05ac0102" "VDO:05ac0102"
+711596-711917 usb_power_delivery: payload: "[2] VDO:05ac0102" "[2] VDO:05ac0102"
 711917-711958 usb_power_delivery: Sym: "0x4" "4"
 711958-711998 usb_power_delivery: Sym: "0x0" "0"
 711998-712038 usb_power_delivery: Sym: "0x0" "0"
@@ -1247,7 +1247,7 @@
 712159-712199 usb_power_delivery: Sym: "0x0" "0"
 712199-712239 usb_power_delivery: Sym: "0x0" "0"
 711917-712239 usb_power_delivery: Data: "[2]00000004" "D2"
-711917-712239 usb_power_delivery: payload: "VDO:00000004" "VDO:00000004"
+711917-712239 usb_power_delivery: payload: "[3] VDO:00000004" "[3] VDO:00000004"
 712239-712279 usb_power_delivery: Sym: "0xB" "B"
 712279-712319 usb_power_delivery: Sym: "0xF" "F"
 712319-712360 usb_power_delivery: Sym: "0xD" "D"
@@ -1259,7 +1259,7 @@
 712239-712561 usb_power_delivery: CRC: "CRC:6dce2dfb" "CRC"
 712561-712601 usb_power_delivery: Sym: "EOP" "#"
 712561-712601 usb_power_delivery: EOP: "EOP" "E"
-710440-712601 usb_power_delivery: text: "#38   (296.016667ms): SNK[0]:VDM - REQ Attention  SVID:05ac - VDO:05ac0102 - VDO:00000004" "..."
+710440-712601 usb_power_delivery: text: "#38   (296.016667ms): (r2) SNK[0]: VDM - [1] REQ Attention  SVID:05ac - [2] VDO:05ac0102 - [3] VDO:00000004" "..."
 712783-713293 usb_power_delivery: Preamble: "Preamble" "..."
 713293-713334 usb_power_delivery: Sym: "SYNC-1" "S1"
 713334-713374 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1271,7 +1271,7 @@
 713535-713575 usb_power_delivery: Sym: "0x1" "1"
 713575-713616 usb_power_delivery: Sym: "0x0" "0"
 713454-713616 usb_power_delivery: Head: "H:0161" "HD"
-712783-713986 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+712783-713986 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 713616-713656 usb_power_delivery: Sym: "0xF" "F"
 713656-713696 usb_power_delivery: Sym: "0x8" "8"
 713696-713736 usb_power_delivery: Sym: "0x8" "8"
@@ -1283,7 +1283,7 @@
 713616-713938 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 713938-713978 usb_power_delivery: Sym: "EOP" "#"
 713938-713978 usb_power_delivery: EOP: "EOP" "E"
-712783-713978 usb_power_delivery: text: "#39   (296.992917ms): SRC[0]:GOOD CRC" "..."
+712783-713978 usb_power_delivery: text: "#39   (296.992917ms): (r2) SRC[0]: GOOD CRC" "..."
 715409-715916 usb_power_delivery: Preamble: "Preamble" "..."
 715916-715957 usb_power_delivery: Sym: "SYNC-1" "S1"
 715957-715997 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1295,7 +1295,7 @@
 716158-716199 usb_power_delivery: Sym: "0x3" "3"
 716199-716239 usb_power_delivery: Sym: "0x2" "2"
 716078-716239 usb_power_delivery: Head: "H:236f" "HD"
-715409-717254 usb_power_delivery: src: "SRC[1]:VDM" "VDM"
+715409-717254 usb_power_delivery: src: "(r2) SRC[1]: VDM" "VDM"
 716239-716279 usb_power_delivery: Sym: "0x2" "2"
 716279-716319 usb_power_delivery: Sym: "0x0" "0"
 716319-716360 usb_power_delivery: Sym: "0x1" "1"
@@ -1305,7 +1305,7 @@
 716480-716521 usb_power_delivery: Sym: "0x5" "5"
 716521-716561 usb_power_delivery: Sym: "0x0" "0"
 716239-716561 usb_power_delivery: Data: "[0]05ac0102" "D0"
-716239-716561 usb_power_delivery: payload: "unstruct [0102] SVID:05ac" "unstruct [0102] SVID:05ac"
+716239-716561 usb_power_delivery: payload: "[1] unstruct [0102] SVID:05ac" "[1] unstruct [0102] SVID:05ac"
 716561-716601 usb_power_delivery: Sym: "0x0" "0"
 716601-716642 usb_power_delivery: Sym: "0x0" "0"
 716642-716682 usb_power_delivery: Sym: "0x2" "2"
@@ -1315,7 +1315,7 @@
 716803-716843 usb_power_delivery: Sym: "0x0" "0"
 716843-716883 usb_power_delivery: Sym: "0x0" "0"
 716561-716883 usb_power_delivery: Data: "[1]00080200" "D1"
-716561-716883 usb_power_delivery: payload: "VDO:00080200" "VDO:00080200"
+716561-716883 usb_power_delivery: payload: "[2] VDO:00080200" "[2] VDO:00080200"
 716883-716923 usb_power_delivery: Sym: "0x7" "7"
 716923-716964 usb_power_delivery: Sym: "0xA" "A"
 716964-717004 usb_power_delivery: Sym: "0x5" "5"
@@ -1327,7 +1327,7 @@
 716883-717206 usb_power_delivery: CRC: "CRC:f12b85a7" "CRC"
 717206-717246 usb_power_delivery: Sym: "EOP" "#"
 717206-717246 usb_power_delivery: EOP: "EOP" "E"
-715409-717246 usb_power_delivery: text: "#40   (298.087083ms): SRC[1]:VDM - unstruct [0102] SVID:05ac - VDO:00080200" "..."
+715409-717246 usb_power_delivery: text: "#40   (298.087083ms): (r2) SRC[1]: VDM - [1] unstruct [0102] SVID:05ac - [2] VDO:00080200" "..."
 717482-717995 usb_power_delivery: Preamble: "Preamble" "..."
 717995-718035 usb_power_delivery: Sym: "SYNC-1" "S1"
 718035-718075 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1339,7 +1339,7 @@
 718236-718276 usb_power_delivery: Sym: "0x2" "2"
 718276-718316 usb_power_delivery: Sym: "0x0" "0"
 718156-718316 usb_power_delivery: Head: "H:0241" "HD"
-717482-718686 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+717482-718686 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 718316-718357 usb_power_delivery: Sym: "0x7" "7"
 718357-718397 usb_power_delivery: Sym: "0x9" "9"
 718397-718437 usb_power_delivery: Sym: "0xD" "D"
@@ -1351,7 +1351,7 @@
 718316-718638 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 718638-718678 usb_power_delivery: Sym: "EOP" "#"
 718638-718678 usb_power_delivery: EOP: "EOP" "E"
-717482-718678 usb_power_delivery: text: "#41   (298.950833ms): SNK[1]:GOOD CRC" "..."
+717482-718678 usb_power_delivery: text: "#41   (298.950833ms): (r2) SNK[1]: GOOD CRC" "..."
 719474-719987 usb_power_delivery: Preamble: "Preamble" "..."
 719987-720027 usb_power_delivery: Sym: "SYNC-1" "S1"
 720027-720067 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1363,7 +1363,7 @@
 720228-720268 usb_power_delivery: Sym: "0x2" "2"
 720268-720308 usb_power_delivery: Sym: "0x1" "1"
 720147-720308 usb_power_delivery: Head: "H:124f" "HD"
-719474-720999 usb_power_delivery: snk: "SNK[1]:VDM" "VDM"
+719474-720999 usb_power_delivery: snk: "(r2) SNK[1]: VDM" "VDM"
 720308-720348 usb_power_delivery: Sym: "0x2" "2"
 720348-720389 usb_power_delivery: Sym: "0x1" "1"
 720389-720429 usb_power_delivery: Sym: "0x0" "0"
@@ -1373,7 +1373,7 @@
 720549-720590 usb_power_delivery: Sym: "0x5" "5"
 720590-720630 usb_power_delivery: Sym: "0x0" "0"
 720308-720630 usb_power_delivery: Data: "[0]05ac0012" "D0"
-720308-720630 usb_power_delivery: payload: "unstruct [0012] SVID:05ac" "unstruct [0012] SVID:05ac"
+720308-720630 usb_power_delivery: payload: "[1] unstruct [0012] SVID:05ac" "[1] unstruct [0012] SVID:05ac"
 720630-720670 usb_power_delivery: Sym: "0x6" "6"
 720670-720710 usb_power_delivery: Sym: "0x8" "8"
 720710-720750 usb_power_delivery: Sym: "0x5" "5"
@@ -1385,7 +1385,7 @@
 720630-720951 usb_power_delivery: CRC: "CRC:dd244586" "CRC"
 720951-720992 usb_power_delivery: Sym: "EOP" "#"
 720951-720992 usb_power_delivery: EOP: "EOP" "E"
-719474-720992 usb_power_delivery: text: "#42   (299.780833ms): SNK[1]:VDM - unstruct [0012] SVID:05ac" "..."
+719474-720992 usb_power_delivery: text: "#42   (299.780833ms): (r2) SNK[1]: VDM - [1] unstruct [0012] SVID:05ac" "..."
 721166-721680 usb_power_delivery: Preamble: "Preamble" "..."
 721680-721720 usb_power_delivery: Sym: "SYNC-1" "S1"
 721720-721760 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1397,7 +1397,7 @@
 721922-721962 usb_power_delivery: Sym: "0x3" "3"
 721962-722002 usb_power_delivery: Sym: "0x0" "0"
 721841-722002 usb_power_delivery: Head: "H:0361" "HD"
-721166-722364 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+721166-722364 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 722002-722042 usb_power_delivery: Sym: "0x3" "3"
 722042-722082 usb_power_delivery: Sym: "0xA" "A"
 722082-722123 usb_power_delivery: Sym: "0x9" "9"
@@ -1409,7 +1409,7 @@
 722002-722324 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 722324-722364 usb_power_delivery: Sym: "EOP" "#"
 722324-722364 usb_power_delivery: EOP: "EOP" "E"
-721166-722364 usb_power_delivery: text: "#43   (300.485833ms): SRC[1]:GOOD CRC" "..."
+721166-722364 usb_power_delivery: text: "#43   (300.485833ms): (r2) SRC[1]: GOOD CRC" "..."
 722987-723500 usb_power_delivery: Preamble: "Preamble" "..."
 723500-723540 usb_power_delivery: Sym: "SYNC-1" "S1"
 723540-723580 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1421,7 +1421,7 @@
 723741-723781 usb_power_delivery: Sym: "0x4" "4"
 723781-723822 usb_power_delivery: Sym: "0x3" "3"
 723661-723822 usb_power_delivery: Head: "H:344f" "HD"
-722987-725156 usb_power_delivery: snk: "SNK[2]:VDM" "VDM"
+722987-725156 usb_power_delivery: snk: "(r2) SNK[2]: VDM" "VDM"
 723822-723862 usb_power_delivery: Sym: "0x6" "6"
 723862-723902 usb_power_delivery: Sym: "0x0" "0"
 723902-723942 usb_power_delivery: Sym: "0x0" "0"
@@ -1431,7 +1431,7 @@
 724063-724103 usb_power_delivery: Sym: "0x5" "5"
 724103-724143 usb_power_delivery: Sym: "0x0" "0"
 723822-724143 usb_power_delivery: Data: "[0]05ac8006" "D0"
-723822-724143 usb_power_delivery: payload: "REQ Attention  SVID:05ac" "REQ Attention  SVID:05ac"
+723822-724143 usb_power_delivery: payload: "[1] REQ Attention  SVID:05ac" "[1] REQ Attention  SVID:05ac"
 724143-724183 usb_power_delivery: Sym: "0x2" "2"
 724183-724224 usb_power_delivery: Sym: "0x0" "0"
 724224-724264 usb_power_delivery: Sym: "0x1" "1"
@@ -1441,7 +1441,7 @@
 724384-724425 usb_power_delivery: Sym: "0x5" "5"
 724425-724465 usb_power_delivery: Sym: "0x0" "0"
 724143-724465 usb_power_delivery: Data: "[1]05ac0102" "D1"
-724143-724465 usb_power_delivery: payload: "VDO:05ac0102" "VDO:05ac0102"
+724143-724465 usb_power_delivery: payload: "[2] VDO:05ac0102" "[2] VDO:05ac0102"
 724465-724505 usb_power_delivery: Sym: "0x0" "0"
 724505-724545 usb_power_delivery: Sym: "0x0" "0"
 724545-724585 usb_power_delivery: Sym: "0x0" "0"
@@ -1451,7 +1451,7 @@
 724706-724746 usb_power_delivery: Sym: "0x0" "0"
 724746-724786 usb_power_delivery: Sym: "0x1" "1"
 724465-724786 usb_power_delivery: Data: "[2]10000000" "D2"
-724465-724786 usb_power_delivery: payload: "VDO:10000000" "VDO:10000000"
+724465-724786 usb_power_delivery: payload: "[3] VDO:10000000" "[3] VDO:10000000"
 724786-724826 usb_power_delivery: Sym: "0xE" "E"
 724826-724867 usb_power_delivery: Sym: "0x5" "5"
 724867-724907 usb_power_delivery: Sym: "0x0" "0"
@@ -1463,7 +1463,7 @@
 724786-725108 usb_power_delivery: CRC: "CRC:3fa2c05e" "CRC"
 725108-725148 usb_power_delivery: Sym: "EOP" "#"
 725108-725148 usb_power_delivery: EOP: "EOP" "E"
-722987-725148 usb_power_delivery: text: "#44   (301.244583ms): SNK[2]:VDM - REQ Attention  SVID:05ac - VDO:05ac0102 - VDO:10000000" "..."
+722987-725148 usb_power_delivery: text: "#44   (301.244583ms): (r2) SNK[2]: VDM - [1] REQ Attention  SVID:05ac - [2] VDO:05ac0102 - [3] VDO:10000000" "..."
 725330-725840 usb_power_delivery: Preamble: "Preamble" "..."
 725840-725881 usb_power_delivery: Sym: "SYNC-1" "S1"
 725881-725921 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1475,7 +1475,7 @@
 726082-726122 usb_power_delivery: Sym: "0x5" "5"
 726122-726162 usb_power_delivery: Sym: "0x0" "0"
 726001-726162 usb_power_delivery: Head: "H:0561" "HD"
-725330-726533 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+725330-726533 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 726162-726203 usb_power_delivery: Sym: "0x6" "6"
 726203-726243 usb_power_delivery: Sym: "0x9" "9"
 726243-726283 usb_power_delivery: Sym: "0xC" "C"
@@ -1487,7 +1487,7 @@
 726162-726485 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 726485-726525 usb_power_delivery: Sym: "EOP" "#"
 726485-726525 usb_power_delivery: EOP: "EOP" "E"
-725330-726525 usb_power_delivery: text: "#45   (302.220833ms): SRC[2]:GOOD CRC" "..."
+725330-726525 usb_power_delivery: text: "#45   (302.220833ms): (r2) SRC[2]: GOOD CRC" "..."
 727956-728463 usb_power_delivery: Preamble: "Preamble" "..."
 728463-728504 usb_power_delivery: Sym: "SYNC-1" "S1"
 728504-728544 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1499,7 +1499,7 @@
 728705-728746 usb_power_delivery: Sym: "0x5" "5"
 728746-728786 usb_power_delivery: Sym: "0x2" "2"
 728625-728786 usb_power_delivery: Head: "H:256f" "HD"
-727956-729793 usb_power_delivery: src: "SRC[2]:VDM" "VDM"
+727956-729793 usb_power_delivery: src: "(r2) SRC[2]: VDM" "VDM"
 728786-728826 usb_power_delivery: Sym: "0x2" "2"
 728826-728866 usb_power_delivery: Sym: "0x0" "0"
 728866-728907 usb_power_delivery: Sym: "0x1" "1"
@@ -1509,7 +1509,7 @@
 729027-729068 usb_power_delivery: Sym: "0x5" "5"
 729068-729108 usb_power_delivery: Sym: "0x0" "0"
 728786-729108 usb_power_delivery: Data: "[0]05ac0102" "D0"
-728786-729108 usb_power_delivery: payload: "unstruct [0102] SVID:05ac" "unstruct [0102] SVID:05ac"
+728786-729108 usb_power_delivery: payload: "[1] unstruct [0102] SVID:05ac" "[1] unstruct [0102] SVID:05ac"
 729108-729148 usb_power_delivery: Sym: "0x2" "2"
 729148-729189 usb_power_delivery: Sym: "0x0" "0"
 729189-729229 usb_power_delivery: Sym: "0x0" "0"
@@ -1519,7 +1519,7 @@
 729350-729390 usb_power_delivery: Sym: "0x0" "0"
 729390-729431 usb_power_delivery: Sym: "0x0" "0"
 729108-729431 usb_power_delivery: Data: "[1]00000002" "D1"
-729108-729431 usb_power_delivery: payload: "VDO:00000002" "VDO:00000002"
+729108-729431 usb_power_delivery: payload: "[2] VDO:00000002" "[2] VDO:00000002"
 729431-729471 usb_power_delivery: Sym: "0x0" "0"
 729471-729511 usb_power_delivery: Sym: "0xC" "C"
 729511-729551 usb_power_delivery: Sym: "0xA" "A"
@@ -1531,7 +1531,7 @@
 729431-729753 usb_power_delivery: CRC: "CRC:e3656ac0" "CRC"
 729753-729793 usb_power_delivery: Sym: "EOP" "#"
 729753-729793 usb_power_delivery: EOP: "EOP" "E"
-727956-729793 usb_power_delivery: text: "#46   (303.315000ms): SRC[2]:VDM - unstruct [0102] SVID:05ac - VDO:00000002" "..."
+727956-729793 usb_power_delivery: text: "#46   (303.315000ms): (r2) SRC[2]: VDM - [1] unstruct [0102] SVID:05ac - [2] VDO:00000002" "..."
 730021-730534 usb_power_delivery: Preamble: "Preamble" "..."
 730534-730574 usb_power_delivery: Sym: "SYNC-1" "S1"
 730574-730614 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1543,7 +1543,7 @@
 730775-730815 usb_power_delivery: Sym: "0x4" "4"
 730815-730855 usb_power_delivery: Sym: "0x0" "0"
 730695-730855 usb_power_delivery: Head: "H:0441" "HD"
-730021-731217 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+730021-731217 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 730855-730896 usb_power_delivery: Sym: "0x2" "2"
 730896-730936 usb_power_delivery: Sym: "0xA" "A"
 730936-730976 usb_power_delivery: Sym: "0x8" "8"
@@ -1555,7 +1555,7 @@
 730855-731177 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 731177-731217 usb_power_delivery: Sym: "EOP" "#"
 731177-731217 usb_power_delivery: EOP: "EOP" "E"
-730021-731217 usb_power_delivery: text: "#47   (304.175417ms): SNK[2]:GOOD CRC" "..."
+730021-731217 usb_power_delivery: text: "#47   (304.175417ms): (r2) SNK[2]: GOOD CRC" "..."
 731960-732473 usb_power_delivery: Preamble: "Preamble" "..."
 732473-732513 usb_power_delivery: Sym: "SYNC-1" "S1"
 732513-732553 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1567,7 +1567,7 @@
 732714-732754 usb_power_delivery: Sym: "0x6" "6"
 732754-732795 usb_power_delivery: Sym: "0x1" "1"
 732634-732795 usb_power_delivery: Head: "H:164f" "HD"
-731960-733478 usb_power_delivery: snk: "SNK[3]:VDM" "VDM"
+731960-733478 usb_power_delivery: snk: "(r2) SNK[3]: VDM" "VDM"
 732795-732835 usb_power_delivery: Sym: "0x2" "2"
 732835-732875 usb_power_delivery: Sym: "0x1" "1"
 732875-732915 usb_power_delivery: Sym: "0x0" "0"
@@ -1577,7 +1577,7 @@
 733036-733076 usb_power_delivery: Sym: "0x5" "5"
 733076-733116 usb_power_delivery: Sym: "0x0" "0"
 732795-733116 usb_power_delivery: Data: "[0]05ac0012" "D0"
-732795-733116 usb_power_delivery: payload: "unstruct [0012] SVID:05ac" "unstruct [0012] SVID:05ac"
+732795-733116 usb_power_delivery: payload: "[1] unstruct [0012] SVID:05ac" "[1] unstruct [0012] SVID:05ac"
 733116-733156 usb_power_delivery: Sym: "0x6" "6"
 733156-733197 usb_power_delivery: Sym: "0x4" "4"
 733197-733237 usb_power_delivery: Sym: "0x3" "3"
@@ -1589,7 +1589,7 @@
 733116-733438 usb_power_delivery: CRC: "CRC:28a4e346" "CRC"
 733438-733478 usb_power_delivery: Sym: "EOP" "#"
 733438-733478 usb_power_delivery: EOP: "EOP" "E"
-731960-733478 usb_power_delivery: text: "#48   (304.983333ms): SNK[3]:VDM - unstruct [0012] SVID:05ac" "..."
+731960-733478 usb_power_delivery: text: "#48   (304.983333ms): (r2) SNK[3]: VDM - [1] unstruct [0012] SVID:05ac" "..."
 733640-734162 usb_power_delivery: Preamble: "Preamble" "..."
 734162-734203 usb_power_delivery: Sym: "SYNC-1" "S1"
 734203-734243 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1601,7 +1601,7 @@
 734404-734444 usb_power_delivery: Sym: "0x7" "7"
 734444-734485 usb_power_delivery: Sym: "0x0" "0"
 734323-734485 usb_power_delivery: Head: "H:0761" "HD"
-733640-734855 usb_power_delivery: src: "SRC[3]:GOOD CRC" "GOOD CRC"
+733640-734855 usb_power_delivery: src: "(r2) SRC[3]: GOOD CRC" "GOOD CRC"
 734485-734525 usb_power_delivery: Sym: "0xA" "A"
 734525-734565 usb_power_delivery: Sym: "0xB" "B"
 734565-734606 usb_power_delivery: Sym: "0xD" "D"
@@ -1613,7 +1613,7 @@
 734485-734807 usb_power_delivery: CRC: "CRC:a35bddba" "CRC"
 734807-734847 usb_power_delivery: Sym: "EOP" "#"
 734807-734847 usb_power_delivery: EOP: "EOP" "E"
-733640-734847 usb_power_delivery: text: "#49   (305.683333ms): SRC[3]:GOOD CRC" "..."
+733640-734847 usb_power_delivery: text: "#49   (305.683333ms): (r2) SRC[3]: GOOD CRC" "..."
 735457-735970 usb_power_delivery: Preamble: "Preamble" "..."
 735970-736010 usb_power_delivery: Sym: "SYNC-1" "S1"
 736010-736050 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1625,7 +1625,7 @@
 736211-736252 usb_power_delivery: Sym: "0x8" "8"
 736252-736292 usb_power_delivery: Sym: "0x3" "3"
 736131-736292 usb_power_delivery: Head: "H:384f" "HD"
-735457-737618 usb_power_delivery: snk: "SNK[4]:VDM" "VDM"
+735457-737618 usb_power_delivery: snk: "(r2) SNK[4]: VDM" "VDM"
 736292-736332 usb_power_delivery: Sym: "0x6" "6"
 736332-736372 usb_power_delivery: Sym: "0x0" "0"
 736372-736412 usb_power_delivery: Sym: "0x0" "0"
@@ -1635,7 +1635,7 @@
 736533-736573 usb_power_delivery: Sym: "0x5" "5"
 736573-736613 usb_power_delivery: Sym: "0x0" "0"
 736292-736613 usb_power_delivery: Data: "[0]05ac8006" "D0"
-736292-736613 usb_power_delivery: payload: "REQ Attention  SVID:05ac" "REQ Attention  SVID:05ac"
+736292-736613 usb_power_delivery: payload: "[1] REQ Attention  SVID:05ac" "[1] REQ Attention  SVID:05ac"
 736613-736653 usb_power_delivery: Sym: "0x2" "2"
 736653-736694 usb_power_delivery: Sym: "0x0" "0"
 736694-736734 usb_power_delivery: Sym: "0x1" "1"
@@ -1645,7 +1645,7 @@
 736854-736895 usb_power_delivery: Sym: "0x5" "5"
 736895-736935 usb_power_delivery: Sym: "0x0" "0"
 736613-736935 usb_power_delivery: Data: "[1]05ac0102" "D1"
-736613-736935 usb_power_delivery: payload: "VDO:05ac0102" "VDO:05ac0102"
+736613-736935 usb_power_delivery: payload: "[2] VDO:05ac0102" "[2] VDO:05ac0102"
 736935-736975 usb_power_delivery: Sym: "0x4" "4"
 736975-737015 usb_power_delivery: Sym: "0x0" "0"
 737015-737055 usb_power_delivery: Sym: "0x0" "0"
@@ -1655,7 +1655,7 @@
 737176-737216 usb_power_delivery: Sym: "0x0" "0"
 737216-737256 usb_power_delivery: Sym: "0x1" "1"
 736935-737256 usb_power_delivery: Data: "[2]10000004" "D2"
-736935-737256 usb_power_delivery: payload: "VDO:10000004" "VDO:10000004"
+736935-737256 usb_power_delivery: payload: "[3] VDO:10000004" "[3] VDO:10000004"
 737256-737297 usb_power_delivery: Sym: "0x2" "2"
 737297-737337 usb_power_delivery: Sym: "0xF" "F"
 737337-737377 usb_power_delivery: Sym: "0xE" "E"
@@ -1667,7 +1667,7 @@
 737256-737578 usb_power_delivery: CRC: "CRC:2a7aeef2" "CRC"
 737578-737618 usb_power_delivery: Sym: "EOP" "#"
 737578-737618 usb_power_delivery: EOP: "EOP" "E"
-735457-737618 usb_power_delivery: text: "#50   (306.440417ms): SNK[4]:VDM - REQ Attention  SVID:05ac - VDO:05ac0102 - VDO:10000004" "..."
+735457-737618 usb_power_delivery: text: "#50   (306.440417ms): (r2) SNK[4]: VDM - [1] REQ Attention  SVID:05ac - [2] VDO:05ac0102 - [3] VDO:10000004" "..."
 737796-738310 usb_power_delivery: Preamble: "Preamble" "..."
 738310-738351 usb_power_delivery: Sym: "SYNC-1" "S1"
 738351-738391 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1679,7 +1679,7 @@
 738552-738592 usb_power_delivery: Sym: "0x9" "9"
 738592-738632 usb_power_delivery: Sym: "0x0" "0"
 738471-738632 usb_power_delivery: Head: "H:0961" "HD"
-737796-738995 usb_power_delivery: src: "SRC[4]:GOOD CRC" "GOOD CRC"
+737796-738995 usb_power_delivery: src: "(r2) SRC[4]: GOOD CRC" "GOOD CRC"
 738632-738673 usb_power_delivery: Sym: "0xD" "D"
 738673-738713 usb_power_delivery: Sym: "0xB" "B"
 738713-738754 usb_power_delivery: Sym: "0x0" "0"
@@ -1691,7 +1691,7 @@
 738632-738955 usb_power_delivery: CRC: "CRC:44e3f0bd" "CRC"
 738955-738995 usb_power_delivery: Sym: "EOP" "#"
 738955-738995 usb_power_delivery: EOP: "EOP" "E"
-737796-738995 usb_power_delivery: text: "#51   (307.415000ms): SRC[4]:GOOD CRC" "..."
+737796-738995 usb_power_delivery: text: "#51   (307.415000ms): (r2) SRC[4]: GOOD CRC" "..."
 740430-740937 usb_power_delivery: Preamble: "Preamble" "..."
 740937-740978 usb_power_delivery: Sym: "SYNC-1" "S1"
 740978-741018 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1703,7 +1703,7 @@
 741179-741219 usb_power_delivery: Sym: "0x7" "7"
 741219-741260 usb_power_delivery: Sym: "0x2" "2"
 741098-741260 usb_power_delivery: Head: "H:276f" "HD"
-740430-742267 usb_power_delivery: src: "SRC[3]:VDM" "VDM"
+740430-742267 usb_power_delivery: src: "(r2) SRC[3]: VDM" "VDM"
 741260-741300 usb_power_delivery: Sym: "0x2" "2"
 741300-741340 usb_power_delivery: Sym: "0x0" "0"
 741340-741380 usb_power_delivery: Sym: "0x1" "1"
@@ -1713,7 +1713,7 @@
 741501-741542 usb_power_delivery: Sym: "0x5" "5"
 741542-741582 usb_power_delivery: Sym: "0x0" "0"
 741260-741582 usb_power_delivery: Data: "[0]05ac0102" "D0"
-741260-741582 usb_power_delivery: payload: "unstruct [0102] SVID:05ac" "unstruct [0102] SVID:05ac"
+741260-741582 usb_power_delivery: payload: "[1] unstruct [0102] SVID:05ac" "[1] unstruct [0102] SVID:05ac"
 741582-741622 usb_power_delivery: Sym: "0x0" "0"
 741622-741662 usb_power_delivery: Sym: "0x0" "0"
 741662-741703 usb_power_delivery: Sym: "0x2" "2"
@@ -1723,7 +1723,7 @@
 741824-741864 usb_power_delivery: Sym: "0x0" "0"
 741864-741904 usb_power_delivery: Sym: "0x0" "0"
 741582-741904 usb_power_delivery: Data: "[1]00000200" "D1"
-741582-741904 usb_power_delivery: payload: "VDO:00000200" "VDO:00000200"
+741582-741904 usb_power_delivery: payload: "[2] VDO:00000200" "[2] VDO:00000200"
 741904-741944 usb_power_delivery: Sym: "0x3" "3"
 741944-741985 usb_power_delivery: Sym: "0xA" "A"
 741985-742025 usb_power_delivery: Sym: "0xE" "E"
@@ -1735,7 +1735,7 @@
 741904-742227 usb_power_delivery: CRC: "CRC:641e5ea3" "CRC"
 742227-742267 usb_power_delivery: Sym: "EOP" "#"
 742227-742267 usb_power_delivery: EOP: "EOP" "E"
-740430-742267 usb_power_delivery: text: "#52   (308.512500ms): SRC[3]:VDM - unstruct [0102] SVID:05ac - VDO:00000200" "..."
+740430-742267 usb_power_delivery: text: "#52   (308.512500ms): (r2) SRC[3]: VDM - [1] unstruct [0102] SVID:05ac - [2] VDO:00000200" "..."
 742495-743008 usb_power_delivery: Preamble: "Preamble" "..."
 743008-743048 usb_power_delivery: Sym: "SYNC-1" "S1"
 743048-743088 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1747,7 +1747,7 @@
 743249-743289 usb_power_delivery: Sym: "0x6" "6"
 743289-743329 usb_power_delivery: Sym: "0x0" "0"
 743168-743329 usb_power_delivery: Head: "H:0641" "HD"
-742495-743691 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+742495-743691 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 743329-743370 usb_power_delivery: Sym: "0xE" "E"
 743370-743410 usb_power_delivery: Sym: "0x8" "8"
 743410-743450 usb_power_delivery: Sym: "0x9" "9"
@@ -1759,7 +1759,7 @@
 743329-743651 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 743651-743691 usb_power_delivery: Sym: "EOP" "#"
 743651-743691 usb_power_delivery: EOP: "EOP" "E"
-742495-743691 usb_power_delivery: text: "#53   (309.372917ms): SNK[3]:GOOD CRC" "..."
+742495-743691 usb_power_delivery: text: "#53   (309.372917ms): (r2) SNK[3]: GOOD CRC" "..."
 745812-746325 usb_power_delivery: Preamble: "Preamble" "..."
 746325-746365 usb_power_delivery: Sym: "SYNC-1" "S1"
 746365-746405 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1771,7 +1771,7 @@
 746566-746606 usb_power_delivery: Sym: "0xA" "A"
 746606-746646 usb_power_delivery: Sym: "0x1" "1"
 746486-746646 usb_power_delivery: Head: "H:1a4f" "HD"
-745812-747338 usb_power_delivery: snk: "SNK[5]:VDM" "VDM"
+745812-747338 usb_power_delivery: snk: "(r2) SNK[5]: VDM" "VDM"
 746646-746687 usb_power_delivery: Sym: "0x2" "2"
 746687-746727 usb_power_delivery: Sym: "0x1" "1"
 746727-746767 usb_power_delivery: Sym: "0x0" "0"
@@ -1781,7 +1781,7 @@
 746888-746928 usb_power_delivery: Sym: "0x5" "5"
 746928-746968 usb_power_delivery: Sym: "0x0" "0"
 746646-746968 usb_power_delivery: Data: "[0]05ac0012" "D0"
-746646-746968 usb_power_delivery: payload: "unstruct [0012] SVID:05ac" "unstruct [0012] SVID:05ac"
+746646-746968 usb_power_delivery: payload: "[1] unstruct [0012] SVID:05ac" "[1] unstruct [0012] SVID:05ac"
 746968-747008 usb_power_delivery: Sym: "0x7" "7"
 747008-747048 usb_power_delivery: Sym: "0x4" "4"
 747048-747088 usb_power_delivery: Sym: "0xE" "E"
@@ -1793,7 +1793,7 @@
 746968-747290 usb_power_delivery: CRC: "CRC:ed540e47" "CRC"
 747290-747330 usb_power_delivery: Sym: "EOP" "#"
 747290-747330 usb_power_delivery: EOP: "EOP" "E"
-745812-747330 usb_power_delivery: text: "#54   (310.755000ms): SNK[5]:VDM - unstruct [0012] SVID:05ac" "..."
+745812-747330 usb_power_delivery: text: "#54   (310.755000ms): (r2) SNK[5]: VDM - [1] unstruct [0012] SVID:05ac" "..."
 747498-748014 usb_power_delivery: Preamble: "Preamble" "..."
 748014-748055 usb_power_delivery: Sym: "SYNC-1" "S1"
 748055-748095 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1805,7 +1805,7 @@
 748256-748296 usb_power_delivery: Sym: "0xB" "B"
 748296-748336 usb_power_delivery: Sym: "0x0" "0"
 748175-748336 usb_power_delivery: Head: "H:0b61" "HD"
-747498-748699 usb_power_delivery: src: "SRC[5]:GOOD CRC" "GOOD CRC"
+747498-748699 usb_power_delivery: src: "(r2) SRC[5]: GOOD CRC" "GOOD CRC"
 748336-748377 usb_power_delivery: Sym: "0x1" "1"
 748377-748417 usb_power_delivery: Sym: "0x9" "9"
 748417-748458 usb_power_delivery: Sym: "0x1" "1"
@@ -1817,7 +1817,7 @@
 748336-748659 usb_power_delivery: CRC: "CRC:aaed9191" "CRC"
 748659-748699 usb_power_delivery: Sym: "EOP" "#"
 748659-748699 usb_power_delivery: EOP: "EOP" "E"
-747498-748699 usb_power_delivery: text: "#55   (311.457500ms): SRC[5]:GOOD CRC" "..."
+747498-748699 usb_power_delivery: text: "#55   (311.457500ms): (r2) SRC[5]: GOOD CRC" "..."
 749280-749793 usb_power_delivery: Preamble: "Preamble" "..."
 749793-749833 usb_power_delivery: Sym: "SYNC-1" "S1"
 749833-749873 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1829,7 +1829,7 @@
 750034-750074 usb_power_delivery: Sym: "0xC" "C"
 750074-750114 usb_power_delivery: Sym: "0x2" "2"
 749953-750114 usb_power_delivery: Head: "H:2c4f" "HD"
-749280-751119 usb_power_delivery: snk: "SNK[6]:VDM" "VDM"
+749280-751119 usb_power_delivery: snk: "(r2) SNK[6]: VDM" "VDM"
 750114-750154 usb_power_delivery: Sym: "0x6" "6"
 750154-750195 usb_power_delivery: Sym: "0x0" "0"
 750195-750235 usb_power_delivery: Sym: "0x0" "0"
@@ -1839,7 +1839,7 @@
 750355-750396 usb_power_delivery: Sym: "0x5" "5"
 750396-750436 usb_power_delivery: Sym: "0x0" "0"
 750114-750436 usb_power_delivery: Data: "[0]05ac8006" "D0"
-750114-750436 usb_power_delivery: payload: "REQ Attention  SVID:05ac" "REQ Attention  SVID:05ac"
+750114-750436 usb_power_delivery: payload: "[1] REQ Attention  SVID:05ac" "[1] REQ Attention  SVID:05ac"
 750436-750476 usb_power_delivery: Sym: "0x5" "5"
 750476-750516 usb_power_delivery: Sym: "0x0" "0"
 750516-750556 usb_power_delivery: Sym: "0x0" "0"
@@ -1849,7 +1849,7 @@
 750677-750717 usb_power_delivery: Sym: "0x5" "5"
 750717-750757 usb_power_delivery: Sym: "0x0" "0"
 750436-750757 usb_power_delivery: Data: "[1]05ac0005" "D1"
-750436-750757 usb_power_delivery: payload: "VDO:05ac0005" "VDO:05ac0005"
+750436-750757 usb_power_delivery: payload: "[2] VDO:05ac0005" "[2] VDO:05ac0005"
 750757-750797 usb_power_delivery: Sym: "0x4" "4"
 750797-750838 usb_power_delivery: Sym: "0x2" "2"
 750838-750878 usb_power_delivery: Sym: "0xF" "F"
@@ -1861,7 +1861,7 @@
 750757-751079 usb_power_delivery: CRC: "CRC:45bf0f24" "CRC"
 751079-751119 usb_power_delivery: Sym: "EOP" "#"
 751079-751119 usb_power_delivery: EOP: "EOP" "E"
-749280-751119 usb_power_delivery: text: "#56   (312.200000ms): SNK[6]:VDM - REQ Attention  SVID:05ac - VDO:05ac0005" "..."
+749280-751119 usb_power_delivery: text: "#56   (312.200000ms): (r2) SNK[6]: VDM - [1] REQ Attention  SVID:05ac - [2] VDO:05ac0005" "..."
 751298-751812 usb_power_delivery: Preamble: "Preamble" "..."
 751812-751852 usb_power_delivery: Sym: "SYNC-1" "S1"
 751852-751892 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1873,7 +1873,7 @@
 752054-752094 usb_power_delivery: Sym: "0xD" "D"
 752094-752134 usb_power_delivery: Sym: "0x0" "0"
 751973-752134 usb_power_delivery: Head: "H:0d61" "HD"
-751298-752505 usb_power_delivery: src: "SRC[6]:GOOD CRC" "GOOD CRC"
+751298-752505 usb_power_delivery: src: "(r2) SRC[6]: GOOD CRC" "GOOD CRC"
 752134-752174 usb_power_delivery: Sym: "0x4" "4"
 752174-752215 usb_power_delivery: Sym: "0xA" "A"
 752215-752255 usb_power_delivery: Sym: "0x4" "4"
@@ -1885,7 +1885,7 @@
 752134-752457 usb_power_delivery: CRC: "CRC:438e34a4" "CRC"
 752457-752497 usb_power_delivery: Sym: "EOP" "#"
 752457-752497 usb_power_delivery: EOP: "EOP" "E"
-751298-752497 usb_power_delivery: text: "#57   (313.040833ms): SRC[6]:GOOD CRC" "..."
+751298-752497 usb_power_delivery: text: "#57   (313.040833ms): (r2) SRC[6]: GOOD CRC" "..."
 754016-754523 usb_power_delivery: Preamble: "Preamble" "..."
 754523-754564 usb_power_delivery: Sym: "SYNC-1" "S1"
 754564-754604 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1897,7 +1897,7 @@
 754765-754806 usb_power_delivery: Sym: "0x9" "9"
 754806-754846 usb_power_delivery: Sym: "0x1" "1"
 754684-754846 usb_power_delivery: Head: "H:196f" "HD"
-754016-755530 usb_power_delivery: src: "SRC[4]:VDM" "VDM"
+754016-755530 usb_power_delivery: src: "(r2) SRC[4]: VDM" "VDM"
 754846-754886 usb_power_delivery: Sym: "0x5" "5"
 754886-754926 usb_power_delivery: Sym: "0x0" "0"
 754926-754966 usb_power_delivery: Sym: "0x0" "0"
@@ -1907,7 +1907,7 @@
 755088-755128 usb_power_delivery: Sym: "0x5" "5"
 755128-755168 usb_power_delivery: Sym: "0x0" "0"
 754846-755168 usb_power_delivery: Data: "[0]05ac0005" "D0"
-754846-755168 usb_power_delivery: payload: "unstruct [0005] SVID:05ac" "unstruct [0005] SVID:05ac"
+754846-755168 usb_power_delivery: payload: "[1] unstruct [0005] SVID:05ac" "[1] unstruct [0005] SVID:05ac"
 755168-755208 usb_power_delivery: Sym: "0x7" "7"
 755208-755248 usb_power_delivery: Sym: "0x8" "8"
 755248-755289 usb_power_delivery: Sym: "0xE" "E"
@@ -1919,7 +1919,7 @@
 755168-755490 usb_power_delivery: CRC: "CRC:60961e87" "CRC"
 755490-755530 usb_power_delivery: Sym: "EOP" "#"
 755490-755530 usb_power_delivery: EOP: "EOP" "E"
-754016-755530 usb_power_delivery: text: "#58   (314.173333ms): SRC[4]:VDM - unstruct [0005] SVID:05ac" "..."
+754016-755530 usb_power_delivery: text: "#58   (314.173333ms): (r2) SRC[4]: VDM - [1] unstruct [0005] SVID:05ac" "..."
 755760-756272 usb_power_delivery: Preamble: "Preamble" "..."
 756272-756313 usb_power_delivery: Sym: "SYNC-1" "S1"
 756313-756353 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1931,7 +1931,7 @@
 756514-756554 usb_power_delivery: Sym: "0x8" "8"
 756554-756594 usb_power_delivery: Sym: "0x0" "0"
 756433-756594 usb_power_delivery: Head: "H:0841" "HD"
-755760-756964 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+755760-756964 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 756594-756634 usb_power_delivery: Sym: "0x9" "9"
 756634-756675 usb_power_delivery: Sym: "0x8" "8"
 756675-756715 usb_power_delivery: Sym: "0x4" "4"
@@ -1943,7 +1943,7 @@
 756594-756916 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 756916-756956 usb_power_delivery: Sym: "EOP" "#"
 756916-756956 usb_power_delivery: EOP: "EOP" "E"
-755760-756956 usb_power_delivery: text: "#59   (314.900000ms): SNK[4]:GOOD CRC" "..."
+755760-756956 usb_power_delivery: text: "#59   (314.900000ms): (r2) SNK[4]: GOOD CRC" "..."
 757882-758394 usb_power_delivery: Preamble: "Preamble" "..."
 758394-758435 usb_power_delivery: Sym: "SYNC-1" "S1"
 758435-758475 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1955,7 +1955,7 @@
 758636-758676 usb_power_delivery: Sym: "0xE" "E"
 758676-758716 usb_power_delivery: Sym: "0x1" "1"
 758555-758716 usb_power_delivery: Head: "H:1e4f" "HD"
-757882-759399 usb_power_delivery: snk: "SNK[7]:VDM" "VDM"
+757882-759399 usb_power_delivery: snk: "(r2) SNK[7]: VDM" "VDM"
 758716-758756 usb_power_delivery: Sym: "0x5" "5"
 758756-758796 usb_power_delivery: Sym: "0x1" "1"
 758796-758837 usb_power_delivery: Sym: "0x0" "0"
@@ -1965,7 +1965,7 @@
 758957-758997 usb_power_delivery: Sym: "0x5" "5"
 758997-759038 usb_power_delivery: Sym: "0x0" "0"
 758716-759038 usb_power_delivery: Data: "[0]05ac0015" "D0"
-758716-759038 usb_power_delivery: payload: "unstruct [0015] SVID:05ac" "unstruct [0015] SVID:05ac"
+758716-759038 usb_power_delivery: payload: "[1] unstruct [0015] SVID:05ac" "[1] unstruct [0015] SVID:05ac"
 759038-759078 usb_power_delivery: Sym: "0xE" "E"
 759078-759118 usb_power_delivery: Sym: "0x3" "3"
 759118-759158 usb_power_delivery: Sym: "0x0" "0"
@@ -1977,7 +1977,7 @@
 759038-759359 usb_power_delivery: CRC: "CRC:8503903e" "CRC"
 759359-759399 usb_power_delivery: Sym: "EOP" "#"
 759359-759399 usb_power_delivery: EOP: "EOP" "E"
-757882-759399 usb_power_delivery: text: "#60   (315.784167ms): SNK[7]:VDM - unstruct [0015] SVID:05ac" "..."
+757882-759399 usb_power_delivery: text: "#60   (315.784167ms): (r2) SNK[7]: VDM - [1] unstruct [0015] SVID:05ac" "..."
 759560-760076 usb_power_delivery: Preamble: "Preamble" "..."
 760076-760116 usb_power_delivery: Sym: "SYNC-1" "S1"
 760116-760156 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1989,7 +1989,7 @@
 760317-760358 usb_power_delivery: Sym: "0xF" "F"
 760358-760398 usb_power_delivery: Sym: "0x0" "0"
 760237-760398 usb_power_delivery: Head: "H:0f61" "HD"
-759560-760760 usb_power_delivery: src: "SRC[7]:GOOD CRC" "GOOD CRC"
+759560-760760 usb_power_delivery: src: "(r2) SRC[7]: GOOD CRC" "GOOD CRC"
 760398-760438 usb_power_delivery: Sym: "0x8" "8"
 760438-760479 usb_power_delivery: Sym: "0x8" "8"
 760479-760519 usb_power_delivery: Sym: "0x5" "5"
@@ -2001,4 +2001,4 @@
 760398-760720 usb_power_delivery: CRC: "CRC:ad805588" "CRC"
 760720-760760 usb_power_delivery: Sym: "EOP" "#"
 760720-760760 usb_power_delivery: EOP: "EOP" "E"
-759560-760760 usb_power_delivery: text: "#61   (316.483333ms): SRC[7]:GOOD CRC" "..."
+759560-760760 usb_power_delivery: text: "#61   (316.483333ms): (r2) SRC[7]: GOOD CRC" "..."

diff --git a/decoder/test/usb_power_delivery/pixel2015_hdmi.bin_raw_data b/decoder/test/usb_power_delivery/pixel2015_hdmi.bin_raw_data
index b9a86948163192b869c28e3ffd665d45ce90528e..12f085a15d3d4110ee69a2f5bb6217bf7fb5169e 100644 (file)
--- a/decoder/test/usb_power_delivery/pixel2015_hdmi.bin_raw_data
+++ b/decoder/test/usb_power_delivery/pixel2015_hdmi.bin_raw_data
@@ -51,3 +51,4 @@
 4767429-4763951 usb_power_delivery: 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 01 01 00 00 00 01 01 00 00 00 01 01 01 00 00 00 01 01 00 01 01 01 00 01 00 01 00 00 01 00 01 00 01 01 01 01 00 00 01 00 01 01 00 00 01 00 01 00 01 01 01 01 00 01 01 01 01 01 00 00 01 00 01 01 00 01 01 00 01 00 00 01 01 00 00 01 00 01 00 01 00 01 00 01 00 01 00 01 01 01 00 01 01 00 00 01 00 00 00 01 01 01 00 01 00 01 00 00 01 01 01 01 00 00 01 00 01 00 01 00 00 01 00 00 01 01 01 00 01 00 00 01 01 00 01 00 01 01 01 00 01 01 01 01 00 01 01 01 01 00 00 01 00 00 01 00 01 00 00 01 00 01 00 01 00 01 00 01 01 00 01 01 01 01 01 00 01 01 01 00 01 01 00 01 01 01 00 00 01 00 01 01 01 00 01 01 01 01 00 01 00 01 01 00 00 01 00 00 00 01 00 01 01 00 01 01 01 00 00 01 00 01 01 01 01 00 01 00 01 01 01 00 00 01 00 01 00 00 01 01 01 00 00 01 01 00 01 00 01 00 01 00 01 00 01 01 01 00 01 00 00 01 01 01 00 00 01 00 01 00 00 01 00 01 01 01 01 01 01 00 00 01 01 01 00 01 00 01 01 00 01 00 00 01 01 01 01 00 01 00 01 00 00 01 01 01 01 00 01 00 00 01 00 01 01 01 01 01 01 00 01 01 00 01 00 01 01 00 01 00 01 00 01 01 01 01 00 01 01 00 00 01 01 00 01 01 01 00 01 00 01 01 00 01 00 00 01 01 00 01 01 00 00
 4768831-4767610 usb_power_delivery: 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 01 01 00 00 00 01 01 00 00 00 01 01 01 00 00 00 01 01 00 00 01 00 00 01 01 01 00 01 01 00 01 00 00 01 01 01 01 00 01 01 01 00 01 01 00 00 01 00 01 00 01 01 01 01 01 00 01 01 01 00 01 00 01 01 00 01 00 01 01 00 01 01 00 01 00 01 00 01 00 01 01 00 00
 4807967-4806118 usb_power_delivery: 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 01 01 00 00 00 01 01 00 00 00 01 01 01 00 00 00 01 01 00 01 01 01 00 01 00 01 00 00 01 01 01 00 00 00 01 00 01 00 01 01 01 00 00 01 01 01 01 01 00 00 01 00 00 01 00 00 01 01 00 00 01 00 00 01 01 01 01 01 00 01 01 01 01 00 01 01 01 00 01 01 00 01 00 01 00 00 01 01 00 00 01 00 00 01 01 01 01 00 01 01 01 01 00 01 01 01 01 00 01 01 01 01 00 01 01 01 01 00 00 01 00 01 01 00 01 01 01 01 00 01 01 01 00 01 01 01 01 00 01 01 01 01 00 01 00 01 01 01 01 01 01 00 01 00 00 01 00 01 00 01 01 00
+4809376-4808154 usb_power_delivery: 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 01 01 00 00 00 01 01 00 00 00 01 01 01 00 00 00 01 01 00 00 01 00 00 01 01 01 00 01 01 01 01 00 00 01 01 01 01 00 01 01 00 01 01 01 01 00 01 01 01 00 01 01 01 01 00 01 01 01 01 01 00 01 01 01 00 01 00 01 00 01 00 01 00 01 01 00 01 01 00 01 01 00 00

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

diff --git a/decoder/test/usb_power_delivery/pixel2015_supply.output b/decoder/test/usb_power_delivery/pixel2015_supply.output
index fe2abab689e179b2cce03147719bdce1a941b144..9c28bde4dd0b6798084b7301b205f99cb0886818 100644 (file)
--- a/decoder/test/usb_power_delivery/pixel2015_supply.output
+++ b/decoder/test/usb_power_delivery/pixel2015_supply.output
@@ -9,7 +9,7 @@
 4302743-4302784 usb_power_delivery: Sym: "0x1" "1"
 4302784-4302825 usb_power_delivery: Sym: "0x3" "3"
 4302662-4302825 usb_power_delivery: Head: "H:3161" "HD"
-4301977-4304177 usb_power_delivery: src: "SRC[0]:SOURCE CAP" "SOURCE CAP"
+4301977-4304177 usb_power_delivery: src: "(r2) SRC[0]: SOURCE CAP" "SOURCE CAP"
 4302825-4302865 usb_power_delivery: Sym: "0xC" "C"
 4302865-4302906 usb_power_delivery: Sym: "0x2" "2"
 4302906-4302947 usb_power_delivery: Sym: "0x1" "1"
@@ -19,7 +19,7 @@
 4303069-4303110 usb_power_delivery: Sym: "0xA" "A"
 4303110-4303151 usb_power_delivery: Sym: "0x0" "0"
 4302825-4303151 usb_power_delivery: Data: "[0]0a01912c" "D0"
-4302825-4303151 usb_power_delivery: payload: "5.0V 3.0A ext dual_role_data" "5.0V 3.0A ext dual_role_data"
+4302825-4303151 usb_power_delivery: payload: "[1] [Fixed] 5V 3A (15W) [unconstrained] [dual_role_data]" "[1] [Fixed] 5V 3A (15W) [unconstrained] [dual_role_data]"
 4303151-4303191 usb_power_delivery: Sym: "0xC" "C"
 4303191-4303232 usb_power_delivery: Sym: "0x2" "2"
 4303232-4303273 usb_power_delivery: Sym: "0x1" "1"
@@ -29,7 +29,7 @@
 4303395-4303436 usb_power_delivery: Sym: "0xA" "A"
 4303436-4303476 usb_power_delivery: Sym: "0x0" "0"
 4303151-4303476 usb_power_delivery: Data: "[1]0a03c12c" "D1"
-4303151-4303476 usb_power_delivery: payload: "12.0V 3.0A ext dual_role_data" "12.0V 3.0A ext dual_role_data"
+4303151-4303476 usb_power_delivery: payload: "[2] [Fixed] 12V 3A (36W) [unconstrained] [dual_role_data]" "[2] [Fixed] 12V 3A (36W) [unconstrained] [dual_role_data]"
 4303476-4303517 usb_power_delivery: Sym: "0xC" "C"
 4303517-4303558 usb_power_delivery: Sym: "0x2" "2"
 4303558-4303598 usb_power_delivery: Sym: "0x1" "1"
@@ -39,7 +39,7 @@
 4303721-4303761 usb_power_delivery: Sym: "0xA" "A"
 4303761-4303802 usb_power_delivery: Sym: "0x0" "0"
 4303476-4303802 usb_power_delivery: Data: "[2]0a06412c" "D2"
-4303476-4303802 usb_power_delivery: payload: "20.0V 3.0A ext dual_role_data" "20.0V 3.0A ext dual_role_data"
+4303476-4303802 usb_power_delivery: payload: "[3] [Fixed] 20V 3A (60W) [unconstrained] [dual_role_data]" "[3] [Fixed] 20V 3A (60W) [unconstrained] [dual_role_data]"
 4303802-4303843 usb_power_delivery: Sym: "0xF" "F"
 4303843-4303883 usb_power_delivery: Sym: "0xB" "B"
 4303883-4303924 usb_power_delivery: Sym: "0xA" "A"
@@ -51,7 +51,7 @@
 4303802-4304128 usb_power_delivery: CRC: "CRC:406c4abf" "CRC"
 4304128-4304168 usb_power_delivery: Sym: "EOP" "#"
 4304128-4304168 usb_power_delivery: EOP: "EOP" "E"
-4301977-4304168 usb_power_delivery: text: "#1    (1792.490417ms): SRC[0]:SOURCE CAP - 5.0V 3.0A ext dual_role_data - 12.0V 3.0A ext dual_role_data - 20.0V 3.0A ext dual_role_data" "..."
+4301977-4304168 usb_power_delivery: text: "#1    (1792.490417ms): (r2) SRC[0]: SOURCE CAP - [1] [Fixed] 5V 3A (15W) [unconstrained] [dual_role_data] - [2] [Fixed] 12V 3A (36W) [unconstrained] [dual_role_data] - [3] [Fixed] 20V 3A (60W) [unconstrained] [dual_role_data]" "..."
 4304342-4304868 usb_power_delivery: Preamble: "Preamble" "..."
 4304868-4304909 usb_power_delivery: Sym: "SYNC-1" "S1"
 4304909-4304950 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -63,7 +63,7 @@
 4305114-4305155 usb_power_delivery: Sym: "0x0" "0"
 4305155-4305196 usb_power_delivery: Sym: "0x0" "0"
 4305032-4305196 usb_power_delivery: Head: "H:0041" "HD"
-4304342-4305573 usb_power_delivery: snk: "SNK[0]:GOOD CRC" "GOOD CRC"
+4304342-4305573 usb_power_delivery: snk: "(r2) SNK[0]: GOOD CRC" "GOOD CRC"
 4305196-4305237 usb_power_delivery: Sym: "0xB" "B"
 4305237-4305278 usb_power_delivery: Sym: "0xB" "B"
 4305278-4305319 usb_power_delivery: Sym: "0xC" "C"
@@ -75,7 +75,7 @@
 4305196-4305524 usb_power_delivery: CRC: "CRC:a8bb6cbb" "CRC"
 4305524-4305565 usb_power_delivery: Sym: "EOP" "#"
 4305524-4305565 usb_power_delivery: EOP: "EOP" "E"
-4304342-4305565 usb_power_delivery: text: "#2    (1793.475833ms): SNK[0]:GOOD CRC" "..."
+4304342-4305565 usb_power_delivery: text: "#2    (1793.475833ms): (r2) SNK[0]: GOOD CRC" "..."
 4306408-4306934 usb_power_delivery: Preamble: "Preamble" "..."
 4306934-4306975 usb_power_delivery: Sym: "SYNC-1" "S1"
 4306975-4307016 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -87,7 +87,7 @@
 4307180-4307221 usb_power_delivery: Sym: "0x0" "0"
 4307221-4307262 usb_power_delivery: Sym: "0x1" "1"
 4307098-4307262 usb_power_delivery: Head: "H:1042" "HD"
-4306408-4307958 usb_power_delivery: snk: "SNK[0]:REQUEST" "REQUEST"
+4306408-4307958 usb_power_delivery: snk: "(r2) SNK[0]: REQUEST" "REQUEST"
 4307262-4307303 usb_power_delivery: Sym: "0xC" "C"
 4307303-4307343 usb_power_delivery: Sym: "0x2" "2"
 4307343-4307384 usb_power_delivery: Sym: "0x1" "1"
@@ -97,7 +97,7 @@
 4307507-4307548 usb_power_delivery: Sym: "0x0" "0"
 4307548-4307589 usb_power_delivery: Sym: "0x1" "1"
 4307262-4307589 usb_power_delivery: Data: "[0]1004b12c" "D0"
-4307262-4307589 usb_power_delivery: payload: "[1]3000/3000 mA" "[1]3000/3000 mA"
+4307262-4307589 usb_power_delivery: payload: "[1] (PDO #1: Fixed 5V) 3A (operating) / 3A (max)" "[1] (PDO #1: Fixed 5V) 3A (operating) / 3A (max)"
 4307589-4307630 usb_power_delivery: Sym: "0x7" "7"
 4307630-4307671 usb_power_delivery: Sym: "0x8" "8"
 4307671-4307712 usb_power_delivery: Sym: "0xC" "C"
@@ -109,7 +109,7 @@
 4307589-4307917 usb_power_delivery: CRC: "CRC:c411cc87" "CRC"
 4307917-4307958 usb_power_delivery: Sym: "EOP" "#"
 4307917-4307958 usb_power_delivery: EOP: "EOP" "E"
-4306408-4307958 usb_power_delivery: text: "#3    (1794.336667ms): SNK[0]:REQUEST - [1]3000/3000 mA" "..."
+4306408-4307958 usb_power_delivery: text: "#3    (1794.336667ms): (r2) SNK[0]: REQUEST - [1] (PDO #1: Fixed 5V) 3A (operating) / 3A (max)" "..."
 4308101-4308624 usb_power_delivery: Preamble: "Preamble" "..."
 4308624-4308664 usb_power_delivery: Sym: "SYNC-1" "S1"
 4308664-4308705 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -121,7 +121,7 @@
 4308868-4308909 usb_power_delivery: Sym: "0x1" "1"
 4308909-4308949 usb_power_delivery: Sym: "0x0" "0"
 4308786-4308949 usb_power_delivery: Head: "H:0161" "HD"
-4308101-4309324 usb_power_delivery: src: "SRC[0]:GOOD CRC" "GOOD CRC"
+4308101-4309324 usb_power_delivery: src: "(r2) SRC[0]: GOOD CRC" "GOOD CRC"
 4308949-4308990 usb_power_delivery: Sym: "0xF" "F"
 4308990-4309031 usb_power_delivery: Sym: "0x8" "8"
 4309031-4309071 usb_power_delivery: Sym: "0x8" "8"
@@ -133,7 +133,7 @@
 4308949-4309275 usb_power_delivery: CRC: "CRC:4a38788f" "CRC"
 4309275-4309316 usb_power_delivery: Sym: "EOP" "#"
 4309275-4309316 usb_power_delivery: EOP: "EOP" "E"
-4308101-4309316 usb_power_delivery: text: "#4    (1795.042083ms): SRC[0]:GOOD CRC" "..."
+4308101-4309316 usb_power_delivery: text: "#4    (1795.042083ms): (r2) SRC[0]: GOOD CRC" "..."
 4318500-4319022 usb_power_delivery: Preamble: "Preamble" "..."
 4319022-4319063 usb_power_delivery: Sym: "SYNC-1" "S1"
 4319063-4319104 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -145,7 +145,7 @@
 4319267-4319307 usb_power_delivery: Sym: "0x3" "3"
 4319307-4319348 usb_power_delivery: Sym: "0x0" "0"
 4319185-4319348 usb_power_delivery: Head: "H:0363" "HD"
-4318500-4319723 usb_power_delivery: src: "SRC[1]:ACCEPT" "ACCEPT"
+4318500-4319723 usb_power_delivery: src: "(r2) SRC[1]: ACCEPT" "ACCEPT"
 4319348-4319389 usb_power_delivery: Sym: "0x1" "1"
 4319389-4319430 usb_power_delivery: Sym: "0x2" "2"
 4319430-4319470 usb_power_delivery: Sym: "0xB" "B"
@@ -157,7 +157,7 @@
 4319348-4319674 usb_power_delivery: CRC: "CRC:96007b21" "CRC"
 4319674-4319715 usb_power_delivery: Sym: "EOP" "#"
 4319674-4319715 usb_power_delivery: EOP: "EOP" "E"
-4318500-4319715 usb_power_delivery: text: "#5    (1799.375000ms): SRC[1]:ACCEPT" "..."
+4318500-4319715 usb_power_delivery: text: "#5    (1799.375000ms): (r2) SRC[1]: ACCEPT" "..."
 4319893-4320418 usb_power_delivery: Preamble: "Preamble" "..."
 4320418-4320459 usb_power_delivery: Sym: "SYNC-1" "S1"
 4320459-4320500 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -169,7 +169,7 @@
 4320664-4320705 usb_power_delivery: Sym: "0x2" "2"
 4320705-4320746 usb_power_delivery: Sym: "0x0" "0"
 4320582-4320746 usb_power_delivery: Head: "H:0241" "HD"
-4319893-4321123 usb_power_delivery: snk: "SNK[1]:GOOD CRC" "GOOD CRC"
+4319893-4321123 usb_power_delivery: snk: "(r2) SNK[1]: GOOD CRC" "GOOD CRC"
 4320746-4320787 usb_power_delivery: Sym: "0x7" "7"
 4320787-4320828 usb_power_delivery: Sym: "0x9" "9"
 4320828-4320869 usb_power_delivery: Sym: "0xD" "D"
@@ -181,7 +181,7 @@
 4320746-4321074 usb_power_delivery: CRC: "CRC:46b50d97" "CRC"
 4321074-4321115 usb_power_delivery: Sym: "EOP" "#"
 4321074-4321115 usb_power_delivery: EOP: "EOP" "E"
-4319893-4321115 usb_power_delivery: text: "#6    (1799.955417ms): SNK[1]:GOOD CRC" "..."
+4319893-4321115 usb_power_delivery: text: "#6    (1799.955417ms): (r2) SNK[1]: GOOD CRC" "..."
 4575113-4575635 usb_power_delivery: Preamble: "Preamble" "..."
 4575635-4575676 usb_power_delivery: Sym: "SYNC-1" "S1"
 4575676-4575716 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -193,7 +193,7 @@
 4575879-4575920 usb_power_delivery: Sym: "0x5" "5"
 4575920-4575961 usb_power_delivery: Sym: "0x0" "0"
 4575798-4575961 usb_power_delivery: Head: "H:0566" "HD"
-4575113-4576335 usb_power_delivery: src: "SRC[2]:PS RDY" "PS RDY"
+4575113-4576335 usb_power_delivery: src: "(r2) SRC[2]: PS RDY" "PS RDY"
 4575961-4576001 usb_power_delivery: Sym: "0x1" "1"
 4576001-4576042 usb_power_delivery: Sym: "0x5" "5"
 4576042-4576083 usb_power_delivery: Sym: "0xA" "A"
@@ -205,7 +205,7 @@
 4575961-4576286 usb_power_delivery: CRC: "CRC:02142a51" "CRC"
 4576286-4576327 usb_power_delivery: Sym: "EOP" "#"
 4576286-4576327 usb_power_delivery: EOP: "EOP" "E"
-4575113-4576327 usb_power_delivery: text: "#7    (1906.297083ms): SRC[2]:PS RDY" "..."
+4575113-4576327 usb_power_delivery: text: "#7    (1906.297083ms): (r2) SRC[2]: PS RDY" "..."
 4576503-4577028 usb_power_delivery: Preamble: "Preamble" "..."
 4577028-4577069 usb_power_delivery: Sym: "SYNC-1" "S1"
 4577069-4577110 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -217,7 +217,7 @@
 4577274-4577315 usb_power_delivery: Sym: "0x4" "4"
 4577315-4577356 usb_power_delivery: Sym: "0x0" "0"
 4577192-4577356 usb_power_delivery: Head: "H:0441" "HD"
-4576503-4577724 usb_power_delivery: snk: "SNK[2]:GOOD CRC" "GOOD CRC"
+4576503-4577724 usb_power_delivery: snk: "(r2) SNK[2]: GOOD CRC" "GOOD CRC"
 4577356-4577397 usb_power_delivery: Sym: "0x2" "2"
 4577397-4577438 usb_power_delivery: Sym: "0xA" "A"
 4577438-4577479 usb_power_delivery: Sym: "0x8" "8"
@@ -229,7 +229,7 @@
 4577356-4577683 usb_power_delivery: CRC: "CRC:afd6a8a2" "CRC"
 4577683-4577724 usb_power_delivery: Sym: "EOP" "#"
 4577683-4577724 usb_power_delivery: EOP: "EOP" "E"
-4576503-4577724 usb_power_delivery: text: "#8    (1906.876250ms): SNK[2]:GOOD CRC" "..."
+4576503-4577724 usb_power_delivery: text: "#8    (1906.876250ms): (r2) SNK[2]: GOOD CRC" "..."
 4602168-4602690 usb_power_delivery: Preamble: "Preamble" "..."
 4602690-4602731 usb_power_delivery: Sym: "SYNC-1" "S1"
 4602731-4602772 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -241,7 +241,7 @@
 4602935-4602975 usb_power_delivery: Sym: "0x7" "7"
 4602975-4603016 usb_power_delivery: Sym: "0x0" "0"
 4602853-4603016 usb_power_delivery: Head: "H:0768" "HD"
-4602168-4603382 usb_power_delivery: src: "SRC[3]:GET SINK CAP" "GET SINK CAP"
+4602168-4603382 usb_power_delivery: src: "(r2) SRC[3]: GET SINK CAP" "GET SINK CAP"
 4603016-4603057 usb_power_delivery: Sym: "0x3" "3"
 4603057-4603097 usb_power_delivery: Sym: "0xF" "F"
 4603097-4603138 usb_power_delivery: Sym: "0x6" "6"
@@ -253,7 +253,7 @@
 4603016-4603341 usb_power_delivery: CRC: "CRC:729966f3" "CRC"
 4603341-4603382 usb_power_delivery: Sym: "EOP" "#"
 4603341-4603382 usb_power_delivery: EOP: "EOP" "E"
-4602168-4603382 usb_power_delivery: text: "#9    (1917.570000ms): SRC[3]:GET SINK CAP" "..."
+4602168-4603382 usb_power_delivery: text: "#9    (1917.570000ms): (r2) SRC[3]: GET SINK CAP" "..."
 4603559-4604085 usb_power_delivery: Preamble: "Preamble" "..."
 4604085-4604126 usb_power_delivery: Sym: "SYNC-1" "S1"
 4604126-4604167 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -265,7 +265,7 @@
 4604330-4604371 usb_power_delivery: Sym: "0x6" "6"
 4604371-4604412 usb_power_delivery: Sym: "0x0" "0"
 4604249-4604412 usb_power_delivery: Head: "H:0641" "HD"
-4603559-4604781 usb_power_delivery: snk: "SNK[3]:GOOD CRC" "GOOD CRC"
+4603559-4604781 usb_power_delivery: snk: "(r2) SNK[3]: GOOD CRC" "GOOD CRC"
 4604412-4604453 usb_power_delivery: Sym: "0xE" "E"
 4604453-4604494 usb_power_delivery: Sym: "0x8" "8"
 4604494-4604535 usb_power_delivery: Sym: "0x9" "9"
@@ -277,7 +277,7 @@
 4604412-4604740 usb_power_delivery: CRC: "CRC:41d8c98e" "CRC"
 4604740-4604781 usb_power_delivery: Sym: "EOP" "#"
 4604740-4604781 usb_power_delivery: EOP: "EOP" "E"
-4603559-4604781 usb_power_delivery: text: "#10   (1918.149583ms): SNK[3]:GOOD CRC" "..."
+4603559-4604781 usb_power_delivery: text: "#10   (1918.149583ms): (r2) SNK[3]: GOOD CRC" "..."
 4605144-4605669 usb_power_delivery: Preamble: "Preamble" "..."
 4605669-4605710 usb_power_delivery: Sym: "SYNC-1" "S1"
 4605710-4605751 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -289,7 +289,7 @@
 4605915-4605956 usb_power_delivery: Sym: "0x2" "2"
 4605956-4605997 usb_power_delivery: Sym: "0x3" "3"
 4605833-4605997 usb_power_delivery: Head: "H:3244" "HD"
-4605144-4607349 usb_power_delivery: snk: "SNK[1]:SINK CAP" "SINK CAP"
+4605144-4607349 usb_power_delivery: snk: "(r2) SNK[1]: SINK CAP" "SINK CAP"
 4605997-4606038 usb_power_delivery: Sym: "0x2" "2"
 4606038-4606079 usb_power_delivery: Sym: "0x3" "3"
 4606079-4606120 usb_power_delivery: Sym: "0x0" "0"
@@ -299,7 +299,7 @@
 4606243-4606284 usb_power_delivery: Sym: "0x2" "2"
 4606284-4606325 usb_power_delivery: Sym: "0x2" "2"
 4605997-4606325 usb_power_delivery: Data: "[0]22019032" "D0"
-4605997-4606325 usb_power_delivery: payload: "5.0V 0.5A dual_role_power dual_role_data" "5.0V 0.5A dual_role_power dual_role_data"
+4605997-4606325 usb_power_delivery: payload: "[1] [Fixed] 5V 0.5A (2.5W) [dual_role_power] [dual_role_data]" "[1] [Fixed] 5V 0.5A (2.5W) [dual_role_power] [dual_role_data]"
 4606325-4606366 usb_power_delivery: Sym: "0xC" "C"
 4606366-4606407 usb_power_delivery: Sym: "0x3" "3"
 4606407-4606448 usb_power_delivery: Sym: "0xC" "C"
@@ -309,7 +309,7 @@
 4606571-4606612 usb_power_delivery: Sym: "0xA" "A"
 4606612-4606653 usb_power_delivery: Sym: "0x5" "5"
 4606325-4606653 usb_power_delivery: Data: "[1]5a417c3c" "D1"
-4606325-4606653 usb_power_delivery: payload: "BATT:4.8/21.0V 15.0W suspend ext dual_role_data" "BATT:4.8/21.0V 15.0W suspend ext dual_role_data"
+4606325-4606653 usb_power_delivery: payload: "[2] [Battery] 4.75/21V 15W" "[2] [Battery] 4.75/21V 15W"
 4606653-4606694 usb_power_delivery: Sym: "0xC" "C"
 4606694-4606735 usb_power_delivery: Sym: "0x2" "2"
 4606735-4606776 usb_power_delivery: Sym: "0xD" "D"
@@ -319,7 +319,7 @@
 4606898-4606939 usb_power_delivery: Sym: "0xA" "A"
 4606939-4606980 usb_power_delivery: Sym: "0x9" "9"
 4606653-4606980 usb_power_delivery: Data: "[2]9a417d2c" "D2"
-4606653-4606980 usb_power_delivery: payload: "VAR:4.8/21.0V 3.0A suspend ext dual_role_data" "VAR:4.8/21.0V 3.0A suspend ext dual_role_data"
+4606653-4606980 usb_power_delivery: payload: "[3] [Variable] 4.75/21V 3A" "[3] [Variable] 4.75/21V 3A"
 4606980-4607021 usb_power_delivery: Sym: "0x8" "8"
 4607021-4607062 usb_power_delivery: Sym: "0xC" "C"
 4607062-4607103 usb_power_delivery: Sym: "0xC" "C"
@@ -331,7 +331,7 @@
 4606980-4607308 usb_power_delivery: CRC: "CRC:8c33dcc8" "CRC"
 4607308-4607349 usb_power_delivery: Sym: "EOP" "#"
 4607308-4607349 usb_power_delivery: EOP: "EOP" "E"
-4605144-4607349 usb_power_delivery: text: "#11   (1918.810000ms): SNK[1]:SINK CAP - 5.0V 0.5A dual_role_power dual_role_data - BATT:4.8/21.0V 15.0W suspend ext dual_role_data - VAR:4.8/21.0V 3.0A suspend ext dual_role_data" "..."
+4605144-4607349 usb_power_delivery: text: "#11   (1918.810000ms): (r2) SNK[1]: SINK CAP - [1] [Fixed] 5V 0.5A (2.5W) [dual_role_power] [dual_role_data] - [2] [Battery] 4.75/21V 15W - [3] [Variable] 4.75/21V 3A" "..."
 4607496-4608018 usb_power_delivery: Preamble: "Preamble" "..."
 4608018-4608060 usb_power_delivery: Sym: "SYNC-1" "S1"
 4608060-4608100 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -343,7 +343,7 @@
 4608263-4608304 usb_power_delivery: Sym: "0x3" "3"
 4608304-4608344 usb_power_delivery: Sym: "0x0" "0"
 4608181-4608344 usb_power_delivery: Head: "H:0361" "HD"
-4607496-4608710 usb_power_delivery: src: "SRC[1]:GOOD CRC" "GOOD CRC"
+4607496-4608710 usb_power_delivery: src: "(r2) SRC[1]: GOOD CRC" "GOOD CRC"
 4608344-4608385 usb_power_delivery: Sym: "0x3" "3"
 4608385-4608425 usb_power_delivery: Sym: "0xA" "A"
 4608425-4608466 usb_power_delivery: Sym: "0x9" "9"
@@ -355,7 +355,7 @@
 4608344-4608670 usb_power_delivery: CRC: "CRC:a43619a3" "CRC"
 4608670-4608710 usb_power_delivery: Sym: "EOP" "#"
 4608670-4608710 usb_power_delivery: EOP: "EOP" "E"
-4607496-4608710 usb_power_delivery: text: "#12   (1919.790000ms): SRC[1]:GOOD CRC" "..."
+4607496-4608710 usb_power_delivery: text: "#12   (1919.790000ms): (r2) SRC[1]: GOOD CRC" "..."
 4755090-4755615 usb_power_delivery: Preamble: "Preamble" "..."
 4755615-4755656 usb_power_delivery: Sym: "SYNC-1" "S1"
 4755656-4755697 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -367,7 +367,7 @@
 4755861-4755902 usb_power_delivery: Sym: "0x4" "4"
 4755902-4755943 usb_power_delivery: Sym: "0x0" "0"
 4755779-4755943 usb_power_delivery: Head: "H:0449" "HD"
-4755090-4756312 usb_power_delivery: snk: "SNK[2]:DR SWAP" "DR SWAP"
+4755090-4756312 usb_power_delivery: snk: "(r2) SNK[2]: DR SWAP" "DR SWAP"
 4755943-4755984 usb_power_delivery: Sym: "0xA" "A"
 4755984-4756025 usb_power_delivery: Sym: "0xA" "A"
 4756025-4756066 usb_power_delivery: Sym: "0x2" "2"
@@ -379,7 +379,7 @@
 4755943-4756271 usb_power_delivery: CRC: "CRC:670f22aa" "CRC"
 4756271-4756312 usb_power_delivery: Sym: "EOP" "#"
 4756271-4756312 usb_power_delivery: EOP: "EOP" "E"
-4755090-4756312 usb_power_delivery: text: "#13   (1981.287500ms): SNK[2]:DR SWAP" "..."
+4755090-4756312 usb_power_delivery: text: "#13   (1981.287500ms): (r2) SNK[2]: DR SWAP" "..."
 4756456-4756978 usb_power_delivery: Preamble: "Preamble" "..."
 4756978-4757020 usb_power_delivery: Sym: "SYNC-1" "S1"
 4757020-4757060 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -391,7 +391,7 @@
 4757223-4757264 usb_power_delivery: Sym: "0x5" "5"
 4757264-4757304 usb_power_delivery: Sym: "0x0" "0"
 4757141-4757304 usb_power_delivery: Head: "H:0561" "HD"
-4756456-4757678 usb_power_delivery: src: "SRC[2]:GOOD CRC" "GOOD CRC"
+4756456-4757678 usb_power_delivery: src: "(r2) SRC[2]: GOOD CRC" "GOOD CRC"
 4757304-4757345 usb_power_delivery: Sym: "0x6" "6"
 4757345-4757385 usb_power_delivery: Sym: "0x9" "9"
 4757385-4757426 usb_power_delivery: Sym: "0xC" "C"
@@ -403,7 +403,7 @@
 4757304-4757630 usb_power_delivery: CRC: "CRC:4d55bc96" "CRC"
 4757630-4757671 usb_power_delivery: Sym: "EOP" "#"
 4757630-4757671 usb_power_delivery: EOP: "EOP" "E"
-4756456-4757671 usb_power_delivery: text: "#14   (1981.856667ms): SRC[2]:GOOD CRC" "..."
+4756456-4757671 usb_power_delivery: text: "#14   (1981.856667ms): (r2) SRC[2]: GOOD CRC" "..."
 4757832-4758355 usb_power_delivery: Preamble: "Preamble" "..."
 4758355-4758396 usb_power_delivery: Sym: "SYNC-1" "S1"
 4758396-4758436 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -415,7 +415,7 @@
 4758599-4758640 usb_power_delivery: Sym: "0x9" "9"
 4758640-4758681 usb_power_delivery: Sym: "0x0" "0"
 4758517-4758681 usb_power_delivery: Head: "H:0963" "HD"
-4757832-4759055 usb_power_delivery: src: "SRC[4]:ACCEPT" "ACCEPT"
+4757832-4759055 usb_power_delivery: src: "(r2) SRC[4]: ACCEPT" "ACCEPT"
 4758681-4758721 usb_power_delivery: Sym: "0xF" "F"
 4758721-4758762 usb_power_delivery: Sym: "0x3" "3"
 4758762-4758803 usb_power_delivery: Sym: "0x2" "2"
@@ -427,7 +427,7 @@
 4758681-4759007 usb_power_delivery: CRC: "CRC:76d5923f" "CRC"
 4759007-4759047 usb_power_delivery: Sym: "EOP" "#"
 4759007-4759047 usb_power_delivery: EOP: "EOP" "E"
-4757832-4759047 usb_power_delivery: text: "#15   (1982.430000ms): SRC[4]:ACCEPT" "..."
+4757832-4759047 usb_power_delivery: text: "#15   (1982.430000ms): (r2) SRC[4]: ACCEPT" "..."
 4759225-4759750 usb_power_delivery: Preamble: "Preamble" "..."
 4759750-4759791 usb_power_delivery: Sym: "SYNC-1" "S1"
 4759791-4759832 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -439,7 +439,7 @@
 4759996-4760037 usb_power_delivery: Sym: "0x8" "8"
 4760037-4760078 usb_power_delivery: Sym: "0x0" "0"
 4759914-4760078 usb_power_delivery: Head: "H:0841" "HD"
-4759225-4760455 usb_power_delivery: snk: "SNK[4]:GOOD CRC" "GOOD CRC"
+4759225-4760455 usb_power_delivery: snk: "(r2) SNK[4]: GOOD CRC" "GOOD CRC"
 4760078-4760119 usb_power_delivery: Sym: "0x9" "9"
 4760119-4760160 usb_power_delivery: Sym: "0x8" "8"
 4760160-4760201 usb_power_delivery: Sym: "0x4" "4"
@@ -451,7 +451,7 @@
 4760078-4760406 usb_power_delivery: CRC: "CRC:a660e489" "CRC"
 4760406-4760447 usb_power_delivery: Sym: "EOP" "#"
 4760406-4760447 usb_power_delivery: EOP: "EOP" "E"
-4759225-4760447 usb_power_delivery: text: "#16   (1983.010417ms): SNK[4]:GOOD CRC" "..."
+4759225-4760447 usb_power_delivery: text: "#16   (1983.010417ms): (r2) SNK[4]: GOOD CRC" "..."
 4811849-4812375 usb_power_delivery: Preamble: "Preamble" "..."
 4812375-4812416 usb_power_delivery: Sym: "SYNC-1" "S1"
 4812416-4812457 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -463,7 +463,7 @@
 4812621-4812662 usb_power_delivery: Sym: "0x6" "6"
 4812662-4812703 usb_power_delivery: Sym: "0x1" "1"
 4812539-4812703 usb_power_delivery: Head: "H:166f" "HD"
-4811849-4813399 usb_power_delivery: snk: "SNK/DFP[3]:VDM" "VDM"
+4811849-4813399 usb_power_delivery: snk: "(r2) SNK/DFP[3]: VDM" "VDM"
 4812703-4812744 usb_power_delivery: Sym: "0x1" "1"
 4812744-4812785 usb_power_delivery: Sym: "0x0" "0"
 4812785-4812826 usb_power_delivery: Sym: "0x0" "0"
@@ -473,7 +473,7 @@
 4812949-4812990 usb_power_delivery: Sym: "0xF" "F"
 4812990-4813031 usb_power_delivery: Sym: "0xF" "F"
 4812703-4813031 usb_power_delivery: Data: "[0]ff008001" "D0"
-4812703-4813031 usb_power_delivery: payload: "REQ Disc Ident  SVID:ff00" "REQ Disc Ident  SVID:ff00"
+4812703-4813031 usb_power_delivery: payload: "[1] REQ Disc Ident  SVID:ff00" "[1] REQ Disc Ident  SVID:ff00"
 4813031-4813072 usb_power_delivery: Sym: "0x6" "6"
 4813072-4813113 usb_power_delivery: Sym: "0x6" "6"
 4813113-4813154 usb_power_delivery: Sym: "0xD" "D"
@@ -485,7 +485,7 @@
 4813031-4813358 usb_power_delivery: CRC: "CRC:d34bed66" "CRC"
 4813358-4813399 usb_power_delivery: Sym: "EOP" "#"
 4813358-4813399 usb_power_delivery: EOP: "EOP" "E"
-4811849-4813399 usb_power_delivery: text: "#17   (2004.937083ms): SNK/DFP[3]:VDM - REQ Disc Ident  SVID:ff00" "..."
+4811849-4813399 usb_power_delivery: text: "#17   (2004.937083ms): (r2) SNK/DFP[3]: VDM - [1] REQ Disc Ident  SVID:ff00" "..."
 4813539-4814062 usb_power_delivery: Preamble: "Preamble" "..."
 4814062-4814103 usb_power_delivery: Sym: "SYNC-1" "S1"
 4814103-4814143 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -497,7 +497,7 @@
 4814306-4814347 usb_power_delivery: Sym: "0x7" "7"
 4814347-4814388 usb_power_delivery: Sym: "0x0" "0"
 4814225-4814388 usb_power_delivery: Head: "H:0741" "HD"
-4813539-4814762 usb_power_delivery: src: "SRC/UFP[3]:GOOD CRC" "GOOD CRC"
+4813539-4814762 usb_power_delivery: src: "(r2) SRC/UFP[3]: GOOD CRC" "GOOD CRC"
 4814388-4814429 usb_power_delivery: Sym: "0x8" "8"
 4814429-4814469 usb_power_delivery: Sym: "0x1" "1"
 4814469-4814510 usb_power_delivery: Sym: "0x9" "9"
@@ -509,7 +509,7 @@
 4814388-4814714 usb_power_delivery: CRC: "CRC:36dff918" "CRC"
 4814714-4814754 usb_power_delivery: Sym: "EOP" "#"
 4814714-4814754 usb_power_delivery: EOP: "EOP" "E"
-4813539-4814754 usb_power_delivery: text: "#18   (2005.641250ms): SRC/UFP[3]:GOOD CRC" "..."
+4813539-4814754 usb_power_delivery: text: "#18   (2005.641250ms): (r2) SRC/UFP[3]: GOOD CRC" "..."
 4815151-4815674 usb_power_delivery: Preamble: "Preamble" "..."
 4815674-4815715 usb_power_delivery: Sym: "SYNC-1" "S1"
 4815715-4815755 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -521,7 +521,7 @@
 4815918-4815959 usb_power_delivery: Sym: "0xB" "B"
 4815959-4815999 usb_power_delivery: Sym: "0x4" "4"
 4815837-4815999 usb_power_delivery: Head: "H:4b4f" "HD"
-4815151-4817677 usb_power_delivery: src: "SRC/UFP[5]:VDM" "VDM"
+4815151-4817677 usb_power_delivery: src: "(r2) SRC/UFP[5]: VDM" "VDM"
 4815999-4816041 usb_power_delivery: Sym: "0x1" "1"
 4816041-4816081 usb_power_delivery: Sym: "0x4" "4"
 4816081-4816122 usb_power_delivery: Sym: "0x0" "0"
@@ -531,7 +531,7 @@
 4816244-4816285 usb_power_delivery: Sym: "0xF" "F"
 4816285-4816325 usb_power_delivery: Sym: "0xF" "F"
 4815999-4816325 usb_power_delivery: Data: "[0]ff008041" "D0"
-4815999-4816325 usb_power_delivery: payload: "ACK Disc Ident  SVID:ff00" "ACK Disc Ident  SVID:ff00"
+4815999-4816325 usb_power_delivery: payload: "[1] ACK Disc Ident  SVID:ff00" "[1] ACK Disc Ident  SVID:ff00"
 4816325-4816366 usb_power_delivery: Sym: "0x1" "1"
 4816366-4816407 usb_power_delivery: Sym: "0xD" "D"
 4816407-4816448 usb_power_delivery: Sym: "0x8" "8"
@@ -541,7 +541,7 @@
 4816569-4816611 usb_power_delivery: Sym: "0x4" "4"
 4816611-4816651 usb_power_delivery: Sym: "0x0" "0"
 4816325-4816651 usb_power_delivery: Data: "[1]040018d1" "D1"
-4816325-4816651 usb_power_delivery: payload: "VDO:040018d1" "VDO:040018d1"
+4816325-4816651 usb_power_delivery: payload: "[2] VDO:040018d1" "[2] VDO:040018d1"
 4816651-4816692 usb_power_delivery: Sym: "0x0" "0"
 4816692-4816732 usb_power_delivery: Sym: "0x0" "0"
 4816732-4816774 usb_power_delivery: Sym: "0x0" "0"
@@ -551,7 +551,7 @@
 4816895-4816936 usb_power_delivery: Sym: "0x0" "0"
 4816936-4816977 usb_power_delivery: Sym: "0x0" "0"
 4816651-4816977 usb_power_delivery: Data: "[2]00000000" "D2"
-4816651-4816977 usb_power_delivery: payload: "VDO:00000000" "VDO:00000000"
+4816651-4816977 usb_power_delivery: payload: "[3] VDO:00000000" "[3] VDO:00000000"
 4816977-4817018 usb_power_delivery: Sym: "0x1" "1"
 4817018-4817058 usb_power_delivery: Sym: "0x0" "0"
 4817058-4817099 usb_power_delivery: Sym: "0x0" "0"
@@ -561,7 +561,7 @@
 4817221-4817262 usb_power_delivery: Sym: "0x0" "0"
 4817262-4817303 usb_power_delivery: Sym: "0x5" "5"
 4816977-4817303 usb_power_delivery: Data: "[3]50120001" "D3"
-4816977-4817303 usb_power_delivery: payload: "VDO:50120001" "VDO:50120001"
+4816977-4817303 usb_power_delivery: payload: "[4] VDO:50120001" "[4] VDO:50120001"
 4817303-4817344 usb_power_delivery: Sym: "0xE" "E"
 4817344-4817384 usb_power_delivery: Sym: "0x9" "9"
 4817384-4817425 usb_power_delivery: Sym: "0xA" "A"
@@ -573,7 +573,7 @@
 4817303-4817628 usb_power_delivery: CRC: "CRC:15b93a9e" "CRC"
 4817628-4817669 usb_power_delivery: Sym: "EOP" "#"
 4817628-4817669 usb_power_delivery: EOP: "EOP" "E"
-4815151-4817669 usb_power_delivery: text: "#19   (2006.312917ms): SRC/UFP[5]:VDM - ACK Disc Ident  SVID:ff00 - VDO:040018d1 - VDO:00000000 - VDO:50120001" "..."
+4815151-4817669 usb_power_delivery: text: "#19   (2006.312917ms): (r2) SRC/UFP[5]: VDM - [1] ACK Disc Ident  SVID:ff00 - [2] VDO:040018d1 - [3] VDO:00000000 - [4] VDO:50120001" "..."
 4817845-4818371 usb_power_delivery: Preamble: "Preamble" "..."
 4818371-4818412 usb_power_delivery: Sym: "SYNC-1" "S1"
 4818412-4818453 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -585,7 +585,7 @@
 4818617-4818658 usb_power_delivery: Sym: "0xA" "A"
 4818658-4818699 usb_power_delivery: Sym: "0x0" "0"
 4818535-4818699 usb_power_delivery: Head: "H:0a61" "HD"
-4817845-4819076 usb_power_delivery: snk: "SNK/DFP[5]:GOOD CRC" "GOOD CRC"
+4817845-4819076 usb_power_delivery: snk: "(r2) SNK/DFP[5]: GOOD CRC" "GOOD CRC"
 4818699-4818740 usb_power_delivery: Sym: "0x7" "7"
 4818740-4818781 usb_power_delivery: Sym: "0x0" "0"
 4818781-4818822 usb_power_delivery: Sym: "0x1" "1"
@@ -597,7 +597,7 @@
 4818699-4819027 usb_power_delivery: CRC: "CRC:ddeaa107" "CRC"
 4819027-4819068 usb_power_delivery: Sym: "EOP" "#"
 4819027-4819068 usb_power_delivery: EOP: "EOP" "E"
-4817845-4819068 usb_power_delivery: text: "#20   (2007.435417ms): SNK/DFP[5]:GOOD CRC" "..."
+4817845-4819068 usb_power_delivery: text: "#20   (2007.435417ms): (r2) SNK/DFP[5]: GOOD CRC" "..."
 4819431-4819956 usb_power_delivery: Preamble: "Preamble" "..."
 4819956-4819997 usb_power_delivery: Sym: "SYNC-1" "S1"
 4819997-4820038 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -609,7 +609,7 @@
 4820202-4820243 usb_power_delivery: Sym: "0x8" "8"
 4820243-4820284 usb_power_delivery: Sym: "0x1" "1"
 4820120-4820284 usb_power_delivery: Head: "H:186f" "HD"
-4819431-4820989 usb_power_delivery: snk: "SNK/DFP[4]:VDM" "VDM"
+4819431-4820989 usb_power_delivery: snk: "(r2) SNK/DFP[4]: VDM" "VDM"
 4820284-4820325 usb_power_delivery: Sym: "0x2" "2"
 4820325-4820366 usb_power_delivery: Sym: "0x0" "0"
 4820366-4820407 usb_power_delivery: Sym: "0x0" "0"
@@ -619,7 +619,7 @@
 4820530-4820571 usb_power_delivery: Sym: "0xF" "F"
 4820571-4820612 usb_power_delivery: Sym: "0xF" "F"
 4820284-4820612 usb_power_delivery: Data: "[0]ff008002" "D0"
-4820284-4820612 usb_power_delivery: payload: "REQ Disc SVID  SVID:ff00" "REQ Disc SVID  SVID:ff00"
+4820284-4820612 usb_power_delivery: payload: "[1] REQ Disc SVID  SVID:ff00" "[1] REQ Disc SVID  SVID:ff00"
 4820612-4820653 usb_power_delivery: Sym: "0x9" "9"
 4820653-4820694 usb_power_delivery: Sym: "0xE" "E"
 4820694-4820735 usb_power_delivery: Sym: "0xC" "C"
@@ -631,7 +631,7 @@
 4820612-4820940 usb_power_delivery: CRC: "CRC:7ecefce9" "CRC"
 4820940-4820981 usb_power_delivery: Sym: "EOP" "#"
 4820940-4820981 usb_power_delivery: EOP: "EOP" "E"
-4819431-4820981 usb_power_delivery: text: "#21   (2008.096250ms): SNK/DFP[4]:VDM - REQ Disc SVID  SVID:ff00" "..."
+4819431-4820981 usb_power_delivery: text: "#21   (2008.096250ms): (r2) SNK/DFP[4]: VDM - [1] REQ Disc SVID  SVID:ff00" "..."
 4821124-4821647 usb_power_delivery: Preamble: "Preamble" "..."
 4821647-4821688 usb_power_delivery: Sym: "SYNC-1" "S1"
 4821688-4821728 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -643,7 +643,7 @@
 4821891-4821932 usb_power_delivery: Sym: "0x9" "9"
 4821932-4821973 usb_power_delivery: Sym: "0x0" "0"
 4821810-4821973 usb_power_delivery: Head: "H:0941" "HD"
-4821124-4822339 usb_power_delivery: src: "SRC/UFP[4]:GOOD CRC" "GOOD CRC"
+4821124-4822339 usb_power_delivery: src: "(r2) SRC/UFP[4]: GOOD CRC" "GOOD CRC"
 4821973-4822013 usb_power_delivery: Sym: "0xF" "F"
 4822013-4822054 usb_power_delivery: Sym: "0x1" "1"
 4822054-4822094 usb_power_delivery: Sym: "0x4" "4"
@@ -655,7 +655,7 @@
 4821973-4822298 usb_power_delivery: CRC: "CRC:d167d41f" "CRC"
 4822298-4822339 usb_power_delivery: Sym: "EOP" "#"
 4822298-4822339 usb_power_delivery: EOP: "EOP" "E"
-4821124-4822339 usb_power_delivery: text: "#22   (2008.801667ms): SRC/UFP[4]:GOOD CRC" "..."
+4821124-4822339 usb_power_delivery: text: "#22   (2008.801667ms): (r2) SRC/UFP[4]: GOOD CRC" "..."
 4822640-4823162 usb_power_delivery: Preamble: "Preamble" "..."
 4823162-4823204 usb_power_delivery: Sym: "SYNC-1" "S1"
 4823204-4823244 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -667,7 +667,7 @@
 4823407-4823448 usb_power_delivery: Sym: "0xD" "D"
 4823448-4823488 usb_power_delivery: Sym: "0x2" "2"
 4823325-4823488 usb_power_delivery: Head: "H:2d4f" "HD"
-4822640-4824514 usb_power_delivery: src: "SRC/UFP[6]:VDM" "VDM"
+4822640-4824514 usb_power_delivery: src: "(r2) SRC/UFP[6]: VDM" "VDM"
 4823488-4823529 usb_power_delivery: Sym: "0x2" "2"
 4823529-4823569 usb_power_delivery: Sym: "0x4" "4"
 4823569-4823611 usb_power_delivery: Sym: "0x0" "0"
@@ -677,7 +677,7 @@
 4823732-4823774 usb_power_delivery: Sym: "0xF" "F"
 4823774-4823814 usb_power_delivery: Sym: "0xF" "F"
 4823488-4823814 usb_power_delivery: Data: "[0]ff008042" "D0"
-4823488-4823814 usb_power_delivery: payload: "ACK Disc SVID  SVID:ff00" "ACK Disc SVID  SVID:ff00"
+4823488-4823814 usb_power_delivery: payload: "[1] ACK Disc SVID  SVID:ff00" "[1] ACK Disc SVID  SVID:ff00"
 4823814-4823855 usb_power_delivery: Sym: "0x0" "0"
 4823855-4823895 usb_power_delivery: Sym: "0x0" "0"
 4823895-4823937 usb_power_delivery: Sym: "0x0" "0"
@@ -687,7 +687,7 @@
 4824058-4824099 usb_power_delivery: Sym: "0x8" "8"
 4824099-4824139 usb_power_delivery: Sym: "0x1" "1"
 4823814-4824139 usb_power_delivery: Data: "[1]18d10000" "D1"
-4823814-4824139 usb_power_delivery: payload: "VDO:18d10000" "VDO:18d10000"
+4823814-4824139 usb_power_delivery: payload: "[2] VDO:18d10000" "[2] VDO:18d10000"
 4824139-4824180 usb_power_delivery: Sym: "0x9" "9"
 4824180-4824221 usb_power_delivery: Sym: "0x4" "4"
 4824221-4824262 usb_power_delivery: Sym: "0x5" "5"
@@ -699,7 +699,7 @@
 4824139-4824466 usb_power_delivery: CRC: "CRC:5d00d549" "CRC"
 4824466-4824506 usb_power_delivery: Sym: "EOP" "#"
 4824466-4824506 usb_power_delivery: EOP: "EOP" "E"
-4822640-4824506 usb_power_delivery: text: "#23   (2009.433333ms): SRC/UFP[6]:VDM - ACK Disc SVID  SVID:ff00 - VDO:18d10000" "..."
+4822640-4824506 usb_power_delivery: text: "#23   (2009.433333ms): (r2) SRC/UFP[6]: VDM - [1] ACK Disc SVID  SVID:ff00 - [2] VDO:18d10000" "..."
 4824680-4825206 usb_power_delivery: Preamble: "Preamble" "..."
 4825206-4825247 usb_power_delivery: Sym: "SYNC-1" "S1"
 4825247-4825288 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -711,7 +711,7 @@
 4825452-4825493 usb_power_delivery: Sym: "0xC" "C"
 4825493-4825534 usb_power_delivery: Sym: "0x0" "0"
 4825370-4825534 usb_power_delivery: Head: "H:0c61" "HD"
-4824680-4825911 usb_power_delivery: snk: "SNK/DFP[6]:GOOD CRC" "GOOD CRC"
+4824680-4825911 usb_power_delivery: snk: "(r2) SNK/DFP[6]: GOOD CRC" "GOOD CRC"
 4825534-4825575 usb_power_delivery: Sym: "0x2" "2"
 4825575-4825616 usb_power_delivery: Sym: "0x3" "3"
 4825616-4825657 usb_power_delivery: Sym: "0x4" "4"
@@ -723,7 +723,7 @@
 4825534-4825861 usb_power_delivery: CRC: "CRC:34890432" "CRC"
 4825861-4825902 usb_power_delivery: Sym: "EOP" "#"
 4825861-4825902 usb_power_delivery: EOP: "EOP" "E"
-4824680-4825902 usb_power_delivery: text: "#24   (2010.283333ms): SNK/DFP[6]:GOOD CRC" "..."
+4824680-4825902 usb_power_delivery: text: "#24   (2010.283333ms): (r2) SNK/DFP[6]: GOOD CRC" "..."
 4826202-4826727 usb_power_delivery: Preamble: "Preamble" "..."
 4826727-4826768 usb_power_delivery: Sym: "SYNC-1" "S1"
 4826768-4826809 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -735,7 +735,7 @@
 4826973-4827014 usb_power_delivery: Sym: "0xA" "A"
 4827014-4827055 usb_power_delivery: Sym: "0x1" "1"
 4826891-4827055 usb_power_delivery: Head: "H:1a6f" "HD"
-4826202-4827752 usb_power_delivery: snk: "SNK/DFP[5]:VDM" "VDM"
+4826202-4827752 usb_power_delivery: snk: "(r2) SNK/DFP[5]: VDM" "VDM"
 4827055-4827096 usb_power_delivery: Sym: "0x3" "3"
 4827096-4827137 usb_power_delivery: Sym: "0x0" "0"
 4827137-4827178 usb_power_delivery: Sym: "0x0" "0"
@@ -745,7 +745,7 @@
 4827301-4827342 usb_power_delivery: Sym: "0x8" "8"
 4827342-4827383 usb_power_delivery: Sym: "0x1" "1"
 4827055-4827383 usb_power_delivery: Data: "[0]18d18003" "D0"
-4827055-4827383 usb_power_delivery: payload: "REQ Disc Mode  SVID:18d1" "REQ Disc Mode  SVID:18d1"
+4827055-4827383 usb_power_delivery: payload: "[1] REQ Disc Mode  SVID:18d1" "[1] REQ Disc Mode  SVID:18d1"
 4827383-4827424 usb_power_delivery: Sym: "0x9" "9"
 4827424-4827465 usb_power_delivery: Sym: "0x6" "6"
 4827465-4827506 usb_power_delivery: Sym: "0xB" "B"
@@ -757,7 +757,7 @@
 4827383-4827711 usb_power_delivery: CRC: "CRC:1aff4b69" "CRC"
 4827711-4827752 usb_power_delivery: Sym: "EOP" "#"
 4827711-4827752 usb_power_delivery: EOP: "EOP" "E"
-4826202-4827752 usb_power_delivery: text: "#25   (2010.917500ms): SNK/DFP[5]:VDM - REQ Disc Mode  SVID:18d1" "..."
+4826202-4827752 usb_power_delivery: text: "#25   (2010.917500ms): (r2) SNK/DFP[5]: VDM - [1] REQ Disc Mode  SVID:18d1" "..."
 4827897-4828420 usb_power_delivery: Preamble: "Preamble" "..."
 4828420-4828461 usb_power_delivery: Sym: "SYNC-1" "S1"
 4828461-4828501 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -769,7 +769,7 @@
 4828664-4828705 usb_power_delivery: Sym: "0xB" "B"
 4828705-4828745 usb_power_delivery: Sym: "0x0" "0"
 4828582-4828745 usb_power_delivery: Head: "H:0b41" "HD"
-4827897-4829112 usb_power_delivery: src: "SRC/UFP[5]:GOOD CRC" "GOOD CRC"
+4827897-4829112 usb_power_delivery: src: "(r2) SRC/UFP[5]: GOOD CRC" "GOOD CRC"
 4828745-4828786 usb_power_delivery: Sym: "0x3" "3"
 4828786-4828827 usb_power_delivery: Sym: "0x3" "3"
 4828827-4828867 usb_power_delivery: Sym: "0x5" "5"
@@ -781,7 +781,7 @@
 4828745-4829071 usb_power_delivery: CRC: "CRC:3f69b533" "CRC"
 4829071-4829112 usb_power_delivery: Sym: "EOP" "#"
 4829071-4829112 usb_power_delivery: EOP: "EOP" "E"
-4827897-4829112 usb_power_delivery: text: "#26   (2011.623750ms): SRC/UFP[5]:GOOD CRC" "..."
+4827897-4829112 usb_power_delivery: text: "#26   (2011.623750ms): (r2) SRC/UFP[5]: GOOD CRC" "..."
 4829416-4829939 usb_power_delivery: Preamble: "Preamble" "..."
 4829939-4829980 usb_power_delivery: Sym: "SYNC-1" "S1"
 4829980-4830020 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -793,7 +793,7 @@
 4830183-4830224 usb_power_delivery: Sym: "0xF" "F"
 4830224-4830264 usb_power_delivery: Sym: "0x2" "2"
 4830102-4830264 usb_power_delivery: Head: "H:2f4f" "HD"
-4829416-4831290 usb_power_delivery: src: "SRC/UFP[7]:VDM" "VDM"
+4829416-4831290 usb_power_delivery: src: "(r2) SRC/UFP[7]: VDM" "VDM"
 4830264-4830305 usb_power_delivery: Sym: "0x3" "3"
 4830305-4830347 usb_power_delivery: Sym: "0x4" "4"
 4830347-4830387 usb_power_delivery: Sym: "0x0" "0"
@@ -803,7 +803,7 @@
 4830509-4830549 usb_power_delivery: Sym: "0x8" "8"
 4830549-4830591 usb_power_delivery: Sym: "0x1" "1"
 4830264-4830591 usb_power_delivery: Data: "[0]18d18043" "D0"
-4830264-4830591 usb_power_delivery: payload: "ACK Disc Mode  SVID:18d1" "ACK Disc Mode  SVID:18d1"
+4830264-4830591 usb_power_delivery: payload: "[1] ACK Disc Mode  SVID:18d1" "[1] ACK Disc Mode  SVID:18d1"
 4830591-4830631 usb_power_delivery: Sym: "0x1" "1"
 4830631-4830672 usb_power_delivery: Sym: "0x0" "0"
 4830672-4830712 usb_power_delivery: Sym: "0x0" "0"
@@ -813,7 +813,7 @@
 4830835-4830875 usb_power_delivery: Sym: "0x0" "0"
 4830875-4830916 usb_power_delivery: Sym: "0x0" "0"
 4830591-4830916 usb_power_delivery: Data: "[1]00000001" "D1"
-4830591-4830916 usb_power_delivery: payload: "VDO:00000001" "VDO:00000001"
+4830591-4830916 usb_power_delivery: payload: "[2] VDO:00000001" "[2] VDO:00000001"
 4830916-4830957 usb_power_delivery: Sym: "0x9" "9"
 4830957-4830997 usb_power_delivery: Sym: "0x7" "7"
 4830997-4831038 usb_power_delivery: Sym: "0x2" "2"
@@ -825,7 +825,7 @@
 4830916-4831242 usb_power_delivery: CRC: "CRC:cf392279" "CRC"
 4831242-4831283 usb_power_delivery: Sym: "EOP" "#"
 4831242-4831283 usb_power_delivery: EOP: "EOP" "E"
-4829416-4831283 usb_power_delivery: text: "#27   (2012.256667ms): SRC/UFP[7]:VDM - ACK Disc Mode  SVID:18d1 - VDO:00000001" "..."
+4829416-4831283 usb_power_delivery: text: "#27   (2012.256667ms): (r2) SRC/UFP[7]: VDM - [1] ACK Disc Mode  SVID:18d1 - [2] VDO:00000001" "..."
 4831453-4831979 usb_power_delivery: Preamble: "Preamble" "..."
 4831979-4832020 usb_power_delivery: Sym: "SYNC-1" "S1"
 4832020-4832061 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -837,7 +837,7 @@
 4832225-4832265 usb_power_delivery: Sym: "0xE" "E"
 4832265-4832307 usb_power_delivery: Sym: "0x0" "0"
 4832143-4832307 usb_power_delivery: Head: "H:0e61" "HD"
-4831453-4832675 usb_power_delivery: snk: "SNK/DFP[7]:GOOD CRC" "GOOD CRC"
+4831453-4832675 usb_power_delivery: snk: "(r2) SNK/DFP[7]: GOOD CRC" "GOOD CRC"
 4832307-4832348 usb_power_delivery: Sym: "0xE" "E"
 4832348-4832388 usb_power_delivery: Sym: "0x1" "1"
 4832388-4832429 usb_power_delivery: Sym: "0x5" "5"
@@ -849,7 +849,7 @@
 4832307-4832634 usb_power_delivery: CRC: "CRC:da87651e" "CRC"
 4832634-4832675 usb_power_delivery: Sym: "EOP" "#"
 4832634-4832675 usb_power_delivery: EOP: "EOP" "E"
-4831453-4832675 usb_power_delivery: text: "#28   (2013.105417ms): SNK/DFP[7]:GOOD CRC" "..."
+4831453-4832675 usb_power_delivery: text: "#28   (2013.105417ms): (r2) SNK/DFP[7]: GOOD CRC" "..."
 4832992-4833518 usb_power_delivery: Preamble: "Preamble" "..."
 4833518-4833559 usb_power_delivery: Sym: "SYNC-1" "S1"
 4833559-4833600 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -861,7 +861,7 @@
 4833764-4833805 usb_power_delivery: Sym: "0xC" "C"
 4833805-4833846 usb_power_delivery: Sym: "0x1" "1"
 4833682-4833846 usb_power_delivery: Head: "H:1c6f" "HD"
-4832992-4834550 usb_power_delivery: snk: "SNK/DFP[6]:VDM" "VDM"
+4832992-4834550 usb_power_delivery: snk: "(r2) SNK/DFP[6]: VDM" "VDM"
 4833846-4833887 usb_power_delivery: Sym: "0x4" "4"
 4833887-4833928 usb_power_delivery: Sym: "0x0" "0"
 4833928-4833969 usb_power_delivery: Sym: "0x1" "1"
@@ -871,7 +871,7 @@
 4834092-4834133 usb_power_delivery: Sym: "0x8" "8"
 4834133-4834174 usb_power_delivery: Sym: "0x1" "1"
 4833846-4834174 usb_power_delivery: Data: "[0]18d18104" "D0"
-4833846-4834174 usb_power_delivery: payload: "REQ Enter Mode pos 1 SVID:18d1" "REQ Enter Mode pos 1 SVID:18d1"
+4833846-4834174 usb_power_delivery: payload: "[1] REQ Enter Mode pos 1 SVID:18d1" "[1] REQ Enter Mode pos 1 SVID:18d1"
 4834174-4834214 usb_power_delivery: Sym: "0x7" "7"
 4834214-4834255 usb_power_delivery: Sym: "0x4" "4"
 4834255-4834296 usb_power_delivery: Sym: "0xC" "C"
@@ -883,7 +883,7 @@
 4834174-4834501 usb_power_delivery: CRC: "CRC:09aaec47" "CRC"
 4834501-4834542 usb_power_delivery: Sym: "EOP" "#"
 4834501-4834542 usb_power_delivery: EOP: "EOP" "E"
-4832992-4834542 usb_power_delivery: text: "#29   (2013.746667ms): SNK/DFP[6]:VDM - REQ Enter Mode pos 1 SVID:18d1" "..."
+4832992-4834542 usb_power_delivery: text: "#29   (2013.746667ms): (r2) SNK/DFP[6]: VDM - [1] REQ Enter Mode pos 1 SVID:18d1" "..."
 4834686-4835208 usb_power_delivery: Preamble: "Preamble" "..."
 4835208-4835250 usb_power_delivery: Sym: "SYNC-1" "S1"
 4835250-4835290 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -895,7 +895,7 @@
 4835453-4835494 usb_power_delivery: Sym: "0xD" "D"
 4835494-4835534 usb_power_delivery: Sym: "0x0" "0"
 4835371-4835534 usb_power_delivery: Head: "H:0d41" "HD"
-4834686-4835909 usb_power_delivery: src: "SRC/UFP[6]:GOOD CRC" "GOOD CRC"
+4834686-4835909 usb_power_delivery: src: "(r2) SRC/UFP[6]: GOOD CRC" "GOOD CRC"
 4835534-4835575 usb_power_delivery: Sym: "0x6" "6"
 4835575-4835616 usb_power_delivery: Sym: "0x0" "0"
 4835616-4835656 usb_power_delivery: Sym: "0x0" "0"
@@ -907,7 +907,7 @@
 4835534-4835860 usb_power_delivery: CRC: "CRC:d60a1006" "CRC"
 4835860-4835901 usb_power_delivery: Sym: "EOP" "#"
 4835860-4835901 usb_power_delivery: EOP: "EOP" "E"
-4834686-4835901 usb_power_delivery: text: "#30   (2014.452500ms): SRC/UFP[6]:GOOD CRC" "..."
+4834686-4835901 usb_power_delivery: text: "#30   (2014.452500ms): (r2) SRC/UFP[6]: GOOD CRC" "..."
 4836791-4837313 usb_power_delivery: Preamble: "Preamble" "..."
 4837313-4837355 usb_power_delivery: Sym: "SYNC-1" "S1"
 4837355-4837395 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -919,7 +919,7 @@
 4837557-4837599 usb_power_delivery: Sym: "0x1" "1"
 4837599-4837639 usb_power_delivery: Sym: "0x1" "1"
 4837476-4837639 usb_power_delivery: Head: "H:114f" "HD"
-4836791-4838331 usb_power_delivery: src: "SRC/UFP[0]:VDM" "VDM"
+4836791-4838331 usb_power_delivery: src: "(r2) SRC/UFP[0]: VDM" "VDM"
 4837639-4837680 usb_power_delivery: Sym: "0x4" "4"
 4837680-4837720 usb_power_delivery: Sym: "0x4" "4"
 4837720-4837762 usb_power_delivery: Sym: "0x1" "1"
@@ -929,7 +929,7 @@
 4837883-4837924 usb_power_delivery: Sym: "0x8" "8"
 4837924-4837964 usb_power_delivery: Sym: "0x1" "1"
 4837639-4837964 usb_power_delivery: Data: "[0]18d18144" "D0"
-4837639-4837964 usb_power_delivery: payload: "ACK Enter Mode pos 1 SVID:18d1" "ACK Enter Mode pos 1 SVID:18d1"
+4837639-4837964 usb_power_delivery: payload: "[1] ACK Enter Mode pos 1 SVID:18d1" "[1] ACK Enter Mode pos 1 SVID:18d1"
 4837964-4838006 usb_power_delivery: Sym: "0xD" "D"
 4838006-4838046 usb_power_delivery: Sym: "0xF" "F"
 4838046-4838087 usb_power_delivery: Sym: "0x5" "5"
@@ -941,7 +941,7 @@
 4837964-4838290 usb_power_delivery: CRC: "CRC:6d8275fd" "CRC"
 4838290-4838331 usb_power_delivery: Sym: "EOP" "#"
 4838290-4838331 usb_power_delivery: EOP: "EOP" "E"
-4836791-4838331 usb_power_delivery: text: "#31   (2015.329583ms): SRC/UFP[0]:VDM - ACK Enter Mode pos 1 SVID:18d1" "..."
+4836791-4838331 usb_power_delivery: text: "#31   (2015.329583ms): (r2) SRC/UFP[0]: VDM - [1] ACK Enter Mode pos 1 SVID:18d1" "..."
 4838512-4839037 usb_power_delivery: Preamble: "Preamble" "..."
 4839037-4839078 usb_power_delivery: Sym: "SYNC-1" "S1"
 4839078-4839119 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -953,7 +953,7 @@
 4839283-4839324 usb_power_delivery: Sym: "0x0" "0"
 4839324-4839365 usb_power_delivery: Sym: "0x0" "0"
 4839201-4839365 usb_power_delivery: Head: "H:0061" "HD"
-4838512-4839734 usb_power_delivery: snk: "SNK/DFP[0]:GOOD CRC" "GOOD CRC"
+4838512-4839734 usb_power_delivery: snk: "(r2) SNK/DFP[0]: GOOD CRC" "GOOD CRC"
 4839365-4839406 usb_power_delivery: Sym: "0x9" "9"
 4839406-4839447 usb_power_delivery: Sym: "0x1" "1"
 4839447-4839488 usb_power_delivery: Sym: "0x8" "8"
@@ -965,7 +965,7 @@
 4839365-4839693 usb_power_delivery: CRC: "CRC:3d3f4819" "CRC"
 4839693-4839734 usb_power_delivery: Sym: "EOP" "#"
 4839693-4839734 usb_power_delivery: EOP: "EOP" "E"
-4838512-4839734 usb_power_delivery: text: "#32   (2016.046667ms): SNK/DFP[0]:GOOD CRC" "..."
+4838512-4839734 usb_power_delivery: text: "#32   (2016.046667ms): (r2) SNK/DFP[0]: GOOD CRC" "..."
 4840048-4840574 usb_power_delivery: Preamble: "Preamble" "..."
 4840574-4840615 usb_power_delivery: Sym: "SYNC-1" "S1"
 4840615-4840656 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -977,7 +977,7 @@
 4840820-4840861 usb_power_delivery: Sym: "0xE" "E"
 4840861-4840902 usb_power_delivery: Sym: "0x1" "1"
 4840738-4840902 usb_power_delivery: Head: "H:1e6f" "HD"
-4840048-4841598 usb_power_delivery: snk: "SNK/DFP[7]:VDM" "VDM"
+4840048-4841598 usb_power_delivery: snk: "(r2) SNK/DFP[7]: VDM" "VDM"
 4840902-4840943 usb_power_delivery: Sym: "0xC" "C"
 4840943-4840984 usb_power_delivery: Sym: "0x0" "0"
 4840984-4841025 usb_power_delivery: Sym: "0x0" "0"
@@ -987,7 +987,7 @@
 4841147-4841189 usb_power_delivery: Sym: "0x8" "8"
 4841189-4841229 usb_power_delivery: Sym: "0x1" "1"
 4840902-4841229 usb_power_delivery: Data: "[0]18d1000c" "D0"
-4840902-4841229 usb_power_delivery: payload: "unstruct [000c] SVID:18d1" "unstruct [000c] SVID:18d1"
+4840902-4841229 usb_power_delivery: payload: "[1] unstruct [000c] SVID:18d1" "[1] unstruct [000c] SVID:18d1"
 4841229-4841270 usb_power_delivery: Sym: "0xF" "F"
 4841270-4841311 usb_power_delivery: Sym: "0x7" "7"
 4841311-4841352 usb_power_delivery: Sym: "0x6" "6"
@@ -999,7 +999,7 @@
 4841229-4841557 usb_power_delivery: CRC: "CRC:5629e67f" "CRC"
 4841557-4841598 usb_power_delivery: Sym: "EOP" "#"
 4841557-4841598 usb_power_delivery: EOP: "EOP" "E"
-4840048-4841598 usb_power_delivery: text: "#33   (2016.686667ms): SNK/DFP[7]:VDM - unstruct [000c] SVID:18d1" "..."
+4840048-4841598 usb_power_delivery: text: "#33   (2016.686667ms): (r2) SNK/DFP[7]: VDM - [1] unstruct [000c] SVID:18d1" "..."
 4841741-4842263 usb_power_delivery: Preamble: "Preamble" "..."
 4842263-4842304 usb_power_delivery: Sym: "SYNC-1" "S1"
 4842304-4842344 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1011,7 +1011,7 @@
 4842507-4842548 usb_power_delivery: Sym: "0xF" "F"
 4842548-4842588 usb_power_delivery: Sym: "0x0" "0"
 4842426-4842588 usb_power_delivery: Head: "H:0f41" "HD"
-4841741-4842955 usb_power_delivery: src: "SRC/UFP[7]:GOOD CRC" "GOOD CRC"
+4841741-4842955 usb_power_delivery: src: "(r2) SRC/UFP[7]: GOOD CRC" "GOOD CRC"
 4842588-4842629 usb_power_delivery: Sym: "0xA" "A"
 4842629-4842671 usb_power_delivery: Sym: "0x2" "2"
 4842671-4842711 usb_power_delivery: Sym: "0x1" "1"
@@ -1023,7 +1023,7 @@
 4842588-4842914 usb_power_delivery: CRC: "CRC:3804712a" "CRC"
 4842914-4842955 usb_power_delivery: Sym: "EOP" "#"
 4842914-4842955 usb_power_delivery: EOP: "EOP" "E"
-4841741-4842955 usb_power_delivery: text: "#34   (2017.392083ms): SRC/UFP[7]:GOOD CRC" "..."
+4841741-4842955 usb_power_delivery: text: "#34   (2017.392083ms): (r2) SRC/UFP[7]: GOOD CRC" "..."
 4849761-4850283 usb_power_delivery: Preamble: "Preamble" "..."
 4850283-4850325 usb_power_delivery: Sym: "SYNC-1" "S1"
 4850325-4850365 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1035,7 +1035,7 @@
 4850528-4850568 usb_power_delivery: Sym: "0x3" "3"
 4850568-4850610 usb_power_delivery: Sym: "0x7" "7"
 4850446-4850610 usb_power_delivery: Head: "H:734f" "HD"
-4849761-4853263 usb_power_delivery: src: "SRC/UFP[1]:VDM" "VDM"
+4849761-4853263 usb_power_delivery: src: "(r2) SRC/UFP[1]: VDM" "VDM"
 4850610-4850650 usb_power_delivery: Sym: "0xC" "C"
 4850650-4850690 usb_power_delivery: Sym: "0x2" "2"
 4850690-4850732 usb_power_delivery: Sym: "0x0" "0"
@@ -1045,7 +1045,7 @@
 4850853-4850895 usb_power_delivery: Sym: "0x8" "8"
 4850895-4850935 usb_power_delivery: Sym: "0x1" "1"
 4850610-4850935 usb_power_delivery: Data: "[0]18d1002c" "D0"
-4850610-4850935 usb_power_delivery: payload: "unstruct [002c] SVID:18d1" "unstruct [002c] SVID:18d1"
+4850610-4850935 usb_power_delivery: payload: "[1] unstruct [002c] SVID:18d1" "[1] unstruct [002c] SVID:18d1"
 4850935-4850976 usb_power_delivery: Sym: "0xB" "B"
 4850976-4851017 usb_power_delivery: Sym: "0x3" "3"
 4851017-4851057 usb_power_delivery: Sym: "0xE" "E"
@@ -1055,7 +1055,7 @@
 4851179-4851220 usb_power_delivery: Sym: "0x6" "6"
 4851220-4851261 usb_power_delivery: Sym: "0xF" "F"
 4850935-4851261 usb_power_delivery: Data: "[1]f6e32e3b" "D1"
-4850935-4851261 usb_power_delivery: payload: "VDO:f6e32e3b" "VDO:f6e32e3b"
+4850935-4851261 usb_power_delivery: payload: "[2] VDO:f6e32e3b" "[2] VDO:f6e32e3b"
 4851261-4851302 usb_power_delivery: Sym: "0xE" "E"
 4851302-4851342 usb_power_delivery: Sym: "0x1" "1"
 4851342-4851382 usb_power_delivery: Sym: "0xA" "A"
@@ -1065,7 +1065,7 @@
 4851505-4851545 usb_power_delivery: Sym: "0x9" "9"
 4851545-4851587 usb_power_delivery: Sym: "0x4" "4"
 4851261-4851587 usb_power_delivery: Data: "[2]491d6a1e" "D2"
-4851261-4851587 usb_power_delivery: payload: "VDO:491d6a1e" "VDO:491d6a1e"
+4851261-4851587 usb_power_delivery: payload: "[3] VDO:491d6a1e" "[3] VDO:491d6a1e"
 4851587-4851627 usb_power_delivery: Sym: "0x3" "3"
 4851627-4851667 usb_power_delivery: Sym: "0xD" "D"
 4851667-4851708 usb_power_delivery: Sym: "0xC" "C"
@@ -1075,7 +1075,7 @@
 4851830-4851872 usb_power_delivery: Sym: "0x7" "7"
 4851872-4851912 usb_power_delivery: Sym: "0x7" "7"
 4851587-4851912 usb_power_delivery: Data: "[3]77f51cd3" "D3"
-4851587-4851912 usb_power_delivery: payload: "VDO:77f51cd3" "VDO:77f51cd3"
+4851587-4851912 usb_power_delivery: payload: "[4] VDO:77f51cd3" "[4] VDO:77f51cd3"
 4851912-4851952 usb_power_delivery: Sym: "0xE" "E"
 4851952-4851993 usb_power_delivery: Sym: "0x5" "5"
 4851993-4852034 usb_power_delivery: Sym: "0x7" "7"
@@ -1085,7 +1085,7 @@
 4852156-4852197 usb_power_delivery: Sym: "0xB" "B"
 4852197-4852237 usb_power_delivery: Sym: "0xD" "D"
 4851912-4852237 usb_power_delivery: Data: "[4]db19a75e" "D4"
-4851912-4852237 usb_power_delivery: payload: "VDO:db19a75e" "VDO:db19a75e"
+4851912-4852237 usb_power_delivery: payload: "[5] VDO:db19a75e" "[5] VDO:db19a75e"
 4852237-4852278 usb_power_delivery: Sym: "0xE" "E"
 4852278-4852319 usb_power_delivery: Sym: "0xD" "D"
 4852319-4852359 usb_power_delivery: Sym: "0xD" "D"
@@ -1095,7 +1095,7 @@
 4852482-4852523 usb_power_delivery: Sym: "0x2" "2"
 4852523-4852564 usb_power_delivery: Sym: "0xC" "C"
 4852237-4852564 usb_power_delivery: Data: "[5]c2aacdde" "D5"
-4852237-4852564 usb_power_delivery: payload: "VDO:c2aacdde" "VDO:c2aacdde"
+4852237-4852564 usb_power_delivery: payload: "[6] VDO:c2aacdde" "[6] VDO:c2aacdde"
 4852564-4852604 usb_power_delivery: Sym: "0x7" "7"
 4852604-4852644 usb_power_delivery: Sym: "0x3" "3"
 4852644-4852686 usb_power_delivery: Sym: "0x4" "4"
@@ -1105,7 +1105,7 @@
 4852807-4852849 usb_power_delivery: Sym: "0x4" "4"
 4852849-4852889 usb_power_delivery: Sym: "0x0" "0"
 4852564-4852889 usb_power_delivery: Data: "[6]04010437" "D6"
-4852564-4852889 usb_power_delivery: payload: "VDO:04010437" "VDO:04010437"
+4852564-4852889 usb_power_delivery: payload: "[7] VDO:04010437" "[7] VDO:04010437"
 4852889-4852929 usb_power_delivery: Sym: "0xA" "A"
 4852929-4852971 usb_power_delivery: Sym: "0xF" "F"
 4852971-4853011 usb_power_delivery: Sym: "0x5" "5"
@@ -1117,7 +1117,7 @@
 4852889-4853215 usb_power_delivery: CRC: "CRC:814155fa" "CRC"
 4853215-4853256 usb_power_delivery: Sym: "EOP" "#"
 4853215-4853256 usb_power_delivery: EOP: "EOP" "E"
-4849761-4853256 usb_power_delivery: text: "#35   (2020.733750ms): SRC/UFP[1]:VDM - unstruct [002c] SVID:18d1 - VDO:f6e32e3b - VDO:491d6a1e - VDO:77f51cd3 - VDO:db19a75e - VDO:c2aacdde - VDO:04010437" "..."
+4849761-4853256 usb_power_delivery: text: "#35   (2020.733750ms): (r2) SRC/UFP[1]: VDM - [1] unstruct [002c] SVID:18d1 - [2] VDO:f6e32e3b - [3] VDO:491d6a1e - [4] VDO:77f51cd3 - [5] VDO:db19a75e - [6] VDO:c2aacdde - [7] VDO:04010437" "..."
 4853432-4853958 usb_power_delivery: Preamble: "Preamble" "..."
 4853958-4853999 usb_power_delivery: Sym: "SYNC-1" "S1"
 4853999-4854040 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1129,7 +1129,7 @@
 4854203-4854244 usb_power_delivery: Sym: "0x2" "2"
 4854244-4854285 usb_power_delivery: Sym: "0x0" "0"
 4854122-4854285 usb_power_delivery: Head: "H:0261" "HD"
-4853432-4854654 usb_power_delivery: snk: "SNK/DFP[1]:GOOD CRC" "GOOD CRC"
+4853432-4854654 usb_power_delivery: snk: "(r2) SNK/DFP[1]: GOOD CRC" "GOOD CRC"
 4854285-4854326 usb_power_delivery: Sym: "0x5" "5"
 4854326-4854367 usb_power_delivery: Sym: "0x3" "3"
 4854367-4854408 usb_power_delivery: Sym: "0x9" "9"
@@ -1141,7 +1141,7 @@
 4854285-4854613 usb_power_delivery: CRC: "CRC:d3312935" "CRC"
 4854613-4854654 usb_power_delivery: Sym: "EOP" "#"
 4854613-4854654 usb_power_delivery: EOP: "EOP" "E"
-4853432-4854654 usb_power_delivery: text: "#36   (2022.263333ms): SNK/DFP[1]:GOOD CRC" "..."
+4853432-4854654 usb_power_delivery: text: "#36   (2022.263333ms): (r2) SNK/DFP[1]: GOOD CRC" "..."
 5603782-5604308 usb_power_delivery: Preamble: "Preamble" "..."
 5604308-5604349 usb_power_delivery: Sym: "SYNC-1" "S1"
 5604349-5604390 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1153,7 +1153,7 @@
 5604554-5604595 usb_power_delivery: Sym: "0x0" "0"
 5604595-5604636 usb_power_delivery: Sym: "0x1" "1"
 5604472-5604636 usb_power_delivery: Head: "H:1062" "HD"
-5603782-5605341 usb_power_delivery: snk: "SNK/DFP[0]:REQUEST" "REQUEST"
+5603782-5605341 usb_power_delivery: snk: "(r2) SNK/DFP[0]: REQUEST" "REQUEST"
 5604636-5604677 usb_power_delivery: Sym: "0xC" "C"
 5604677-5604718 usb_power_delivery: Sym: "0x2" "2"
 5604718-5604759 usb_power_delivery: Sym: "0x1" "1"
@@ -1163,7 +1163,7 @@
 5604882-5604923 usb_power_delivery: Sym: "0x0" "0"
 5604923-5604964 usb_power_delivery: Sym: "0x3" "3"
 5604636-5604964 usb_power_delivery: Data: "[0]3004b12c" "D0"
-5604636-5604964 usb_power_delivery: payload: "[3]3000/3000 mA" "[3]3000/3000 mA"
+5604636-5604964 usb_power_delivery: payload: "[1] (PDO #3: Variable 4.75/21V) 75W (operating)" "[1] (PDO #3: Variable 4.75/21V) 75W (operating)"
 5604964-5605005 usb_power_delivery: Sym: "0x9" "9"
 5605005-5605046 usb_power_delivery: Sym: "0x7" "7"
 5605046-5605087 usb_power_delivery: Sym: "0x9" "9"
@@ -1175,7 +1175,7 @@
 5604964-5605291 usb_power_delivery: CRC: "CRC:f8d3e979" "CRC"
 5605291-5605332 usb_power_delivery: Sym: "EOP" "#"
 5605291-5605332 usb_power_delivery: EOP: "EOP" "E"
-5603782-5605332 usb_power_delivery: text: "#37   (2334.909167ms): SNK/DFP[0]:REQUEST - [3]3000/3000 mA" "..."
+5603782-5605332 usb_power_delivery: text: "#37   (2334.909167ms): (r2) SNK/DFP[0]: REQUEST - [1] (PDO #3: Variable 4.75/21V) 75W (operating)" "..."
 5605475-5605998 usb_power_delivery: Preamble: "Preamble" "..."
 5605998-5606039 usb_power_delivery: Sym: "SYNC-1" "S1"
 5606039-5606079 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1187,7 +1187,7 @@
 5606242-5606283 usb_power_delivery: Sym: "0x1" "1"
 5606283-5606323 usb_power_delivery: Sym: "0x0" "0"
 5606160-5606323 usb_power_delivery: Head: "H:0141" "HD"
-5605475-5606698 usb_power_delivery: src: "SRC/UFP[0]:GOOD CRC" "GOOD CRC"
+5605475-5606698 usb_power_delivery: src: "(r2) SRC/UFP[0]: GOOD CRC" "GOOD CRC"
 5606323-5606365 usb_power_delivery: Sym: "0xD" "D"
 5606365-5606405 usb_power_delivery: Sym: "0x2" "2"
 5606405-5606446 usb_power_delivery: Sym: "0xC" "C"
@@ -1199,7 +1199,7 @@
 5606323-5606650 usb_power_delivery: CRC: "CRC:dfbc5c2d" "CRC"
 5606650-5606690 usb_power_delivery: Sym: "EOP" "#"
 5606650-5606690 usb_power_delivery: EOP: "EOP" "E"
-5605475-5606690 usb_power_delivery: text: "#38   (2335.614583ms): SRC/UFP[0]:GOOD CRC" "..."
+5605475-5606690 usb_power_delivery: text: "#38   (2335.614583ms): (r2) SRC/UFP[0]: GOOD CRC" "..."
 5616084-5616607 usb_power_delivery: Preamble: "Preamble" "..."
 5616607-5616648 usb_power_delivery: Sym: "SYNC-1" "S1"
 5616648-5616688 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1211,7 +1211,7 @@
 5616852-5616892 usb_power_delivery: Sym: "0x5" "5"
 5616892-5616933 usb_power_delivery: Sym: "0x0" "0"
 5616770-5616933 usb_power_delivery: Head: "H:0543" "HD"
-5616084-5617307 usb_power_delivery: src: "SRC/UFP[2]:ACCEPT" "ACCEPT"
+5616084-5617307 usb_power_delivery: src: "(r2) SRC/UFP[2]: ACCEPT" "ACCEPT"
 5616933-5616973 usb_power_delivery: Sym: "0x6" "6"
 5616973-5617015 usb_power_delivery: Sym: "0xB" "B"
 5617015-5617055 usb_power_delivery: Sym: "0xA" "A"
@@ -1223,7 +1223,7 @@
 5616933-5617259 usb_power_delivery: CRC: "CRC:eae7fab6" "CRC"
 5617259-5617300 usb_power_delivery: Sym: "EOP" "#"
 5617259-5617300 usb_power_delivery: EOP: "EOP" "E"
-5616084-5617300 usb_power_delivery: text: "#39   (2340.035000ms): SRC/UFP[2]:ACCEPT" "..."
+5616084-5617300 usb_power_delivery: text: "#39   (2340.035000ms): (r2) SRC/UFP[2]: ACCEPT" "..."
 5617481-5618007 usb_power_delivery: Preamble: "Preamble" "..."
 5618007-5618048 usb_power_delivery: Sym: "SYNC-1" "S1"
 5618048-5618089 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1235,7 +1235,7 @@
 5618253-5618294 usb_power_delivery: Sym: "0x4" "4"
 5618294-5618335 usb_power_delivery: Sym: "0x0" "0"
 5618171-5618335 usb_power_delivery: Head: "H:0461" "HD"
-5617481-5618712 usb_power_delivery: snk: "SNK/DFP[2]:GOOD CRC" "GOOD CRC"
+5617481-5618712 usb_power_delivery: snk: "(r2) SNK/DFP[2]: GOOD CRC" "GOOD CRC"
 5618335-5618376 usb_power_delivery: Sym: "0x0" "0"
 5618376-5618417 usb_power_delivery: Sym: "0x0" "0"
 5618417-5618458 usb_power_delivery: Sym: "0xC" "C"
@@ -1247,7 +1247,7 @@
 5618335-5618663 usb_power_delivery: CRC: "CRC:3a528c00" "CRC"
 5618663-5618704 usb_power_delivery: Sym: "EOP" "#"
 5618663-5618704 usb_power_delivery: EOP: "EOP" "E"
-5617481-5618704 usb_power_delivery: text: "#40   (2340.617083ms): SNK/DFP[2]:GOOD CRC" "..."
+5617481-5618704 usb_power_delivery: text: "#40   (2340.617083ms): (r2) SNK/DFP[2]: GOOD CRC" "..."
 5872714-5873236 usb_power_delivery: Preamble: "Preamble" "..."
 5873236-5873277 usb_power_delivery: Sym: "SYNC-1" "S1"
 5873277-5873318 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1259,7 +1259,7 @@
 5873481-5873521 usb_power_delivery: Sym: "0x7" "7"
 5873521-5873562 usb_power_delivery: Sym: "0x0" "0"
 5873399-5873562 usb_power_delivery: Head: "H:0746" "HD"
-5872714-5873937 usb_power_delivery: src: "SRC/UFP[3]:PS RDY" "PS RDY"
+5872714-5873937 usb_power_delivery: src: "(r2) SRC/UFP[3]: PS RDY" "PS RDY"
 5873562-5873603 usb_power_delivery: Sym: "0xF" "F"
 5873603-5873644 usb_power_delivery: Sym: "0xD" "D"
 5873644-5873684 usb_power_delivery: Sym: "0xF" "F"
@@ -1271,7 +1271,7 @@
 5873562-5873888 usb_power_delivery: CRC: "CRC:799e6fdf" "CRC"
 5873888-5873929 usb_power_delivery: Sym: "EOP" "#"
 5873888-5873929 usb_power_delivery: EOP: "EOP" "E"
-5872714-5873929 usb_power_delivery: text: "#41   (2446.964167ms): SRC/UFP[3]:PS RDY" "..."
+5872714-5873929 usb_power_delivery: text: "#41   (2446.964167ms): (r2) SRC/UFP[3]: PS RDY" "..."
 5874106-5874632 usb_power_delivery: Preamble: "Preamble" "..."
 5874632-5874673 usb_power_delivery: Sym: "SYNC-1" "S1"
 5874673-5874714 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -1283,7 +1283,7 @@
 5874878-5874919 usb_power_delivery: Sym: "0x6" "6"
 5874919-5874960 usb_power_delivery: Sym: "0x0" "0"
 5874796-5874960 usb_power_delivery: Head: "H:0661" "HD"
-5874106-5875328 usb_power_delivery: snk: "SNK/DFP[3]:GOOD CRC" "GOOD CRC"
+5874106-5875328 usb_power_delivery: snk: "(r2) SNK/DFP[3]: GOOD CRC" "GOOD CRC"
 5874960-5875001 usb_power_delivery: Sym: "0xC" "C"
 5875001-5875041 usb_power_delivery: Sym: "0x2" "2"
 5875041-5875082 usb_power_delivery: Sym: "0xD" "D"
@@ -1295,4 +1295,4 @@
 5874960-5875287 usb_power_delivery: CRC: "CRC:d45ced2c" "CRC"
 5875287-5875328 usb_power_delivery: Sym: "EOP" "#"
 5875287-5875328 usb_power_delivery: EOP: "EOP" "E"
-5874106-5875328 usb_power_delivery: text: "#42   (2447.544167ms): SNK/DFP[3]:GOOD CRC" "..."
+5874106-5875328 usb_power_delivery: text: "#42   (2447.544167ms): (r2) SNK/DFP[3]: GOOD CRC" "..."

diff --git a/decoder/test/usb_power_delivery/test.conf b/decoder/test/usb_power_delivery/test.conf
index b4cffa0b2116c6468311d5e3b7109af704122e99..4f6e72aac50a45974eda4e81636693765b51af2b 100644 (file)
--- a/decoder/test/usb_power_delivery/test.conf
+++ b/decoder/test/usb_power_delivery/test.conf
@@ -4,28 +4,28 @@ test exception_samplerate
        output usb_power_delivery exception match SamplerateError
 
 test pixel2015_supply
-       protocol-decoder usb_power_delivery channel cc=0 option fulltext=yes
+       protocol-decoder usb_power_delivery channel cc1=0 channel cc2=1 option fulltext=yes
        input usb_power_delivery/pixel_2015/power_supply_20V.sr
        output usb_power_delivery annotation match pixel2015_supply.output
        output usb_power_delivery python match pixel2015_supply.python
        output usb_power_delivery binary class raw-data match pixel2015_supply.bin_raw_data
 
 test pixel2015_hdmi
-       protocol-decoder usb_power_delivery channel cc=1 option fulltext=yes
+       protocol-decoder usb_power_delivery channel cc1=0 channel cc2=1 option fulltext=yes
        input usb_power_delivery/pixel_2015/hdmi_dongle.sr
        output usb_power_delivery annotation match pixel2015_hdmi.output
        output usb_power_delivery python match pixel2015_hdmi.python
        output usb_power_delivery binary class raw-data match pixel2015_hdmi.bin_raw_data
 
 test macbook2015_supply
-       protocol-decoder usb_power_delivery channel cc=0 option fulltext=yes
+       protocol-decoder usb_power_delivery channel cc1=0 channel cc2=1 option fulltext=yes
        input usb_power_delivery/macbook_2015/apple_power_brick.sr
        output usb_power_delivery annotation match macbook2015_supply.output
        output usb_power_delivery python match macbook2015_supply.python
        output usb_power_delivery binary class raw-data match macbook2015_supply.bin_raw_data
 
 test macbook2015_hdmi
-       protocol-decoder usb_power_delivery channel cc=0 option fulltext=yes
+       protocol-decoder usb_power_delivery channel cc1=0 channel cc2=1 option fulltext=yes
        input usb_power_delivery/macbook_2015/apple_av_hdmi.sr
        output usb_power_delivery annotation match macbook2015_hdmi.output
        output usb_power_delivery python match macbook2015_hdmi.python