X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.h;h=375d4821ea94c90941075d0d2b89c239d7ea9a1f;hb=7048bb1f356305caf458862ebdf22ae0645dae66;hp=0bdb7f2f58f1add1595ce8f6d8fe2fb8c2210d61;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/protocol.h b/src/hardware/yokogawa-dlm/protocol.h index 0bdb7f2f..375d4821 100644 --- a/src/hardware/yokogawa-dlm/protocol.h +++ b/src/hardware/yokogawa-dlm/protocol.h @@ -31,15 +31,15 @@ #include "protocol_wrappers.h" #define LOG_PREFIX "yokogawa-dlm" -#define MAX_INSTRUMENT_VERSIONS 4 +#define MAX_INSTRUMENT_VERSIONS 8 -#define RECEIVE_BUFFER_SIZE (4096) +#define RECEIVE_BUFFER_SIZE 4096 /* See Communication Interface User's Manual on p. 268 (:WAVeform:ALL:SEND?). */ -#define DLM_MAX_FRAME_LENGTH (12500) +#define DLM_MAX_FRAME_LENGTH 12500 /* See Communication Interface User's Manual on p. 269 (:WAVeform:SEND?). */ -#define DLM_DIVISION_FOR_WORD_FORMAT (3200) -#define DLM_DIVISION_FOR_BYTE_FORMAT (12.5) +#define DLM_DIVISION_FOR_WORD_FORMAT 3200 +#define DLM_DIVISION_FOR_BYTE_FORMAT 12.5 enum trigger_slopes { SLOPE_POSITIVE, @@ -121,18 +121,13 @@ struct dev_context { gboolean data_pending; }; -/*--- api.c -----------------------------------------------------------------*/ SR_PRIV int dlm_data_request(const struct sr_dev_inst *sdi); - -/*--- protocol.c ------------------------------------------------------------*/ SR_PRIV int dlm_model_get(char *model_id, char **model_name, int *model_index); SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index); SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data); - SR_PRIV void dlm_scope_state_destroy(struct scope_state *state); SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi); SR_PRIV int dlm_sample_rate_query(const struct sr_dev_inst *sdi); - SR_PRIV int dlm_channel_data_request(const struct sr_dev_inst *sdi); #endif