deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add stk500 platform and changes suggested by Daniel Willmann

Browse source
This commit is contained in:
David Kopf 2011-08-03 11:18:55 -04:00
parent e953b66f78
commit e2ad2acde4
16 changed files with 945 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cpu/avr/bootloader.c
View file

@ -6,13 +6,25 @@
#include <avr/pgmspace.h>
#include "dev/usb/usb_drv.h"
//Not all AVR toolchains alias MCUSR to the older MSUSCR name
//#if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8515__) || defined (__AVR_ATmega16__)
#if !defined (MCUSR) && defined (MCUCSR)
#warning *** MCUSR not defined, using MCUCSR instead ***
#define MCUSR MCUCSR
#endif
volatile uint32_t Boot_Key ATTR_NO_INIT;
bool
bootloader_is_present(void) {
#if defined(RAMPZ)
return pgm_read_word_far(BOOTLOADER_START_ADDRESS)!=0xFFFF;
#else
/* Probably can just return false when < 64K flash */
// return pgm_read_word_near(BOOTLOADER_START_ADDRESS)!=0xFFFF;
return false;
#endif
}
void
Jump_To_Bootloader(void)
{