X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.h;h=3b17299114bb244e16685662174b1b5a4e496353;hb=f82525e60d50c7bd06e2d398c3244a6b3aecc46a;hp=a085936197abe4ff9244b23492872678c6fe8297;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h index a0859361..3b172991 100644 --- a/src/hardware/rigol-ds/protocol.h +++ b/src/hardware/rigol-ds/protocol.h @@ -89,9 +89,7 @@ enum wait_events { WAIT_STOP, /* Wait for scope stopping (only single shots) */ }; -/** Private, per-device-instance driver context. */ struct dev_context { - /* Device model */ const struct rigol_ds_model *model; enum data_format format; @@ -117,16 +115,16 @@ struct dev_context { gboolean digital_channels[MAX_DIGITAL_CHANNELS]; gboolean la_enabled; float timebase; + float attenuation[MAX_ANALOG_CHANNELS]; float vdiv[MAX_ANALOG_CHANNELS]; int vert_reference[MAX_ANALOG_CHANNELS]; float vert_offset[MAX_ANALOG_CHANNELS]; char *trigger_source; float horiz_triggerpos; char *trigger_slope; + float trigger_level; char *coupling[MAX_ANALOG_CHANNELS]; - /* Operational state */ - /* Number of frames received in total. */ uint64_t num_frames; /* GSList entry for the current channel. */ @@ -153,5 +151,6 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi); SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi); SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data); SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi); +SR_PRIV int rigol_ds_get_dev_cfg_vertical(const struct sr_dev_inst *sdi); #endif