Fix ODR bugs

This commit is contained in:
TuxSH 2020-05-05 18:13:32 +01:00
parent 9942e8b299
commit 0da90f61fc
3 changed files with 4 additions and 2 deletions

View File

@ -102,7 +102,6 @@ u32 nbSection0Modules;
Result (*InterruptManager__MapInterrupt)(InterruptManager *manager, KBaseInterruptEvent *iEvent, u32 interruptID, Result (*InterruptManager__MapInterrupt)(InterruptManager *manager, KBaseInterruptEvent *iEvent, u32 interruptID,
u32 coreID, u32 priority, bool disableUponReceipt, bool levelHighActive); u32 coreID, u32 priority, bool disableUponReceipt, bool levelHighActive);
InterruptManager *interruptManager; InterruptManager *interruptManager;
KBaseInterruptEvent *customInterruptEvent;
void (*initFPU)(void); void (*initFPU)(void);
void (*mcuReboot)(void); void (*mcuReboot)(void);

View File

@ -121,12 +121,14 @@ _safecpy_end:
.section .rodata.safecpy_sz, "a", %progbits .section .rodata.safecpy_sz, "a", %progbits
.global safecpy_sz .global safecpy_sz
.type safecpy_sz, %object
safecpy_sz: .word _safecpy_end - safecpy safecpy_sz: .word _safecpy_end - safecpy
.section .bss.SGI0Handler, "aw", %nobits .section .bss.SGI0Handler, "aw", %nobits
.balign 4 .balign 4
.global SGI0Handler .global SGI0Handler
.type safecpy_sz, %object
SGI0Handler: .skip 4 @ see synchronization.c SGI0Handler: .skip 4 @ see synchronization.c
.balign 4 .balign 4
@ -136,4 +138,5 @@ SGI0Handler: .skip 4 @ see synchronization.c
_customInterruptEventObj: .word SGI0Handler _customInterruptEventObj: .word SGI0Handler
.global customInterruptEvent .global customInterruptEvent
.type safecpy_sz, %object
customInterruptEvent: .word _customInterruptEventObj customInterruptEvent: .word _customInterruptEventObj

View File

@ -30,7 +30,7 @@
extern Menu screenFiltersMenu; extern Menu screenFiltersMenu;
int screenFiltersCurrentTemperature; extern int screenFiltersCurrentTemperature;
void screenFiltersSetDisabled(void); void screenFiltersSetDisabled(void);
void screenFiltersReduceBlueLevel1(void); void screenFiltersReduceBlueLevel1(void);