X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fprotocol.h;h=8e614ce2a335621932a9869c99358d6aea5ac268;hb=2c24077466a299ead689c90f01f55f6d86c7386b;hp=e903537728c2bdca03c08b599182ec59e307f81f;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h index e9035377..8e614ce2 100644 --- a/src/hardware/manson-hcs-3xxx/protocol.h +++ b/src/hardware/manson-hcs-3xxx/protocol.h @@ -31,7 +31,7 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "manson-hcs-3xxx" @@ -58,15 +58,15 @@ enum { /** Information on a single model. */ struct hcs_model { int model_id; /**< Model info */ - char *name; /**< Model name */ - char *id; /**< Model ID, like delivered by interface */ + const char *name; /**< Model name */ + const char *id; /**< Model ID, like delivered by interface */ double voltage[3]; /**< Min, max, step */ double current[3]; /**< Min, max, step */ }; /** Private, per-device-instance driver context. */ struct dev_context { - const struct hcs_model *model; /**< Model informaion. */ + const struct hcs_model *model; /**< Model information. */ uint64_t limit_samples; uint64_t limit_msec; @@ -92,7 +92,7 @@ struct dev_context { }; SR_PRIV int hcs_parse_volt_curr_mode(struct sr_dev_inst *sdi, char **tokens); -SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char* buf, int buflen); +SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char *buf, int buflen); SR_PRIV int hcs_send_cmd(struct sr_serial_dev_inst *serial, const char *cmd, ...); SR_PRIV int hcs_receive_data(int fd, int revents, void *cb_data);