kopia lustrzana https://github.com/Hamlib/Hamlib
Add PRXll macro for 64-bit use
rodzic
cd0a9aebb6
commit
64b35ccbee
|
@ -100,22 +100,28 @@ extern HAMLIB_EXPORT(void) rig_force_cache_timeout(struct timeval *tv);
|
|||
#ifdef PRId64
|
||||
/** \brief printf(3) format to be used for long long (64bits) type */
|
||||
# define PRIll PRId64
|
||||
# define PRXll PRIx64
|
||||
#else
|
||||
# ifdef FBSD4
|
||||
# define PRIll "qd"
|
||||
# define PRXll "qx"
|
||||
# else
|
||||
# define PRIll "lld"
|
||||
# define PRXll "lld"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef SCNd64
|
||||
/** \brief scanf(3) format to be used for long long (64bits) type */
|
||||
# define SCNll SCNd64
|
||||
# define SCNXll SCNx64
|
||||
#else
|
||||
# ifdef FBSD4
|
||||
# define SCNll "qd"
|
||||
# define SCNXll "qx"
|
||||
# else
|
||||
# define SCNll "lld"
|
||||
# define SCNXll "llx"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -3788,10 +3788,10 @@ declare_proto_rig(dump_state)
|
|||
for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->rx_range_list[i]); i++)
|
||||
{
|
||||
fprintf(fout,
|
||||
"%"FREQFMT" %"FREQFMT" 0x%llx %d %d 0x%x 0x%x\n",
|
||||
"%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
|
||||
rs->rx_range_list[i].start,
|
||||
rs->rx_range_list[i].end,
|
||||
rs->rx_range_list[i].modes,
|
||||
(uint64_t)rs->rx_range_list[i].modes,
|
||||
rs->rx_range_list[i].low_power,
|
||||
rs->rx_range_list[i].high_power,
|
||||
rs->rx_range_list[i].vfo,
|
||||
|
@ -3803,10 +3803,10 @@ declare_proto_rig(dump_state)
|
|||
for (i = 0; i < FRQRANGESIZ && !RIG_IS_FRNG_END(rs->tx_range_list[i]); i++)
|
||||
{
|
||||
fprintf(fout,
|
||||
"%"FREQFMT" %"FREQFMT" 0x%llx %d %d 0x%x 0x%x\n",
|
||||
"%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
|
||||
rs->tx_range_list[i].start,
|
||||
rs->tx_range_list[i].end,
|
||||
rs->tx_range_list[i].modes,
|
||||
(uint64_t)rs->tx_range_list[i].modes,
|
||||
rs->tx_range_list[i].low_power,
|
||||
rs->tx_range_list[i].high_power,
|
||||
rs->tx_range_list[i].vfo,
|
||||
|
@ -3818,8 +3818,8 @@ declare_proto_rig(dump_state)
|
|||
for (i = 0; i < TSLSTSIZ && !RIG_IS_TS_END(rs->tuning_steps[i]); i++)
|
||||
{
|
||||
fprintf(fout,
|
||||
"0x%llx %ld\n",
|
||||
rs->tuning_steps[i].modes,
|
||||
"0x%"PRXll" %ld\n",
|
||||
(uint64_t)rs->tuning_steps[i].modes,
|
||||
rs->tuning_steps[i].ts);
|
||||
}
|
||||
|
||||
|
@ -3828,8 +3828,8 @@ declare_proto_rig(dump_state)
|
|||
for (i = 0; i < FLTLSTSIZ && !RIG_IS_FLT_END(rs->filters[i]); i++)
|
||||
{
|
||||
fprintf(fout,
|
||||
"0x%llx %ld\n",
|
||||
rs->filters[i].modes,
|
||||
"0x%"PRXll" %ld\n",
|
||||
(uint64_t)rs->filters[i].modes,
|
||||
rs->filters[i].width);
|
||||
}
|
||||
|
||||
|
@ -3858,12 +3858,12 @@ declare_proto_rig(dump_state)
|
|||
|
||||
fprintf(fout, "\n");
|
||||
|
||||
fprintf(fout, "0x%llx\n", rs->has_get_func);
|
||||
fprintf(fout, "0x%llx\n", rs->has_set_func);
|
||||
fprintf(fout, "0x%llx\n", rs->has_get_level);
|
||||
fprintf(fout, "0x%llx\n", rs->has_set_level);
|
||||
fprintf(fout, "0x%llx\n", rs->has_get_parm);
|
||||
fprintf(fout, "0x%llx\n", rs->has_set_parm);
|
||||
fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_get_func);
|
||||
fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_set_func);
|
||||
fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_get_level);
|
||||
fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_set_level);
|
||||
fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_get_parm);
|
||||
fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_set_parm);
|
||||
|
||||
#if 0
|
||||
gran_t level_gran[RIG_SETTING_MAX]; /*!< level granularity */
|
||||
|
|
Ładowanie…
Reference in New Issue