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

XIRQ: Change "variable style" by "pointer style"

Browse source
This commit is contained in:
emb4fun 2023-02-27 14:18:33 +01:00
parent d9d141359b
commit 49e3cdb09d
No known key found for this signature in database
GPG key ID: F71BF3BCA38B40A7
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sw/example/processor_check/main.c
View file

@ -1231,8 +1231,8 @@ int main() {
test_fail();
}
NEORV32_XIRQ.IER = 0;
NEORV32_XIRQ.IPR = -1;
NEORV32_XIRQ->IER = 0;
NEORV32_XIRQ->IPR = -1;
// ----------------------------------------------------------

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

@ -951,7 +951,7 @@ enum NEORV32_BUSKEEPER_CTRL_enum {
**************************************************************************/
/**@{*/
/** XIRQ module prototype */
typedef struct __attribute__((packed,aligned(4))) {
typedef volatile struct __attribute__((packed,aligned(4))) {
uint32_t IER; /**< offset 0: IRQ input enable register */
uint32_t IPR; /**< offset 4: pending IRQ register /ack/clear */
uint32_t SCR; /**< offset 8: interrupt source register */
@ -962,7 +962,7 @@ typedef struct __attribute__((packed,aligned(4))) {
#define NEORV32_XIRQ_BASE (0xFFFFFF80U)
/** XIRQ module hardware access (#neorv32_xirq_t) */
#define NEORV32_XIRQ (*((volatile neorv32_xirq_t*) (NEORV32_XIRQ_BASE)))
#define NEORV32_XIRQ ((neorv32_xirq_t*) (NEORV32_XIRQ_BASE))
/**@}*/

30
sw/lib/source/neorv32_xirq.c
View file

@ -77,9 +77,9 @@ int neorv32_xirq_available(void) {
**************************************************************************/
int neorv32_xirq_setup(void) {
NEORV32_XIRQ.IER = 0; // disable all input channels
NEORV32_XIRQ.IPR = 0; // clear all pending IRQs
NEORV32_XIRQ.SCR = 0; // acknowledge (clear) XIRQ interrupt
NEORV32_XIRQ->IER = 0; // disable all input channels
NEORV32_XIRQ->IPR = 0; // clear all pending IRQs
NEORV32_XIRQ->SCR = 0; // acknowledge (clear) XIRQ interrupt
int i;
for (i=0; i<32; i++) {
@ -124,8 +124,8 @@ int neorv32_xirq_get_num(void) {
if (neorv32_xirq_available()) {
neorv32_cpu_csr_clr(CSR_MIE, 1 << XIRQ_FIRQ_ENABLE); // make sure XIRQ cannot fire
NEORV32_XIRQ.IER = 0xffffffff; // try to set all enable flags
enable = NEORV32_XIRQ.IER; // read back actually set flags
NEORV32_XIRQ->IER = 0xffffffff; // try to set all enable flags
enable = NEORV32_XIRQ->IER; // read back actually set flags
// count set bits in enable
cnt = 0;
@ -151,7 +151,7 @@ int neorv32_xirq_get_num(void) {
void neorv32_xirq_clear_pending(uint8_t ch) {
if (ch < 32) { // channel valid?
NEORV32_XIRQ.IPR = ~(1 << ch);
NEORV32_XIRQ->IPR = ~(1 << ch);
}
}
@ -164,7 +164,7 @@ void neorv32_xirq_clear_pending(uint8_t ch) {
void neorv32_xirq_channel_enable(uint8_t ch) {
if (ch < 32) { // channel valid?
NEORV32_XIRQ.IER |= 1 << ch;
NEORV32_XIRQ->IER |= 1 << ch;
}
}
@ -177,7 +177,7 @@ void neorv32_xirq_channel_enable(uint8_t ch) {
void neorv32_xirq_channel_disable(uint8_t ch) {
if (ch < 32) { // channel valid?
NEORV32_XIRQ.IER &= ~(1 << ch);
NEORV32_XIRQ->IER &= ~(1 << ch);
}
}
@ -197,8 +197,8 @@ int neorv32_xirq_install(uint8_t ch, void (*handler)(void)) {
if (ch < 32) {
__neorv32_xirq_vector_lut[ch] = (uint32_t)handler; // install handler
uint32_t mask = 1 << ch;
NEORV32_XIRQ.IPR = ~mask; // clear if pending
NEORV32_XIRQ.IER |= mask; // enable channel
NEORV32_XIRQ->IPR = ~mask; // clear if pending
NEORV32_XIRQ->IER |= mask; // enable channel
return 0;
}
return 1;
@ -219,8 +219,8 @@ int neorv32_xirq_uninstall(uint8_t ch) {
if (ch < 32) {
__neorv32_xirq_vector_lut[ch] = (uint32_t)(&__neorv32_xirq_dummy_handler); // override using dummy handler
uint32_t mask = 1 << ch;
NEORV32_XIRQ.IER &= ~mask; // disable channel
NEORV32_XIRQ.IPR = ~mask; // clear if pending
NEORV32_XIRQ->IER &= ~mask; // disable channel
NEORV32_XIRQ->IPR = ~mask; // clear if pending
return 0;
}
return 1;
@ -235,7 +235,7 @@ static void __neorv32_xirq_core(void) {
neorv32_cpu_csr_write(CSR_MIP, ~(1 << XIRQ_FIRQ_PENDING)); // acknowledge XIRQ FIRQ
uint32_t src = NEORV32_XIRQ.SCR; // get IRQ source (with highest priority)
uint32_t src = NEORV32_XIRQ->SCR; // get IRQ source (with highest priority)
// execute handler
uint32_t xirq_handler = __neorv32_xirq_vector_lut[src];
@ -244,8 +244,8 @@ static void __neorv32_xirq_core(void) {
(*handler_pnt)();
uint32_t mask = 1 << src;
NEORV32_XIRQ.IPR = ~mask; // clear current pending interrupt
NEORV32_XIRQ.SCR = 0; // acknowledge current XIRQ interrupt
NEORV32_XIRQ->IPR = ~mask; // clear current pending interrupt
NEORV32_XIRQ->SCR = 0; // acknowledge current XIRQ interrupt
}