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

Merge GitHub PR #1739.

pull/1745/head
Nate Bargmann 2025-05-22 17:23:35 -05:00
rodzic 91a4d914d9 5fe81cdef4
commit 9b177cd8b3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: FB2C5130D55A8819
2 zmienionych plików z 12 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/kit/usrp.c
Wyświetl plik

@ -19,6 +19,8 @@
* *
*/ */
#include <hamlib/config.h>
/* /*
* Compile only this model if usrp is available * Compile only this model if usrp is available
*/ */

16
rigs/kit/usrp_impl.cc
Wyświetl plik

@ -30,7 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <usrp_standard.h> #include <usrp/usrp_standard.h>
#include "usrp_impl.h" #include "usrp_impl.h"
#include "token.h" #include "token.h"
@ -46,7 +46,7 @@ struct usrp_priv_data {
int usrp_init(RIG *rig) int usrp_init(RIG *rig)
{ {
// cppcheck-suppress leakReturnValNotUsed // cppcheck-suppress leakReturnValNotUsed
STATE(rig)->priv = static_cast<struct usrp_priv_data*>malloc(sizeof(struct usrp_priv_data)); STATE(rig)->priv = static_cast<struct usrp_priv_data*>(malloc(sizeof(struct usrp_priv_data)));
if (!STATE(rig)->priv) { if (!STATE(rig)->priv) {
/* whoops! memory shortage! */ /* whoops! memory shortage! */
return -RIG_ENOMEM; return -RIG_ENOMEM;
@ -69,7 +69,7 @@ int usrp_cleanup(RIG *rig)
int usrp_open(RIG *rig) int usrp_open(RIG *rig)
{ {
struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv; struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
int which_board = 0; int which_board = 0;
int decim = 125; int decim = 125;
@ -83,7 +83,7 @@ int usrp_open(RIG *rig)
int usrp_close(RIG *rig) int usrp_close(RIG *rig)
{ {
struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv; struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
if (!priv) if (!priv)
{ {
@ -101,7 +101,7 @@ int usrp_close(RIG *rig)
*/ */
int usrp_set_conf(RIG *rig, hamlib_token_t token, const char *val) int usrp_set_conf(RIG *rig, hamlib_token_t token, const char *val)
{ {
struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv; struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
if (!priv) if (!priv)
{ {
@ -126,7 +126,7 @@ int usrp_set_conf(RIG *rig, hamlib_token_t token, const char *val)
*/ */
int usrp_get_conf(RIG *rig, hamlib_token_t token, char *val) int usrp_get_conf(RIG *rig, hamlib_token_t token, char *val)
{ {
const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv; const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
if (!priv) if (!priv)
{ {
@ -148,7 +148,7 @@ int usrp_get_conf(RIG *rig, hamlib_token_t token, char *val)
int usrp_set_freq(RIG *rig, vfo_t vfo, freq_t freq) int usrp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv; const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
int chan = 0; int chan = 0;
if (!priv) if (!priv)
@ -166,7 +166,7 @@ int usrp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int usrp_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) int usrp_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>STATE(rig)->priv; const struct usrp_priv_data *priv = static_cast<struct usrp_priv_data*>(STATE(rig)->priv);
int chan = 0; int chan = 0;
if (!priv) if (!priv)