diff options
| author | cpldcpu <cpldcpu@gmail.com> | 2013-12-27 18:36:28 +0100 |
|---|---|---|
| committer | cpldcpu <cpldcpu@gmail.com> | 2013-12-27 18:36:28 +0100 |
| commit | 181445ff3a2e28c980d3c6f8dd38578659db5664 (patch) | |
| tree | d8223d8b504379ba7bd11a603dc4f95ef89ad92e /firmware/main.c | |
| parent | afd9fd6b6b54d7d9d995c01a814dd4098f10e30a (diff) | |
| download | micronucleus-181445ff3a2e28c980d3c6f8dd38578659db5664.tar.gz micronucleus-181445ff3a2e28c980d3c6f8dd38578659db5664.tar.bz2 micronucleus-181445ff3a2e28c980d3c6f8dd38578659db5664.zip | |
firmware: clean up nop
Diffstat (limited to 'firmware/main.c')
| -rw-r--r-- | firmware/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/firmware/main.c b/firmware/main.c index 36a42be..83c5538 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -60,8 +60,9 @@ register uint8_t events asm( "r3" ); // register saves many bytes #define clearEvents() events = 0 // Definition of sei and cli without memory barrier keyword to prevent reloading of memory variables -#define sei() __asm__ __volatile__ ("sei") -#define cli() __asm__ __volatile__ ("cli") +#define sei() asm volatile("sei") +#define cli() asm volatile("cli") +#define nop() asm volatile("nop") uint16_t idlePolls = 0; // how long have we been idle? @@ -276,7 +277,7 @@ static inline void leaveBootloader(void) { unsigned char stored_osc_calibration = pgm_read_byte(BOOTLOADER_ADDRESS - TINYVECTOR_OSCCAL_OFFSET); if (stored_osc_calibration != 0xFF && stored_osc_calibration != 0x00) { OSCCAL=stored_osc_calibration; - asm volatile("nop"); + nop(); } #endif // jump to application reset vector at end of flash @@ -350,7 +351,7 @@ int main(void) { #if OSCCAL_RESTORE OSCCAL=osccal_default; - asm volatile("nop"); // NOP to avoid CPU hickup during oscillator stabilization + nop(); // NOP to avoid CPU hickup during oscillator stabilization #endif leaveBootloader(); |