- unsigned int ramsize, n, triggerbar;
-
- ramsize = get_memory_size(devc->memory_size) / 4;
- if (devc->trigger) {
- n = ramsize;
- if (devc->max_memory_size < n)
- n = devc->max_memory_size;
- if (devc->limit_samples < n)
- n = devc->limit_samples;
- n = n * devc->capture_ratio / 100;
- if (n > ramsize - 8)
- triggerbar = ramsize - 8;
- else
- triggerbar = n;
- } else {
+ unsigned int trigger_depth, triggerbar, ramsize_trigger;
+
+ trigger_depth = get_memory_size(devc->memory_size) / 4;
+ if (devc->limit_samples < trigger_depth)
+ trigger_depth = devc->limit_samples;
+
+ if (devc->trigger)
+ triggerbar = trigger_depth * devc->capture_ratio / 100;
+ else
+ triggerbar = 0;
+
+ ramsize_trigger = trigger_depth - triggerbar;
+ /* Matches USB packet captures from official app/driver */
+ if (triggerbar > 2)
+ triggerbar -= 2;
+ else {
+ ramsize_trigger -= 1;