From a22b21f3d7fa9fc94e11587f1cd1b5e7f11169d4 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Tue, 25 Jan 2022 08:14:39 -0600 Subject: [PATCH] Fix more rigport pointer references in si570avrusb.c --- rigs/kit/si570avrusb.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c index e7890f997..a4f3409ee 100644 --- a/rigs/kit/si570avrusb.c +++ b/rigs/kit/si570avrusb.c @@ -785,7 +785,7 @@ int fasdr_open(RIG *rig) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_VERSION, 0x0E00, 0, - buffer, 2, rig->state.rigport.timeout); + buffer, 2, rig->state.rigport->timeout); if (ret != 2) { @@ -801,7 +801,7 @@ int fasdr_open(RIG *rig) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_EEPROM, F_CAL_STATUS, 0, buffer, 1, - rig->state.rigport.timeout); + rig->state.rigport->timeout); if (ret != 1) { @@ -814,7 +814,7 @@ int fasdr_open(RIG *rig) // ret = libusb_control_transfer(udh, // REQUEST_TYPE_IN, // REQUEST_READ_XTALL, 0, 0, (unsigned char *) &iFreq, sizeof(iFreq), -// rig->state.rigport.timeout); +// rig->state.rigport->timeout); if (buffer[0] == 0xFF) { rig_debug(RIG_DEBUG_VERBOSE, "%s: Device not calibrated", __func__); @@ -826,7 +826,7 @@ int fasdr_open(RIG *rig) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_EEPROM, F_CRYST + i, 0, &buffer[i], 1, - rig->state.rigport.timeout); + rig->state.rigport->timeout); if (ret != 1) { @@ -978,7 +978,7 @@ static int setBPF(RIG *rig, int enable) nBytes = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_FILTERS, 0, 255, (unsigned char *) FilterCrossOver, sizeof(FilterCrossOver), - rig->state.rigport.timeout); + rig->state.rigport->timeout); if (nBytes < 0) { @@ -991,7 +991,7 @@ static int setBPF(RIG *rig, int enable) int retval = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_FILTERS, enable, (nBytes / 2) - 1, (unsigned char *) FilterCrossOver, sizeof(FilterCrossOver), - rig->state.rigport.timeout); + rig->state.rigport->timeout); if (retval < 2) { @@ -1031,7 +1031,7 @@ int si570xxxusb_open(RIG *rig) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_VERSION, 0x0E00, 0, - buffer, 2, rig->state.rigport.timeout); + buffer, 2, rig->state.rigport->timeout); if (ret != 2) { @@ -1052,7 +1052,7 @@ int si570xxxusb_open(RIG *rig) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_XTALL, 0, 0, buffer, sizeof(buffer), - rig->state.rigport.timeout); + rig->state.rigport->timeout); if (ret != 4) { @@ -1091,7 +1091,7 @@ const char *si570xxxusb_get_info(RIG *rig) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_VERSION, 0x0E00, 0, - buffer, sizeof(buffer), rig->state.rigport.timeout); + buffer, sizeof(buffer), rig->state.rigport->timeout); if (ret != 2) { @@ -1238,7 +1238,7 @@ int si570xxxusb_set_freq(RIG *rig, vfo_t vfo, freq_t freq) buffer[0] = buffer[0] + (theSolution.HS_DIV << 5); ret = libusb_control_transfer(udh, REQUEST_TYPE_OUT, - request, value, index, buffer, sizeof(buffer), rig->state.rigport.timeout); + request, value, index, buffer, sizeof(buffer), rig->state.rigport->timeout); rig_debug(RIG_DEBUG_TRACE, "%s: Freq=%.6f MHz, Real=%.6f MHz, buf=%02x%02x%02x%02x%02x%02x\n", @@ -1283,7 +1283,7 @@ int si570xxxusb_set_freq_by_value(RIG *rig, vfo_t vfo, freq_t freq) buffer[0], buffer[1], buffer[2], buffer[3]); ret = libusb_control_transfer(udh, REQUEST_TYPE_OUT, - request, value, index, buffer, sizeof(buffer), rig->state.rigport.timeout); + request, value, index, buffer, sizeof(buffer), rig->state.rigport->timeout); if (!ret) { @@ -1347,7 +1347,7 @@ int si570xxxusb_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_REGISTERS, priv->i2c_addr, 0, - buffer, sizeof(buffer), rig->state.rigport.timeout); + buffer, sizeof(buffer), rig->state.rigport->timeout); if (ret <= 0) { @@ -1373,7 +1373,7 @@ int si570xxxusb_get_freq_by_value(RIG *rig, vfo_t vfo, freq_t *freq) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_READ_FREQUENCY, 0, 0, - buffer, sizeof(buffer), rig->state.rigport.timeout); + buffer, sizeof(buffer), rig->state.rigport->timeout); if (ret != 4) { @@ -1407,7 +1407,7 @@ int si570xxxusb_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) ret = libusb_control_transfer(udh, REQUEST_TYPE_IN, REQUEST_SET_PTT, (ptt == RIG_PTT_ON) ? 1 : 0, 0, - buffer, sizeof(buffer), rig->state.rigport.timeout); + buffer, sizeof(buffer), rig->state.rigport->timeout); if (ret < 0) {