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

BUSKEEPER: Change "variable style" by "pointer style" (#525)

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

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

@ -690,7 +690,7 @@ int main() {
if ((neorv32_cpu_csr_read(CSR_MCAUSE) == TRAP_CODE_L_ACCESS) && // load bus access error exception
(neorv32_cpu_csr_read(CSR_MTVAL) == ADDR_UNREACHABLE) &&
(tmp_b == 0xcafe1230) && // make sure dest. reg is not updated
(NEORV32_BUSKEEPER.CTRL = tmp_a)) { // buskeeper: error flag + timeout error
(NEORV32_BUSKEEPER->CTRL = tmp_a)) { // buskeeper: error flag + timeout error
test_ok();
}
else {
@ -739,7 +739,7 @@ int main() {
if ((neorv32_cpu_csr_read(CSR_MCAUSE) == TRAP_CODE_S_ACCESS) && // store bus access error exception
(neorv32_cpu_csr_read(CSR_MTVAL) == ADDR_READONLY) &&
(NEORV32_BUSKEEPER.CTRL == tmp_a)) { // buskeeper: error flag + device error
(NEORV32_BUSKEEPER->CTRL == tmp_a)) { // buskeeper: error flag + device error
test_ok();
}
else {

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

@ -927,7 +927,7 @@ enum NEORV32_ONEWIRE_DATA_enum {
**************************************************************************/
/**@{*/
/** BUSKEEPER module prototype */
typedef struct __attribute__((packed,aligned(4))) {
typedef volatile struct __attribute__((packed,aligned(4))) {
uint32_t CTRL; /**< offset 0: control register (#NEORV32_BUSKEEPER_CTRL_enum) */
const uint32_t reserved ; /**< offset 4: reserved */
} neorv32_buskeeper_t;
@ -936,7 +936,7 @@ typedef struct __attribute__((packed,aligned(4))) {
#define NEORV32_BUSKEEPER_BASE (0xFFFFFF78U)
/** BUSKEEPER module hardware access (#neorv32_buskeeper_t) */
#define NEORV32_BUSKEEPER (*((volatile neorv32_buskeeper_t*) (NEORV32_BUSKEEPER_BASE)))
#define NEORV32_BUSKEEPER ((neorv32_buskeeper_t*) (NEORV32_BUSKEEPER_BASE))
/** BUSKEEPER control/data register bits */
enum NEORV32_BUSKEEPER_CTRL_enum {

4
sw/lib/source/neorv32_rte.c
View file

@ -74,7 +74,7 @@ void neorv32_rte_setup(void) {
neorv32_cpu_csr_write(CSR_MIP, 0);
// clear BUSKEEPER error flags
NEORV32_BUSKEEPER.CTRL = 0;
NEORV32_BUSKEEPER->CTRL = 0;
// install debug handler for all trap sources
uint8_t id;
@ -245,7 +245,7 @@ static void __neorv32_rte_debug_handler(void) {
}
// check specific cause if bus access fault exception
else if ((trap_cause == TRAP_CODE_I_ACCESS) || (trap_cause == TRAP_CODE_L_ACCESS) || (trap_cause == TRAP_CODE_S_ACCESS)) {
uint32_t bus_err = NEORV32_BUSKEEPER.CTRL;
uint32_t bus_err = NEORV32_BUSKEEPER->CTRL;
if (bus_err & (1<<BUSKEEPER_ERR_FLAG)) { // exception caused by bus system?
if (bus_err & (1<<BUSKEEPER_ERR_TYPE)) {
neorv32_uart0_puts(" [TIMEOUT_ERR]");