X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=f8833806dda30973a8ba63535402d9f46ff4b5f1;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=f756b6e577cb83c1236dc32ebae9b4a310956222;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index f756b6e5..f8833806 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 extern struct sr_dev_driver ikalogic_scanalogic2_driver_info;
@@ -25,34 +26,30 @@ extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
 
 static void stop_acquisition(struct sr_dev_inst *sdi)
 {
-	struct drv_context *drvc = sdi->driver->priv;
+	struct drv_context *drvc = sdi->driver->context;
 	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
 
 	devc = sdi->priv;
 
 	/* Remove USB file descriptors from polling. */
 	usb_source_remove(sdi->session, drvc->sr_ctx);
 
-	packet.type = SR_DF_END;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_end(devc->cb_data, LOG_PREFIX);
 
 	sdi->status = SR_ST_ACTIVE;
 }
 
 static void abort_acquisition(struct sr_dev_inst *sdi)
 {
-	struct drv_context *drvc = sdi->driver->priv;
+	struct drv_context *drvc = sdi->driver->context;
 	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
 
 	devc = sdi->priv;
 
 	/* Remove USB file descriptors from polling. */
 	usb_source_remove(sdi->session, drvc->sr_ctx);
 
-	packet.type = SR_DF_END;
-	sr_session_send(devc->cb_data, &packet);
+	std_session_send_df_end(devc->cb_data, LOG_PREFIX);
 
 	sdi->driver->dev_close(sdi);
 }
@@ -215,7 +212,7 @@ SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data
 		return TRUE;
 
 	di = sdi->driver;
-	drvc = di->priv;
+	drvc = di->context;
 	current_time = g_get_monotonic_time();
 
 	if (devc->state == STATE_WAIT_DATA_READY &&
@@ -258,7 +255,7 @@ SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data
 	return TRUE;
 }
 
-SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_in( struct libusb_transfer *transfer)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -269,7 +266,8 @@ SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
 	devc = sdi->priv;
 
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
-		sr_err("Transfer to device failed: %i.", transfer->status);
+		sr_err("Transfer to device failed: %s.",
+			libusb_error_name(transfer->status));
 		devc->transfer_error = TRUE;
 		return;
 	}
@@ -389,7 +387,7 @@ SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
 	}
 }
 
-SR_PRIV void sl2_receive_transfer_out( struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_out( struct libusb_transfer *transfer)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -399,7 +397,8 @@ SR_PRIV void sl2_receive_transfer_out( struct libusb_transfer *transfer)
 	devc = sdi->priv;
 
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
-		sr_err("Transfer to device failed: %i.", transfer->status);
+		sr_err("Transfer to device failed: %s.",
+			libusb_error_name(transfer->status));
 		devc->transfer_error = TRUE;
 		return;
 	}
@@ -643,7 +642,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
 	uint8_t buffer[PACKET_LENGTH];
 	int ret;
 
-	drvc = ikalogic_scanalogic2_driver_info.priv;
+	drvc = ikalogic_scanalogic2_driver_info.context;
 
 	if (!dev_info)
 		return SR_ERR_ARG;