kopia lustrzana https://github.com/Hamlib/Hamlib
Fix more rig state pointer references in funcube.c and si570avrusb.c
rodzic
a22b21f3d7
commit
67e28c4faf
|
@ -313,7 +313,7 @@ int funcube_cleanup(RIG *rig)
|
|||
const char *funcube_get_info(RIG *rig)
|
||||
{
|
||||
static char buf[64];
|
||||
libusb_device_handle *udh = rig->state.rigport.handle;
|
||||
libusb_device_handle *udh = rig->state.rigport->handle;
|
||||
struct libusb_device_descriptor desc;
|
||||
|
||||
/* always succeeds since libusb-1.0.16 */
|
||||
|
@ -436,12 +436,12 @@ int set_freq_v1(libusb_device_handle *udh, unsigned int f, int timeout)
|
|||
int funcube_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
||||
{
|
||||
struct funcube_priv_data *priv = (struct funcube_priv_data *)rig->state.priv;
|
||||
libusb_device_handle *udh = rig->state.rigport.handle;
|
||||
libusb_device_handle *udh = rig->state.rigport->handle;
|
||||
int ret;
|
||||
|
||||
if ((ret = set_freq_v1(udh, freq, rig->state.rigport.timeout)) != RIG_OK)
|
||||
if ((ret = set_freq_v1(udh, freq, rig->state.rigport->timeout)) != RIG_OK)
|
||||
{
|
||||
if ((ret = set_freq_v0(udh, freq, rig->state.rigport.timeout)) == RIG_OK)
|
||||
if ((ret = set_freq_v0(udh, freq, rig->state.rigport->timeout)) == RIG_OK)
|
||||
{
|
||||
priv->freq = freq;
|
||||
}
|
||||
|
@ -468,7 +468,7 @@ int get_freq_v0(RIG *rig, vfo_t vfo, freq_t *freq)
|
|||
|
||||
int get_freq_v1(RIG *rig, vfo_t vfo, freq_t *freq)
|
||||
{
|
||||
libusb_device_handle *udh = rig->state.rigport.handle;
|
||||
libusb_device_handle *udh = rig->state.rigport->handle;
|
||||
int ret;
|
||||
unsigned int f;
|
||||
int actual_length;
|
||||
|
@ -483,7 +483,7 @@ int get_freq_v1(RIG *rig, vfo_t vfo, freq_t *freq)
|
|||
au8BufOut[3] & 0xFF);
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, OUTPUT_ENDPOINT, au8BufOut,
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport.timeout);
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
|
@ -493,7 +493,7 @@ int get_freq_v1(RIG *rig, vfo_t vfo, freq_t *freq)
|
|||
}
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, sizeof(au8BufIn),
|
||||
&actual_length, rig->state.rigport.timeout);
|
||||
&actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0 || actual_length != sizeof(au8BufIn))
|
||||
{
|
||||
|
@ -536,7 +536,7 @@ int funcube_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
|
|||
|
||||
int funcube_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
||||
{
|
||||
libusb_device_handle *udh = rig->state.rigport.handle;
|
||||
libusb_device_handle *udh = rig->state.rigport->handle;
|
||||
int ret;
|
||||
int actual_length;
|
||||
unsigned char au8BufOut[64] = "\0\0\0\0"; // endpoint size
|
||||
|
@ -609,7 +609,7 @@ int funcube_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
|||
au8BufOut[3] & 0xFF);
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, OUTPUT_ENDPOINT, au8BufOut,
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport.timeout);
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
|
@ -619,7 +619,7 @@ int funcube_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
|||
}
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, sizeof(au8BufIn),
|
||||
&actual_length, rig->state.rigport.timeout);
|
||||
&actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0 || actual_length != sizeof(au8BufIn))
|
||||
{
|
||||
|
@ -643,7 +643,7 @@ int funcube_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
|
|||
|
||||
int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||
{
|
||||
libusb_device_handle *udh = rig->state.rigport.handle;
|
||||
libusb_device_handle *udh = rig->state.rigport->handle;
|
||||
int ret;
|
||||
int actual_length;
|
||||
unsigned char au8BufOut[64] = "\0\0\0\0"; // endpoint size
|
||||
|
@ -671,7 +671,7 @@ int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
au8BufOut[3] & 0xFF);
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, OUTPUT_ENDPOINT, au8BufOut,
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport.timeout);
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
|
@ -681,7 +681,7 @@ int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
}
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, sizeof(au8BufIn),
|
||||
&actual_length, rig->state.rigport.timeout);
|
||||
&actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0 || actual_length != sizeof(au8BufIn))
|
||||
{
|
||||
|
@ -768,7 +768,7 @@ int funcube_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
|||
int funcube_hid_cmd(RIG *rig, unsigned char *au8BufOut, unsigned char *au8BufIn,
|
||||
int inputSize)
|
||||
{
|
||||
libusb_device_handle *udh = rig->state.rigport.handle;
|
||||
libusb_device_handle *udh = rig->state.rigport->handle;
|
||||
int ret;
|
||||
int actual_length;
|
||||
rig_debug(RIG_DEBUG_TRACE, "%s: HID packet set to %02x%02x%02x%02x\n",
|
||||
|
@ -776,7 +776,7 @@ int funcube_hid_cmd(RIG *rig, unsigned char *au8BufOut, unsigned char *au8BufIn,
|
|||
au8BufOut[3] & 0xFF);
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, OUTPUT_ENDPOINT, au8BufOut,
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport.timeout);
|
||||
sizeof(au8BufOut), &actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
|
@ -786,7 +786,7 @@ int funcube_hid_cmd(RIG *rig, unsigned char *au8BufOut, unsigned char *au8BufIn,
|
|||
}
|
||||
|
||||
ret = libusb_interrupt_transfer(udh, INPUT_ENDPOINT, au8BufIn, inputSize,
|
||||
&actual_length, rig->state.rigport.timeout);
|
||||
&actual_length, rig->state.rigport->timeout);
|
||||
|
||||
if (ret < 0 || actual_length != inputSize)
|
||||
{
|
||||
|
|
|
@ -570,7 +570,7 @@ static uint32_t getLongWord(unsigned char const *bytes)
|
|||
*/
|
||||
int si570avrusb_init(RIG *rig)
|
||||
{
|
||||
hamlib_port_t *rp = &rig->state.rigport;
|
||||
hamlib_port_t *rp = rig->state.rigport;
|
||||
struct si570xxxusb_priv_data *priv;
|
||||
|
||||
rig->state.priv = (struct si570xxxusb_priv_data *)calloc(sizeof(struct
|
||||
|
@ -611,7 +611,7 @@ int si570avrusb_init(RIG *rig)
|
|||
*/
|
||||
int si570peaberry1_init(RIG *rig)
|
||||
{
|
||||
hamlib_port_t *rp = &rig->state.rigport;
|
||||
hamlib_port_t *rp = rig->state.rigport;
|
||||
struct si570xxxusb_priv_data *priv;
|
||||
|
||||
rig->state.priv = (struct si570xxxusb_priv_data *)calloc(sizeof(struct
|
||||
|
@ -652,7 +652,7 @@ int si570peaberry1_init(RIG *rig)
|
|||
*/
|
||||
int si570peaberry2_init(RIG *rig)
|
||||
{
|
||||
hamlib_port_t *rp = &rig->state.rigport;
|
||||
hamlib_port_t *rp = rig->state.rigport;
|
||||
struct si570xxxusb_priv_data *priv;
|
||||
|
||||
rig->state.priv = (struct si570xxxusb_priv_data *)calloc(sizeof(struct
|
||||
|
@ -693,7 +693,7 @@ int si570peaberry2_init(RIG *rig)
|
|||
*/
|
||||
int si570picusb_init(RIG *rig)
|
||||
{
|
||||
hamlib_port_t *rp = &rig->state.rigport;
|
||||
hamlib_port_t *rp = rig->state.rigport;
|
||||
struct si570xxxusb_priv_data *priv;
|
||||
|
||||
rig->state.priv = (struct si570xxxusb_priv_data *)calloc(sizeof(struct
|
||||
|
@ -734,7 +734,7 @@ int si570picusb_init(RIG *rig)
|
|||
|
||||
int fasdr_init(RIG *rig)
|
||||
{
|
||||
hamlib_port_t *rp = &rig->state.rigport;
|
||||
hamlib_port_t *rp = rig->state.rigport;
|
||||
struct si570xxxusb_priv_data *priv;
|
||||
|
||||
rig->state.priv = (struct si570xxxusb_priv_data *)calloc(sizeof(struct
|
||||
|
|
Ładowanie…
Reference in New Issue