usb_power_delivery: fixup order of combined annotation text fragments

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

diff --git a/decoder/test/usb_power_delivery/macbook2015_hdmi.output b/decoder/test/usb_power_delivery/macbook2015_hdmi.output
index 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"