core: Fix comment and remove unused code
This commit is contained in:
tmk
parent
19350e3ee5
commit
b3980122bb
1 changed files with 15 additions and 100 deletions
|
|
@ -16,8 +16,8 @@
|
||||||
* AVR Boot section size are defined by setting BOOTSZ fuse in fact. Consult with your MCU datasheet.
|
* AVR Boot section size are defined by setting BOOTSZ fuse in fact. Consult with your MCU datasheet.
|
||||||
* Note that 'Word'(2 bytes) size and address are used in datasheet while TMK uses 'Byte'.
|
* Note that 'Word'(2 bytes) size and address are used in datasheet while TMK uses 'Byte'.
|
||||||
*
|
*
|
||||||
*
|
|
||||||
* Size of Bootloaders in bytes:
|
* Size of Bootloaders in bytes:
|
||||||
|
* Atmel DFU loader(ATmega32U2) 4096
|
||||||
* Atmel DFU loader(ATmega32U4) 4096
|
* Atmel DFU loader(ATmega32U4) 4096
|
||||||
* Atmel DFU loader(AT90USB128) 8192
|
* Atmel DFU loader(AT90USB128) 8192
|
||||||
* LUFA bootloader(ATmega32U4) 4096
|
* LUFA bootloader(ATmega32U4) 4096
|
||||||
|
|
@ -27,33 +27,19 @@
|
||||||
* Teensy++ halfKay(AT90USB128) 1024
|
* Teensy++ halfKay(AT90USB128) 1024
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* AVR Boot section is located at the end of Flash memory like the followings.
|
* AVR Boot section is located at the end of Flash memory.
|
||||||
*
|
*
|
||||||
*
|
* byte ATMega32u4 with 4096-byte Boot section
|
||||||
* byte Atmel/LUFA(ATMega32u4) byte Atmel(AT90SUB128)
|
* 0x0000 +---------------+
|
||||||
* 0x0000 +---------------+ 0x00000 +---------------+
|
* | |
|
||||||
* | | | |
|
* | |
|
||||||
* | | | |
|
* | Application | 28KB
|
||||||
* | Application | | Application |
|
* | |
|
||||||
* | | | |
|
* = =
|
||||||
* = = = =
|
* | |
|
||||||
* | | 32KB-4KB | | 128KB-8KB
|
* 0x7000 +---------------+ <---- BOOTLOADER_START
|
||||||
* 0x6000 +---------------+ 0x1FC00 +---------------+
|
* | Bootloader | 4KB BOOTLOADER_SIZE
|
||||||
* | Bootloader | 4KB | Bootloader | 8KB
|
* 0x7FFF +---------------+ <---- FLASHEND
|
||||||
* 0x7FFF +---------------+ 0x1FFFF +---------------+
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* byte Teensy(ATMega32u4) byte Teensy++(AT90SUB128)
|
|
||||||
* 0x0000 +---------------+ 0x00000 +---------------+
|
|
||||||
* | | | |
|
|
||||||
* | | | |
|
|
||||||
* | Application | | Application |
|
|
||||||
* | | | |
|
|
||||||
* = = = =
|
|
||||||
* | | 32KB-512B | | 128KB-1KB
|
|
||||||
* 0x7E00 +---------------+ 0x1FC00 +---------------+
|
|
||||||
* | Bootloader | 512B | Bootloader | 1KB
|
|
||||||
* 0x7FFF +---------------+ 0x1FFFF +---------------+
|
|
||||||
*/
|
*/
|
||||||
#ifndef BOOTLOADER_SIZE
|
#ifndef BOOTLOADER_SIZE
|
||||||
#warning To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
|
#warning To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
|
||||||
|
|
@ -127,74 +113,3 @@ void bootloader_jump_after_watchdog_reset(void)
|
||||||
((void (*)(void))(BOOTLOADER_START/2))();
|
((void (*)(void))(BOOTLOADER_START/2))();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* Jumping To The Bootloader
|
|
||||||
* http://www.pjrc.com/teensy/jump_to_bootloader.html
|
|
||||||
*
|
|
||||||
* This method doen't work when using LUFA. idk why.
|
|
||||||
* - needs to initialize more regisers or interrupt setting?
|
|
||||||
*/
|
|
||||||
void bootloader_jump(void) {
|
|
||||||
#ifdef PROTOCOL_LUFA
|
|
||||||
USB_Disable();
|
|
||||||
cli();
|
|
||||||
_delay_ms(2000);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
|
||||||
cli();
|
|
||||||
UDCON = 1;
|
|
||||||
USBCON = (1<<FRZCLK);
|
|
||||||
UCSR1B = 0;
|
|
||||||
_delay_ms(5);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Initialize
|
|
||||||
*/
|
|
||||||
#if defined(__AVR_AT90USB162__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
|
|
||||||
DDRB = 0; DDRC = 0; DDRD = 0;
|
|
||||||
PORTB = 0; PORTC = 0; PORTD = 0;
|
|
||||||
#elif defined(__AVR_ATmega32U4__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
|
|
||||||
DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
|
|
||||||
PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
|
||||||
#elif defined(__AVR_AT90USB646__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
|
|
||||||
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
|
|
||||||
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
|
||||||
#elif defined(__AVR_AT90USB1286__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
|
|
||||||
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
|
|
||||||
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* USBaspLoader
|
|
||||||
*/
|
|
||||||
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
|
|
||||||
// This makes custom USBasploader come up.
|
|
||||||
MCUSR = 0;
|
|
||||||
|
|
||||||
// initialize ports
|
|
||||||
PORTB = 0; PORTC= 0; PORTD = 0;
|
|
||||||
DDRB = 0; DDRC= 0; DDRD = 0;
|
|
||||||
|
|
||||||
// disable interrupts
|
|
||||||
EIMSK = 0; EECR = 0; SPCR = 0;
|
|
||||||
ACSR = 0; SPMCSR = 0; WDTCSR = 0; PCICR = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0;
|
|
||||||
ADCSRA = 0; TWCR = 0; UCSR0B = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// This is compled into 'icall', address should be in word unit, not byte.
|
|
||||||
((void (*)(void))(BOOTLOADER_START/2))();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue