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

SDI: Change "variable style" by "pointer style" (#516)

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

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

@ -743,7 +743,7 @@ typedef struct __attribute__((packed,aligned(4))) {
**************************************************************************/
/**@{*/
/** SDI module prototype */
typedef struct __attribute__((packed,aligned(4))) {
typedef volatile struct __attribute__((packed,aligned(4))) {
uint32_t CTRL; /**< offset 0: control register (#NEORV32_SDI_CTRL_enum) */
uint32_t DATA; /**< offset 4: data register */
} neorv32_sdi_t;
@ -752,7 +752,7 @@ typedef struct __attribute__((packed,aligned(4))) {
#define NEORV32_SDI_BASE (0xFFFFFF00U)
/** SDI module hardware access (#neorv32_sdi_t) */
#define NEORV32_SDI (*((volatile neorv32_sdi_t*) (NEORV32_SDI_BASE)))
#define NEORV32_SDI ((neorv32_sdi_t*) (NEORV32_SDI_BASE))
/** SDI control register bits */
enum NEORV32_SDI_CTRL_enum {

24
sw/lib/source/neorv32_sdi.c
View file

@ -68,13 +68,13 @@ int neorv32_sdi_available(void) {
**************************************************************************/
void neorv32_sdi_setup(uint32_t irq_mask) {
NEORV32_SDI.CTRL = 0; // reset
NEORV32_SDI->CTRL = 0; // reset
uint32_t tmp = 0;
tmp |= (uint32_t)(1 & 0x01) << SDI_CTRL_EN;
tmp |= (uint32_t)(irq_mask & (0x0f << SDI_CTRL_IRQ_RX_AVAIL));
NEORV32_SDI.CTRL = tmp;
NEORV32_SDI->CTRL = tmp;
}
@ -83,7 +83,7 @@ void neorv32_sdi_setup(uint32_t irq_mask) {
**************************************************************************/
void neorv32_sdi_rx_clear(void) {
NEORV32_SDI.CTRL |= (uint32_t)(1 << SDI_CTRL_CLR_RX);
NEORV32_SDI->CTRL |= (uint32_t)(1 << SDI_CTRL_CLR_RX);
}
@ -92,7 +92,7 @@ void neorv32_sdi_rx_clear(void) {
**************************************************************************/
void neorv32_sdi_disable(void) {
NEORV32_SDI.CTRL &= ~((uint32_t)(1 << SDI_CTRL_EN));
NEORV32_SDI->CTRL &= ~((uint32_t)(1 << SDI_CTRL_EN));
}
@ -101,7 +101,7 @@ void neorv32_sdi_disable(void) {
**************************************************************************/
void neorv32_sdi_enable(void) {
NEORV32_SDI.CTRL |= ((uint32_t)(1 << SDI_CTRL_EN));
NEORV32_SDI->CTRL |= ((uint32_t)(1 << SDI_CTRL_EN));
}
@ -112,7 +112,7 @@ void neorv32_sdi_enable(void) {
**************************************************************************/
int neorv32_sdi_get_fifo_depth(void) {
uint32_t tmp = (NEORV32_SDI.CTRL >> SDI_CTRL_FIFO_LSB) & 0x0f;
uint32_t tmp = (NEORV32_SDI->CTRL >> SDI_CTRL_FIFO_LSB) & 0x0f;
return (int)(1 << tmp);
}
@ -125,11 +125,11 @@ int neorv32_sdi_get_fifo_depth(void) {
**************************************************************************/
int neorv32_sdi_put(uint8_t data) {
if (NEORV32_SDI.CTRL & (1 << SDI_CTRL_TX_FULL)) {
if (NEORV32_SDI->CTRL & (1 << SDI_CTRL_TX_FULL)) {
return -1;
}
else {
NEORV32_SDI.DATA = (uint32_t)data;
NEORV32_SDI->DATA = (uint32_t)data;
return 0;
}
}
@ -142,7 +142,7 @@ int neorv32_sdi_put(uint8_t data) {
**************************************************************************/
void neorv32_sdi_put_nonblocking(uint8_t data) {
NEORV32_SDI.DATA = (uint32_t)data;
NEORV32_SDI->DATA = (uint32_t)data;
}
@ -154,8 +154,8 @@ void neorv32_sdi_put_nonblocking(uint8_t data) {
**************************************************************************/
int neorv32_sdi_get(uint8_t* data) {
if (NEORV32_SDI.CTRL & (1 << SDI_CTRL_RX_AVAIL)) {
*data = (uint8_t)NEORV32_SDI.DATA;
if (NEORV32_SDI->CTRL & (1 << SDI_CTRL_RX_AVAIL)) {
*data = (uint8_t)NEORV32_SDI->DATA;
return 0;
}
else {
@ -171,5 +171,5 @@ int neorv32_sdi_get(uint8_t* data) {
**************************************************************************/
uint8_t neorv32_sdi_get_nonblocking(void) {
return (uint8_t)NEORV32_SDI.DATA;
return (uint8_t)NEORV32_SDI->DATA;
}