X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=e93658208831324953fdf3f3de61cd1b12e063e7;hb=319fe9cea6e59858e5d887fb6f63826ecd1208ae;hp=ba1905132442019ceff60732cb9b2fe389a92fcb;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h index ba190513..e9365820 100644 --- a/src/hardware/scpi-pps/protocol.h +++ b/src/hardware/scpi-pps/protocol.h @@ -100,10 +100,11 @@ struct scpi_pps { struct channel_spec { const char *name; - /* Min, max, programming resolution. */ - float voltage[3]; - float current[3]; - float frequency[3]; + /* Min, max, programming resolution, spec digits, encoding digits. */ + double voltage[5]; + double current[5]; + double power[5]; + double frequency[5]; }; struct channel_group_spec { @@ -113,13 +114,14 @@ struct channel_group_spec { }; struct pps_channel { - int mq; + enum sr_mq mq; unsigned int hw_output_idx; const char *hwname; + int digits; }; struct pps_channel_instance { - int mq; + enum sr_mq mq; int command; const char *prefix; }; @@ -134,17 +136,13 @@ enum acq_states { STATE_STOP, }; -/** Private, per-device-instance driver context. */ struct dev_context { - /* Model-specific information */ const struct scpi_pps *device; - /* Operational state */ gboolean beeper_was_set; struct channel_spec *channels; struct channel_group_spec *channel_groups; - /* Temporary state across callbacks */ struct sr_channel *cur_channel; };