X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fprotocol.c;h=1a0b7bce39820a12dffd19a5f60fa1d31f38d951;hb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;hp=148f0ba18933fd80ec26bd2ee171be379e582097;hpb=98fec29ecbb5093856b69311be8e937c162edded;p=libsigrok.git diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c index 148f0ba1..1a0b7bce 100644 --- a/src/hardware/link-mso19/protocol.c +++ b/src/hardware/link-mso19/protocol.c @@ -198,7 +198,7 @@ SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val) return mso_send_control_message(devc->serial, ARRAY_AND_SIZE(ops)); } -SR_PRIV inline uint16_t mso_calc_raw_from_mv(struct dev_context * devc) +SR_PRIV uint16_t mso_calc_raw_from_mv(struct dev_context *devc) { return (uint16_t) (0x200 - ((devc->dso_trigger_voltage / devc->dso_probe_attn) / @@ -357,7 +357,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data) GSList *l; int i; - struct drv_context *drvc = di->priv; + struct drv_context *drvc = di->context; /* Find this device's devc struct by its fd. */ struct dev_context *devc = NULL;