Fixing some nop constants in delay.h to make them better

1 files changed, 6 insertions, 4 deletions

diff --git a/delay.h b/delay.h
index c29de694..a6fff105 100644
--- a/delay.h
+++ b/delay.h
@@ -9,8 +9,10 @@
 
 #if defined(__arm__) 
 # define NOP __asm__ __volatile__ ("nop\n");
+# define NOP2 __asm__ __volatile__ ("nop\n\tnop");
 #else
 #  define NOP __asm__ __volatile__ ("cp r0,r0\n");
+#  define NOP2 __asm__ __volatile__ ("rjmp .+0");
 #endif
 
 // predeclaration to not upset the compiler
@@ -54,9 +56,9 @@ template<> __attribute__((always_inline)) inline void delaycycles<-2>() {}
 template<> __attribute__((always_inline)) inline void delaycycles<-1>() {}
 template<> __attribute__((always_inline)) inline void delaycycles<0>() {}
 template<> __attribute__((always_inline)) inline void delaycycles<1>() {NOP;}
-template<> __attribute__((always_inline)) inline void delaycycles<2>() {NOP;NOP;}
-template<> __attribute__((always_inline)) inline void delaycycles<3>() {NOP;NOP;NOP;}
-template<> __attribute__((always_inline)) inline void delaycycles<4>() {NOP;NOP;NOP;NOP;}
-template<> __attribute__((always_inline)) inline void delaycycles<5>() {NOP;NOP;NOP;NOP;NOP;}
+template<> __attribute__((always_inline)) inline void delaycycles<2>() {NOP2;}
+template<> __attribute__((always_inline)) inline void delaycycles<3>() {NOP;NOP2;}
+template<> __attribute__((always_inline)) inline void delaycycles<4>() {NOP2;NOP2;}
+template<> __attribute__((always_inline)) inline void delaycycles<5>() {NOP2;NOP2;NOP;}
 
 #endif
\ No newline at end of file