X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=50bad8be9be3a7a403216181cab820698d42b8eb;hb=7db9027985c2d59eccb0a20979bf5d7c699c8c8b;hp=41ebcf22353633c2e79f0f9f1117457c85950259;hpb=df3ea149cc65ae52f19fa4b50c4af7a217a590fa;p=libsigrok.git

diff --git a/src/session.c b/src/session.c
index 41ebcf22..50bad8be 100644
--- a/src/session.c
+++ b/src/session.c
@@ -830,8 +830,7 @@ SR_API int sr_session_start(struct sr_session *session)
 		lend = l->next;
 		for (l = session->devs; l != lend; l = l->next) {
 			sdi = l->data;
-			if (sdi->driver->dev_acquisition_stop)
-				sdi->driver->dev_acquisition_stop(sdi);
+			sdi->driver->dev_acquisition_stop(sdi);
 		}
 		/* TODO: Handle delayed stops. Need to iterate the event
 		 * sources... */
@@ -1035,7 +1034,6 @@ SR_API int sr_session_stopped_callback_set(struct sr_session *session,
 static void datafeed_dump(const struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_logic *logic;
-	const struct sr_datafeed_analog_old *analog_old;
 	const struct sr_datafeed_analog *analog;
 
 	/* Please use the same order as in libsigrok.h. */
@@ -1057,11 +1055,6 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 		sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
 		       "unitsize = %d).", logic->length, logic->unitsize);
 		break;
-	case SR_DF_ANALOG_OLD:
-		analog_old = packet->payload;
-		sr_dbg("bus: Received SR_DF_ANALOG_OLD packet (%d samples).",
-		       analog_old->num_samples);
-		break;
 	case SR_DF_FRAME_BEGIN:
 		sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
 		break;
@@ -1116,43 +1109,6 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		return SR_ERR_BUG;
 	}
 
-	if (packet->type == SR_DF_ANALOG_OLD) {
-		/* Convert to SR_DF_ANALOG. */
-		const struct sr_datafeed_analog_old *analog_old = packet->payload;
-		struct sr_analog_encoding encoding;
-		struct sr_analog_meaning meaning;
-		struct sr_analog_spec spec;
-		struct sr_datafeed_analog analog;
-		struct sr_datafeed_packet new_packet;
-		new_packet.type = SR_DF_ANALOG;
-		new_packet.payload = &analog;
-		analog.data = analog_old->data;
-		analog.num_samples = analog_old->num_samples;
-		analog.encoding = &encoding;
-		analog.meaning = &meaning;
-		analog.spec = &spec;
-		encoding.unitsize = sizeof(float);
-		encoding.is_signed = TRUE;
-		encoding.is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
-		encoding.is_bigendian = TRUE;
-#else
-		encoding.is_bigendian = FALSE;
-#endif
-		encoding.digits = 0;
-		encoding.is_digits_decimal = FALSE;
-		encoding.scale.p = 1;
-		encoding.scale.q = 1;
-		encoding.offset.p = 0;
-		encoding.offset.q = 1;
-		meaning.mq = analog_old->mq;
-		meaning.unit = analog_old->unit;
-		meaning.mqflags = analog_old->mqflags;
-		meaning.channels = analog_old->channels;
-		spec.spec_digits = 0;
-		return sr_session_send(sdi, &new_packet);
-	}
-
 	/*
 	 * Pass the packet to the first transform module. If that returns
 	 * another packet (instead of NULL), pass that packet to the next
@@ -1501,8 +1457,6 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 	struct sr_datafeed_meta *meta_copy;
 	const struct sr_datafeed_logic *logic;
 	struct sr_datafeed_logic *logic_copy;
-	const struct sr_datafeed_analog_old *analog_old;
-	struct sr_datafeed_analog_old *analog_old_copy;
 	const struct sr_datafeed_analog *analog;
 	struct sr_datafeed_analog *analog_copy;
 	uint8_t *payload;
@@ -1534,19 +1488,6 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
 		(*copy)->payload = logic_copy;
 		break;
-	case SR_DF_ANALOG_OLD:
-		analog_old = packet->payload;
-		analog_old_copy = g_malloc(sizeof(*analog_old_copy));
-		analog_old_copy->channels = g_slist_copy(analog_old->channels);
-		analog_old_copy->num_samples = analog_old->num_samples;
-		analog_old_copy->mq = analog_old->mq;
-		analog_old_copy->unit = analog_old->unit;
-		analog_old_copy->mqflags = analog_old->mqflags;
-		analog_old_copy->data = g_malloc(analog_old->num_samples * sizeof(float));
-		memcpy(analog_old_copy->data, analog_old->data,
-				analog_old->num_samples * sizeof(float));
-		(*copy)->payload = analog_old_copy;
-		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
 		analog_copy = g_malloc(sizeof(*analog_copy));
@@ -1577,7 +1518,6 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_meta *meta;
 	const struct sr_datafeed_logic *logic;
-	const struct sr_datafeed_analog_old *analog_old;
 	const struct sr_datafeed_analog *analog;
 	struct sr_config *src;
 	GSList *l;
@@ -1606,12 +1546,6 @@ void sr_packet_free(struct sr_datafeed_packet *packet)
 		g_free(logic->data);
 		g_free((void *)packet->payload);
 		break;
-	case SR_DF_ANALOG_OLD:
-		analog_old = packet->payload;
-		g_slist_free(analog_old->channels);
-		g_free(analog_old->data);
-		g_free((void *)packet->payload);
-		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
 		g_free(analog->data);