This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 69227863fa0161a23a3a8109e346a1d966d85a6d Author: raiden00pl <[email protected]> AuthorDate: Fri Oct 16 10:54:28 2026 +0200 arch/arm/nrf52: fix RADIO register and lower-half macro definitions Fix the CRCCNF LEN_1 typo, the SKIPADDR IEEE 802.15.4 value, the DAP register address and the DATAWHITEIV width, and the argument names of NRF52_RADIO_TIFSSET and NRF52_RADIO_WHITESET. Of these, the code uses only the DATAWHITEIV width. The register dump printed DAB6 and DAP6 in place of DAB7 and DAP7. Assisted-by: Claude Code Signed-off-by: raiden00pl <[email protected]> --- arch/arm/src/nrf52/hardware/nrf52_radio.h | 10 +++++----- arch/arm/src/nrf52/nrf52_radio.c | 4 ++-- arch/arm/src/nrf52/nrf52_radio.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/nrf52/hardware/nrf52_radio.h b/arch/arm/src/nrf52/hardware/nrf52_radio.h index 095140c1f3f..5c3e1e5e195 100644 --- a/arch/arm/src/nrf52/hardware/nrf52_radio.h +++ b/arch/arm/src/nrf52/hardware/nrf52_radio.h @@ -195,7 +195,7 @@ #define NRF52_RADIO_DATAWHITEIV (NRF52_RADIO_BASE + NRF52_RADIO_DATAWHITEIV_OFFSET) #define NRF52_RADIO_BCC (NRF52_RADIO_BASE + NRF52_RADIO_BCC_OFFSET) #define NRF52_RADIO_DAB(p) (NRF52_RADIO_BASE + NRF52_RADIO_DAB_OFFSET(p)) -#define NRF52_RADIO_DAP(p) (NRF52_RADIO_BASE + NRF52_RADIO_PAP_OFFSET(p)) +#define NRF52_RADIO_DAP(p) (NRF52_RADIO_BASE + NRF52_RADIO_DAP_OFFSET(p)) #define NRF52_RADIO_DACNF (NRF52_RADIO_BASE + NRF52_RADIO_DACNF_OFFSET) #define NRF52_RADIO_MHRMATCHCONF (NRF52_RADIO_BASE + NRF52_RADIO_MHRMATCHCONF_OFFSET) #define NRF52_RADIO_MHRMATCHMAS (NRF52_RADIO_BASE + NRF52_RADIO_MHRMATCHMAS_OFFSET) @@ -383,7 +383,7 @@ #define RADIO_CRCCNF_LEN_SHIFT (0) /* Bit 0-1: CRC length in number of bytes */ #define RADIO_CRCCNF_LEN_MASK (0x3 << RADIO_CRCCNF_LEN_SHIFT) # define RADIO_CRCCNF_LEN_DIS (0 << RADIO_CRCCNF_LEN_SHIFT) -# define RADIO_CRCCNF_LEN_1 (1 << RADIO_CRCCNF_LEN_SHIFTb) +# define RADIO_CRCCNF_LEN_1 (1 << RADIO_CRCCNF_LEN_SHIFT) # define RADIO_CRCCNF_LEN_2 (2 << RADIO_CRCCNF_LEN_SHIFT) # define RADIO_CRCCNF_LEN_3 (3 << RADIO_CRCCNF_LEN_SHIFT) #define RADIO_CRCCNF_SKIPADDR_SHIFT (8) /* Bit 8-9: Include or exclude packet address field out of CRC calculation */ @@ -391,7 +391,7 @@ # define RADIO_CRCCNF_SKIPADDR_MASK (0x3 << RADIO_CRCCNF_SKIPADDR_SHIFT) # define RADIO_CRCCNF_SKIPADDR_INCL (0 << RADIO_CRCCNF_SKIPADDR_SHIFT) # define RADIO_CRCCNF_SKIPADDR_SKIP (1 << RADIO_CRCCNF_SKIPADDR_SHIFT) -# define RADIO_CRCCNF_SKIPADDR_IEEE (3 << RADIO_CRCCNF_SKIPADDR_SHIFT) +# define RADIO_CRCCNF_SKIPADDR_IEEE (2 << RADIO_CRCCNF_SKIPADDR_SHIFT) #else # define RADIO_CRCCNF_SKIPADDR_MASK (0x1 << RADIO_CRCCNF_SKIPADDR_SHIFT) # define RADIO_CRCCNF_SKIPADDR_INCL (0 << RADIO_CRCCNF_SKIPADDR_SHIFT) @@ -436,8 +436,8 @@ /* DATAWHITEIV Register */ #define RADIO_DATAWHITEIV_SHIFT (0) /* Bits 0-6: Data whitening initial value */ -#define RADIO_DATAWHITEIV_MASK (0x3f << RADIO_DATAWHITEIV_SHIFT) -#define RADIO_DATAWHITEIV_MAX (0x3f) +#define RADIO_DATAWHITEIV_MASK (0x7f << RADIO_DATAWHITEIV_SHIFT) +#define RADIO_DATAWHITEIV_MAX (0x7f) /* DAP Register */ diff --git a/arch/arm/src/nrf52/nrf52_radio.c b/arch/arm/src/nrf52/nrf52_radio.c index 90e79825e5e..0ef1cc95415 100644 --- a/arch/arm/src/nrf52/nrf52_radio.c +++ b/arch/arm/src/nrf52/nrf52_radio.c @@ -833,7 +833,7 @@ static void nrf52_radio_dumpregs(struct nrf52_radio_dev_s *dev) printf("DAB6 0x%08" PRIx32 "\n", nrf52_radio_getreg(dev, NRF52_RADIO_DAB_OFFSET(6))); printf("DAB7 0x%08" PRIx32 "\n", - nrf52_radio_getreg(dev, NRF52_RADIO_DAB_OFFSET(6))); + nrf52_radio_getreg(dev, NRF52_RADIO_DAB_OFFSET(7))); printf("DAP0 0x%08" PRIx32 "\n", nrf52_radio_getreg(dev, NRF52_RADIO_DAP_OFFSET(0))); printf("DAP1 0x%08" PRIx32 "\n", @@ -849,7 +849,7 @@ static void nrf52_radio_dumpregs(struct nrf52_radio_dev_s *dev) printf("DAP6 0x%08" PRIx32 "\n", nrf52_radio_getreg(dev, NRF52_RADIO_DAP_OFFSET(6))); printf("DAP7 0x%08" PRIx32 "\n", - nrf52_radio_getreg(dev, NRF52_RADIO_DAP_OFFSET(6))); + nrf52_radio_getreg(dev, NRF52_RADIO_DAP_OFFSET(7))); printf("DACNF 0x%08" PRIx32 "\n", nrf52_radio_getreg(dev, NRF52_RADIO_DACNF_OFFSET)); printf("MHRMATCHCONF 0x%08" PRIx32 "\n", diff --git a/arch/arm/src/nrf52/nrf52_radio.h b/arch/arm/src/nrf52/nrf52_radio.h index e4fb0d603c9..748a8baa431 100644 --- a/arch/arm/src/nrf52/nrf52_radio.h +++ b/arch/arm/src/nrf52/nrf52_radio.h @@ -55,10 +55,10 @@ #define NRF52_RADIO_FREQSET(lower, f) lower->ops->freq_set(lower, f) #define NRF52_RADIO_RSSIGET(lower, r) lower->ops->rssi_get(lower, r) #define NRF52_RADIO_TXPWRSET(lower, p) lower->ops->txpower_set(lower, p) -#define NRF52_RADIO_TIFSSET(lower, p) lower->ops->tifs_set(lower, t) +#define NRF52_RADIO_TIFSSET(lower, t) lower->ops->tifs_set(lower, t) #define NRF52_RADIO_PKTCFG(lower, cfg) lower->ops->pkt_cfg(lower, cfg) #define NRF52_RADIO_CRCCFG(lower, cfg) lower->ops->crc_cfg(lower, cfg) -#define NRF52_RADIO_WHITESET(lower, cfg) lower->ops->white_set(lower, c) +#define NRF52_RADIO_WHITESET(lower, c) lower->ops->white_set(lower, c) #define NRF52_RADIO_ADDRSET(lower, i, a) lower->ops->addr_set(lower, i, a) #define NRF52_RADIO_DUMPREGS(lower) lower->ops->dumpregs(lower) #define NRF52_RADIO_SFDSET(lower, sfd) lower->ops->sfd_set(lower, sfd)
