X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fprotocol.c;h=e1c8da17b910b4e25b703c923760591939976fa9;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=1bca7520c8cddf09fc7f8e485e81f93bdff538d6;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/kecheng-kc-330b/protocol.c b/src/hardware/kecheng-kc-330b/protocol.c
index 1bca7520..e1c8da17 100644
--- a/src/hardware/kecheng-kc-330b/protocol.c
+++ b/src/hardware/kecheng-kc-330b/protocol.c
@@ -29,7 +29,6 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data)
 	struct sr_dev_driver *di;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
 	struct sr_usb_dev_inst *usb;
 	struct timeval tv;
@@ -54,8 +53,7 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data)
 	if (sdi->status == SR_ST_STOPPING) {
 		libusb_free_transfer(devc->xfer);
 		usb_source_remove(sdi->session, drvc->sr_ctx);
-		packet.type = SR_DF_END;
-		sr_session_send(cb_data, &packet);
+		std_session_send_df_end(sdi, LOG_PREFIX);
 		sdi->status = SR_ST_ACTIVE;
 		return TRUE;
 	}
@@ -71,8 +69,7 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data)
 			if (ret != 0 || len != 1) {
 				sr_dbg("Failed to request new acquisition: %s",
 						libusb_error_name(ret));
-				sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-						devc->cb_data);
+				sdi->driver->dev_acquisition_stop(sdi);
 				return TRUE;
 			}
 			libusb_submit_transfer(devc->xfer);
@@ -93,8 +90,7 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data)
 		if (ret != 0 || len != 4) {
 			sr_dbg("Failed to request next chunk: %s",
 					libusb_error_name(ret));
-			sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-					devc->cb_data);
+			sdi->driver->dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 		libusb_submit_transfer(devc->xfer);
@@ -108,21 +104,20 @@ static void send_data(const struct sr_dev_inst *sdi, void *buf, unsigned int buf
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 
 	devc = sdi->priv;
 
-	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->mqflags;
 	analog.unit = SR_UNIT_DECIBEL_SPL;
 	analog.channels = sdi->channels;
 	analog.num_samples = buf_len;
 	analog.data = buf;
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
-	sr_session_send(devc->cb_data, &packet);
-
+	sr_session_send(sdi, &packet);
 }
 
 SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer)
@@ -139,8 +134,7 @@ SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer
 	switch (transfer->status) {
 	case LIBUSB_TRANSFER_NO_DEVICE:
 		/* USB device was unplugged. */
-		sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-				devc->cb_data);
+		sdi->driver->dev_acquisition_stop(sdi);
 		return;
 	case LIBUSB_TRANSFER_COMPLETED:
 	case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
@@ -161,8 +155,7 @@ SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer
 			send_data(sdi, fvalue, 1);
 			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);
+				sdi->driver->dev_acquisition_stop(sdi);
 			} else {
 				/* let USB event handler fire off another
 				 * request when the time is right. */
@@ -182,8 +175,7 @@ SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer
 			send_data(sdi, fvalue, 1);
 			devc->num_samples += num_samples;
 			if (devc->num_samples >= devc->stored_samples) {
-				sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-						devc->cb_data);
+				sdi->driver->dev_acquisition_stop(sdi);
 			} else {
 				/* let USB event handler fire off another
 				 * request when the time is right. */