* Author: Christian Starkjohann
* Author: Stephan Baerwolf
* Creation Date: 2007-12-08
- * Modification Date: 2012-11-10
+ * Modification Date: 2013-03-31
* Tabsize: 4
* Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
* License: GNU GPL v2 (see License.txt)
- * This Revision: $Id: main.c 786 2010-05-30 20:41:40Z cs $
*/
#include "spminterface.h" /* must be included as first! */
static const uchar signatureBytes[4] = {
#ifdef SIGNATURE_BYTES
SIGNATURE_BYTES
+#elif defined (__AVR_ATmega8535__)
+ 0x1e, 0x93, 0x08, 0
#elif defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__)
0x1e, 0x93, 0x07, 0
#elif defined (__AVR_ATmega16__)
/* ------------------------------------------------------------------------ */
+#if (HAVE_BOOTLOADERENTRY_FROMSOFTWARE)
+void __attribute__ ((section(".init3"),naked,used,no_instrument_function)) __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND(void);
+void __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND(void) {
+ asm volatile (
+ "in %[mcucsrval] , %[mcucsrio]\n\t"
+ "ldi r29 , %[ramendhi]\n\t"
+ "ldi r28 , %[ramendlo]\n\t"
+#if (FLASHEND>131071)
+ "ld %[result] , Y+\n\t"
+ "cpi %[result] , %[bootaddrhi]\n\t"
+ "brne __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND_mismatch%=\n\t"
+#endif
+ "ld %[result] , Y+\n\t"
+ "cpi %[result] , %[bootaddrme]\n\t"
+ "ld %[result] , Y+\n\t"
+ "breq __BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND_done%=\n\t"
+
+ "__BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND_mismatch%=:\n\t"
+ "ldi %[result] , 0xff\n\t"
+
+ "__BOOTLOADERENTRY_FROMSOFTWARE__bootup_investigate_RAMEND_done%=:\n\t"
+ : [result] "=a" (__BOOTLOADERENTRY_FROMSOFTWARE__bootup_RAMEND_doesmatch),
+ [mcucsrval] "=a" (__BOOTLOADERENTRY_FROMSOFTWARE__bootup_MCUCSR)
+ : [mcucsrio] "I" (_SFR_IO_ADDR(MCUCSR)),
+#if (FLASHEND>131071)
+ [ramendhi] "M" (((RAMEND - 2) >> 8) & 0xff),
+ [ramendlo] "M" (((RAMEND - 2) >> 0) & 0xff),
+ [bootaddrhi] "M" (((__BOOTLOADERENTRY_FROMSOFTWARE__EXPECTEDADDRESS) >>16) & 0xff),
+#else
+ [ramendhi] "M" (((RAMEND - 1) >> 8) & 0xff),
+ [ramendlo] "M" (((RAMEND - 1) >> 0) & 0xff),
+#endif
+ [bootaddrme] "M" (((__BOOTLOADERENTRY_FROMSOFTWARE__EXPECTEDADDRESS) >> 8) & 0xff)
+
+ );
+}
+#endif
+
#if (USE_BOOTUP_CLEARRAM)
/*
* Under normal circumstances, RESET will not clear contents of RAM.
* As always, if you want it done - do it yourself...
*/
-void __attribute__ ((naked)) __attribute__ ((section (".init3"))) __clearram(void);
-void __clearram(void) {
+void __attribute__ ((section(".init3"),naked,used,no_instrument_function)) __func_clearram(void);
+void __func_clearram(void) {
extern size_t __bss_end;
asm volatile (
"__clearram:\n\t"
+#if (!(HAVE_BOOTLOADERENTRY_FROMSOFTWARE))
"ldi r29, %[ramendhi]\n\t"
"ldi r28, %[ramendlo]\n\t"
+#endif
"__clearramloop%=:\n\t"
"st -Y , __zero_reg__\n\t"
"cp r28, %A[bssend]\n\t"
static void (*nullVector)(void) __attribute__((__noreturn__));
#endif
-static void __attribute__((__noreturn__)) leaveBootloader()
-{
#if (USE_EXCESSIVE_ASSEMBLER) && (defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega8HVA__))
-asm volatile (
+static void __attribute__((naked,__noreturn__)) leaveBootloader(void);
+static void leaveBootloader(void) {
+ asm volatile (
"cli\n\t"
- "clr r30\n\t"
"sbi %[usbddr], %[usbminus]\n\t"
"cbi %[port], %[bit]\n\t"
- "out %[usbintrenab], r30\n\t"
- "out %[usbintrcfg], r30\n\t"
+ "out %[usbintrenab], __zero_reg__\n\t"
+ "out %[usbintrcfg], __zero_reg__\n\t"
"ldi r31, %[ivce]\n\t"
"out %[mygicr], r31\n\t"
- "out %[mygicr], r30\n\t"
- "clr r31\n\t"
- "icall\n\t"
+ "out %[mygicr], __zero_reg__\n\t"
+ "rjmp nullVector\n\t"
:
: [port] "I" (_SFR_IO_ADDR(PIN_PORT(JUMPER_PORT))),
[bit] "I" (PIN(JUMPER_PORT, JUMPER_BIT)),
[mygicr] "I" (_SFR_IO_ADDR(GICR)),
[ivce] "I" (1<<IVCE)
);
-/* TODO: compiler will put an unnecessary "ret" at this end ! */
+}
#else
+static void __attribute__((__noreturn__)) leaveBootloader(void);
+static void leaveBootloader(void) {
DBG1(0x01, 0, 0);
cli();
usbDeviceDisconnect();
USB_INTR_CFG = 0; /* also reset config bits */
GICR = (1 << IVCE); /* enable change of interrupt vectors */
GICR = (0 << IVSEL); /* move interrupts to application flash section */
-
+
+/*
+ * There seems to be another funny compiler Bug.
+ * When gcc is using "eicall" opcode it forgets to modify EIND.
+ * On devices with large flash memory there are some target address bits
+ * missing. In this case some zero bits...
+ */
+#if (defined(EIND) && ((FLASHEND)>131071))
+ EIND=0;
+#endif
/* We must go through a global function pointer variable instead of writing
* ((void (*)(void))0)();
* because the compiler optimizes a constant 0 to "rcall 0" which is not
* handled correctly by the assembler.
*/
nullVector();
-#endif
}
+#endif
/* ------------------------------------------------------------------------ */
rval = rq->wIndex.bytes[0] & 3;
rval = signatureBytes[rval];
#if HAVE_READ_LOCK_FUSE
-#if defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || defined (__AVR_ATmega16__) || defined (__AVR_ATmega32__)
+#if defined (__AVR_ATmega8535__) || \
+ defined (__AVR_ATmega8__) || defined (__AVR_ATmega8A__) || \
+ defined (__AVR_ATmega16__) || defined (__AVR_ATmega32__)
}else if(rq->wValue.bytes[0] == 0x58 && rq->wValue.bytes[1] == 0x00){ /* read lock bits */
rval = boot_lock_fuse_bits_get(GET_LOCK_BITS);
}else if(rq->wValue.bytes[0] == 0x50 && rq->wValue.bytes[1] == 0x00){ /* read lfuse bits */
}
-uchar usbFunctionSetup(uchar data[8])
+usbMsgLen_t usbFunctionSetup(uchar data[8])
{
usbRequest_t *rq = (void *)data;
-uchar len = 0;
+usbMsgLen_t len = 0;
static uchar replyBuffer[4];
- usbMsgPtr = replyBuffer;
+ usbMsgPtr = (usbMsgPtr_t)replyBuffer;
if(rq->bRequest == USBASP_FUNC_TRANSMIT){ /* emulate parts of ISP protocol */
replyBuffer[3] = usbFunctionSetup_USBASP_FUNC_TRANSMIT(rq);
- len = 4;
+ len = (usbMsgLen_t)4;
}else if((rq->bRequest == USBASP_FUNC_ENABLEPROG) || (rq->bRequest == USBASP_FUNC_SETISPSCK)){
/* replyBuffer[0] = 0; is never touched and thus always 0 which means success */
- len = 1;
+ len = (usbMsgLen_t)1;
}else if(rq->bRequest >= USBASP_FUNC_READFLASH && rq->bRequest <= USBASP_FUNC_SETLONGADDRESS){
currentAddress.w[0] = rq->wValue.word;
if(rq->bRequest == USBASP_FUNC_SETLONGADDRESS){
#if HAVE_EEPROM_PAGED_ACCESS
currentRequest = rq->bRequest;
#endif
- len = 0xff; /* hand over to usbFunctionRead() / usbFunctionWrite() */
+ len = USB_NO_MSG; /* hand over to usbFunctionRead() / usbFunctionWrite() */
}
}else if(rq->bRequest == USBASP_FUNC_DISCONNECT){
# endif
wdt_disable(); /* main app may have enabled watchdog */
#endif
+ MCUCSR = 0; /* clear all reset flags for next time */
initForUsbConnectivity();
do{
usbPoll();
);
#else
if (stayinloader >= 0x10) {
- if (!bootLoaderCondition()) {
+ if (!bootLoaderConditionSimple()) {
stayinloader-=0x10;
}
} else {
- if (bootLoaderCondition()) {
+ if (bootLoaderConditionSimple()) {
if (stayinloader > 1) stayinloader-=2;
}
}
projects / pub / USBaspLoader.git / blobdiff