__le32 vals[DIGITAL_PWR_COMP_VALS_NUM];
} sets[2][RTW89_TX_COMP_BAND_NR][BB_PATH_NUM_8922D];
} *pwr_comp_v0;
+ const struct {
+ __le32 base[DIGITAL_PWR_COMP_BASE_NUM];
+ struct {
+ __le32 vals[DIGITAL_PWR_COMP_VALS_NUM];
+ } sets[2][RTW89_TX_COMP_BAND_NR][BB_PATH_NUM_8922D];
+ } *pwr_comp;
struct rtw89_fw_elm_info *elm_info = &rtwdev->fw.elm_info;
const struct rtw89_fw_element_hdr *txcomp_elm = elm_info->tx_comp;
const __le32 (*comp_base)[DIGITAL_PWR_COMP_BASE_NUM];
u32 addr, val;
u32 i;
- if (sizeof(*pwr_comp_v0) == le32_to_cpu(txcomp_elm->size)) {
+ if (sizeof(*pwr_comp) == le32_to_cpu(txcomp_elm->size)) {
+ pwr_comp = (const void *)txcomp_elm->u.common.contents;
+ comp_base = &pwr_comp->base;
+ comp_vals = &pwr_comp->sets[nss][chan->tx_comp_band][path].vals;
+ } else if (sizeof(*pwr_comp_v0) == le32_to_cpu(txcomp_elm->size)) {
pwr_comp_v0 = (const void *)txcomp_elm->u.common.contents;
comp_base = &pwr_comp_v0->sets[nss][chan->tx_comp_band][path].base;
comp_vals = &pwr_comp_v0->sets[nss][chan->tx_comp_band][path].vals;