X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fprotocol.c;h=88c47e0ae811a938101570af66774eef18fe66df;hb=96ed86253b1d320b8f467581d7a29b9e4a570348;hp=6f997db020389ed30d8abdaee0c05651ecc19c84;hpb=c9404469185faf035390aeb6ced077a70601b756;p=libsigrok.git
diff --git a/src/hardware/hung-chang-dso-2100/protocol.c b/src/hardware/hung-chang-dso-2100/protocol.c
index 6f997db0..88c47e0a 100644
--- a/src/hardware/hung-chang-dso-2100/protocol.c
+++ b/src/hardware/hung-chang-dso-2100/protocol.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include "protocol.h"
@@ -330,14 +331,10 @@ static void push_samples(const struct sr_dev_inst *sdi, uint8_t *buf, size_t num
{
struct dev_context *devc = sdi->priv;
float *data = devc->samples;
- struct sr_datafeed_analog analog = {
- .channels = devc->enabled_channel,
- .num_samples = num,
- .mq = SR_MQ_VOLTAGE,
- .unit = SR_UNIT_VOLT,
- .mqflags = 0,
- .data = data,
- };
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_datafeed_packet packet = {
.type = SR_DF_ANALOG,
.payload = &analog,
@@ -347,7 +344,15 @@ static void push_samples(const struct sr_dev_inst *sdi, uint8_t *buf, size_t num
while (num--)
data[num] = (buf[num] - 0x80) * factor;
- sr_session_send(devc->cb_data, &packet);
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+ analog.meaning->channels = devc->enabled_channel;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
+ analog.num_samples = num;
+ analog.data = data;
+
+ sr_session_send(sdi, &packet);
}
static int read_subframe(const struct sr_dev_inst *sdi, uint8_t *buf)
@@ -392,7 +397,7 @@ static int read_subframe(const struct sr_dev_inst *sdi, uint8_t *buf)
};
push_samples(sdi, buf, 6);
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
buf += 6;
num -= 6;
}
@@ -434,11 +439,11 @@ SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data)
return TRUE;
if (state != 0x03) {
- sr_err("Unexpected state 0x%X while checking for trigger");
+ sr_err("Unexpected state 0x%X while checking for trigger", state);
return FALSE;
}
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (devc->channel) {
while (read_subframe(sdi, buf)) {
@@ -452,10 +457,10 @@ SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data)
}
packet.type = SR_DF_FRAME_END;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (++devc->frame >= devc->frame_limit)
- hung_chang_dso_2100_dev_acquisition_stop(sdi, devc->cb_data);
+ hung_chang_dso_2100_dev_acquisition_stop(sdi);
else
hung_chang_dso_2100_move_to(sdi, 0x21);