X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fpgm.h;h=f0dc05a489e7c9c172af0e58f1210351733cd19a;hb=5db9a047e4c96959fcde47fde001ec0e0bfb9bb5;hp=5f10d002ea5a6c153048467cd1746da88a79a20b;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git diff --git a/mware/pgm.h b/mware/pgm.h index 5f10d002..f0dc05a4 100755 --- a/mware/pgm.h +++ b/mware/pgm.h @@ -41,26 +41,6 @@ ); \ __result; \ }) - #if 0 // 128/103 - #define pgm_read_uint16_t(addr) \ - ({ \ - uint32_t __addr32 = (uint32_t)(addr); \ - uint16_t __result; \ - __asm__ \ - ( \ - "out %2, %C1" "\n\t" \ - "movw r30, %1" "\n\t" \ - "elpm %A0, Z+" "\n\t" \ - "elpm %B0, Z" "\n\t" \ - : "=r" (__result) \ - : "r" (__addr32), \ - "I" (_SFR_IO_ADDR(RAMPZ)) \ - : "r30", "r31" \ - ); \ - __result; \ - }) - #endif - #define pgm_read_uint16_t(addr) \ ({ \ uint16_t __addr16 = (uint16_t)(addr); \ @@ -92,32 +72,6 @@ ); \ __result; \ }) - #if 0 // 128/103 - #define pgm_read_uint16_t(addr) \ - ({ \ - uint32_t __addr32 = (uint32_t)(addr); \ - uint16_t __result; \ - __asm__ \ - ( \ - "out %2, %C1" "\n\t" \ - "mov r31, %B1" "\n\t" \ - "mov r30, %A1" "\n\t" \ - "elpm" "\n\t" \ - "mov %A0, r0" "\n\t" \ - "in r0, %2" "\n\t" \ - "adiw r30, 1" "\n\t" \ - "adc r0, __zero_reg__" "\n\t" \ - "out %2, r0" "\n\t" \ - "elpm" "\n\t" \ - "mov %B0, r0" "\n\t" \ - : "=r" (__result) \ - : "r" (__addr32), \ - "I" (_SFR_IO_ADDR(RAMPZ)) \ - : "r0", "r30", "r31" \ - ); \ - __result; \ - }) - #endif #define pgm_read_uint16_t(addr) \ ({ \ uint16_t __addr16 = (uint16_t)(addr); \