X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fprotocol.h;h=d6eb872b8a9d14f7dd2f0aef89e5e7524cbb4907;hb=98b7b0895659ded4ccbdf99ea3d6d72db6de4a5e;hp=e32f39e9f9829ab7c76a3cd9fa41c61419d25cf5;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git diff --git a/src/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h index e32f39e9..d6eb872b 100644 --- a/src/hardware/link-mso19/protocol.h +++ b/src/hardware/link-mso19/protocol.h @@ -84,7 +84,6 @@ struct mso_prototrig { uint8_t spimode; }; -/* Private, per-device-instance driver context. */ struct dev_context { /* info */ uint8_t hwmodel; @@ -97,10 +96,11 @@ struct dev_context { uint16_t offset_range; uint64_t limit_samples; uint64_t num_samples; + /* register cache */ uint8_t ctlbase1; uint8_t ctlbase2; - /* state */ + uint8_t la_threshold; uint64_t cur_rate; uint8_t dso_probe_attn; @@ -115,7 +115,6 @@ struct dev_context { double dso_trigger_voltage; uint16_t dso_trigger_width; struct mso_prototrig protocol_trigger; - void *cb_data; uint16_t buffer_n; char buffer[4096]; }; @@ -201,12 +200,7 @@ static const struct rate_map rate_map[] = { /* FIXME: Determine corresponding voltages */ static const uint16_t la_threshold_map[] = { - 0x8600, - 0x8770, - 0x88ff, - 0x8c70, - 0x8eff, - 0x8fff, + 0x8600, 0x8770, 0x88ff, 0x8c70, 0x8eff, 0x8fff, }; #endif