X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=3909638fbdc65e76e9f4a850da06909d149008b6;hb=660e398fe9f5fc608787f8fd75a9df8aac61026f;hp=70a9d7731d35e50e249c213680b29e8f822fa7ab;hpb=8f996b89481670219c7576e2c68b128a0a2ce026;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 70a9d773..3909638f 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -745,11 +745,11 @@ static int cleanup(void) } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *channel_group) { struct dev_context *devc; - (void)probe_group; + (void)channel_group; switch (id) { case SR_CONF_SAMPLERATE: @@ -767,12 +767,12 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *channel_group) { struct dev_context *devc; int ret; - (void)probe_group; + (void)channel_group; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -801,13 +801,13 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *channel_group) { GVariant *gvar; GVariantBuilder gvb; (void)sdi; - (void)probe_group; + (void)channel_group; switch (key) { case SR_CONF_DEVICE_OPTIONS: @@ -1061,7 +1061,7 @@ static int receive_data(int fd, int revents, void *cb_data) /* Find first ts. */ if (devc->state.chunks_downloaded == 0) { - devc->state.lastts = *(uint16_t *) buf - 1; + devc->state.lastts = RL16(buf) - 1; devc->state.lastsample = 0; }