astyle misc.c and add CRC function for future use

pull/680/head
Mike Black W9MDB 2021-04-17 22:47:14 -05:00
rodzic 0a5d9d9768
commit b74bf05541
2 zmienionych plików z 34 dodań i 4 usunięć

Wyświetl plik

@ -380,7 +380,7 @@ int HAMLIB_API sprintf_freq(char *str, int nlen, freq_t freq)
decplaces = 1;
}
return sprintf(str, "%.*f %s", decplaces , f, hz);
return sprintf(str, "%.*f %s", decplaces, f, hz);
}
@ -1638,7 +1638,8 @@ int HAMLIB_API rig_set_cache_timeout_ms(RIG *rig, hamlib_cache_t selection,
// So we map these to Main/Sub as required
vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
{
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s, vfo_curr=%s\n", __func__, rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo));
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s, vfo_curr=%s\n", __func__,
rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo));
if (vfo == RIG_VFO_CURR)
{
@ -1672,7 +1673,8 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
}
int satmode = rig->state.cache.satmode;
if (vfo == RIG_VFO_TX) vfo = RIG_VFO_A;
if (vfo == RIG_VFO_TX) { vfo = RIG_VFO_A; }
if (split) { vfo = RIG_VFO_B; }
@ -1690,7 +1692,10 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
}
else if (vfo == RIG_VFO_B)
rig_debug(RIG_DEBUG_TRACE, "%s: final vfo=%s\n", __func__, rig_strvfo(vfo));
{
rig_debug(RIG_DEBUG_TRACE, "%s: final vfo=%s\n", __func__, rig_strvfo(vfo));
}
return vfo;
}
@ -2217,6 +2222,29 @@ void errmsg(int err, char *s, const char *func, const char *file, int line)
rigerror(err));
}
uint32_t CRC32_function(uint8_t *buf, uint32_t len)
{
uint32_t val, crc;
uint8_t i;
crc = 0xFFFFFFFF;
while (len--)
{
val = (crc^*buf++) & 0xFF;
for (i = 0; i < 8; i++)
{
val = val & 1 ? (val >> 1) ^ 0xEDB88320 : val >> 1;
}
crc = val ^ crc >> 8;
}
return crc ^ 0xFFFFFFFF;
}
//! @endcond

Wyświetl plik

@ -110,6 +110,8 @@ extern HAMLIB_EXPORT(vfo_t) vfo_fixup(RIG *rig, vfo_t vfo);
extern HAMLIB_EXPORT(int) parse_hoststr(char *host, char hoststr[256], char port[6]);
extern HAMLIB_EXPORT(uint32_t) CRC32_function(uint8_t *buf, uint32_t len);
#ifdef PRId64
/** \brief printf(3) format to be used for long long (64bits) type */
# define PRIll PRId64