X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=80593ceca8ad54ed205e7db214a9bcd56f4f64d2;hb=6402c379161ec138e451901c411817a55846a75b;hp=f939b0d729722ff89d7c2fd231dcac5de5e53436;hpb=3c996d8e231eb3ae2ff37182a0c9762bcd681770;p=libsigrok.git diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h index f939b0d7..80593cec 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. */ + float voltage[5]; + float current[5]; + float power[5]; + float 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; }; @@ -139,9 +141,6 @@ struct dev_context { /* Model-specific information */ const struct scpi_pps *device; - /* Acquisition settings */ - void *cb_data; - /* Operational state */ gboolean beeper_was_set; struct channel_spec *channels;