* 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;
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;
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;
return TRUE;
di = sdi->driver;
- drvc = di->priv;
+ drvc = di->context;
current_time = g_get_monotonic_time();
if (devc->state == STATE_WAIT_DATA_READY &&
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;
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;
}
}
}
-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;
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;
}
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;
{
return libusb_control_transfer(dev_handle, USB_REQUEST_TYPE_IN,
USB_HID_GET_REPORT, USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
- (unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT);
+ (unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT_MS);
}
SR_PRIV int sl2_transfer_out(libusb_device_handle *dev_handle, uint8_t *data)
{
return libusb_control_transfer(dev_handle, USB_REQUEST_TYPE_OUT,
USB_HID_SET_REPORT, USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
- (unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT);
+ (unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT_MS);
}