X-Git-Url: http://git.linex4red.de/pub/USBaspLoader.git/blobdiff_plain/7a4ceb936af1b67889b9083a7ff74cf5f9fef6b9..refs/heads/testing:/firmware/spminterface.h diff --git a/firmware/spminterface.h b/firmware/spminterface.h index 0e6db6a..6c7a895 100644 --- a/firmware/spminterface.h +++ b/firmware/spminterface.h @@ -2,9 +2,9 @@ * Project: USBaspLoader * Author: Stephan Baerwolf * Creation Date: 2012-08-01 - * Copyright: (c) 2012 by Stephan Baerwolf + * Copyright: (c) 2013 by Stephan Baerwolf * License: GNU GPL v2 (see License.txt) - * Version: 0.8 + * Version: 0.97 */ #ifndef SPMINTERFACE_H_f70ba6adf7624275947e859bdbff0599 @@ -37,6 +37,9 @@ bootloader__do_spm: ;you may also want to disable wdt, since this routine may busy-loop ;================================================================== ;-->INPUT: +;#if HAVE_SPMINTEREFACE_MAGICVALUE +;magicvalue in r23:r22:r21:r20 +;#endif ;spmcr (spmcrval determines SPM action) will be register: r18 ;MCU dependend RA(MPZ should be transfered within register: r11 ;lo8(Z) should be transfered within register: r12 @@ -55,7 +58,7 @@ bootloader__do_spm: ;================================================================== ; TODO: waitA and waitB could be merged to subroutine saving 2 opc ;================================================================== - +; ;load pageaddress (Z) from (r11:)r13:12 since it may was used for icall mov rampZ, r11 mov r30, r12 @@ -85,8 +88,11 @@ ret * */ -#include +#include "bootloaderconfig.h" +#ifndef SREG +# include +#endif /* @@ -106,21 +112,62 @@ ret #define funcaddr___bootloader__do_spm (&bootloader__do_spm) #endif #else - #if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__) + #if defined (__AVR_ATmega8535__) + #define funcaddr___bootloader__do_spm 0x182a + #elif defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__) #define funcaddr___bootloader__do_spm 0x1826 + #elif defined (__AVR_ATmega16__) + #define funcaddr___bootloader__do_spm 0x3854 #elif defined (__AVR_ATmega32__) #define funcaddr___bootloader__do_spm 0x7054 #elif defined (__AVR_ATmega88__) || defined (__AVR_ATmega88P__) || defined (__AVR_ATmega88A__) || defined (__AVR_ATmega88PA__) #define funcaddr___bootloader__do_spm 0x1834 + #elif defined (__AVR_ATmega162__) + #define funcaddr___bootloader__do_spm 0x3870 + #elif defined (__AVR_ATmega164A__) || defined (__AVR_ATmega164P__) || defined (__AVR_ATmega164PA__) + #define funcaddr___bootloader__do_spm 0x387c #elif defined (__AVR_ATmega168__) || defined (__AVR_ATmega168P__) || defined (__AVR_ATmega168A__) || defined (__AVR_ATmega168PA__) #define funcaddr___bootloader__do_spm 0x3868 + #elif defined (__AVR_ATmega324A__) || defined (__AVR_ATmega324P__) || defined (__AVR_ATmega324PA__) + #define funcaddr___bootloader__do_spm 0x707c + #elif defined (__AVR_ATmega328__) || defined (__AVR_ATmega328P__) + #define funcaddr___bootloader__do_spm 0x7068 + #elif defined (__AVR_ATmega640__) + #define funcaddr___bootloader__do_spm 0xe0e4 + #elif defined (__AVR_ATmega644__) + #define funcaddr___bootloader__do_spm 0xe070 + #elif defined (__AVR_ATmega644A__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644PA__) + #define funcaddr___bootloader__do_spm 0xe07c + #elif defined (__AVR_ATmega128__) + #define funcaddr___bootloader__do_spm 0x1e08c + #elif defined (__AVR_ATmega1280__) + #define funcaddr___bootloader__do_spm 0x1e0e4 + #elif defined (__AVR_ATmega1281__) + #define funcaddr___bootloader__do_spm 0x1e0cc + #elif defined (__AVR_ATmega1284__) || defined (__AVR_ATmega1284P__) + #define funcaddr___bootloader__do_spm 0x1e08c + #elif defined (__AVR_ATmega2560__) + #define funcaddr___bootloader__do_spm 0x3e0e4 + #elif defined (__AVR_ATmega2561__) + #define funcaddr___bootloader__do_spm 0x3e0cc #else #error "unknown MCU - where is bootloader__do_spm located?" #endif + + #if ((defined(_VECTORS_SIZE)) && (defined(BOOTLOADER_ADDRESS))) + #if (funcaddr___bootloader__do_spm != (BOOTLOADER_ADDRESS+_VECTORS_SIZE)) + #error "bootloader__do_spm is not located after interrupts - sth. is very wrong here!" + #endif + #endif + #endif #endif +#ifndef SPMEN +#define SPMEN SELFPRGEN +#endif + /* * Call the "bootloader__do_spm"-function, located within the BLS via comfortable C-interface * During operation code will block - disable or reset watchdog before call. @@ -134,38 +181,245 @@ ret * REMEMBER: interrupts have to be disabled! (otherwise code may crash non-deterministic) * */ -#define __do_spm_Ex(flash_wordaddress, spmcrval, dataword, ___bootloader__do_spm__ptr) \ -({ \ - asm volatile ( \ - "push r0\n\t" \ - "push r1\n\t" \ - \ - "mov r13, %B[flashaddress]\n\t" \ - "mov r12, %A[flashaddress]\n\t" \ - "mov r11, %C[flashaddress]\n\t" \ - \ - /* also load the spmcrval */ \ - "mov r18, %[spmcrval]\n\t" \ - \ - \ - "mov r1, %B[data]\n\t" \ - "mov r0, %A[data]\n\t" \ - \ - /* finally call the bootloader-function */ \ - "icall\n\r" \ - \ - "pop r1\n\t" \ - "pop r0\n\t" \ - \ - : \ - : [flashaddress] "r" (flash_wordaddress), \ - [spmfunctionaddress] "z" (___bootloader__do_spm__ptr), \ - [spmcrval] "r" (spmcrval), \ - [data] "r" (dataword) \ - : "r0","r1","r11","r12","r13","r18" \ - ); \ -}) +#define __do_spm_Ex(arguments...) __do_spm_GeneralEx(HAVE_SPMINTEREFACE_MAGICVALUE, ##arguments) + + +#if HAVE_SPMINTEREFACE_MAGICVALUE +#define __do_spm_GeneralEx __do_spm_ExASMEx_magic +#else +#define __do_spm_GeneralEx __do_spm_ExASMEx_ +#endif + + +#if (defined(EIND) && ((FLASHEND)>131071)) + /* + * Huge flash version using eicall (and EIND) + * MV defines the magic value to be send to bootloader_do_spm + */ + #define __do_spm_ExASMEx_(MV, flash_wordaddress, spmcrval, dataword, ___bootloader__do_spm__ptr) \ + ({ \ + asm volatile ( \ + "push r0\n\t" \ + "push r1\n\t" \ + \ + "mov r13, %B[flashaddress]\n\t" \ + "mov r12, %A[flashaddress]\n\t" \ + "mov r11, %C[flashaddress]\n\t" \ + \ + /* prepare the EIND for following eicall */ \ + "in r18, %[eind]\n\t" \ + "push r18\n\t" \ + "ldi r18, %[spmfuncaddrEIND]\n\t" \ + "out %[eind], r18\n\t" \ + \ + /* also load the spmcrval */ \ + "mov r18, %[spmcrval]\n\t" \ + \ + \ + "mov r1, %B[data]\n\t" \ + "mov r0, %A[data]\n\t" \ + \ + /* finally call the bootloader-function */ \ + "eicall\n\t" \ + "pop r1\n\t" \ + "out %[eind], r1\n\t" \ + \ + /* \ + * bootloader__do_spm should change spmcrval (r18) to \ + * "((1<>16)), \ + [eind] "I" (_SFR_IO_ADDR(EIND)), \ + [spmcrval] "r" (spmcrval), \ + [data] "r" (dataword), \ + [spmret] "M" ((1<>16)), \ + [eind] "I" (_SFR_IO_ADDR(EIND)), \ + [spmcrval] "r" (spmcrval), \ + [data] "r" (dataword), \ + [spmret] "M" ((1<>24)&0xff), \ + [magicC] "M" (((MV)>>16)&0xff), \ + [magicB] "M" (((MV)>> 8)&0xff), \ + [magicA] "M" (((MV)>> 0)&0xff) \ + : "r0","r1","r11","r12","r13","r18","r20","r21","r22","r23" \ + ); \ + }) + + +#else + /* + * Normal version for devices with <=128KiB flash (using icall) + */ + #if ((FLASHEND)>131071) + #error "Using inappropriate code for device with more than 128kib flash" + #endif + + #define __do_spm_ExASMEx_(MV, flash_wordaddress, spmcrval, dataword, ___bootloader__do_spm__ptr) \ + ({ \ + asm volatile ( \ + "push r0\n\t" \ + "push r1\n\t" \ + \ + "mov r13, %B[flashaddress]\n\t" \ + "mov r12, %A[flashaddress]\n\t" \ + "mov r11, %C[flashaddress]\n\t" \ + \ + /* also load the spmcrval */ \ + "mov r18, %[spmcrval]\n\t" \ + \ + \ + "mov r1, %B[data]\n\t" \ + "mov r0, %A[data]\n\t" \ + \ + /* finally call the bootloader-function */ \ + "icall\n\t" \ + \ + /* \ + * bootloader__do_spm should change spmcrval (r18) to \ + * "((1<>24)&0xff), \ + [magicC] "M" (((MV)>>16)&0xff), \ + [magicB] "M" (((MV)>> 8)&0xff), \ + [magicA] "M" (((MV)>> 0)&0xff) \ + : "r0","r1","r11","r12","r13","r18","r20","r21","r22","r23" \ + ); \ + }) +#endif #if (!(defined(BOOTLOADER_ADDRESS))) || (defined(NEW_BOOTLOADER_ADDRESS)) void do_spm(const uint32_t flash_byteaddress, const uint8_t spmcrval, const uint16_t dataword) { @@ -173,23 +427,27 @@ void do_spm(const uint32_t flash_byteaddress, const uint8_t spmcrval, const uint } #endif - -#include "bootloaderconfig.h" +#if HAVE_SPMINTEREFACE_NORETMAGIC + #define bootloader__do_spm_magic_exitstrategy(a) (0xf7f9) +#else + #define bootloader__do_spm_magic_exitstrategy(a) (a) +#endif #if (HAVE_SPMINTEREFACE) && (defined(BOOTLOADER_ADDRESS)) && (!(defined(NEW_BOOTLOADER_ADDRESS))) /* * insert architecture dependend "bootloader_do_spm"-code - * - * try to make this array as big as possible - * (so bootloader always uses 2kbytes flash) */ -#if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__) || defined (__AVR_ATmega32__) +#if defined (__AVR_ATmega8535__) || defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__) || defined (__AVR_ATmega16__) || defined (__AVR_ATmega162__) || defined (__AVR_ATmega32__) -#if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__) +#if defined (__AVR_ATmega8535__) || defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__) #if (BOOTLOADER_ADDRESS != 0x1800) #error BOOTLOADER_ADDRESS!=0x1800, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use #endif +#elif defined (__AVR_ATmega16__) || defined (__AVR_ATmega162__) + #if (BOOTLOADER_ADDRESS != 0x3800) + #error BOOTLOADER_ADDRESS!=0x3800, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif #elif defined (__AVR_ATmega32__) #if (BOOTLOADER_ADDRESS != 0x7000) #error BOOTLOADER_ADDRESS!=0x7000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use @@ -199,11 +457,25 @@ void do_spm(const uint32_t flash_byteaddress, const uint8_t spmcrval, const uint #endif //assume SPMCR==0x37, SPMEN==0x0, RWWSRE=0x4, RWWSB=0x6 -const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, - 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508, 0xFFFF}; +#if HAVE_SPMINTEREFACE_MAGICVALUE +const uint16_t bootloader__do_spm[23] BOOTLIBLINK = { + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 28) & 0xf))<<8) | (0x70 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 24) & 0xf))), // r23 + bootloader__do_spm_magic_exitstrategy(0xf4a1), // brne +20 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 20) & 0xf))<<8) | (0x60 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 16) & 0xf))), // r22 + bootloader__do_spm_magic_exitstrategy(0xf491), // brne +18 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 12) & 0xf))<<8) | (0x50 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 8) & 0xf))), // r21 + bootloader__do_spm_magic_exitstrategy(0xf481), // brne +16 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 4) & 0xf))<<8) | (0x40 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 0) & 0xf))), // r20 + bootloader__do_spm_magic_exitstrategy(0xf471), // brne +14 +#else +const uint16_t bootloader__do_spm[15] BOOTLIBLINK = { +#endif + 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, + 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508 +}; + /* 00001826 : - 1826: 00 00 nop 1828: ec 2d mov r30, r12 182a: fd 2d mov r31, r13 @@ -230,9 +502,6 @@ const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb #elif defined (__AVR_ATmega48__) || defined (__AVR_ATmega48P__) || defined (__AVR_ATmega88__) || defined (__AVR_ATmega88P__) || defined (__AVR_ATmega168__) || defined (__AVR_ATmega168P__) -//assume SPMCR:=SPMCSR==0x37, SPMEN:=SELFPRGEN==0x0, RWWSRE=0x4, RWWSB=0x6 -const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, - 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508, 0xFFFF}; #if defined (__AVR_ATmega88__) || defined (__AVR_ATmega88P__) #if (BOOTLOADER_ADDRESS != 0x1800) @@ -246,9 +515,25 @@ const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb #error undefined device selection - this should not happen! #endif +//assume SPMCR:=SPMCSR==0x37, SPMEN:=SELFPRGEN==0x0, RWWSRE=0x4, RWWSB=0x6 +#if HAVE_SPMINTEREFACE_MAGICVALUE +const uint16_t bootloader__do_spm[23] BOOTLIBLINK = { + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 28) & 0xf))<<8) | (0x70 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 24) & 0xf))), // r23 + bootloader__do_spm_magic_exitstrategy(0xf4a1), // brne +20 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 20) & 0xf))<<8) | (0x60 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 16) & 0xf))), // r22 + bootloader__do_spm_magic_exitstrategy(0xf491), // brne +18 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 12) & 0xf))<<8) | (0x50 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 8) & 0xf))), // r21 + bootloader__do_spm_magic_exitstrategy(0xf481), // brne +16 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 4) & 0xf))<<8) | (0x40 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 0) & 0xf))), // r20 + bootloader__do_spm_magic_exitstrategy(0xf471), // brne +14 +#else +const uint16_t bootloader__do_spm[15] BOOTLIBLINK = { +#endif + 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, + 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508 +}; /* 00001826 : - 1826: 00 00 nop 1828: ec 2d mov r30, r12 182a: fd 2d mov r31, r13 @@ -284,16 +569,33 @@ const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb #if (BOOTLOADER_ADDRESS != 0x3800) #error BOOTLOADER_ADDRESS!=0x3800, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use #endif +#elif defined (__AVR_ATmega328__) || defined (__AVR_ATmega328P__) + #if (BOOTLOADER_ADDRESS != 0x7000) + #error BOOTLOADER_ADDRESS!=0x7000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif #else #error undefined device selection - this should not happen! #endif //assume SPMCR:=SPMCSR==0x37, SPMEN:=SELFPRGEN==0x0, RWWSRE=0x4, RWWSB=0x6 -const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, - 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508, 0xFFFF}; +#if HAVE_SPMINTEREFACE_MAGICVALUE +const uint16_t bootloader__do_spm[23] BOOTLIBLINK = { + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 28) & 0xf))<<8) | (0x70 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 24) & 0xf))), // r23 + bootloader__do_spm_magic_exitstrategy(0xf4a1), // brne +20 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 20) & 0xf))<<8) | (0x60 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 16) & 0xf))), // r22 + bootloader__do_spm_magic_exitstrategy(0xf491), // brne +18 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 12) & 0xf))<<8) | (0x50 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 8) & 0xf))), // r21 + bootloader__do_spm_magic_exitstrategy(0xf481), // brne +16 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 4) & 0xf))<<8) | (0x40 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 0) & 0xf))), // r20 + bootloader__do_spm_magic_exitstrategy(0xf471), // brne +14 +#else +const uint16_t bootloader__do_spm[15] BOOTLIBLINK = { +#endif + 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, + 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508 +}; /* 00001826 : - 1826: 00 00 nop 1828: ec 2d mov r30, r12 182a: fd 2d mov r31, r13 @@ -319,10 +621,122 @@ const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0x0000, 0x2dec, 0x2dfd, 0xb -#elif defined (__AVR_ATmega164A__) || defined (__AVR_ATmega164PA__) || defined (__AVR_ATmega324A__) || defined (__AVR_ATmega324PA__) || defined (__AVR_ATmega644A__) || defined (__AVR_ATmega644PA__) || defined (__AVR_ATmega1284__) || defined (__AVR_ATmega1284P__) +#elif defined (__AVR_ATmega128__) + +#if defined (__AVR_ATmega128__) + #if (BOOTLOADER_ADDRESS != 0x1E000) + #error BOOTLOADER_ADDRESS!=0x1E000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#else + #error undefined device selection - this should not happen! +#endif + +//assume SPMCR:=SPMCSR==0x68, SPMEN==0x0, RWWSRE=0x4, RWWSB=0x6 and rampZ=0x3b +#if HAVE_SPMINTEREFACE_MAGICVALUE +const uint16_t bootloader__do_spm[28] BOOTLIBLINK = { + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 28) & 0xf))<<8) | (0x70 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 24) & 0xf))), // r23 + bootloader__do_spm_magic_exitstrategy(0xf4c9), // brne +21+4 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 20) & 0xf))<<8) | (0x60 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 16) & 0xf))), // r22 + bootloader__do_spm_magic_exitstrategy(0xf4b9), // brne +19+4 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 12) & 0xf))<<8) | (0x50 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 8) & 0xf))), // r21 + bootloader__do_spm_magic_exitstrategy(0xf4a9), // brne +17+4 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 4) & 0xf))<<8) | (0x40 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 0) & 0xf))), // r20 + bootloader__do_spm_magic_exitstrategy(0xf499), // brne +15+4 +#else +const uint16_t bootloader__do_spm[20] BOOTLIBLINK = { +#endif + 0xbebb, 0x2dec, 0x2dfd, 0x90b0, 0x0068, 0xfcb0, 0xcffc, 0x9320, 0x0068, + 0x95e8, 0x90b0, 0x0068, 0xfcb0, 0xcffc, 0xe121, 0x90b0, 0x0068, 0xfcb6, + 0xcff0, 0x9508 +}; +/* +0001e08c : + 1e08c: bb be out 0x3b, r11 ; 59 + 1e08e: ec 2d mov r30, r12 + 1e090: fd 2d mov r31, r13 + +0001e092 : + 1e092: b0 90 68 00 lds r11, 0x0068 + 1e096: b0 fc sbrc r11, 0 + 1e098: fc cf rjmp .-8 ; 0x1e092 + 1e09a: 20 93 68 00 sts 0x0068, r18 + 1e09e: e8 95 spm + +0001e0a0 : + 1e0a0: b0 90 68 00 lds r11, 0x0068 + 1e0a4: b0 fc sbrc r11, 0 + 1e0a6: fc cf rjmp .-8 ; 0x1e0a0 + 1e0a8: 21 e1 ldi r18, 0x11 ; 17 + 1e0aa: b0 90 68 00 lds r11, 0x0068 + 1e0ae: b6 fc sbrc r11, 6 + 1e0b0: f0 cf rjmp .-32 ; 0x1e092 + 1e0b2: 08 95 ret +*/ + + + + + +#elif defined (__AVR_ATmega164A__) || defined (__AVR_ATmega164P__) || defined (__AVR_ATmega164PA__) || defined (__AVR_ATmega324A__) || defined (__AVR_ATmega324P__) || defined (__AVR_ATmega324PA__) || defined (__AVR_ATmega640__) || defined (__AVR_ATmega644__) || defined (__AVR_ATmega644A__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644PA__) || defined (__AVR_ATmega1280__) || defined (__AVR_ATmega1281__) || defined (__AVR_ATmega1284__) || defined (__AVR_ATmega1284P__) || defined (__AVR_ATmega2560__) || defined (__AVR_ATmega2561__) + +#if defined (__AVR_ATmega164A__) || defined (__AVR_ATmega164P__) || defined (__AVR_ATmega164PA__) + #if (BOOTLOADER_ADDRESS != 0x3800) + #error BOOTLOADER_ADDRESS!=0x3800, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega324A__) || defined (__AVR_ATmega324P__) || defined (__AVR_ATmega324PA__) + #if (BOOTLOADER_ADDRESS != 0x7000) + #error BOOTLOADER_ADDRESS!=0x7000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega640__) + #if (BOOTLOADER_ADDRESS != 0xE000) + #error BOOTLOADER_ADDRESS!=0xE000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega644__) || defined (__AVR_ATmega644A__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644PA__) + #if (BOOTLOADER_ADDRESS != 0xE000) + #error BOOTLOADER_ADDRESS!=0xE000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega1280__) + #if (BOOTLOADER_ADDRESS != 0x1E000) + #error BOOTLOADER_ADDRESS!=0x1E000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega1281__) + #if (BOOTLOADER_ADDRESS != 0x1E000) + #error BOOTLOADER_ADDRESS!=0x1E000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega1284__) || defined (__AVR_ATmega1284P__) + #if (BOOTLOADER_ADDRESS != 0x1E000) + #error BOOTLOADER_ADDRESS!=0x1E000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega2560__) + #if (BOOTLOADER_ADDRESS != 0x3E000) + #error BOOTLOADER_ADDRESS!=0x3E000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#elif defined (__AVR_ATmega2561__) + #if (BOOTLOADER_ADDRESS != 0x3E000) + #error BOOTLOADER_ADDRESS!=0x3E000, on current MCU "funcaddr___bootloader__do_spm" might be currupted - please edit spminterface.h for nonstandard use + #endif +#else + #error undefined device selection - this should not happen! +#endif + //assume SPMCR:=SPCSR==0x37, SPMEN==0x0, RWWSRE=0x4, RWWSB=0x6 and rampZ=0x3b -const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0xbebb, 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, - 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508, 0xFFFF}; +#if HAVE_SPMINTEREFACE_MAGICVALUE +const uint16_t bootloader__do_spm[24] BOOTLIBLINK = { + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 28) & 0xf))<<8) | (0x70 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 24) & 0xf))), // r23 + bootloader__do_spm_magic_exitstrategy(0xf4a9), // brne +21 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 20) & 0xf))<<8) | (0x60 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 16) & 0xf))), // r22 + bootloader__do_spm_magic_exitstrategy(0xf499), // brne +19 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 12) & 0xf))<<8) | (0x50 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 8) & 0xf))), // r21 + bootloader__do_spm_magic_exitstrategy(0xf489), // brne +17 + (((0x30 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 4) & 0xf))<<8) | (0x40 | ((HAVE_SPMINTEREFACE_MAGICVALUE >> 0) & 0xf))), // r20 + bootloader__do_spm_magic_exitstrategy(0xf479), // brne +15 +#else +const uint16_t bootloader__do_spm[16] BOOTLIBLINK = { +#endif + 0xbebb, + 0x2dec, 0x2dfd, 0xb6b7, 0xfcb0, 0xcffd, 0xbf27, 0x95e8, 0xb6b7, + 0xfcb0, 0xcffd, 0xe121, 0xb6b7, 0xfcb6, 0xcff4, 0x9508 +}; /* 00001826 : 1826: bb be out 0x3b,r11 ; rampZ=r11; (rampZ is at IO 0x3b) @@ -359,4 +773,4 @@ const uint16_t bootloader__do_spm[17] BOOTLIBLINK = {0xbebb, 0x2dec, 0x2dfd, 0xb #endif #endif - \ No newline at end of file +