X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=247e41fb88a38fa8614c739932a9f6b8b0bd5679;hb=478c8d923e026fe2dda707f67336326da635b2eb;hp=25b55cb1d372ea7c331d2cc47103ecbc95aee783;hpb=22c18b03707834251b14a4f77d92aee19188dcbc;p=libsigrok.git diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h index 25b55cb1..247e41fb 100644 --- a/src/hardware/scpi-pps/protocol.h +++ b/src/hardware/scpi-pps/protocol.h @@ -51,8 +51,6 @@ enum pps_scpi_cmds { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, - SCPI_CMD_GET_OUTPUT_CHANNEL_CONFIG, - SCPI_CMD_SET_OUTPUT_CHANNEL_CONFIG, }; /* @@ -70,8 +68,8 @@ enum pps_features { }; struct scpi_pps { - char *idn_vendor; - char *idn_model; + char *vendor; + char *model; uint64_t features; const int32_t *devopts; unsigned int num_devopts; @@ -129,7 +127,10 @@ struct dev_context { }; const char *get_vendor(const char *raw_vendor); +SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command); SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...); +SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar, + const GVariantType *gvtype, int command, ...); SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data); #endif