X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fprotocol.c;h=31f161e8f1dca4f03ec5cbab4acf242f6ddf24a2;hb=1e726f568d6d72a8c6afdcd8fa98b98e910ad523;hp=022fac7ec456983e2c15edffd6d2783879af6d0f;hpb=6433156c3275df933e4bf6dcfb020c91fca0ae86;p=libsigrok.git

diff --git a/src/hardware/hung-chang-dso-2100/protocol.c b/src/hardware/hung-chang-dso-2100/protocol.c
index 022fac7e..31f161e8 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 <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <ieee1284.h>
 #include "protocol.h"
 
@@ -330,7 +331,7 @@ 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 = {
+	struct sr_datafeed_analog_old analog = {
 		.channels = devc->enabled_channel,
 		.num_samples = num,
 		.mq = SR_MQ_VOLTAGE,
@@ -339,7 +340,7 @@ static void push_samples(const struct sr_dev_inst *sdi, uint8_t *buf, size_t num
 		.data = data,
 	};
 	struct sr_datafeed_packet packet = {
-		.type = SR_DF_ANALOG,
+		.type = SR_DF_ANALOG_OLD,
 		.payload = &analog,
 	};
 	float factor = devc->factor;
@@ -347,7 +348,7 @@ 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_session_send(sdi, &packet);
 }
 
 static int read_subframe(const struct sr_dev_inst *sdi, uint8_t *buf)
@@ -392,7 +393,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;
 			}
@@ -438,7 +439,7 @@ SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data)
 		return FALSE;
 	}
 
-	sr_session_send(devc->cb_data, &packet);
+	sr_session_send(sdi, &packet);
 
 	if (devc->channel) {
 		while (read_subframe(sdi, buf)) {
@@ -452,10 +453,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);