Backport recent changes from mainline.

[libsigrok.git] / src / hardware / link-mso19 / protocol.h

diff --git a/src/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h
index 4c8a66b26a22f0e241501be5dcc2e50f27492cea..d6eb872b8a9d14f7dd2f0aef89e5e7524cbb4907 100644 (file)
--- 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;
@@ -200,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