From 099b6bc3df94b31e30b2de81f3b41cfdaecd288d Mon Sep 17 00:00:00 2001 From: David Garske Date: Fri, 6 Nov 2015 09:41:16 -0800 Subject: [PATCH] Updated the Rowley Crossworks example so it builds due to new user-crypto. Tested and verified new "CUSTOM_RAND_TYPE" using 8, 16 and 32 bit values. --- IDE/ROWLEY-CROSSWORKS-ARM/hw.h | 2 +- IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c | 2 +- IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c | 2 +- IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp | 20 ++++++++++++++------ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/hw.h b/IDE/ROWLEY-CROSSWORKS-ARM/hw.h index 3a9bea546..1461f59bc 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/hw.h +++ b/IDE/ROWLEY-CROSSWORKS-ARM/hw.h @@ -10,4 +10,4 @@ uint32_t hw_get_time_sec(void); uint32_t hw_get_time_msec(void); void hw_uart_printchar(int c); void hw_watchdog_disable(void); -int hw_rand(void); +uint32_t hw_rand(void); diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c b/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c index f8fe62441..7dab09433 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c @@ -167,7 +167,7 @@ void hw_uart_printchar(int c) UART_PORT->D = (uint8_t)c; /* Send the character */ } -int hw_rand(void) +uint32_t hw_rand(void) { while((RNG->SR & RNG_SR_OREG_LVL(0xF)) == 0) {}; /* Wait until FIFO has a value available */ return RNG->OR; /* Return next value in FIFO output register */ diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c b/IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c index 562f153c6..1929e868b 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c @@ -29,7 +29,7 @@ double current_time(int reset) return time; } -int custom_rand_generate(void) +uint32_t custom_rand_generate(void) { return hw_rand(); } diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp index 9d20a1ba5..3221c59c1 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp +++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp @@ -10,12 +10,14 @@ project_type="Library" /> - + + + + + + + + +