2   #define F_CPU 1000000UL /* 1 Mhz-Takt; hier richtigen Wert eintragen */ 
   5 // 1) Test the "changed"     - feature by debugging a LED-PIN to high (PB0?) 
   6 // 2) Test the "needs_erase" - feature by debugging a LED-PIN to high (PB1?) 
   7 // #define mypgmdebug 1 
   9 #include "../firmware/spminterface.h" 
  13 #include <avr/interrupt.h> 
  16 #include <avr/pgmspace.h> 
  20 #include <util/delay.h> 
  25 // helpful definitions and makros //// 
  27 #ifndef NEW_BOOTLOADER_ADDRESS 
  28   #error "where should the new bootloader be positioned?" 
  33 #if (NEW_BOOTLOADER_ADDRESS != (funcaddr___bootloader__do_spm-(funcaddr___bootloader__do_spm % SPM_PAGESIZE))) 
  34   #warning the new bootloader seems to be located elsewhere, than the current one! 
  37 #ifndef NEW_SPM_ADDRESS 
  38   #warning I do not know where new "bootloader__do_spm" is located - assuming "NEW_BOOTLOADER_ADDRESS+(funcaddr___bootloader__do_spm % SPM_PAGESIZE)" 
  39   #define NEW_SPM_ADDRESS (NEW_BOOTLOADER_ADDRESS+(funcaddr___bootloader__do_spm % SPM_PAGESIZE)) 
  42 // TEMP_SPM supports up to 4 pages for "bootloader__do_spm"... 
  43 #define TEMP_SPM_NUMPAGE 4 
  44 #define TEMP_SPM_BLKSIZE (TEMP_SPM_NUMPAGE*SPM_PAGESIZE) 
  45 #ifndef TEMP_SPM_PAGEADR 
  46   #warning "TEMP_SPM_PAGEADR" is not defined explicitly - will choose END OF FLASH ! 
  47   #define TEMP_SPM_PAGEADR ((FLASHEND+1) - TEMP_SPM_BLKSIZE) 
  49 #define TEMP_SPM_ADDRESS ((TEMP_SPM_PAGEADR) + (funcaddr___bootloader__do_spm % SPM_PAGESIZE)) 
  52 #if (NEW_SPM_ADDRESS == funcaddr___bootloader__do_spm) 
  53   #define new_do_spm    do_spm 
  55 void new_do_spm(const uint32_t flash_byteaddress
, const uint8_t spmcrval
, const uint16_t dataword
) { 
  56     __do_spm_Ex(flash_byteaddress
, spmcrval
, dataword
, NEW_SPM_ADDRESS 
>> 1); 
  60 void temp_do_spm(const uint32_t flash_byteaddress
, const uint8_t spmcrval
, const uint16_t dataword
) { 
  61     __do_spm_Ex(flash_byteaddress
, spmcrval
, dataword
, TEMP_SPM_ADDRESS 
>> 1); 
  66 // some important consistency checks //// 
  68 //check if "NEW_BOOTLOADER_ADDRESS" is page-aligned 
  69 #if (NEW_BOOTLOADER_ADDRESS % SPM_PAGESIZE != 0)  
  70   #error "NEW_BOOTLOADER_ADDRESS" is not aligned to pages! 
  73 //check, if NEW_SPM_ADDRESS is an even address 
  74 #if ((NEW_SPM_ADDRESS % 2) != 0) 
  75   #error NEW_SPM_ADDRESS must be an even address, since it contains executable code! 
  80 //check, if TEMP_SPM somehow overlaps with old SPM 
  81 #if (((TEMP_SPM_ADDRESS + TEMP_SPM_BLKSIZE + SPM_PAGESIZE) >= funcaddr___bootloader__do_spm) && (TEMP_SPM_ADDRESS <= (funcaddr___bootloader__do_spm + TEMP_SPM_BLKSIZE + SPM_PAGESIZE))) 
  82   #error TEMP_SPM_ADDRESS overlaps "funcaddr___bootloader__do_spm"! 
  85 //check, if TEMP_SPM somehow overlaps with new SPM 
  86 #if (((TEMP_SPM_ADDRESS + TEMP_SPM_BLKSIZE + SPM_PAGESIZE) >= NEW_SPM_ADDRESS) && (TEMP_SPM_ADDRESS <= (NEW_SPM_ADDRESS + TEMP_SPM_BLKSIZE + SPM_PAGESIZE))) 
  87   #error TEMP_SPM_ADDRESS overlaps "NEW_SPM_ADDRESS"! 
  90 //check, if TEMP_SPM_ADDRESS is an even address 
  91 #if ((TEMP_SPM_ADDRESS % 2) != 0) 
  92   #error TEMP_SPM_ADDRESS must be an even address, since it contains executable code! 
  95 //check, if TEMP_SPM_ADDRESS fits into flash 
  96 #if ((TEMP_SPM_PAGEADR + TEMP_SPM_BLKSIZE) > (FLASHEND+1)) 
  97   #error TEMP_SPM_ADDRESS exceeds flashend! 
 100 //check if size too low 
 101 #if (SIZEOF_new_firmware <= (TEMP_SPM_BLKSIZE + (NEW_SPM_ADDRESS - NEW_BOOTLOADER_ADDRESS))) 
 102   #error empty firmware! 
 105 //check if size too high 
 106 #if (SIZEOF_new_firmware > ((FLASHEND+1)-NEW_BOOTLOADER_ADDRESS)) 
 107   #error firmware too big! firmware does not fit into flash memory! 
 113  * in this case a near address 
 115 typedef uint32_t mypgm_addr_t
; 
 116 typedef void (*mypgm_spminterface
)(const uint32_t flash_byteaddress
, const uint8_t spmcrval
, const uint16_t dataword
); 
 120 size_t mypgm_readpage(const mypgm_addr_t byteaddress
,const void* buffer
, const size_t bufferbytesize
) { 
 121   size_t        result          
= (bufferbytesize 
< SPM_PAGESIZE
)?bufferbytesize
:SPM_PAGESIZE
; 
 122   size_t        pagesize        
= result 
>> 1; 
 123   uint16_t      *pagedata       
= (void*)buffer
; 
 124   mypgm_addr_t  pageaddr        
= byteaddress 
- (byteaddress 
% SPM_PAGESIZE
); 
 127   for (i
=0;i
<pagesize
;i
+=1) { 
 128     pagedata
[i
]=pgm_read_word(pageaddr
); 
 135 // replace it somehow with "memcpy_PF" in order to save some ops... 
 136 size_t mypgm_readpage(const mypgm_addr_t byteaddress
,const void* buffer
, const size_t bufferbytesize
) { 
 137   size_t        result          
= (bufferbytesize 
< SPM_PAGESIZE
)?bufferbytesize
:SPM_PAGESIZE
; 
 138   mypgm_addr_t  pageaddr        
= byteaddress 
- (byteaddress 
% SPM_PAGESIZE
); 
 140   memcpy_PF((void*)buffer
, (uint_farptr_t
)pageaddr
, result
); 
 146 size_t mypgm_WRITEpage(const mypgm_addr_t byteaddress
,const void* buffer
, const size_t bufferbytesize
, mypgm_spminterface spmfunc
) { 
 147   size_t        result          
= (bufferbytesize 
< SPM_PAGESIZE
)?bufferbytesize
:SPM_PAGESIZE
; 
 148   size_t        pagesize        
= result 
>> 1; 
 149   uint16_t      *pagedata       
= (void*)buffer
; 
 150   mypgm_addr_t  pageaddr_bakup  
= byteaddress 
- (byteaddress 
% SPM_PAGESIZE
); 
 151   mypgm_addr_t  pageaddr        
= pageaddr_bakup
; 
 153   uint8_t       changed
=0, needs_erase
=0; 
 157   // just check, if page needs a rewrite or an erase... 
 158   for (i
=0;i
<pagesize
;i
+=1) { 
 159     deeword
=pgm_read_word(pageaddr
); 
 161     if (deeword 
!= pagedata
[i
]) changed
=1; 
 172      * ==> /(/x * y) ==> x + /y 
 174     deeword 
|= ~pagedata
[i
]; 
 175     if ((~deeword
) != 0) needs_erase
=1; 
 187       //do a page-erase, ATTANTION: flash only can be erased a limited number of times ! 
 188       spmfunc(pageaddr_bakup
, 0x3, 0); 
 199     // from now on, the page is assumed empty !! (hopefully our code is located somewhere else!) 
 200     // now, fill the tempoary buffer 
 201     // ATTANTION: see comment on "do_spm" ! 
 202     pageaddr    
= pageaddr_bakup
; 
 203     for (i
=0;i
<pagesize
;i
+=1) { 
 204       spmfunc(pageaddr
, 0x1, pagedata
[i
]); 
 208     // so, now finally write the page to the FLASH 
 209     spmfunc(pageaddr_bakup
, 0x5, 0); 
 211     // no change - no write... 
 219 // #pragma GCC diagnostic ignored "-Wno-pointer-to-int-cast" 
 223     uint8_t buffer
[SPM_PAGESIZE
]; 
 237     // check if firmware would change... 
 239     for (i
=0;i
<SIZEOF_new_firmware
;i
+=2) { 
 241       a
=pgm_read_word((void*)&new_firmware
[i
]); 
 242       b
=pgm_read_word(NEW_BOOTLOADER_ADDRESS
+i
); 
 251     // need to change the firmware... 
 256       // copy the current "bootloader__do_spm" to tempoary position via std. "bootloader__do_spm" 
 257       for (i
=0;i
<TEMP_SPM_BLKSIZE
;i
+=SPM_PAGESIZE
) { 
 258         mypgm_WRITEpage(TEMP_SPM_PAGEADR
+i
, buffer
, mypgm_readpage(funcaddr___bootloader__do_spm
+i
, buffer
, sizeof(buffer
)), do_spm
); 
 268       // start updating the firmware to "NEW_BOOTLOADER_ADDRESS" until at least "TEMP_SPM_BLKSIZE"-bytes after "NEW_SPM_ADDRESS" were written 
 269       // therefore use the tempoary "bootloader__do_spm" (since we most probably will overwrite the default do_spm) 
 270       for (i
=0;;i
+=SPM_PAGESIZE
) { 
 271         memset((void*)buffer
, 0xff, sizeof(buffer
)); 
 272         memcpy_PF((void*)buffer
, (uint_farptr_t
)((void*)&new_firmware
[i
]), ((SIZEOF_new_firmware
-i
)>sizeof(buffer
))?
sizeof(buffer
):(SIZEOF_new_firmware
-i
)); 
 274         mypgm_WRITEpage(NEW_BOOTLOADER_ADDRESS
+i
, buffer
, sizeof(buffer
), temp_do_spm
); 
 283         if ((NEW_BOOTLOADER_ADDRESS
+i
) > (NEW_SPM_ADDRESS
+TEMP_SPM_BLKSIZE
)) break; 
 287       // continue writeing the new_firmware after "NEW_SPM_ADDRESS+TEMP_SPM_BLKSIZE" this time use the "new_do_spm" 
 288       for (;i
<SIZEOF_new_firmware
;i
+=SPM_PAGESIZE
) { 
 289         memset((void*)buffer
, 0xff, sizeof(buffer
)); 
 290         memcpy_PF((void*)buffer
, (uint_farptr_t
)((void*)&new_firmware
[i
]), ((SIZEOF_new_firmware
-i
)>sizeof(buffer
))?
sizeof(buffer
):(SIZEOF_new_firmware
-i
)); 
 292         mypgm_WRITEpage(NEW_BOOTLOADER_ADDRESS
+i
, buffer
, sizeof(buffer
), new_do_spm
);