You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ut...@apache.org on 2021/02/17 13:22:50 UTC
[mynewt-core] 01/05: trng: k64f: rename to trng_kinetis
This is an automated email from the ASF dual-hosted git repository.
utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit e1694f56ec604b9c85d2567530eeb5a53a147ffe
Author: Fabio Utzig <ut...@apache.org>
AuthorDate: Tue Feb 9 07:10:25 2021 -0300
trng: k64f: rename to trng_kinetis
This makes it less specific, since the driver should also work on other
Kinetis families.
Signed-off-by: Fabio Utzig <ut...@apache.org>
---
hw/bsp/frdm-k64f/pkg.yml | 2 +-
hw/bsp/frdm-k64f/src/hal_bsp.c | 4 +--
.../include/trng_kinetis/trng_kinetis.h} | 8 +++---
.../trng/{trng_k64f => trng_kinetis}/pkg.yml | 4 +--
.../src/trng_kinetis.c} | 32 +++++++++++-----------
.../trng/{trng_k64f => trng_kinetis}/syscfg.yml | 2 +-
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/hw/bsp/frdm-k64f/pkg.yml b/hw/bsp/frdm-k64f/pkg.yml
index 193337d..c1d234d 100644
--- a/hw/bsp/frdm-k64f/pkg.yml
+++ b/hw/bsp/frdm-k64f/pkg.yml
@@ -64,7 +64,7 @@ pkg.deps.UART_5:
- "@apache-mynewt-core/hw/drivers/uart/uart_hal"
pkg.deps.TRNG:
- - "@apache-mynewt-core/hw/drivers/trng/trng_k64f"
+ - "@apache-mynewt-core/hw/drivers/trng/trng_kinetis"
pkg.deps.CRYPTO:
- "@apache-mynewt-core/hw/drivers/crypto/crypto_k64f"
diff --git a/hw/bsp/frdm-k64f/src/hal_bsp.c b/hw/bsp/frdm-k64f/src/hal_bsp.c
index 1f6c95e..84c5a97 100644
--- a/hw/bsp/frdm-k64f/src/hal_bsp.c
+++ b/hw/bsp/frdm-k64f/src/hal_bsp.c
@@ -30,7 +30,7 @@
#include "hal/hal_flash.h"
#if MYNEWT_VAL(TRNG)
#include "trng/trng.h"
-#include "trng_k64f/trng_k64f.h"
+#include "trng_kinetis/trng_kinetis.h"
#endif
#if MYNEWT_VAL(CRYPTO)
#include "crypto/crypto.h"
@@ -210,7 +210,7 @@ hal_bsp_init(void)
#if MYNEWT_VAL(TRNG)
rc = os_dev_create(&os_bsp_trng.dev, "trng",
OS_DEV_INIT_KERNEL, OS_DEV_INIT_PRIO_DEFAULT,
- k64f_trng_dev_init, NULL);
+ kinetis_trng_dev_init, NULL);
assert(rc == 0);
#endif
diff --git a/hw/drivers/trng/trng_k64f/include/trng_k64f/trng_k64f.h b/hw/drivers/trng/trng_kinetis/include/trng_kinetis/trng_kinetis.h
similarity index 86%
rename from hw/drivers/trng/trng_k64f/include/trng_k64f/trng_k64f.h
rename to hw/drivers/trng/trng_kinetis/include/trng_kinetis/trng_kinetis.h
index 069e80b..dc73bc4 100644
--- a/hw/drivers/trng/trng_k64f/include/trng_k64f/trng_k64f.h
+++ b/hw/drivers/trng/trng_kinetis/include/trng_kinetis/trng_kinetis.h
@@ -17,8 +17,8 @@
* under the License.
*/
-#ifndef __TRNG_K64F_H__
-#define __TRNG_K64F_H__
+#ifndef __TRNG_KINETIS_H__
+#define __TRNG_KINETIS_H__
#include "trng/trng.h"
@@ -26,10 +26,10 @@
extern "C" {
#endif
-int k64f_trng_dev_init(struct os_dev *dev, void *arg);
+int kinetis_trng_dev_init(struct os_dev *dev, void *arg);
#ifdef __cplusplus
}
#endif
-#endif /* __TRNG_K64F_H__ */
+#endif /* __TRNG_KINETIS_H__ */
diff --git a/hw/drivers/trng/trng_k64f/pkg.yml b/hw/drivers/trng/trng_kinetis/pkg.yml
similarity index 92%
rename from hw/drivers/trng/trng_k64f/pkg.yml
rename to hw/drivers/trng/trng_kinetis/pkg.yml
index 9fbbcc1..e978db0 100644
--- a/hw/drivers/trng/trng_k64f/pkg.yml
+++ b/hw/drivers/trng/trng_kinetis/pkg.yml
@@ -17,8 +17,8 @@
# under the License.
#
-pkg.name: hw/drivers/trng/trng_k64f
-pkg.description: TRNG driver for K64F
+pkg.name: hw/drivers/trng/trng_kinetis
+pkg.description: TRNG driver for Kinetis
pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
pkg.homepage: "http://mynewt.apache.org/"
pkg.keywords:
diff --git a/hw/drivers/trng/trng_k64f/src/trng_k64f.c b/hw/drivers/trng/trng_kinetis/src/trng_kinetis.c
similarity index 83%
rename from hw/drivers/trng/trng_k64f/src/trng_k64f.c
rename to hw/drivers/trng/trng_kinetis/src/trng_kinetis.c
index 91b924c..45d914c 100644
--- a/hw/drivers/trng/trng_k64f/src/trng_k64f.c
+++ b/hw/drivers/trng/trng_kinetis/src/trng_kinetis.c
@@ -20,9 +20,9 @@
#include <string.h>
#include "fsl_rnga.h"
#include "trng/trng.h"
-#include "trng_k64f/trng_k64f.h"
+#include "trng_kinetis/trng_kinetis.h"
-static uint8_t rng_cache[ MYNEWT_VAL(K64F_TRNG_CACHE_LEN) ];
+static uint8_t rng_cache[ MYNEWT_VAL(KINETIS_TRNG_CACHE_LEN) ];
static uint16_t rng_cache_out;
static uint16_t rng_cache_in;
static struct os_mutex rng_cache_mu;
@@ -35,7 +35,7 @@ static struct os_eventq rng_evtq;
static struct os_task poller_task;
static inline void
-k64f_rnga_start(void)
+kinetis_rnga_start(void)
{
struct os_event evt;
@@ -48,14 +48,14 @@ k64f_rnga_start(void)
}
static inline void
-k64f_rnga_stop(void)
+kinetis_rnga_stop(void)
{
RNGA_SetMode(RNG, kRNGA_ModeSleep);
running = false;
}
static size_t
-k64f_trng_read(struct trng_dev *trng, void *ptr, size_t size)
+kinetis_trng_read(struct trng_dev *trng, void *ptr, size_t size)
{
size_t num_read;
@@ -83,7 +83,7 @@ k64f_trng_read(struct trng_dev *trng, void *ptr, size_t size)
rng_cache_out = (rng_cache_out + num_read) % sizeof(rng_cache);
if (num_read > 0) {
- k64f_rnga_start();
+ kinetis_rnga_start();
}
os_mutex_release(&rng_cache_mu);
@@ -92,7 +92,7 @@ k64f_trng_read(struct trng_dev *trng, void *ptr, size_t size)
}
static uint32_t
-k64f_trng_get_u32(struct trng_dev *trng)
+kinetis_trng_get_u32(struct trng_dev *trng)
{
union {
uint32_t v32;
@@ -100,10 +100,10 @@ k64f_trng_get_u32(struct trng_dev *trng)
} val;
size_t num;
- num = k64f_trng_read(trng, &val.v8, sizeof(val.v8));
+ num = kinetis_trng_read(trng, &val.v8, sizeof(val.v8));
while (num < sizeof(val.v8)) {
os_sched(NULL);
- num += k64f_trng_read(trng, &val.v8[num], sizeof(val.v8) - num);
+ num += kinetis_trng_read(trng, &val.v8[num], sizeof(val.v8) - num);
}
return val.v32;
@@ -129,7 +129,7 @@ rnga_poller_handler(void *arg)
}
if ((rng_cache_in + 1) % sizeof(rng_cache) == rng_cache_out) {
- k64f_rnga_stop();
+ kinetis_rnga_stop();
break;
}
}
@@ -143,7 +143,7 @@ rnga_poller_handler(void *arg)
}
static int
-k64f_trng_dev_open(struct os_dev *dev, uint32_t wait, void *arg)
+kinetis_trng_dev_open(struct os_dev *dev, uint32_t wait, void *arg)
{
struct trng_dev *trng;
@@ -156,14 +156,14 @@ k64f_trng_dev_open(struct os_dev *dev, uint32_t wait, void *arg)
RNGA_Init(RNG);
- k64f_rnga_start();
+ kinetis_rnga_start();
}
return 0;
}
int
-k64f_trng_dev_init(struct os_dev *dev, void *arg)
+kinetis_trng_dev_init(struct os_dev *dev, void *arg)
{
struct trng_dev *trng;
int rc;
@@ -171,10 +171,10 @@ k64f_trng_dev_init(struct os_dev *dev, void *arg)
trng = (struct trng_dev *)dev;
assert(trng);
- OS_DEV_SETHANDLERS(dev, k64f_trng_dev_open, NULL);
+ OS_DEV_SETHANDLERS(dev, kinetis_trng_dev_open, NULL);
- trng->interface.get_u32 = k64f_trng_get_u32;
- trng->interface.read = k64f_trng_read;
+ trng->interface.get_u32 = kinetis_trng_get_u32;
+ trng->interface.read = kinetis_trng_read;
os_eventq_init(&rng_evtq);
os_mutex_init(&rng_cache_mu);
diff --git a/hw/drivers/trng/trng_k64f/syscfg.yml b/hw/drivers/trng/trng_kinetis/syscfg.yml
similarity index 96%
rename from hw/drivers/trng/trng_k64f/syscfg.yml
rename to hw/drivers/trng/trng_kinetis/syscfg.yml
index d44da2c..9f8c0cf 100644
--- a/hw/drivers/trng/trng_k64f/syscfg.yml
+++ b/hw/drivers/trng/trng_kinetis/syscfg.yml
@@ -17,6 +17,6 @@
#
syscfg.defs:
- K64F_TRNG_CACHE_LEN:
+ KINETIS_TRNG_CACHE_LEN:
description: 'Internal cache length, shall be a multiple of 4'
value: 32