X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fcem-dt-885x%2Fprotocol.c;h=68d003a0d0243d50c05cb58169b5ba9fe180722d;hb=0a1f7b09b3fa4cc4da29c7acf53717e14b004b63;hp=e3fea4c3a93f5d04a50bad8f2ce32a2357e730e2;hpb=f3f19d1131025b68d29a11273b627c83d748e7ea;p=libsigrok.git

diff --git a/src/hardware/cem-dt-885x/protocol.c b/src/hardware/cem-dt-885x/protocol.c
index e3fea4c3..68d003a0 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"
 
@@ -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;
@@ -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);
 
@@ -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);