X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=70ef28094ea42a4165d438411e425b6d96eac309;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;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..70ef2809 100644 --- a/src/hardware/ikalogic-scanalogic2/protocol.c +++ b/src/hardware/ikalogic-scanalogic2/protocol.c @@ -215,7 +215,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 +258,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; @@ -389,7 +389,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; @@ -643,7 +643,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;