Remove return values of handlers.
Signed-off-by: imi415 <imi415.public@gmail.com>
This commit is contained in:
parent
d8e7b24931
commit
886fc31ff0
|
@ -1,8 +1,8 @@
|
||||||
BasedOnStyle: Google
|
BasedOnStyle: Google
|
||||||
IndentWidth: 4
|
IndentWidth: 4
|
||||||
AlignConsecutiveMacros: AcrossEmptyLines
|
AlignConsecutiveMacros: AcrossEmptyLines
|
||||||
AlignConsecutiveDeclarations: AcrossEmptyLines
|
AlignConsecutiveDeclarations: Consecutive
|
||||||
AlignConsecutiveAssignments: AcrossEmptyLinesAndComments
|
AlignConsecutiveAssignments: Consecutive
|
||||||
AllowShortFunctionsOnASingleLine: None
|
AllowShortFunctionsOnASingleLine: None
|
||||||
BreakBeforeBraces: Custom
|
BreakBeforeBraces: Custom
|
||||||
BraceWrapping:
|
BraceWrapping:
|
||||||
|
|
16
src/main.c
16
src/main.c
|
@ -4,19 +4,19 @@
|
||||||
#include "stx7105.h"
|
#include "stx7105.h"
|
||||||
#include "stx7105_utils.h"
|
#include "stx7105_utils.h"
|
||||||
|
|
||||||
#define LED_RED_GPIO PIO0
|
#define LED_RED_GPIO PIO0
|
||||||
#define LED_RED_PIN 5U
|
#define LED_RED_PIN 5U
|
||||||
|
|
||||||
#define LED_BLUE_GPIO PIO0
|
#define LED_BLUE_GPIO PIO0
|
||||||
#define LED_BLUE_PIN 4U
|
#define LED_BLUE_PIN 4U
|
||||||
|
|
||||||
#define CONSOLE_ASC ASC2
|
#define CONSOLE_ASC ASC2
|
||||||
#define SYSTEM_DEVID (0xFE001000U) /* DEVID */
|
#define SYSTEM_DEVID (0xFE001000U) /* DEVID */
|
||||||
#define SYSTEM_CONFIG34 (0xFE001188U) /* PIO4 */
|
#define SYSTEM_CONFIG34 (0xFE001188U) /* PIO4 */
|
||||||
#define SYSTEM_CONFIG7 (0xFE00111CU) /* RXSEL */
|
#define SYSTEM_CONFIG7 (0xFE00111CU) /* RXSEL */
|
||||||
|
|
||||||
#define MEMTEST_START 0x82000000
|
#define MEMTEST_START 0x82000000
|
||||||
#define MEMTEST_END 0x8F000000
|
#define MEMTEST_END 0x8F000000
|
||||||
|
|
||||||
void uart_init(void) {
|
void uart_init(void) {
|
||||||
PIO4->CLR_PC0 = 1U; /* PC = 110, AFOUT, PP */
|
PIO4->CLR_PC0 = 1U; /* PC = 110, AFOUT, PP */
|
||||||
|
@ -63,8 +63,8 @@ int main(void) {
|
||||||
init_led(LED_RED_GPIO, LED_RED_PIN, 0U);
|
init_led(LED_RED_GPIO, LED_RED_PIN, 0U);
|
||||||
init_led(LED_BLUE_GPIO, LED_BLUE_PIN, 0U);
|
init_led(LED_BLUE_GPIO, LED_BLUE_PIN, 0U);
|
||||||
|
|
||||||
setbuf(stdout,NULL);
|
setbuf(stdout, NULL);
|
||||||
setbuf(stderr,NULL);
|
setbuf(stderr, NULL);
|
||||||
|
|
||||||
uart_init();
|
uart_init();
|
||||||
|
|
||||||
|
|
|
@ -25,84 +25,75 @@ typedef enum {
|
||||||
|
|
||||||
/* ========================= TMU 0/1/2 Underrun Interrupt Handlers ================================= */
|
/* ========================= TMU 0/1/2 Underrun Interrupt Handlers ================================= */
|
||||||
|
|
||||||
WEAK_ATTR int tuni0_handler(void) {
|
WEAK_ATTR void tuni0_handler(void) {
|
||||||
/* Does nothing */
|
/* Does nothing */
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WEAK_ATTR int tuni1_handler(void) {
|
WEAK_ATTR void tuni1_handler(void) {
|
||||||
/* Does nothing */
|
/* Does nothing */
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WEAK_ATTR int tuni2_handler(void) {
|
WEAK_ATTR void tuni2_handler(void) {
|
||||||
/* Does nothing */
|
/* Does nothing */
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================= ASC(UART) 0/1/2 Interrupt Handlers ================================= */
|
/* ========================= ASC(UART) 0/1/2 Interrupt Handlers ================================= */
|
||||||
|
|
||||||
WEAK_ATTR int asc2_handler(void) {
|
WEAK_ATTR void asc2_handler(void) {
|
||||||
/* Does nothing */
|
/* Does nothing */
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================= Different Trap Code Handlers ================================= */
|
/* ========================= Different Trap Code Handlers ================================= */
|
||||||
|
|
||||||
WEAK_ATTR int syscall_handler(uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4) {
|
WEAK_ATTR void syscall_handler(uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4) {
|
||||||
return 0;
|
/* Does nothing */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================= TRAPA(Trap) Exception Handlers ================================= */
|
/* ========================= TRAPA(Trap) Exception Handlers ================================= */
|
||||||
|
|
||||||
WEAK_ATTR int trap_handler(uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4) {
|
WEAK_ATTR void trap_handler(uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4) {
|
||||||
tra_type_t tra = (CSP->TRA >> 2U) & 0xFFU; /* TRA[9:2] */
|
tra_type_t tra = (CSP->TRA >> 2U) & 0xFFU; /* TRA[9:2] */
|
||||||
|
|
||||||
switch (tra) {
|
switch (tra) {
|
||||||
case TRA_TYPE_SYSCALL:
|
case TRA_TYPE_SYSCALL:
|
||||||
return syscall_handler(p1, p2, p3, p4);
|
syscall_handler(p1, p2, p3, p4);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================= System Exception Handlers ================================= */
|
/* ========================= System Exception Handlers ================================= */
|
||||||
|
|
||||||
WEAK_IRQ_ATTR int general_exc_handler(uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4) {
|
WEAK_IRQ_ATTR void general_exc_handler(uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4) {
|
||||||
expevt_type_t expevt = CSP->EXPEVT;
|
expevt_type_t expevt = CSP->EXPEVT;
|
||||||
switch (expevt) {
|
switch (expevt) {
|
||||||
case EXP_TYPE_TRAP:
|
case EXP_TYPE_TRAP:
|
||||||
return trap_handler(p1, p2, p3, p4);
|
trap_handler(p1, p2, p3, p4);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================= System Interrupt Handlers ================================= */
|
/* ========================= System Interrupt Handlers ================================= */
|
||||||
|
|
||||||
WEAK_IRQ_ATTR int general_int_handler(void) {
|
WEAK_IRQ_ATTR void general_int_handler(void) {
|
||||||
intevt_type_t intevt = CSP->INTEVT;
|
intevt_type_t intevt = CSP->INTEVT;
|
||||||
switch (intevt) {
|
switch (intevt) {
|
||||||
case INT_TYPE_TMU_TNUI0:
|
case INT_TYPE_TMU_TNUI0:
|
||||||
return tuni0_handler();
|
tuni0_handler();
|
||||||
break;
|
break;
|
||||||
case INT_TYPE_TMU_TNUI1:
|
case INT_TYPE_TMU_TNUI1:
|
||||||
return tuni1_handler();
|
tuni1_handler();
|
||||||
break;
|
break;
|
||||||
case INT_TYPE_TMU_TNUI2:
|
case INT_TYPE_TMU_TNUI2:
|
||||||
return tuni2_handler();
|
tuni2_handler();
|
||||||
break;
|
break;
|
||||||
case INT_TYPE_ASC_UART2:
|
case INT_TYPE_ASC_UART2:
|
||||||
return asc2_handler();
|
asc2_handler();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
}
|
}
|
|
@ -39,7 +39,7 @@ void delay_ms(uint32_t msec) {
|
||||||
INTC->IPRA |= (1U << INTC_IPRA_IPR_TMU0_Pos); /* Interrupt priority 1 */
|
INTC->IPRA |= (1U << INTC_IPRA_IPR_TMU0_Pos); /* Interrupt priority 1 */
|
||||||
|
|
||||||
/* Wait until underflow occurs */
|
/* Wait until underflow occurs */
|
||||||
while(s_tmu_flag != 1) {
|
while (s_tmu_flag != 1) {
|
||||||
asm("sleep");
|
asm("sleep");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,9 +48,7 @@ void delay_ms(uint32_t msec) {
|
||||||
TMU->TSTR &= ~TMU_TSTR_STR0_Msk; /* Stop counter */
|
TMU->TSTR &= ~TMU_TSTR_STR0_Msk; /* Stop counter */
|
||||||
}
|
}
|
||||||
|
|
||||||
int tuni0_handler(void) {
|
void tuni0_handler(void) {
|
||||||
s_tmu_flag = 1U;
|
s_tmu_flag = 1U;
|
||||||
TMU->TCR0 &= ~(TMU_TCR_UNF_Msk);
|
TMU->TCR0 &= ~(TMU_TCR_UNF_Msk);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#define CONSOLE_ASC ASC2
|
#define CONSOLE_ASC ASC2
|
||||||
|
|
||||||
#define HEAP_SIZE 0x10000
|
#define HEAP_SIZE 0x10000
|
||||||
|
|
||||||
extern char _end;
|
extern char _end;
|
||||||
static uint32_t s_heap_size = 0U;
|
static uint32_t s_heap_size = 0U;
|
||||||
|
@ -35,10 +35,9 @@ int _write(int file, char *ptr, int len) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int _open(const char *name, int flags, int mode) {
|
int _open(const char *name, int flags, int mode) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int _read(int file, char *ptr, int len) {
|
int _read(int file, char *ptr, int len) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue