X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder%2Ftest%2Fusb_power_delivery%2Fmacbook2015_supply.output;h=82fa289dbfe279c65c908d09f256c305fe8beba9;hb=d7acfec48fc36d5d9d2d5d559cdf27e65606ca0c;hp=ce1835ca0d1fe55b51bd3e43a5defb611820a8c9;hpb=07d897d1a0a380d446de84b461db068c3f31b0da;p=sigrok-test.git

diff --git a/decoder/test/usb_power_delivery/macbook2015_supply.output b/decoder/test/usb_power_delivery/macbook2015_supply.output
index ce1835c..82fa289 100644
--- 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" "..."