mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix rest of rig.state pointer in kit rigs

pull/948/head
Mike Black W9MDB 2022-01-25 08:31:38 -06:00
rodzic 67e28c4faf
commit fe08947700
4 zmienionych plików z 14 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
rigs/kit/dwt.c
Wyświetl plik

@ -625,7 +625,7 @@ const struct rig_caps dwt_caps =
int dwt_init(RIG *rig) int dwt_init(RIG *rig)
{ {
hamlib_port_t *rp = &rig->state.rigport; hamlib_port_t *rp = rig->state.rigport;
rp->parm.usb.vid = USB_VID_CT; rp->parm.usb.vid = USB_VID_CT;
rp->parm.usb.pid = USB_PID_CT_DWT; rp->parm.usb.pid = USB_PID_CT_DWT;
@ -639,7 +639,7 @@ int dwt_init(RIG *rig)
#define MSG_LEN 16 #define MSG_LEN 16
int dwt_set_freq(RIG *rig, vfo_t vfo, freq_t freq) int dwt_set_freq(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 request, value, index; int request, value, index;
unsigned char buf[MSG_LEN] = { 0x4a, 0x00, 0x03, 0x00, 0xff, 0xff, 0x32 }; unsigned char buf[MSG_LEN] = { 0x4a, 0x00, 0x03, 0x00, 0xff, 0xff, 0x32 };
int requesttype, r; int requesttype, r;
@ -672,7 +672,7 @@ int dwt_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
const char *dwt_get_info(RIG *rig) const char *dwt_get_info(RIG *rig)
{ {
static char buf[64]; 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; struct libusb_device_descriptor desc;
/* always succeeds since libusb-1.0.16 */ /* always succeeds since libusb-1.0.16 */

8
rigs/kit/elektor507.c
Wyświetl plik

@ -377,7 +377,7 @@ const char *elektor507_get_info(RIG *rig)
*/ */
int elektor507_init(RIG *rig) int elektor507_init(RIG *rig)
{ {
hamlib_port_t *rp = &rig->state.rigport; hamlib_port_t *rp = rig->state.rigport;
struct elektor507_priv_data *priv; struct elektor507_priv_data *priv;
rig->state.priv = (struct elektor507_priv_data *)calloc(sizeof(struct rig->state.priv = (struct elektor507_priv_data *)calloc(sizeof(struct
@ -430,7 +430,7 @@ int elektor507_cleanup(RIG *rig)
const char *elektor507_get_info(RIG *rig) const char *elektor507_get_info(RIG *rig)
{ {
static char buf[64]; 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; struct libusb_device_descriptor desc;
/* always succeeds since libusb-1.0.16 */ /* always succeeds since libusb-1.0.16 */
@ -443,7 +443,7 @@ const char *elektor507_get_info(RIG *rig)
int elektor507_libusb_setup(RIG *rig) int elektor507_libusb_setup(RIG *rig)
{ {
libusb_device_handle *udh = rig->state.rigport.handle; libusb_device_handle *udh = rig->state.rigport->handle;
int ret; int ret;
unsigned short index = 0, usb_val; unsigned short index = 0, usb_val;
@ -504,7 +504,7 @@ int elektor507_libusb_setup(RIG *rig)
int elektor507_ftdi_write_data(RIG *rig, void *FTOutBuf, int elektor507_ftdi_write_data(RIG *rig, void *FTOutBuf,
unsigned long BufferSize) unsigned long BufferSize)
{ {
libusb_device_handle *udh = rig->state.rigport.handle; libusb_device_handle *udh = rig->state.rigport->handle;
int ret, actual_length; int ret, actual_length;
rig_debug(RIG_DEBUG_TRACE, "%s called, %lu bytes\n", __func__, BufferSize); rig_debug(RIG_DEBUG_TRACE, "%s called, %lu bytes\n", __func__, BufferSize);

10
rigs/kit/fifisdr.c
Wyświetl plik

@ -279,12 +279,12 @@ static int fifisdr_usb_write(RIG *rig,
unsigned char *bytes, int size) unsigned char *bytes, int size)
{ {
int ret; int ret;
libusb_device_handle *udh = rig->state.rigport.handle; libusb_device_handle *udh = rig->state.rigport->handle;
ret = libusb_control_transfer(udh, ret = libusb_control_transfer(udh,
LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_OUT, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_OUT,
request, value, index, request, value, index,
bytes, size, rig->state.rigport.timeout); bytes, size, rig->state.rigport->timeout);
if (ret != size) if (ret != size)
{ {
@ -306,12 +306,12 @@ static int fifisdr_usb_read(RIG *rig,
unsigned char *bytes, int size) unsigned char *bytes, int size)
{ {
int ret; int ret;
libusb_device_handle *udh = rig->state.rigport.handle; libusb_device_handle *udh = rig->state.rigport->handle;
ret = libusb_control_transfer(udh, ret = libusb_control_transfer(udh,
LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN,
request, value, index, request, value, index,
bytes, size, rig->state.rigport.timeout); bytes, size, rig->state.rigport->timeout);
if (ret != size) if (ret != size)
{ {
@ -329,7 +329,7 @@ static int fifisdr_usb_read(RIG *rig,
int fifisdr_init(RIG *rig) int fifisdr_init(RIG *rig)
{ {
hamlib_port_t *rp = &rig->state.rigport; hamlib_port_t *rp = rig->state.rigport;
struct fifisdr_priv_instance_data *priv; struct fifisdr_priv_instance_data *priv;
rig->state.priv = (struct fifisdr_priv_instance_data *)calloc(sizeof( rig->state.priv = (struct fifisdr_priv_instance_data *)calloc(sizeof(

4
rigs/kit/funcube.c
Wyświetl plik

@ -234,7 +234,7 @@ const struct rig_caps funcubeplus_caps =
int funcube_init(RIG *rig) int funcube_init(RIG *rig)
{ {
hamlib_port_t *rp = &rig->state.rigport; hamlib_port_t *rp = rig->state.rigport;
struct funcube_priv_data *priv; struct funcube_priv_data *priv;
rig->state.priv = (struct funcube_priv_data *)calloc(sizeof( rig->state.priv = (struct funcube_priv_data *)calloc(sizeof(
@ -264,7 +264,7 @@ int funcube_init(RIG *rig)
int funcubeplus_init(RIG *rig) int funcubeplus_init(RIG *rig)
{ {
hamlib_port_t *rp = &rig->state.rigport; hamlib_port_t *rp = rig->state.rigport;
struct funcube_priv_data *priv; struct funcube_priv_data *priv;
rig->state.priv = (struct funcube_priv_data *)calloc(sizeof( rig->state.priv = (struct funcube_priv_data *)calloc(sizeof(