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 41c8c40dd9c1c1b5316abc3b5524afb8d533872a Author: Fabio Utzig <ut...@apache.org> AuthorDate: Mon Feb 8 12:41:55 2021 -0300 Rename hash_k64f to hash_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/hash_context.h | 0 .../include/hash_kinetis/hash_kinetis.h} | 8 ++++---- hw/drivers/hash/{hash_k64f => hash_kinetis}/pkg.yml | 4 ++-- .../hash_k64f.c => hash_kinetis/src/hash_kinetis.c} | 20 ++++++++++---------- .../src/hash_kinetis_cau.c} | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/bsp/frdm-k64f/pkg.yml b/hw/bsp/frdm-k64f/pkg.yml index 7143c45..193337d 100644 --- a/hw/bsp/frdm-k64f/pkg.yml +++ b/hw/bsp/frdm-k64f/pkg.yml @@ -73,4 +73,4 @@ pkg.deps.ENC_FLASH_DEV: - "@apache-mynewt-core/hw/drivers/flash/enc_flash/ef_crypto" pkg.deps.HASH: - - "@apache-mynewt-core/hw/drivers/hash/hash_k64f" + - "@apache-mynewt-core/hw/drivers/hash/hash_kinetis" diff --git a/hw/bsp/frdm-k64f/src/hal_bsp.c b/hw/bsp/frdm-k64f/src/hal_bsp.c index f79a1ba..1f6c95e 100644 --- a/hw/bsp/frdm-k64f/src/hal_bsp.c +++ b/hw/bsp/frdm-k64f/src/hal_bsp.c @@ -41,7 +41,7 @@ #endif #if MYNEWT_VAL(HASH) #include "hash/hash.h" -#include "hash_k64f/hash_k64f.h" +#include "hash_kinetis/hash_kinetis.h" #endif #if MYNEWT_VAL(UART_0) || MYNEWT_VAL(UART_1) || MYNEWT_VAL(UART_2) || \ MYNEWT_VAL(UART_3) || MYNEWT_VAL(UART_4) || MYNEWT_VAL(UART_5) @@ -223,7 +223,7 @@ hal_bsp_init(void) #if MYNEWT_VAL(HASH) rc = os_dev_create(&os_bsp_hash.dev, "hash", OS_DEV_INIT_KERNEL, - OS_DEV_INIT_PRIO_DEFAULT, k64f_hash_dev_init, NULL); + OS_DEV_INIT_PRIO_DEFAULT, kinetis_hash_dev_init, NULL); assert(rc == 0); #endif diff --git a/hw/drivers/hash/hash_k64f/include/hash_context.h b/hw/drivers/hash/hash_kinetis/include/hash_context.h similarity index 100% rename from hw/drivers/hash/hash_k64f/include/hash_context.h rename to hw/drivers/hash/hash_kinetis/include/hash_context.h diff --git a/hw/drivers/hash/hash_k64f/include/hash_k64f/hash_k64f.h b/hw/drivers/hash/hash_kinetis/include/hash_kinetis/hash_kinetis.h similarity index 86% rename from hw/drivers/hash/hash_k64f/include/hash_k64f/hash_k64f.h rename to hw/drivers/hash/hash_kinetis/include/hash_kinetis/hash_kinetis.h index 76100dc..d2a8b18 100644 --- a/hw/drivers/hash/hash_k64f/include/hash_k64f/hash_k64f.h +++ b/hw/drivers/hash/hash_kinetis/include/hash_kinetis/hash_kinetis.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef __HASH_K64F_H__ -#define __HASH_K64F_H__ +#ifndef __HASH_KINETIS_H__ +#define __HASH_KINETIS_H__ #include "hash/hash.h" @@ -26,10 +26,10 @@ extern "C" { #endif -int k64f_hash_dev_init(struct os_dev *dev, void *arg); +int kinetis_hash_dev_init(struct os_dev *dev, void *arg); #ifdef __cplusplus } #endif -#endif /* __HASH_K64F_H__ */ +#endif /* __HASH_KINETIS_H__ */ diff --git a/hw/drivers/hash/hash_k64f/pkg.yml b/hw/drivers/hash/hash_kinetis/pkg.yml similarity index 91% rename from hw/drivers/hash/hash_k64f/pkg.yml rename to hw/drivers/hash/hash_kinetis/pkg.yml index 0a71c76..386899c 100644 --- a/hw/drivers/hash/hash_k64f/pkg.yml +++ b/hw/drivers/hash/hash_kinetis/pkg.yml @@ -17,8 +17,8 @@ # under the License. # -pkg.name: hw/drivers/hash/hash_k64f -pkg.description: Hash driver for NXP K64F +pkg.name: hw/drivers/hash/hash_kinetis +pkg.description: Hash driver for NXP Kinetis family pkg.author: "Apache Mynewt <d...@mynewt.apache.org>" pkg.homepage: "http://mynewt.apache.org/" pkg.keywords: diff --git a/hw/drivers/hash/hash_k64f/src/hash_k64f.c b/hw/drivers/hash/hash_kinetis/src/hash_kinetis.c similarity index 88% rename from hw/drivers/hash/hash_k64f/src/hash_k64f.c rename to hw/drivers/hash/hash_kinetis/src/hash_kinetis.c index dd48412..170e253 100644 --- a/hw/drivers/hash/hash_k64f/src/hash_k64f.c +++ b/hw/drivers/hash/hash_kinetis/src/hash_kinetis.c @@ -22,7 +22,7 @@ #include <os/mynewt.h> #include "hash/hash.h" -#include "hash_k64f/hash_k64f.h" +#include "hash_kinetis/hash_kinetis.h" static struct os_mutex gmtx; static uint32_t g_algos = HASH_ALGO_SHA256; @@ -51,7 +51,7 @@ extern void cau_sha256_hash(const unsigned char *msg_data, unsigned int *sha256_state); static int -k64f_hash_start(struct hash_dev *hash, void *ctx, uint16_t algo) +kinetis_hash_start(struct hash_dev *hash, void *ctx, uint16_t algo) { struct hash_sha256_context *sha256ctx; @@ -69,7 +69,7 @@ k64f_hash_start(struct hash_dev *hash, void *ctx, uint16_t algo) } static int -k64f_hash_update(struct hash_dev *hash, void *ctx, uint16_t algo, +kinetis_hash_update(struct hash_dev *hash, void *ctx, uint16_t algo, const void *inbuf, uint32_t inlen) { uint32_t i; @@ -100,7 +100,7 @@ k64f_hash_update(struct hash_dev *hash, void *ctx, uint16_t algo, } static int -k64f_hash_finish(struct hash_dev *hash, void *ctx, uint16_t algo, +kinetis_hash_finish(struct hash_dev *hash, void *ctx, uint16_t algo, void *outbuf) { uint32_t i; @@ -142,7 +142,7 @@ k64f_hash_finish(struct hash_dev *hash, void *ctx, uint16_t algo, } static int -k64f_hash_dev_open(struct os_dev *dev, uint32_t wait, void *arg) +kinetis_hash_dev_open(struct os_dev *dev, uint32_t wait, void *arg) { struct hash_dev *hash; @@ -158,20 +158,20 @@ k64f_hash_dev_open(struct os_dev *dev, uint32_t wait, void *arg) } int -k64f_hash_dev_init(struct os_dev *dev, void *arg) +kinetis_hash_dev_init(struct os_dev *dev, void *arg) { struct hash_dev *hash; hash = (struct hash_dev *)dev; assert(hash); - OS_DEV_SETHANDLERS(dev, k64f_hash_dev_open, NULL); + OS_DEV_SETHANDLERS(dev, kinetis_hash_dev_open, NULL); assert(os_mutex_init(&gmtx) == 0); - hash->interface.start = k64f_hash_start; - hash->interface.update = k64f_hash_update; - hash->interface.finish = k64f_hash_finish; + hash->interface.start = kinetis_hash_start; + hash->interface.update = kinetis_hash_update; + hash->interface.finish = kinetis_hash_finish; hash->interface.algomask = g_algos; return 0; diff --git a/hw/drivers/hash/hash_k64f/src/hash_k64f_cau.c b/hw/drivers/hash/hash_kinetis/src/hash_kinetis_cau.c similarity index 99% rename from hw/drivers/hash/hash_k64f/src/hash_k64f_cau.c rename to hw/drivers/hash/hash_kinetis/src/hash_kinetis_cau.c index fab478d..c8c3afe 100644 --- a/hw/drivers/hash/hash_k64f/src/hash_k64f_cau.c +++ b/hw/drivers/hash/hash_kinetis/src/hash_kinetis_cau.c @@ -18,7 +18,7 @@ */ #include <stdint.h> -#include "hash_k64f/hash_k64f.h" +#include "hash_kinetis/hash_kinetis.h" /* * CAU interface