github-mirrors/neorv32
1
0
Fork 0
mirror of https://github.com/stnolting/neorv32.git synced 2025-04-24 14:17:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

TRNG: Change "variable style" by "pointer style" (#518)

Browse source
This commit is contained in:
Stephan 2023-02-27 18:51:32 +01:00 • committed by GitHub
commit 22978ee1b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sw/lib/include/neorv32.h
View file

@ -1169,7 +1169,7 @@ enum NEORV32_TWI_DATA_enum {
**************************************************************************/
/**@{*/
/** TRNG module prototype */
typedef struct __attribute__((packed,aligned(4))) {
typedef volatile struct __attribute__((packed,aligned(4))) {
uint32_t CTRL; /**< offset 0: control register (#NEORV32_TRNG_CTRL_enum) */
} neorv32_trng_t;
@ -1177,7 +1177,7 @@ typedef struct __attribute__((packed,aligned(4))) {
#define NEORV32_TRNG_BASE (0xFFFFFFB8U)
/** TRNG module hardware access (#neorv32_trng_t) */
#define NEORV32_TRNG (*((volatile neorv32_trng_t*) (NEORV32_TRNG_BASE)))
#define NEORV32_TRNG ((neorv32_trng_t*) (NEORV32_TRNG_BASE))
/** TRNG control/data register bits */
enum NEORV32_TRNG_CTRL_enum {

12
sw/lib/source/neorv32_trng.c
View file

@ -68,14 +68,14 @@ void neorv32_trng_enable(void) {
int i;
NEORV32_TRNG.CTRL = 0; // reset
NEORV32_TRNG->CTRL = 0; // reset
// wait for all internal components to reset
for (i=0; i<512; i++) {
asm volatile ("nop");
}
NEORV32_TRNG.CTRL = 1 << TRNG_CTRL_EN; // activate
NEORV32_TRNG->CTRL = 1 << TRNG_CTRL_EN; // activate
// "warm-up"
for (i=0; i<512; i++) {
@ -92,7 +92,7 @@ void neorv32_trng_enable(void) {
**************************************************************************/
void neorv32_trng_disable(void) {
NEORV32_TRNG.CTRL = 0;
NEORV32_TRNG->CTRL = 0;
}
@ -101,7 +101,7 @@ void neorv32_trng_disable(void) {
**************************************************************************/
void neorv32_trng_fifo_clear(void) {
NEORV32_TRNG.CTRL |= 1 << TRNG_CTRL_FIFO_CLR; // bit auto clears
NEORV32_TRNG->CTRL |= 1 << TRNG_CTRL_FIFO_CLR; // bit auto clears
}
@ -113,7 +113,7 @@ void neorv32_trng_fifo_clear(void) {
**************************************************************************/
int neorv32_trng_get(uint8_t *data) {
uint32_t tmp = NEORV32_TRNG.CTRL;
uint32_t tmp = NEORV32_TRNG->CTRL;
*data = (uint8_t)(tmp >> TRNG_CTRL_DATA_LSB);
if (tmp & (1<<TRNG_CTRL_VALID)) { // output data valid?
@ -134,7 +134,7 @@ int neorv32_trng_get(uint8_t *data) {
**************************************************************************/
int neorv32_trng_check_sim_mode(void) {
if (NEORV32_TRNG.CTRL & (1<<TRNG_CTRL_SIM_MODE)) {
if (NEORV32_TRNG->CTRL & (1<<TRNG_CTRL_SIM_MODE)) {
return -1; // simulation mode (PRNG)
}
else {