michaelh/zephyr
1
0
Fork 0
Code Releases Activity

toolchain: gcc: rename popcount to avoid conflict with C++20

Browse source 
The macro conflicts with the C++20 feature std::popcount

fixes zephyrproject-rtos/zephyr#53421

Signed-off-by: Hein Wessels <heinwessels93@gmail.com>
This commit is contained in:
Hein Wessels 2023-01-03 08:29:50 +01:00 • committed by Carles Cufí
commit 3210541c86
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/dai/intel/ssp/ssp.c
View file

@ -1348,8 +1348,8 @@ static int dai_ssp_set_config_tplg(struct dai_intel_ssp *dp, const struct dai_co
*/
sspsp |= SSPSP_SFRMP(!inverted_frame);
active_tx_slots = popcount(ssp->params.tx_slots);
active_rx_slots = popcount(ssp->params.rx_slots);
active_tx_slots = POPCOUNT(ssp->params.tx_slots);
active_rx_slots = POPCOUNT(ssp->params.rx_slots);
/*
* handle TDM mode, TDM mode has padding at the end of
@ -1837,9 +1837,9 @@ static const struct dai_config *dai_ssp_config_get(const struct device *dev, enu
params->rate = ssp->params.fsync_rate;
if (dir == DAI_DIR_PLAYBACK) {
params->channels = popcount(ssp->params.tx_slots);
params->channels = POPCOUNT(ssp->params.tx_slots);
} else {
params->channels = popcount(ssp->params.rx_slots);
params->channels = POPCOUNT(ssp->params.rx_slots);
}
params->word_size = ssp->params.sample_valid_bits;