X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcem-dt-885x%2Fprotocol.c;h=092d16542aa2aa1e0f3ff75c7049dac726228cc8;hb=6402c379161ec138e451901c411817a55846a75b;hp=8f6724d50b79c53d94ca53ebfbf4a4766f9c7469;hpb=0c5f2abc6697504b5d760dfa56cc90bea180198f;p=libsigrok.git

diff --git a/src/hardware/cem-dt-885x/protocol.c b/src/hardware/cem-dt-885x/protocol.c
index 8f6724d5..092d1654 100644
--- a/src/hardware/cem-dt-885x/protocol.c
+++ b/src/hardware/cem-dt-885x/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include "protocol.h"
 
@@ -66,6 +67,9 @@ 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_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	GString *dbg;
 	float fvalue;
 	int i;
@@ -130,21 +134,20 @@ static void process_mset(const struct sr_dev_inst *sdi)
 				break;
 			}
 		}
-		memset(&analog, 0, sizeof(struct sr_datafeed_analog));
-		analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
-		analog.mqflags = devc->cur_mqflags;
-		analog.unit = SR_UNIT_DECIBEL_SPL;
-		analog.channels = sdi->channels;
+		sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
+		analog.meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
+		analog.meaning->mqflags = devc->cur_mqflags;
+		analog.meaning->unit = SR_UNIT_DECIBEL_SPL;
+		analog.meaning->channels = sdi->channels;
 		analog.num_samples = 1;
 		analog.data = &devc->last_spl;
 		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
-		sr_session_send(devc->cb_data, &packet);
+		sr_session_send(sdi, &packet);
 
 		devc->num_samples++;
 		if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
-			sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-					devc->cb_data);
+			sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
 		break;
 	case TOKEN_RECORDING_ON:
 		devc->recording = TRUE;
@@ -166,7 +169,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;
 	}
 
@@ -178,32 +181,34 @@ 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_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	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));
-	analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
-	analog.mqflags = devc->cur_mqflags;
-	analog.unit = SR_UNIT_DECIBEL_SPL;
-	analog.channels = sdi->channels;
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
+	analog.meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
+	analog.meaning->mqflags = devc->cur_mqflags;
+	analog.meaning->unit = SR_UNIT_DECIBEL_SPL;
+	analog.meaning->channels = sdi->channels;
 	analog.num_samples = num_samples;
 	analog.data = fbuf;
 	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
-	sr_session_send(devc->cb_data, &packet);
+	sr_session_send(sdi, &packet);
 
 	devc->num_samples += analog.num_samples;
 	if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
-		sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-				devc->cb_data);
+		sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
 
 	return;
 }
@@ -316,8 +321,7 @@ static void process_byte(const struct sr_dev_inst *sdi, const unsigned char c,
 			 * records. Otherwise the frontend would have no
 			 * way to tell where stored data ends and live
 			 * measurements begin. */
-			sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-					devc->cb_data);
+			sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
 		} else if (c == RECORD_DATA) {
 			devc->buf_len = 0;
 			devc->state = ST_GET_LOG_RECORD_DATA;
@@ -341,7 +345,7 @@ static void process_byte(const struct sr_dev_inst *sdi, const unsigned char c,
 			src = sr_config_new(SR_CONF_SAMPLE_INTERVAL,
 					g_variant_new_uint64(devc->buf[7] * 1000));
 			meta.config = g_slist_append(NULL, src);
-			sr_session_send(devc->cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			g_free(src);
 			devc->buf_len = 0;
 		}
@@ -766,11 +770,11 @@ SR_PRIV int cem_dt_885x_meas_range_set(const struct sr_dev_inst *sdi,
 	devc = sdi->priv;
 	if (low == 30 && high == 130)
 		token = TOKEN_MEAS_RANGE_30_130;
-	else if (low == 30 &&  high == 80)
+	else if (low == 30 && high == 80)
 		token = TOKEN_MEAS_RANGE_30_80;
-	else if (low == 50 &&  high == 100)
+	else if (low == 50 && high == 100)
 		token = TOKEN_MEAS_RANGE_50_100;
-	else if (low == 80 &&  high == 130)
+	else if (low == 80 && high == 130)
 		token = TOKEN_MEAS_RANGE_80_130;
 	else
 		return SR_ERR;