diff options
| author | Maximilien Cuony <maximilien@theglu.org> | 2016-06-05 22:28:56 +0200 |
|---|---|---|
| committer | Maximilien Cuony <maximilien@theglu.org> | 2016-06-05 22:28:56 +0200 |
| commit | 765b06950c1a5b55bb96a29f9da3c136f790a0f2 (patch) | |
| tree | ebe75c291b201a16cf16ed52fbfc2c82d13a98ff /src/common/includes/Core | |
| parent | 327114f6c35a2c28004eb950baf5d1c1c175824a (diff) | |
| download | glutte-o-matic-765b06950c1a5b55bb96a29f9da3c136f790a0f2.tar.gz glutte-o-matic-765b06950c1a5b55bb96a29f9da3c136f790a0f2.tar.bz2 glutte-o-matic-765b06950c1a5b55bb96a29f9da3c136f790a0f2.zip | |
Fix warnings
Diffstat (limited to 'src/common/includes/Core')
| -rw-r--r-- | src/common/includes/Core/common.h | 3 | ||||
| -rw-r--r-- | src/common/includes/Core/delay.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/common/includes/Core/common.h b/src/common/includes/Core/common.h index 80739cf..950085c 100644 --- a/src/common/includes/Core/common.h +++ b/src/common/includes/Core/common.h @@ -58,3 +58,6 @@ int random_bool(void); #define FAULT_SOURCE_USART 4 void trigger_fault(int source); +#ifdef SIMULATOR +void __disable_irq(void); +#endif diff --git a/src/common/includes/Core/delay.h b/src/common/includes/Core/delay.h index 67ff3b7..4cc3f07 100644 --- a/src/common/includes/Core/delay.h +++ b/src/common/includes/Core/delay.h @@ -28,7 +28,12 @@ // High-precisions delay (with approximations) // These functions only work if interupts are disabled +#ifdef SIMULATOR +void delay_us(int micros); +void delay_ms(int millis); +#else void delay_us(uint32_t micros); void delay_ms(uint32_t millis); +#endif -void delay_init(); +void delay_init(void); |