Enable interleaved view.

greatscottgadgets · Oct 8, 2024 · 8306548 · 8306548
1 parent ff1f8d2
commit 8306548
Show file tree

Hide file tree

Showing 5 changed files with 287 additions and 2 deletions.
diff --git 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/alt-settings/reference.txt b/tests/ui/alt-settings/reference.txt
@@ -16,6 +16,22 @@ At traffic-hierarchical row 0:
 + Setting configuration 1 for device 27
 + Getting string descriptor #4, language 0x0409 (English/US) for device 27, reading 2 bytes
 + Getting string descriptor #4, language 0x0409 (English/US) for device 27, reading 46 bytes: 'Ksoloti Bulk Interface'
+At traffic-interleaved row 0:
++ 9 SOF groups
++ Setting address to 27 for device 0
++ Getting device descriptor #0 for device 27, reading 8 bytes
++ Getting device descriptor #0 for device 27, reading 18 bytes
++ Getting string descriptor #5, language 0x0409 (English/US) for device 27, reading 2 bytes
++ Getting string descriptor #5, language 0x0409 (English/US) for device 27, reading 26 bytes: 'Ksoloti Core'
++ Getting string descriptor #1, language 0x0409 (English/US) for device 27, reading 2 bytes
++ Getting string descriptor #1, language 0x0409 (English/US) for device 27, reading 16 bytes: 'Ksoloti'
++ Getting string descriptor #3, language 0x0409 (English/US) for device 27, reading 2 bytes
++ Getting string descriptor #3, language 0x0409 (English/US) for device 27, reading 50 bytes: '002900193133510B33383438'
++ Getting configuration descriptor #0 for device 27, reading 9 bytes
++ Getting configuration descriptor #0 for device 27, reading 426 bytes
++ Setting configuration 1 for device 27
++ Getting string descriptor #4, language 0x0409 (English/US) for device 27, reading 2 bytes
++ Getting string descriptor #4, language 0x0409 (English/US) for device 27, reading 46 bytes: 'Ksoloti Bulk Interface'
 At traffic-transactions row 0:
 + 30 SOF packets
 + SETUP transaction on 0.0 with 8 data bytes, ACK: [00, 05, 1B, 00, 00, 00, 00, 00]

diff --git 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