X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fprotocol.c;h=14e70cf221ed13f9d41adf1082098ce215f8648e;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=65cb756bd87774dc4b275d5673710507d9654d94;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c
index 65cb756b..14e70cf2 100644
--- a/src/hardware/uni-t-ut32x/protocol.c
+++ b/src/hardware/uni-t-ut32x/protocol.c
@@ -17,13 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
-
+#include <config.h>
 #include <string.h>
 #include <math.h>
+#include "protocol.h"
 
 extern struct sr_dev_driver uni_t_ut32x_driver_info;
-static struct sr_dev_driver *di = &uni_t_ut32x_driver_info;
 
 static float parse_temperature(unsigned char *buf)
 {
@@ -63,7 +62,7 @@ static void process_packet(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 *spew;
 	float temp;
 	int i;
@@ -90,7 +89,7 @@ static void process_packet(struct sr_dev_inst *sdi)
 		is_valid = FALSE;
 
 	if (is_valid) {
-		memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+		memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 		analog.mq = SR_MQ_TEMPERATURE;
 		analog.mqflags = 0;
 		switch (devc->packet[5] - 0x30) {
@@ -129,7 +128,7 @@ static void process_packet(struct sr_dev_inst *sdi)
 		if (is_valid) {
 			analog.num_samples = 1;
 			analog.data = &temp;
-			packet.type = SR_DF_ANALOG;
+			packet.type = SR_DF_ANALOG_OLD;
 			packet.payload = &analog;
 			sr_session_send(devc->cb_data, &packet);
 			g_slist_free(analog.channels);
@@ -147,7 +146,7 @@ static void process_packet(struct sr_dev_inst *sdi)
 
 }
 
-SR_PRIV void uni_t_ut32x_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL uni_t_ut32x_receive_transfer(struct libusb_transfer *transfer)
 {
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
@@ -194,8 +193,8 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 {
 	struct drv_context *drvc;
 	struct dev_context *devc;
+	struct sr_dev_driver *di;
 	struct sr_dev_inst *sdi;
-	struct sr_datafeed_packet packet;
 	struct sr_usb_dev_inst *usb;
 	struct timeval tv;
 	int len, ret;
@@ -204,11 +203,12 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 	(void)fd;
 	(void)revents;
 
-	drvc = di->priv;
-
 	if (!(sdi = cb_data))
 		return TRUE;
 
+	di = sdi->driver;
+	drvc = di->context;
+
 	if (!(devc = sdi->priv))
 		return TRUE;
 
@@ -218,8 +218,7 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 
 	if (sdi->status == SR_ST_STOPPING) {
 		usb_source_remove(sdi->session, drvc->sr_ctx);
-		packet.type = SR_DF_END;
-		sr_session_send(cb_data, &packet);
+		std_session_send_df_header(cb_data, LOG_PREFIX);
 
 		/* Tell the device to stop sending USB packets. */
 		usb = sdi->conn;
@@ -237,4 +236,3 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 
 	return TRUE;
 }
-