Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf fromtree] Revert "drivers: ieee802154: nrf: cache radio channel" #1481

Merged
merged 1 commit into from
Feb 8, 2024
Merged

[nrf fromtree] Revert "drivers: ieee802154: nrf: cache radio channel" #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions drivers/ieee802154/ieee802154_nrf5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,6 @@ static int nrf5_cca(const struct device *dev)
{
struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev);

nrf_802154_channel_set(nrf5_data.channel);

if (!nrf_802154_cca()) {
LOG_DBG("CCA failed");
return -EBUSY;
Expand All @@ -282,7 +280,7 @@ static int nrf5_set_channel(const struct device *dev, uint16_t channel)
return channel < 11 ? -ENOTSUP : -EINVAL;
}

nrf5_data.channel = channel;
nrf_802154_channel_set(channel);

return 0;
}
Expand All @@ -295,8 +293,6 @@ static int nrf5_energy_scan_start(const struct device *dev,

ARG_UNUSED(dev);

nrf_802154_channel_set(nrf5_data.channel);

if (nrf5_data.energy_scan_done == NULL) {
nrf5_data.energy_scan_done = done_cb;

Expand Down Expand Up @@ -462,10 +458,6 @@ static bool nrf5_tx_immediate(struct net_pkt *pkt, uint8_t *payload, bool cca)
.use_metadata_value = true,
.power = nrf5_data.txpwr,
},
.tx_channel = {
.use_metadata_value = true,
.channel = nrf5_data.channel,
},
};

return nrf_802154_transmit_raw(payload, &metadata);
Expand All @@ -483,10 +475,6 @@ static bool nrf5_tx_csma_ca(struct net_pkt *pkt, uint8_t *payload)
.use_metadata_value = true,
.power = nrf5_data.txpwr,
},
.tx_channel = {
.use_metadata_value = true,
.channel = nrf5_data.channel,
},
};

return nrf_802154_transmit_csma_ca_raw(payload, &metadata);
Expand Down Expand Up @@ -526,7 +514,7 @@ static bool nrf5_tx_at(struct nrf5_802154_data *nrf5_radio, struct net_pkt *pkt,
.dynamic_data_is_set = net_pkt_ieee802154_mac_hdr_rdy(pkt),
},
.cca = cca,
.channel = nrf5_data.channel,
.channel = nrf_802154_channel_get(),
.tx_power = {
.use_metadata_value = true,
.power = nrf5_data.txpwr,
Expand Down Expand Up @@ -668,7 +656,6 @@ static int nrf5_start(const struct device *dev)
ARG_UNUSED(dev);

nrf_802154_tx_power_set(nrf5_data.txpwr);
nrf_802154_channel_set(nrf5_data.channel);

if (!nrf_802154_receive()) {
LOG_ERR("Failed to enter receive state");
Expand Down Expand Up @@ -713,7 +700,6 @@ static int nrf5_continuous_carrier(const struct device *dev)
ARG_UNUSED(dev);

nrf_802154_tx_power_set(nrf5_data.txpwr);
nrf_802154_channel_set(nrf5_data.channel);

if (!nrf_802154_continuous_carrier()) {
LOG_ERR("Failed to enter continuous carrier state");
Expand Down
3 changes: 0 additions & 3 deletions drivers/ieee802154/ieee802154_nrf5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ struct nrf5_802154_data {
/* The TX power in dBm. */
int8_t txpwr;

/* The radio channel. */
uint8_t channel;

#if defined(CONFIG_NRF_802154_SER_HOST) && defined(CONFIG_IEEE802154_CSL_ENDPOINT)
/* The last configured value of CSL period in units of 10 symbols. */
uint32_t csl_period;
Expand Down
Loading