From: Stephan Baerwolf Date: Tue, 31 Jul 2012 18:10:19 +0000 (+0200) Subject: donor the free bytes to "bootloader__do_spm" X-Git-Tag: 2010-07-27-stephan-201207312030^0 X-Git-Url: http://git.linex4red.de/pub/USBaspLoader.git/commitdiff_plain/04e6008e92b18adabb880bff5117815134c34801?ds=inline donor the free bytes to "bootloader__do_spm" Signed-off-by: Stephan Baerwolf --- diff --git a/firmware/bootloaderconfig.h b/firmware/bootloaderconfig.h index 6a181df..fdcb9d0 100644 --- a/firmware/bootloaderconfig.h +++ b/firmware/bootloaderconfig.h @@ -104,7 +104,7 @@ these macros are defined, the boot loader usees them. #define HAVE_DOSPM_TUNNELCMD 1 /* * When enabled, "HAVE_DOSPM_TUNNELCMD" will implement an PROGMEM ARRAY - * with up to 13 opcodes within BLS. + * with up to 15 opcodes within BLS. * This array will be called "bootloader__do_spm", and implements the * "do_spm" subroutine from atmels "Instruction Set Manual" Rev.0856I, page 140. * If additionally "HAVE_BLB11_SOFTW_BACKDOOR" is enabled, the array will just diff --git a/firmware/main.c b/firmware/main.c index ccaa445..b855d01 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -97,7 +97,7 @@ typedef union longConverter{ #if HAVE_DOSPM_TUNNELCMD #if HAVE_BLB11_SOFTW_BACKDOOR - const uint16_t bootloader__do_spm[13] PROGMEM = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}; + const uint16_t bootloader__do_spm[15] PROGMEM = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}; #else /* do_spm: @@ -122,7 +122,7 @@ out SREG, temp2 ret */ #if defined (__AVR_ATmega8__) - const uint16_t bootloader__do_spm[13] PROGMEM = {0xb68f , 0x94f8, 0xb677, 0xfc70, 0xcffd, 0xbe97, 0x95e8, 0xbe8f, 0x9508, 0x00, 0xFFFF, 0xFFFF, 0xFFFF}; + const uint16_t bootloader__do_spm[15] PROGMEM = {0xb68f , 0x94f8, 0xb677, 0xfc70, 0xcffd, 0xbe97, 0x95e8, 0xbe8f, 0x9508, 0x00, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; #else #error "bootloader__do_spm has to be adapted, since there is no guaranty for SREG==0x3f, SPMCR==0x37, SPMEN==0x00" #endif