michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: entropy: nrf5: Remove entropy_nrf_get_entropy_isr() function

Browse source 
The entropy_nrf_get_entropy_isr(), which is specific to this driver,
is in fact equivalent of generic entropy_get_entropy_isr(..., 0).

This commit removes the entropy_nrf_get_entropy_isr() function
and replaces its usage by call to generic entropy API.

Signed-off-by: Piotr Zięcik <piotr.ziecik@nordicsemi.no>
This commit is contained in:
Piotr Zięcik 2018-08-23 13:56:13 +02:00 • committed by Carles Cufí
commit 615efcce69
3 changed files with 12 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/entropy/entropy_nrf5.c
View file

@ -347,10 +347,3 @@ static int entropy_nrf5_init(struct device *device)
return 0;
}
u8_t entropy_nrf_get_entropy_isr(struct device *dev, u8_t *buf, u8_t len)
{
ARG_UNUSED(dev);
return rng_pool_get((struct rng_pool *)entropy_nrf5_data.isr, buf, len);
}

21
include/drivers/entropy/nrf5_entropy.h
View file

@ -1,21 +0,0 @@
/*
* Copyright (c) 2018 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DRIVERS_ENTROPY_NRF5_ENTROPY_H_
#define ZEPHYR_INCLUDE_DRIVERS_ENTROPY_NRF5_ENTROPY_H_
/**
* @brief Fills a buffer with entropy in a non-blocking manner.
* Callable from ISRs.
*
* @param dev Pointer to the device structure.
* @param buf Buffer to fill with entropy.
* @param len Buffer length.
* @retval number of bytes filled with entropy.
*/
u8_t entropy_nrf_get_entropy_isr(struct device *dev, u8_t *buf, u8_t len);
#endif /* ZEPHYR_INCLUDE_DRIVERS_ENTROPY_NRF5_ENTROPY_H_ */

24
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -11,6 +11,7 @@
#include <soc.h>
#include <device.h>
#include <entropy.h>
#include <clock_control.h>
#include <bluetooth/hci.h>
#include <misc/util.h>
@ -19,7 +20,6 @@
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/entropy/nrf5_entropy.h>
#endif /* CONFIG_SOC_COMPATIBLE_NRF */
#include "hal/cpu.h"
@ -3925,9 +3925,9 @@ static inline u32_t isr_close_adv(void)
u32_t ticker_status;
u16_t random_delay;
entropy_nrf_get_entropy_isr(_radio.entropy,
(void *)&random_delay,
sizeof(random_delay));
entropy_get_entropy_isr(_radio.entropy,
(void *)&random_delay,
sizeof(random_delay), 0);
random_delay %= HAL_TICKER_US_TO_TICKS(10000);
random_delay += 1;
@ -9399,10 +9399,10 @@ static void enc_req_reused_send(struct connection *conn,
pdu_ctrl_tx->llctrl.enc_req.ediv[1] =
conn->llcp.encryption.ediv[1];
/* NOTE: if not sufficient random numbers, ignore waiting */
entropy_nrf_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_req.skdm,
sizeof(pdu_ctrl_tx->llctrl.enc_req.skdm));
entropy_nrf_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_req.ivm,
sizeof(pdu_ctrl_tx->llctrl.enc_req.ivm));
entropy_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_req.skdm,
sizeof(pdu_ctrl_tx->llctrl.enc_req.skdm), 0);
entropy_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_req.ivm,
sizeof(pdu_ctrl_tx->llctrl.enc_req.ivm), 0);
}
static u8_t enc_rsp_send(struct connection *conn)
@ -9422,10 +9422,10 @@ static u8_t enc_rsp_send(struct connection *conn)
sizeof(struct pdu_data_llctrl_enc_rsp);
pdu_ctrl_tx->llctrl.opcode = PDU_DATA_LLCTRL_TYPE_ENC_RSP;
/* NOTE: if not sufficient random numbers, ignore waiting */
entropy_nrf_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_rsp.skds,
sizeof(pdu_ctrl_tx->llctrl.enc_rsp.skds));
entropy_nrf_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_rsp.ivs,
sizeof(pdu_ctrl_tx->llctrl.enc_rsp.ivs));
entropy_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_rsp.skds,
sizeof(pdu_ctrl_tx->llctrl.enc_rsp.skds), 0);
entropy_get_entropy_isr(_radio.entropy, pdu_ctrl_tx->llctrl.enc_rsp.ivs,
sizeof(pdu_ctrl_tx->llctrl.enc_rsp.ivs), 0);
/* things from slave stored for session key calculation */
memcpy(&conn->llcp.encryption.skd[8],