X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcem-dt-885x%2Fprotocol.c;h=68d003a0d0243d50c05cb58169b5ba9fe180722d;hb=32ba0d80054df01767ec323c621ab1c6bc5f310c;hp=bbb1a03a0b1a935af36bc59c011d93341f702899;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git
diff --git a/src/hardware/cem-dt-885x/protocol.c b/src/hardware/cem-dt-885x/protocol.c
index bbb1a03a..68d003a0 100644
--- a/src/hardware/cem-dt-885x/protocol.c
+++ b/src/hardware/cem-dt-885x/protocol.c
@@ -17,11 +17,12 @@
* along with this program. If not, see .
*/
+#include
#include
#include "protocol.h"
/* Length of expected payload for each token. */
-static int token_payloads[][2] = {
+static const int token_payloads[][2] = {
{ TOKEN_WEIGHT_TIME_FAST, 0 },
{ TOKEN_WEIGHT_TIME_SLOW, 0 },
{ TOKEN_HOLD_MAX, 0 },
@@ -65,7 +66,7 @@ static void process_mset(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
GString *dbg;
float fvalue;
int i;
@@ -84,7 +85,7 @@ static void process_mset(const struct sr_dev_inst *sdi)
g_string_free(dbg, TRUE);
}
- switch(devc->token) {
+ switch (devc->token) {
case TOKEN_WEIGHT_TIME_FAST:
devc->cur_mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F;
devc->cur_mqflags &= ~SR_MQFLAG_SPL_TIME_WEIGHT_S;
@@ -130,14 +131,14 @@ static void process_mset(const struct sr_dev_inst *sdi)
break;
}
}
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
analog.mqflags = devc->cur_mqflags;
analog.unit = SR_UNIT_DECIBEL_SPL;
analog.channels = sdi->channels;
analog.num_samples = 1;
analog.data = &devc->last_spl;
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
sr_session_send(devc->cb_data, &packet);
@@ -166,7 +167,7 @@ static void process_mset(const struct sr_dev_inst *sdi)
case TOKEN_MEAS_RANGE_OK:
case TOKEN_MEAS_RANGE_OVER:
case TOKEN_MEAS_RANGE_UNDER:
- /* Not useful, or not expressable in sigrok. */
+ /* Not useful, or not expressible in sigrok. */
break;
}
@@ -177,26 +178,26 @@ static void send_data(const struct sr_dev_inst *sdi, unsigned char *data,
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
float fbuf[SAMPLES_PER_PACKET];
unsigned int i;
devc = sdi->priv;
- for (i = 0; i < num_samples; i ++) {
+ for (i = 0; i < num_samples; i++) {
fbuf[i] = ((data[i * 2] & 0xf0) >> 4) * 100;
fbuf[i] += (data[i * 2] & 0x0f) * 10;
fbuf[i] += ((data[i * 2 + 1] & 0xf0) >> 4);
fbuf[i] += (data[i * 2 + 1] & 0x0f) / 10.0;
}
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
analog.mqflags = devc->cur_mqflags;
analog.unit = SR_UNIT_DECIBEL_SPL;
analog.channels = sdi->channels;
analog.num_samples = num_samples;
analog.data = fbuf;
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
sr_session_send(devc->cb_data, &packet);