usb_power_delivery: Update tests to match new output of decoder

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

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