diff --git a/src/ui.rs b/src/ui.rs index 0c5538b0..13a5f925 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -95,8 +95,8 @@ use { crate::record_ui::Recording, }; -const TRAFFIC_MODES: [TrafficViewMode; 3] = - [Hierarchical, Transactions, Packets]; +const TRAFFIC_MODES: [TrafficViewMode; 4] = + [Hierarchical, Interleaved, Transactions, Packets]; static TOTAL: AtomicU64 = AtomicU64::new(0); static CURRENT: AtomicU64 = AtomicU64::new(0); diff --git a/tests/ui/emf2022-badge/reference.txt b/tests/ui/emf2022-badge/reference.txt index 1d4c6ebb..cb808506 100644 --- a/tests/ui/emf2022-badge/reference.txt +++ b/tests/ui/emf2022-badge/reference.txt @@ -33,6 +33,39 @@ At traffic-hierarchical row 0: + Getting unknown descriptor #0 for interface 2.2, reading 144 bytes + Class request #9, index 0, value 513 for interface 2.2, writing 2 bytes + Polling 194 times for interrupt transfer on endpoint 2.3 IN +At traffic-interleaved row 0: ++ 209 SOF groups ++ Getting device descriptor #0 for device 0, reading 18 of 64 requested bytes ++ Setting address to 1 for device 0 ++ Getting device descriptor #0 for device 1, reading 18 bytes ++ 3 times: Getting device qualifier descriptor #0 for device 1, reading 0 of 10 requested bytes, stalled ++ Getting configuration descriptor #0 for device 1, reading 9 bytes ++ Getting configuration descriptor #0 for device 1, reading 98 bytes ++ Getting string descriptor #0 for device 1, reading 4 of 255 requested bytes ++ Getting string descriptor #2, language 0x0409 (English/US) for device 1, reading 56 of 255 requested bytes: 'USB JTAG/serial debug unit\u{0}' ++ Getting string descriptor #1, language 0x0409 (English/US) for device 1, reading 22 of 255 requested bytes: 'Espressif\u{0}' ++ Getting string descriptor #3, language 0x0409 (English/US) for device 1, reading 36 of 255 requested bytes: 'F4:12:FA:4D:F1:7C' ++ Setting configuration 1 for device 1 ++ Class request #32, index 0, value 0 for interface 1.0, writing 7 bytes ++ Getting device descriptor #0 for device 0, reading 18 of 64 requested bytes ++ Setting address to 2 for device 0 ++ Getting device descriptor #0 for device 2, reading 18 bytes ++ 3 times: Getting device qualifier descriptor #0 for device 2, reading 0 of 10 requested bytes, stalled ++ Getting configuration descriptor #0 for device 2, reading 9 bytes ++ Getting configuration descriptor #0 for device 2, reading 100 bytes ++ Getting string descriptor #0 for device 2, reading 4 of 255 requested bytes ++ Getting string descriptor #2, language 0x0409 (English/US) for device 2, reading 12 of 255 requested bytes: 'TiDAL' ++ Getting string descriptor #1, language 0x0409 (English/US) for device 2, reading 44 of 255 requested bytes: 'Electromagnetic Field' ++ Getting string descriptor #3, language 0x0409 (English/US) for device 2, reading 14 of 255 requested bytes: '123456' ++ Setting configuration 1 for device 2 ++ Getting string descriptor #4, language 0x0409 (English/US) for device 2, reading 42 of 255 requested bytes: 'Espressif CDC Device' ++ Class request #32, index 0, value 0 for interface 2.0, writing 7 bytes ++ Getting string descriptor #5, language 0x0409 (English/US) for device 2, reading 24 of 255 requested bytes: 'TiDAL badge' ++ Getting string descriptor #3, language 0x0409 (English/US) for device 2, reading 14 of 255 requested bytes: '123456' ++ Class request #10, index 0, value 0 for interface 2.2 ++ Getting unknown descriptor #0 for interface 2.2, reading 144 bytes ++ Class request #9, index 0, value 513 for interface 2.2, writing 2 bytes ++ Polling 194 times for interrupt transfer on endpoint 2.3 IN At traffic-transactions row 0: + 6 SOF packets + SETUP transaction on 0.0 with 8 data bytes, ACK: [80, 06, 00, 01, 00, 00, 40, 00] @@ -4287,6 +4320,12 @@ At traffic-hierarchical row 0: At traffic-hierarchical row 35: - Polling 194 times for interrupt transfer on endpoint 2.3 IN + Polling 263 times for interrupt transfer on endpoint 2.3 IN +At traffic-interleaved row 0: +- 209 SOF groups ++ 278 SOF groups +At traffic-interleaved row 35: +- Polling 194 times for interrupt transfer on endpoint 2.3 IN ++ Polling 263 times for interrupt transfer on endpoint 2.3 IN At traffic-transactions row 542: + IN transaction on 2.3, NAK + 8 SOF packets diff --git a/tests/ui/mouse-step/reference.txt b/tests/ui/mouse-step/reference.txt index 52fa9dd9..6d501261 100644 --- a/tests/ui/mouse-step/reference.txt +++ b/tests/ui/mouse-step/reference.txt @@ -2,6 +2,8 @@ Opening file tests/mouse/capture.pcap Updating after 1 packets decoded At traffic-hierarchical row 0: + 1 invalid groups +At traffic-interleaved row 0: ++ 1 invalid groups At traffic-transactions row 0: + 1 malformed packet At traffic-packets row 0: @@ -22,6 +24,8 @@ At traffic-hierarchical row 0: + 1 invalid groups + 1 malformed packet + Malformed packet (invalid PID) of 1 byte: [FF] +At traffic-interleaved row 1: ++ Incomplete control transfer on device 0 At traffic-transactions row 1: + SETUP transaction on 0.0 At traffic-packets row 1: @@ -60,6 +64,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 0 of 64 requested bytes, incomplete At traffic-hierarchical row 8: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 0 of 64 requested bytes, incomplete At traffic-transactions row 2: + IN transaction on 0.0 At traffic-packets row 4: @@ -84,6 +91,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 0 of 64 requested bytes, incomplete At traffic-hierarchical row 11: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 0 of 64 requested bytes, incomplete At traffic-transactions row 3: + IN transaction on 0.0 At traffic-packets row 6: @@ -108,6 +118,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 0 of 64 requested bytes, incomplete At traffic-hierarchical row 14: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 0 of 64 requested bytes, incomplete At traffic-transactions row 4: + IN transaction on 0.0 At traffic-packets row 8: @@ -143,6 +156,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 8 of 64 requested bytes, incomplete At traffic-hierarchical row 18: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 8 of 64 requested bytes, incomplete At traffic-transactions row 5: + IN transaction on 0.0 At traffic-packets row 11: @@ -162,6 +178,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 8 of 64 requested bytes, incomplete At traffic-hierarchical row 19: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 8 of 64 requested bytes, incomplete At traffic-transactions row 6: + IN transaction on 0.0 At traffic-packets row 13: @@ -181,6 +200,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 8 of 64 requested bytes, incomplete At traffic-hierarchical row 20: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 8 of 64 requested bytes, incomplete At traffic-transactions row 7: + IN transaction on 0.0 At traffic-packets row 15: @@ -209,6 +231,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 16 of 64 requested bytes, incomplete At traffic-hierarchical row 21: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 16 of 64 requested bytes, incomplete At traffic-transactions row 8: + IN transaction on 0.0 At traffic-packets row 18: @@ -228,6 +253,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 16 of 64 requested bytes, incomplete At traffic-hierarchical row 22: + IN transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 16 of 64 requested bytes, incomplete At traffic-transactions row 9: + IN transaction on 0.0 At traffic-packets row 20: @@ -256,6 +284,9 @@ At traffic-hierarchical row 3: + Getting device descriptor #0 for device 0, reading 18 of 64 requested bytes, incomplete At traffic-hierarchical row 23: + OUT transaction on 0.0 +At traffic-interleaved row 1: +- Incomplete control transfer on device 0 ++ Getting device descriptor #0 for device 0, reading 18 of 64 requested bytes, incomplete At traffic-transactions row 10: + OUT transaction on 0.0 At traffic-packets row 23: @@ -281,6 +312,8 @@ At traffic-packets row 25: Updating after 27 packets decoded At traffic-hierarchical row 24: + Incomplete control transfer on device 0 +At traffic-interleaved row 2: ++ Incomplete control transfer on device 0 At traffic-transactions row 11: + SETUP transaction on 0.0 At traffic-packets row 26: @@ -301,6 +334,9 @@ Updating after 30 packets decoded At traffic-hierarchical row 24: - Incomplete control transfer on device 0 + Setting address to 4 for device 0, incomplete +At traffic-interleaved row 2: +- Incomplete control transfer on device 0 ++ Setting address to 4 for device 0, incomplete At traffic-transactions row 12: + IN transaction on 0.0 At traffic-packets row 29: @@ -315,6 +351,9 @@ Updating after 32 packets decoded At traffic-hierarchical row 24: - Incomplete control transfer on device 0 + Setting address to 4 for device 0, incomplete +At traffic-interleaved row 2: +- Incomplete control transfer on device 0 ++ Setting address to 4 for device 0, incomplete At traffic-transactions row 13: + IN transaction on 0.0 At traffic-packets row 31: @@ -380,6 +419,8 @@ At traffic-hierarchical row 0: + IN transaction on 0.0 with 2 data bytes, ACK: [00, 01] + OUT transaction on 0.0 with no data, ACK + Setting address to 4 for device 0 +At traffic-interleaved row 3: ++ Incomplete control transfer on device 4 At traffic-transactions row 14: + SETUP transaction on 4.0 At traffic-packets row 34: @@ -405,6 +446,9 @@ Updating after 38 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 0 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 0 of 18 requested bytes, incomplete At traffic-transactions row 15: + IN transaction on 4.0 At traffic-packets row 37: @@ -419,6 +463,9 @@ Updating after 40 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 0 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 0 of 18 requested bytes, incomplete At traffic-transactions row 16: + IN transaction on 4.0 At traffic-packets row 39: @@ -433,6 +480,9 @@ Updating after 42 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 0 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 0 of 18 requested bytes, incomplete At traffic-transactions row 17: + IN transaction on 4.0 At traffic-packets row 41: @@ -453,6 +503,9 @@ Updating after 45 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 8 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 8 of 18 requested bytes, incomplete At traffic-transactions row 18: + IN transaction on 4.0 At traffic-packets row 44: @@ -467,6 +520,9 @@ Updating after 47 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 8 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 8 of 18 requested bytes, incomplete At traffic-transactions row 19: + IN transaction on 4.0 At traffic-packets row 46: @@ -481,6 +537,9 @@ Updating after 49 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 8 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 8 of 18 requested bytes, incomplete At traffic-transactions row 20: + IN transaction on 4.0 At traffic-packets row 48: @@ -501,6 +560,9 @@ Updating after 52 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 16 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 16 of 18 requested bytes, incomplete At traffic-transactions row 21: + IN transaction on 4.0 At traffic-packets row 51: @@ -515,6 +577,9 @@ Updating after 54 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 16 of 18 requested bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 16 of 18 requested bytes, incomplete At traffic-transactions row 22: + IN transaction on 4.0 At traffic-packets row 53: @@ -535,6 +600,9 @@ Updating after 57 packets decoded At traffic-hierarchical row 25: - Incomplete control transfer on device 4 + Getting device descriptor #0 for device 4, reading 18 bytes, incomplete +At traffic-interleaved row 3: +- Incomplete control transfer on device 4 ++ Getting device descriptor #0 for device 4, reading 18 bytes, incomplete At traffic-transactions row 23: + OUT transaction on 4.0 At traffic-packets row 56: @@ -575,6 +643,8 @@ At devices row 2: Updating after 60 packets decoded At traffic-hierarchical row 26: + Incomplete control transfer on device 4 +At traffic-interleaved row 4: ++ Incomplete control transfer on device 4 At traffic-transactions row 24: + SETUP transaction on 4.0 At traffic-packets row 59: @@ -595,6 +665,9 @@ Updating after 63 packets decoded At traffic-hierarchical row 26: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 0 of 9 requested bytes, incomplete +At traffic-interleaved row 4: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 0 of 9 requested bytes, incomplete At traffic-transactions row 25: + IN transaction on 4.0 At traffic-packets row 62: @@ -609,6 +682,9 @@ Updating after 65 packets decoded At traffic-hierarchical row 26: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 0 of 9 requested bytes, incomplete +At traffic-interleaved row 4: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 0 of 9 requested bytes, incomplete At traffic-transactions row 26: + IN transaction on 4.0 At traffic-packets row 64: @@ -623,6 +699,9 @@ Updating after 67 packets decoded At traffic-hierarchical row 26: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 0 of 9 requested bytes, incomplete +At traffic-interleaved row 4: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 0 of 9 requested bytes, incomplete At traffic-transactions row 27: + IN transaction on 4.0 At traffic-packets row 66: @@ -643,6 +722,9 @@ Updating after 70 packets decoded At traffic-hierarchical row 26: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 8 of 9 requested bytes, incomplete +At traffic-interleaved row 4: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 8 of 9 requested bytes, incomplete At traffic-transactions row 28: + IN transaction on 4.0 At traffic-packets row 69: @@ -657,6 +739,9 @@ Updating after 72 packets decoded At traffic-hierarchical row 26: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 8 of 9 requested bytes, incomplete +At traffic-interleaved row 4: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 8 of 9 requested bytes, incomplete At traffic-transactions row 29: + IN transaction on 4.0 At traffic-packets row 71: @@ -677,6 +762,9 @@ Updating after 75 packets decoded At traffic-hierarchical row 26: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 9 bytes, incomplete +At traffic-interleaved row 4: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 9 bytes, incomplete At traffic-transactions row 30: + OUT transaction on 4.0 At traffic-packets row 74: @@ -714,6 +802,8 @@ At devices row 17: Updating after 78 packets decoded At traffic-hierarchical row 27: + Incomplete control transfer on device 4 +At traffic-interleaved row 5: ++ Incomplete control transfer on device 4 At traffic-transactions row 31: + SETUP transaction on 4.0 At traffic-packets row 77: @@ -737,6 +827,9 @@ Updating after 81 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 0 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 0 of 34 requested bytes, incomplete At traffic-transactions row 32: + IN transaction on 4.0 At traffic-packets row 80: @@ -751,6 +844,9 @@ Updating after 83 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 0 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 0 of 34 requested bytes, incomplete At traffic-transactions row 33: + IN transaction on 4.0 At traffic-packets row 82: @@ -765,6 +861,9 @@ Updating after 85 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 0 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 0 of 34 requested bytes, incomplete At traffic-transactions row 34: + IN transaction on 4.0 At traffic-packets row 84: @@ -785,6 +884,9 @@ Updating after 88 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 8 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 8 of 34 requested bytes, incomplete At traffic-transactions row 35: + IN transaction on 4.0 At traffic-packets row 87: @@ -799,6 +901,9 @@ Updating after 90 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 8 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 8 of 34 requested bytes, incomplete At traffic-transactions row 36: + IN transaction on 4.0 At traffic-packets row 89: @@ -813,6 +918,9 @@ Updating after 92 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 8 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 8 of 34 requested bytes, incomplete At traffic-transactions row 37: + IN transaction on 4.0 At traffic-packets row 91: @@ -833,6 +941,9 @@ Updating after 95 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 16 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 16 of 34 requested bytes, incomplete At traffic-transactions row 38: + IN transaction on 4.0 At traffic-packets row 94: @@ -847,6 +958,9 @@ Updating after 97 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 16 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 16 of 34 requested bytes, incomplete At traffic-transactions row 39: + IN transaction on 4.0 At traffic-packets row 96: @@ -861,6 +975,9 @@ Updating after 99 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 16 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 16 of 34 requested bytes, incomplete At traffic-transactions row 40: + IN transaction on 4.0 At traffic-packets row 98: @@ -881,6 +998,9 @@ Updating after 102 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 24 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 24 of 34 requested bytes, incomplete At traffic-transactions row 41: + IN transaction on 4.0 At traffic-packets row 101: @@ -895,6 +1015,9 @@ Updating after 104 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 24 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 24 of 34 requested bytes, incomplete At traffic-transactions row 42: + IN transaction on 4.0 At traffic-packets row 103: @@ -909,6 +1032,9 @@ Updating after 106 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 24 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 24 of 34 requested bytes, incomplete At traffic-transactions row 43: + IN transaction on 4.0 At traffic-packets row 105: @@ -929,6 +1055,9 @@ Updating after 109 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 32 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 32 of 34 requested bytes, incomplete At traffic-transactions row 44: + IN transaction on 4.0 At traffic-packets row 108: @@ -943,6 +1072,9 @@ Updating after 111 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 32 of 34 requested bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 32 of 34 requested bytes, incomplete At traffic-transactions row 45: + IN transaction on 4.0 At traffic-packets row 110: @@ -963,6 +1095,9 @@ Updating after 114 packets decoded At traffic-hierarchical row 27: - Incomplete control transfer on device 4 + Getting configuration descriptor #0 for device 4, reading 34 bytes, incomplete +At traffic-interleaved row 5: +- Incomplete control transfer on device 4 ++ Getting configuration descriptor #0 for device 4, reading 34 bytes, incomplete At traffic-transactions row 46: + OUT transaction on 4.0 At traffic-packets row 113: @@ -1010,6 +1145,8 @@ At devices row 37: Updating after 117 packets decoded At traffic-hierarchical row 28: + Incomplete control transfer on device 4 +At traffic-interleaved row 6: ++ Incomplete control transfer on device 4 At traffic-transactions row 47: + SETUP transaction on 4.0 At traffic-packets row 116: @@ -1030,6 +1167,9 @@ Updating after 120 packets decoded At traffic-hierarchical row 28: - Incomplete control transfer on device 4 + Getting string descriptor #0 for device 4, reading 0 of 255 requested bytes, incomplete +At traffic-interleaved row 6: +- Incomplete control transfer on device 4 ++ Getting string descriptor #0 for device 4, reading 0 of 255 requested bytes, incomplete At traffic-transactions row 48: + IN transaction on 4.0 At traffic-packets row 119: @@ -1044,6 +1184,9 @@ Updating after 122 packets decoded At traffic-hierarchical row 28: - Incomplete control transfer on device 4 + Getting string descriptor #0 for device 4, reading 0 of 255 requested bytes, incomplete +At traffic-interleaved row 6: +- Incomplete control transfer on device 4 ++ Getting string descriptor #0 for device 4, reading 0 of 255 requested bytes, incomplete At traffic-transactions row 49: + IN transaction on 4.0 At traffic-packets row 121: @@ -1058,6 +1201,9 @@ Updating after 124 packets decoded At traffic-hierarchical row 28: - Incomplete control transfer on device 4 + Getting string descriptor #0 for device 4, reading 0 of 255 requested bytes, incomplete +At traffic-interleaved row 6: +- Incomplete control transfer on device 4 ++ Getting string descriptor #0 for device 4, reading 0 of 255 requested bytes, incomplete At traffic-transactions row 50: + IN transaction on 4.0 At traffic-packets row 123: @@ -1078,6 +1224,9 @@ Updating after 127 packets decoded At traffic-hierarchical row 28: - Incomplete control transfer on device 4 + Getting string descriptor #0 for device 4, reading 4 of 255 requested bytes, incomplete +At traffic-interleaved row 6: +- Incomplete control transfer on device 4 ++ Getting string descriptor #0 for device 4, reading 4 of 255 requested bytes, incomplete At traffic-transactions row 51: + OUT transaction on 4.0 At traffic-packets row 126: @@ -1100,6 +1249,8 @@ At devices row 0: Updating after 130 packets decoded At traffic-hierarchical row 29: + Incomplete control transfer on device 4 +At traffic-interleaved row 7: ++ Incomplete control transfer on device 4 At traffic-transactions row 52: + SETUP transaction on 4.0 At traffic-packets row 129: @@ -1120,6 +1271,9 @@ Updating after 133 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 0 of 255 requested bytes, incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 0 of 255 requested bytes, incomplete At traffic-transactions row 53: + IN transaction on 4.0 At traffic-packets row 132: @@ -1134,6 +1288,9 @@ Updating after 135 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 0 of 255 requested bytes, incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 0 of 255 requested bytes, incomplete At traffic-transactions row 54: + IN transaction on 4.0 At traffic-packets row 134: @@ -1148,6 +1305,9 @@ Updating after 137 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 0 of 255 requested bytes, incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 0 of 255 requested bytes, incomplete At traffic-transactions row 55: + IN transaction on 4.0 At traffic-packets row 136: @@ -1168,6 +1328,9 @@ Updating after 140 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 8 of 255 requested bytes: 'USB', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 8 of 255 requested bytes: 'USB', incomplete At traffic-transactions row 56: + IN transaction on 4.0 At traffic-packets row 139: @@ -1188,6 +1351,9 @@ Updating after 143 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 16 of 255 requested bytes: 'USB Opt', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 16 of 255 requested bytes: 'USB Opt', incomplete At traffic-transactions row 57: + IN transaction on 4.0 At traffic-packets row 142: @@ -1202,6 +1368,9 @@ Updating after 145 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 16 of 255 requested bytes: 'USB Opt', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 16 of 255 requested bytes: 'USB Opt', incomplete At traffic-transactions row 58: + IN transaction on 4.0 At traffic-packets row 144: @@ -1216,6 +1385,9 @@ Updating after 147 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 16 of 255 requested bytes: 'USB Opt', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 16 of 255 requested bytes: 'USB Opt', incomplete At traffic-transactions row 59: + IN transaction on 4.0 At traffic-packets row 146: @@ -1236,6 +1408,9 @@ Updating after 150 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 24 of 255 requested bytes: 'USB Optical', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 24 of 255 requested bytes: 'USB Optical', incomplete At traffic-transactions row 60: + IN transaction on 4.0 At traffic-packets row 149: @@ -1250,6 +1425,9 @@ Updating after 152 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 24 of 255 requested bytes: 'USB Optical', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 24 of 255 requested bytes: 'USB Optical', incomplete At traffic-transactions row 61: + IN transaction on 4.0 At traffic-packets row 151: @@ -1264,6 +1442,9 @@ Updating after 154 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 24 of 255 requested bytes: 'USB Optical', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 24 of 255 requested bytes: 'USB Optical', incomplete At traffic-transactions row 62: + IN transaction on 4.0 At traffic-packets row 153: @@ -1284,6 +1465,9 @@ Updating after 157 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 32 of 255 requested bytes: 'USB Optical Mou', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 32 of 255 requested bytes: 'USB Optical Mou', incomplete At traffic-transactions row 63: + IN transaction on 4.0 At traffic-packets row 156: @@ -1298,6 +1482,9 @@ Updating after 159 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 32 of 255 requested bytes: 'USB Optical Mou', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 32 of 255 requested bytes: 'USB Optical Mou', incomplete At traffic-transactions row 64: + IN transaction on 4.0 At traffic-packets row 158: @@ -1318,6 +1505,9 @@ Updating after 162 packets decoded At traffic-hierarchical row 29: - Incomplete control transfer on device 4 + Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 36 of 255 requested bytes: 'USB Optical Mouse', incomplete +At traffic-interleaved row 7: +- Incomplete control transfer on device 4 ++ Getting string descriptor #2, language 0x0409 (English/US) for device 4, reading 36 of 255 requested bytes: 'USB Optical Mouse', incomplete At traffic-transactions row 65: + OUT transaction on 4.0 At traffic-packets row 161: diff --git a/tests/ui/split-poll-step/reference.txt b/tests/ui/split-poll-step/reference.txt index 85f63afa..0f1faa30 100644 --- a/tests/ui/split-poll-step/reference.txt +++ b/tests/ui/split-poll-step/reference.txt @@ -7,6 +7,8 @@ At traffic-packets row 0: Updating after 2 packets decoded At traffic-hierarchical row 0: + Polling 1 times for interrupt transfer on endpoint 14.1 IN +At traffic-interleaved row 0: ++ Polling 1 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 0: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -33,6 +35,8 @@ At traffic-hierarchical row 0: - Starting IN transaction on 14.1 + Polling 1 times for interrupt transfer on endpoint 14.1 IN + Starting IN transaction on 14.1 +At traffic-interleaved row 1: ++ Polling 1 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 1: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -90,6 +94,9 @@ At traffic-hierarchical row 0: + Polling 2 times for interrupt transfer on endpoint 14.1 IN At traffic-hierarchical row 3: + Starting IN transaction on 14.1 +At traffic-interleaved row 0: +- Polling 1 times for interrupt transfer on endpoint 14.1 IN ++ Polling 2 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 4: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -106,6 +113,9 @@ At traffic-hierarchical row 4: + Polling 2 times for interrupt transfer on endpoint 14.2 IN At traffic-hierarchical row 7: + Starting IN transaction on 14.2 +At traffic-interleaved row 1: +- Polling 1 times for interrupt transfer on endpoint 14.2 IN ++ Polling 2 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 5: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -128,6 +138,9 @@ At traffic-hierarchical row 0: + Polling 2 times for interrupt transfer on endpoint 14.1 IN At traffic-hierarchical row 4: + Completing IN transaction on 14.1, NAK +At traffic-interleaved row 0: +- Polling 1 times for interrupt transfer on endpoint 14.1 IN ++ Polling 2 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 6: - Completing low speed interrupt transaction on hub 12 port 2 + Completing IN transaction on 0.16, NAK @@ -150,6 +163,9 @@ At traffic-hierarchical row 5: + Polling 2 times for interrupt transfer on endpoint 14.2 IN At traffic-hierarchical row 9: + Completing IN transaction on 14.2, NAK +At traffic-interleaved row 1: +- Polling 1 times for interrupt transfer on endpoint 14.2 IN ++ Polling 2 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 7: - Completing low speed interrupt transaction on hub 12 port 2 + Completing IN transaction on 0.16, NAK @@ -166,6 +182,9 @@ At traffic-hierarchical row 0: + Polling 3 times for interrupt transfer on endpoint 14.1 IN At traffic-hierarchical row 5: + Starting IN transaction on 14.1 +At traffic-interleaved row 0: +- Polling 1 times for interrupt transfer on endpoint 14.1 IN ++ Polling 3 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 8: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -182,6 +201,9 @@ At traffic-hierarchical row 6: + Polling 3 times for interrupt transfer on endpoint 14.2 IN At traffic-hierarchical row 11: + Starting IN transaction on 14.2 +At traffic-interleaved row 1: +- Polling 1 times for interrupt transfer on endpoint 14.2 IN ++ Polling 3 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 9: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -204,6 +226,9 @@ At traffic-hierarchical row 0: + Polling 3 times for interrupt transfer on endpoint 14.1 IN At traffic-hierarchical row 6: + Completing IN transaction on 14.1, NAK +At traffic-interleaved row 0: +- Polling 1 times for interrupt transfer on endpoint 14.1 IN ++ Polling 3 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 10: - Completing low speed interrupt transaction on hub 12 port 2 + Completing IN transaction on 0.16, NAK @@ -226,6 +251,9 @@ At traffic-hierarchical row 7: + Polling 3 times for interrupt transfer on endpoint 14.2 IN At traffic-hierarchical row 13: + Completing IN transaction on 14.2, NAK +At traffic-interleaved row 1: +- Polling 1 times for interrupt transfer on endpoint 14.2 IN ++ Polling 3 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 11: - Completing low speed interrupt transaction on hub 12 port 2 + Completing IN transaction on 0.16, NAK @@ -242,6 +270,9 @@ At traffic-hierarchical row 0: + Polling 4 times for interrupt transfer on endpoint 14.1 IN At traffic-hierarchical row 7: + Starting IN transaction on 14.1 +At traffic-interleaved row 0: +- Polling 1 times for interrupt transfer on endpoint 14.1 IN ++ Polling 4 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 12: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -258,6 +289,9 @@ At traffic-hierarchical row 8: + Polling 4 times for interrupt transfer on endpoint 14.2 IN At traffic-hierarchical row 15: + Starting IN transaction on 14.2 +At traffic-interleaved row 1: +- Polling 1 times for interrupt transfer on endpoint 14.2 IN ++ Polling 4 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 13: - Starting low speed interrupt transaction on hub 12 port 2 + Starting IN transaction on 0.16 @@ -280,6 +314,9 @@ At traffic-hierarchical row 0: + Polling 4 times for interrupt transfer on endpoint 14.1 IN At traffic-hierarchical row 8: + Completing IN transaction on 14.1, NAK +At traffic-interleaved row 0: +- Polling 1 times for interrupt transfer on endpoint 14.1 IN ++ Polling 4 times for interrupt transfer on endpoint 14.1 IN At traffic-transactions row 14: - Completing low speed interrupt transaction on hub 12 port 2 + Completing IN transaction on 0.16, NAK @@ -302,6 +339,9 @@ At traffic-hierarchical row 9: + Polling 4 times for interrupt transfer on endpoint 14.2 IN At traffic-hierarchical row 17: + Completing IN transaction on 14.2, NAK +At traffic-interleaved row 1: +- Polling 1 times for interrupt transfer on endpoint 14.2 IN ++ Polling 4 times for interrupt transfer on endpoint 14.2 IN At traffic-transactions row 15: - Completing low speed interrupt transaction on hub 12 port 2 + Completing IN transaction on 0.16, NAK