X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=03d5d1bf32df778c0f824b29a8fb5fbc672d1933;hb=803db07a1af036a5da65581ddbac23b7f84a4388;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..03d5d1bf 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 .
*/
+#include
#include "protocol.h"
extern struct sr_dev_driver ikalogic_scanalogic2_driver_info;
@@ -25,7 +26,7 @@ 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;
@@ -42,7 +43,7 @@ static void stop_acquisition(struct sr_dev_inst *sdi)
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;
@@ -215,7 +216,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 +259,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 +270,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 +391,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 +401,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 +646,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;