usb_power_delivery: fixup order of combined annotation text fragments

The USB power delivery decoder got adjusted to construct complex
annotations that consisted of several text fragments in a reproducible
order. Adjust the test expectation to match the PD implementation.

diff --git a/decoder/test/usb_power_delivery/macbook2015_hdmi.output b/decoder/test/usb_power_delivery/macbook2015_hdmi.output
index 73e6d0fe5306f42e23ba467700da637e338e995e..c49fee6439c20191c5f0097a01547697993ee047 100644 (file)
--- a/decoder/test/usb_power_delivery/macbook2015_hdmi.output
+++ b/decoder/test/usb_power_delivery/macbook2015_hdmi.output
@@ -19,7 +19,7 @@
 56986-57027 usb_power_delivery: Sym: "0x6" "6"
 57027-57067 usb_power_delivery: Sym: "0x3" "3"
 56745-57067 usb_power_delivery: Data: "[0]36019096" "D0"
-56745-57067 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap"
+56745-57067 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
 57067-57107 usb_power_delivery: Sym: "0xE" "E"
 57107-57147 usb_power_delivery: Sym: "0x3" "3"
 57147-57187 usb_power_delivery: Sym: "0x1" "1"
@@ -31,7 +31,7 @@
 57067-57388 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 57388-57428 usb_power_delivery: Sym: "EOP" "#"
 57388-57428 usb_power_delivery: EOP: "EOP" "E"
-55912-57428 usb_power_delivery: text: "#1    (23.296667ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "..."
+55912-57428 usb_power_delivery: text: "#1    (23.296667ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
 62499-63011 usb_power_delivery: Preamble: "Preamble" "..."
 63011-63051 usb_power_delivery: Sym: "SYNC-1" "S1"
 63051-63091 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -53,7 +53,7 @@
 63573-63614 usb_power_delivery: Sym: "0x6" "6"
 63614-63654 usb_power_delivery: Sym: "0x3" "3"
 63332-63654 usb_power_delivery: Data: "[0]36019096" "D0"
-63332-63654 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap"
+63332-63654 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
 63654-63694 usb_power_delivery: Sym: "0xE" "E"
 63694-63734 usb_power_delivery: Sym: "0x3" "3"
 63734-63774 usb_power_delivery: Sym: "0x1" "1"
@@ -65,7 +65,7 @@
 63654-63975 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 63975-64015 usb_power_delivery: Sym: "EOP" "#"
 63975-64015 usb_power_delivery: EOP: "EOP" "E"
-62499-64015 usb_power_delivery: text: "#2    (26.041250ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "..."
+62499-64015 usb_power_delivery: text: "#2    (26.041250ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
 69076-69589 usb_power_delivery: Preamble: "Preamble" "..."
 69589-69629 usb_power_delivery: Sym: "SYNC-1" "S1"
 69629-69669 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -87,7 +87,7 @@
 70151-70191 usb_power_delivery: Sym: "0x6" "6"
 70191-70231 usb_power_delivery: Sym: "0x3" "3"
 69910-70231 usb_power_delivery: Data: "[0]36019096" "D0"
-69910-70231 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap"
+69910-70231 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
 70231-70271 usb_power_delivery: Sym: "0xE" "E"
 70271-70312 usb_power_delivery: Sym: "0x3" "3"
 70312-70352 usb_power_delivery: Sym: "0x1" "1"
@@ -99,7 +99,7 @@
 70231-70553 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 70553-70593 usb_power_delivery: Sym: "EOP" "#"
 70553-70593 usb_power_delivery: EOP: "EOP" "E"
-69076-70593 usb_power_delivery: text: "#3    (28.781667ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "..."
+69076-70593 usb_power_delivery: text: "#3    (28.781667ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
 463745-464257 usb_power_delivery: Preamble: "Preamble" "..."
 464257-464297 usb_power_delivery: Sym: "SYNC-1" "S1"
 464297-464337 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -121,7 +121,7 @@
 464820-464860 usb_power_delivery: Sym: "0x6" "6"
 464860-464900 usb_power_delivery: Sym: "0x3" "3"
 464579-464900 usb_power_delivery: Data: "[0]36019096" "D0"
-464579-464900 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "5.0V 1.5A dual_role_power suspend dual_role_data comm_cap"
+464579-464900 usb_power_delivery: payload: "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "5.0V 1.5A dual_role_power suspend comm_cap dual_role_data"
 464900-464940 usb_power_delivery: Sym: "0xE" "E"
 464940-464980 usb_power_delivery: Sym: "0x3" "3"
 464980-465020 usb_power_delivery: Sym: "0x1" "1"
@@ -133,7 +133,7 @@
 464900-465221 usb_power_delivery: CRC: "CRC:9c73613e" "CRC"
 465221-465261 usb_power_delivery: Sym: "EOP" "#"
 465221-465261 usb_power_delivery: EOP: "EOP" "E"
-463745-465261 usb_power_delivery: text: "#4    (193.227083ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend dual_role_data comm_cap" "..."
+463745-465261 usb_power_delivery: text: "#4    (193.227083ms): SRC[0]:SOURCE CAP - 5.0V 1.5A dual_role_power suspend comm_cap dual_role_data" "..."
 465508-466023 usb_power_delivery: Preamble: "Preamble" "..."
 466023-466064 usb_power_delivery: Sym: "SYNC-1" "S1"
 466064-466104 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -179,7 +179,7 @@
 468805-468845 usb_power_delivery: Sym: "0x3" "3"
 468845-468885 usb_power_delivery: Sym: "0x1" "1"
 468562-468885 usb_power_delivery: Data: "[0]13025896" "D0"
-468562-468885 usb_power_delivery: payload: "[1]1500/1500 mA no_suspend comm_cap" "[1]1500/1500 mA no_suspend comm_cap"
+468562-468885 usb_power_delivery: payload: "[1]1500/1500 mA comm_cap no_suspend" "[1]1500/1500 mA comm_cap no_suspend"
 468885-468925 usb_power_delivery: Sym: "0xA" "A"
 468925-468966 usb_power_delivery: Sym: "0x6" "6"
 468966-469006 usb_power_delivery: Sym: "0xF" "F"
@@ -191,7 +191,7 @@
 468885-469208 usb_power_delivery: CRC: "CRC:dfbe7f6a" "CRC"
 469208-469248 usb_power_delivery: Sym: "EOP" "#"
 469208-469248 usb_power_delivery: EOP: "EOP" "E"
-467724-469248 usb_power_delivery: text: "#6    (194.885000ms): SNK[0]:REQUEST - [1]1500/1500 mA no_suspend comm_cap" "..."
+467724-469248 usb_power_delivery: text: "#6    (194.885000ms): SNK[0]:REQUEST - [1]1500/1500 mA comm_cap no_suspend" "..."
 469499-470011 usb_power_delivery: Preamble: "Preamble" "..."
 470011-470052 usb_power_delivery: Sym: "SYNC-1" "S1"
 470052-470092 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -333,7 +333,7 @@
 599909-599949 usb_power_delivery: Sym: "0x6" "6"
 599949-599989 usb_power_delivery: Sym: "0x2" "2"
 599668-599989 usb_power_delivery: Data: "[0]26019096" "D0"
-599668-599989 usb_power_delivery: payload: "5.0V 1.5A dual_role_power dual_role_data comm_cap" "5.0V 1.5A dual_role_power dual_role_data comm_cap"
+599668-599989 usb_power_delivery: payload: "5.0V 1.5A dual_role_power comm_cap dual_role_data" "5.0V 1.5A dual_role_power comm_cap dual_role_data"
 599989-600029 usb_power_delivery: Sym: "0xA" "A"
 600029-600069 usb_power_delivery: Sym: "0xF" "F"
 600069-600110 usb_power_delivery: Sym: "0x4" "4"
@@ -345,7 +345,7 @@
 599989-600311 usb_power_delivery: CRC: "CRC:0e8484fa" "CRC"
 600311-600351 usb_power_delivery: Sym: "EOP" "#"
 600311-600351 usb_power_delivery: EOP: "EOP" "E"
-598834-600351 usb_power_delivery: text: "#12   (249.514167ms): SRC[3]:SOURCE CAP - 5.0V 1.5A dual_role_power dual_role_data comm_cap" "..."
+598834-600351 usb_power_delivery: text: "#12   (249.514167ms): SRC[3]:SOURCE CAP - 5.0V 1.5A dual_role_power comm_cap dual_role_data" "..."
 600632-601147 usb_power_delivery: Preamble: "Preamble" "..."
 601147-601187 usb_power_delivery: Sym: "SYNC-1" "S1"
 601187-601228 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -391,7 +391,7 @@
 604460-604501 usb_power_delivery: Sym: "0x3" "3"
 604501-604541 usb_power_delivery: Sym: "0x1" "1"
 604218-604541 usb_power_delivery: Data: "[0]13025896" "D0"
-604218-604541 usb_power_delivery: payload: "[1]1500/1500 mA no_suspend comm_cap" "[1]1500/1500 mA no_suspend comm_cap"
+604218-604541 usb_power_delivery: payload: "[1]1500/1500 mA comm_cap no_suspend" "[1]1500/1500 mA comm_cap no_suspend"
 604541-604581 usb_power_delivery: Sym: "0xA" "A"
 604581-604622 usb_power_delivery: Sym: "0x0" "0"
 604622-604662 usb_power_delivery: Sym: "0xC" "C"
@@ -403,7 +403,7 @@
 604541-604864 usb_power_delivery: CRC: "CRC:a57e2c0a" "CRC"
 604864-604904 usb_power_delivery: Sym: "EOP" "#"
 604864-604904 usb_power_delivery: EOP: "EOP" "E"
-603380-604904 usb_power_delivery: text: "#14   (251.408333ms): SNK[1]:REQUEST - [1]1500/1500 mA no_suspend comm_cap" "..."
+603380-604904 usb_power_delivery: text: "#14   (251.408333ms): SNK[1]:REQUEST - [1]1500/1500 mA comm_cap no_suspend" "..."
 605141-605654 usb_power_delivery: Preamble: "Preamble" "..."
 605654-605694 usb_power_delivery: Sym: "SYNC-1" "S1"
 605694-605734 usb_power_delivery: Sym: "SYNC-1" "S1"

diff --git a/decoder/test/usb_power_delivery/macbook2015_supply.output b/decoder/test/usb_power_delivery/macbook2015_supply.output
index 2c744ed862bccee6371056fe751c9a0156934fc8..ce1835ca0d1fe55b51bd3e43a5defb611820a8c9 100644 (file)
--- a/decoder/test/usb_power_delivery/macbook2015_supply.output
+++ b/decoder/test/usb_power_delivery/macbook2015_supply.output
@@ -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 no_suspend comm_cap" "[2]2000/2000 mA no_suspend comm_cap"
+427275-427597 usb_power_delivery: payload: "[2]2000/2000 mA comm_cap no_suspend" "[2]2000/2000 mA 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 no_suspend comm_cap" "..."
+426441-427958 usb_power_delivery: text: "#6    (177.683750ms): SNK[0]:REQUEST - [2]2000/2000 mA 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"

diff --git a/decoder/test/usb_power_delivery/pixel2015_hdmi.output b/decoder/test/usb_power_delivery/pixel2015_hdmi.output
index e90a7cbde7fb141cd683fb778d97ca1856d11d27..195f2915fbfd1efbd66fc2acbc551704d4b11a80 100644 (file)
--- a/decoder/test/usb_power_delivery/pixel2015_hdmi.output
+++ b/decoder/test/usb_power_delivery/pixel2015_hdmi.output
@@ -19,7 +19,7 @@
 104733-104774 usb_power_delivery: Sym: "0x6" "6"
 104774-104815 usb_power_delivery: Sym: "0x2" "2"
 104487-104815 usb_power_delivery: Data: "[0]2601905a" "D0"
-104487-104815 usb_power_delivery: payload: "5.0V 0.9A dual_role_power dual_role_data comm_cap" "5.0V 0.9A dual_role_power dual_role_data comm_cap"
+104487-104815 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
 104815-104856 usb_power_delivery: Sym: "0x4" "4"
 104856-104897 usb_power_delivery: Sym: "0xE" "E"
 104897-104938 usb_power_delivery: Sym: "0x0" "0"
@@ -31,7 +31,7 @@
 104815-105143 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 105143-105184 usb_power_delivery: Sym: "EOP" "#"
 105143-105184 usb_power_delivery: EOP: "EOP" "E"
-103643-105184 usb_power_delivery: text: "#1    (43.184583ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power dual_role_data comm_cap" "..."
+103643-105184 usb_power_delivery: text: "#1    (43.184583ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
 110437-110954 usb_power_delivery: Preamble: "Preamble" "..."
 110954-110995 usb_power_delivery: Sym: "SYNC-1" "S1"
 110995-111036 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -53,7 +53,7 @@
 111528-111569 usb_power_delivery: Sym: "0x6" "6"
 111569-111610 usb_power_delivery: Sym: "0x2" "2"
 111282-111610 usb_power_delivery: Data: "[0]2601905a" "D0"
-111282-111610 usb_power_delivery: payload: "5.0V 0.9A dual_role_power dual_role_data comm_cap" "5.0V 0.9A dual_role_power dual_role_data comm_cap"
+111282-111610 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
 111610-111651 usb_power_delivery: Sym: "0x4" "4"
 111651-111692 usb_power_delivery: Sym: "0xE" "E"
 111692-111733 usb_power_delivery: Sym: "0x0" "0"
@@ -65,7 +65,7 @@
 111610-111938 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 111938-111979 usb_power_delivery: Sym: "EOP" "#"
 111938-111979 usb_power_delivery: EOP: "EOP" "E"
-110437-111979 usb_power_delivery: text: "#2    (46.015417ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power dual_role_data comm_cap" "..."
+110437-111979 usb_power_delivery: text: "#2    (46.015417ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
 116668-117184 usb_power_delivery: Preamble: "Preamble" "..."
 117184-117226 usb_power_delivery: Sym: "SYNC-1" "S1"
 117226-117266 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -87,7 +87,7 @@
 117758-117799 usb_power_delivery: Sym: "0x6" "6"
 117799-117840 usb_power_delivery: Sym: "0x2" "2"
 117513-117840 usb_power_delivery: Data: "[0]2601905a" "D0"
-117513-117840 usb_power_delivery: payload: "5.0V 0.9A dual_role_power dual_role_data comm_cap" "5.0V 0.9A dual_role_power dual_role_data comm_cap"
+117513-117840 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
 117840-117881 usb_power_delivery: Sym: "0x4" "4"
 117881-117922 usb_power_delivery: Sym: "0xE" "E"
 117922-117963 usb_power_delivery: Sym: "0x0" "0"
@@ -99,7 +99,7 @@
 117840-118168 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 118168-118209 usb_power_delivery: Sym: "EOP" "#"
 118168-118209 usb_power_delivery: EOP: "EOP" "E"
-116668-118209 usb_power_delivery: text: "#3    (48.611667ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power dual_role_data comm_cap" "..."
+116668-118209 usb_power_delivery: text: "#3    (48.611667ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
 122899-123415 usb_power_delivery: Preamble: "Preamble" "..."
 123415-123456 usb_power_delivery: Sym: "SYNC-1" "S1"
 123456-123497 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -121,7 +121,7 @@
 123989-124030 usb_power_delivery: Sym: "0x6" "6"
 124030-124071 usb_power_delivery: Sym: "0x2" "2"
 123743-124071 usb_power_delivery: Data: "[0]2601905a" "D0"
-123743-124071 usb_power_delivery: payload: "5.0V 0.9A dual_role_power dual_role_data comm_cap" "5.0V 0.9A dual_role_power dual_role_data comm_cap"
+123743-124071 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
 124071-124112 usb_power_delivery: Sym: "0x4" "4"
 124112-124153 usb_power_delivery: Sym: "0xE" "E"
 124153-124194 usb_power_delivery: Sym: "0x0" "0"
@@ -133,7 +133,7 @@
 124071-124399 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 124399-124440 usb_power_delivery: Sym: "EOP" "#"
 124399-124440 usb_power_delivery: EOP: "EOP" "E"
-122899-124440 usb_power_delivery: text: "#4    (51.207917ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power dual_role_data comm_cap" "..."
+122899-124440 usb_power_delivery: text: "#4    (51.207917ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
 372136-372653 usb_power_delivery: Preamble: "Preamble" "..."
 372653-372694 usb_power_delivery: Sym: "SYNC-1" "S1"
 372694-372735 usb_power_delivery: Sym: "SYNC-1" "S1"
@@ -155,7 +155,7 @@
 373226-373267 usb_power_delivery: Sym: "0x6" "6"
 373267-373309 usb_power_delivery: Sym: "0x2" "2"
 372981-373309 usb_power_delivery: Data: "[0]2601905a" "D0"
-372981-373309 usb_power_delivery: payload: "5.0V 0.9A dual_role_power dual_role_data comm_cap" "5.0V 0.9A dual_role_power dual_role_data comm_cap"
+372981-373309 usb_power_delivery: payload: "5.0V 0.9A dual_role_power comm_cap dual_role_data" "5.0V 0.9A dual_role_power comm_cap dual_role_data"
 373309-373349 usb_power_delivery: Sym: "0x4" "4"
 373349-373390 usb_power_delivery: Sym: "0xE" "E"
 373390-373431 usb_power_delivery: Sym: "0x0" "0"
@@ -167,7 +167,7 @@
 373309-373636 usb_power_delivery: CRC: "CRC:bd5f20e4" "CRC"
 373636-373677 usb_power_delivery: Sym: "EOP" "#"
 373636-373677 usb_power_delivery: EOP: "EOP" "E"
-372136-373677 usb_power_delivery: text: "#5    (155.056667ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power dual_role_data comm_cap" "..."
+372136-373677 usb_power_delivery: text: "#5    (155.056667ms): SRC[0]:SOURCE CAP - 5.0V 0.9A dual_role_power comm_cap dual_role_data" "..."
 373850-374361 usb_power_delivery: Preamble: "Preamble" "..."
 374361-374402 usb_power_delivery: Sym: "SYNC-1" "S1"
 374402-374442 usb_power_delivery: Sym: "SYNC-1" "S1"

diff --git a/decoder/test/usb_power_delivery/pixel2015_supply.output b/decoder/test/usb_power_delivery/pixel2015_supply.output
index c9bac4a87c3aefabc6624e17326a4d66b2ef3294..fe2abab689e179b2cce03147719bdce1a941b144 100644 (file)
--- a/decoder/test/usb_power_delivery/pixel2015_supply.output
+++ b/decoder/test/usb_power_delivery/pixel2015_supply.output
@@ -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 dual_role_data ext" "5.0V 3.0A dual_role_data ext"
+4302825-4303151 usb_power_delivery: payload: "5.0V 3.0A ext dual_role_data" "5.0V 3.0A ext 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 dual_role_data ext" "12.0V 3.0A dual_role_data ext"
+4303151-4303476 usb_power_delivery: payload: "12.0V 3.0A ext dual_role_data" "12.0V 3.0A ext 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 dual_role_data ext" "20.0V 3.0A dual_role_data ext"
+4303476-4303802 usb_power_delivery: payload: "20.0V 3.0A ext dual_role_data" "20.0V 3.0A ext 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 dual_role_data ext - 12.0V 3.0A dual_role_data ext - 20.0V 3.0A dual_role_data ext" "..."
+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" "..."
 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"
@@ -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 dual_role_data ext" "BATT:4.8/21.0V 15.0W suspend dual_role_data ext"
+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"
 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 dual_role_data ext" "VAR:4.8/21.0V 3.0A suspend dual_role_data ext"
+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"
 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 dual_role_data ext - VAR:4.8/21.0V 3.0A suspend dual_role_data ext" "..."
+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" "..."
 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"