diff options
| author | Daniel Garcia <danielgarcia@gmail.com> | 2014-03-10 00:02:27 +0400 |
|---|---|---|
| committer | Daniel Garcia <danielgarcia@gmail.com> | 2014-03-10 00:02:27 +0400 |
| commit | d1535918f9a0023d1c3a6c1c89615bc3c8d0c3e0 (patch) | |
| tree | 87fa2b3df5f8434c28abf325517b172a40c46917 /clockless_trinket.h | |
| parent | 2dd3a81ce2f8c0e94660976cdd0401b5aebf8e63 (diff) | |
Fix the trinket avr code for the mega and it's higher i/o port pin layouts
Diffstat (limited to 'clockless_trinket.h')
| -rw-r--r-- | clockless_trinket.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/clockless_trinket.h b/clockless_trinket.h index 2d5621e2..de6e8f01 100644 --- a/clockless_trinket.h +++ b/clockless_trinket.h @@ -39,9 +39,9 @@ template<> __attribute__((always_inline)) inline void _dc<6>(register uint8_t & template<> __attribute__((always_inline)) inline void _dc<7>(register uint8_t & loopvar) { _dc<4>(loopvar); _dc<3>(loopvar); } template<> __attribute__((always_inline)) inline void _dc<8>(register uint8_t & loopvar) { _dc<4>(loopvar); _dc<4>(loopvar); } -#define D1(ADJ) _dc<T1-(1+ADJ)>(loopvar); -#define D2(ADJ) _dc<T2-(1+ADJ)>(loopvar); -#define D3(ADJ) _dc<T3-(1+ADJ)>(loopvar); +#define D1(ADJ) _dc<T1-(AVR_PIN_CYCLES(DATA_PIN)+ADJ)>(loopvar); +#define D2(ADJ) _dc<T2-(AVR_PIN_CYCLES(DATA_PIN)+ADJ)>(loopvar); +#define D3(ADJ) _dc<T3-(AVR_PIN_CYCLES(DATA_PIN)+ADJ)>(loopvar); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -101,12 +101,12 @@ public: // The variables that our various asm statemetns use. The same block of variables needs to be declared for // all the asm blocks because GCC is pretty stupid and it would clobber variables happily or optimize code away too aggressively #define ASM_VARS : /* write variables */ \ + [count] "+x" (count), \ + [data] "+z" (data), \ [b0] "+a" (b0), \ [b1] "+a" (b1), \ [b2] "+a" (b2), \ - [count] "+x" (count), \ [scale_base] "+a" (scale_base), \ - [data] "+z" (data), \ [loopvar] "+a" (loopvar) \ : /* use variables */ \ [ADV] "r" (advanceBy), \ @@ -118,7 +118,7 @@ public: [d0] "r" (pixels.d[RO(0)]), \ [d1] "r" (pixels.d[RO(1)]), \ [d2] "r" (pixels.d[RO(2)]), \ - [PORT] "M" (FastPin<DATA_PIN>::port()-0x20), \ + [PORT] "M" (FastPin<DATA_PIN>::port()-0x20), \ [O0] "M" (RGB_BYTE0(RGB_ORDER)), \ [O1] "M" (RGB_BYTE1(RGB_ORDER)), \ [O2] "M" (RGB_BYTE2(RGB_ORDER)) \ @@ -126,9 +126,9 @@ public: // 1 cycle, write hi to the port -#define HI1 asm __volatile__("out %[PORT], %[hi]" ASM_VARS ); +#define HI1 if((int)(FastPin<DATA_PIN>::port()) < 64) { asm __volatile__("out %[PORT], %[hi]" ASM_VARS ); } else { *FastPin<DATA_PIN>::port()=hi; } // 1 cycle, write lo to the port -#define LO1 asm __volatile__("out %[PORT], %[lo]" ASM_VARS ); +#define LO1 if((int)(FastPin<DATA_PIN>::port()) < 64) { asm __volatile__("out %[PORT], %[lo]" ASM_VARS ); } else { *FastPin<DATA_PIN>::port()=lo; } // 2 cycles, sbrs on flipping the lne to lo if we're pushing out a 0 #define QLO2(B, N) asm __volatile__("sbrs %[" #B "], " #N ASM_VARS ); LO1; // load a byte from ram into the given var with the given offset |