aboutsummaryrefslogtreecommitdiff
path: root/bootloaders/optiboot/optiboot_atmega328.lst
diff options
context:
space:
mode:
Diffstat (limited to 'bootloaders/optiboot/optiboot_atmega328.lst')
-rw-r--r--bootloaders/optiboot/optiboot_atmega328.lst439
1 files changed, 222 insertions, 217 deletions
diff --git a/bootloaders/optiboot/optiboot_atmega328.lst b/bootloaders/optiboot/optiboot_atmega328.lst
index 0da8aaf..7876b96 100644
--- a/bootloaders/optiboot/optiboot_atmega328.lst
+++ b/bootloaders/optiboot/optiboot_atmega328.lst
@@ -3,27 +3,27 @@ optiboot_atmega328.elf: file format elf32-avr
Sections:
Idx Name Size VMA LMA File off Algn
- 0 .text 000001fc 00007e00 00007e00 00000054 2**1
+ 0 .text 000001da 00007e00 00007e00 00000054 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 .version 00000002 00007ffe 00007ffe 00000250 2**0
+ 1 .version 00000002 00007ffe 00007ffe 0000022e 2**0
CONTENTS, READONLY
- 2 .debug_aranges 00000028 00000000 00000000 00000252 2**0
+ 2 .debug_aranges 00000028 00000000 00000000 00000230 2**0
CONTENTS, READONLY, DEBUGGING
- 3 .debug_pubnames 0000006a 00000000 00000000 0000027a 2**0
+ 3 .debug_pubnames 0000005f 00000000 00000000 00000258 2**0
CONTENTS, READONLY, DEBUGGING
- 4 .debug_info 00000285 00000000 00000000 000002e4 2**0
+ 4 .debug_info 0000028c 00000000 00000000 000002b7 2**0
CONTENTS, READONLY, DEBUGGING
- 5 .debug_abbrev 0000019f 00000000 00000000 00000569 2**0
+ 5 .debug_abbrev 00000199 00000000 00000000 00000543 2**0
CONTENTS, READONLY, DEBUGGING
- 6 .debug_line 00000453 00000000 00000000 00000708 2**0
+ 6 .debug_line 00000456 00000000 00000000 000006dc 2**0
CONTENTS, READONLY, DEBUGGING
- 7 .debug_frame 00000090 00000000 00000000 00000b5c 2**2
+ 7 .debug_frame 00000080 00000000 00000000 00000b34 2**2
CONTENTS, READONLY, DEBUGGING
- 8 .debug_str 00000141 00000000 00000000 00000bec 2**0
+ 8 .debug_str 00000149 00000000 00000000 00000bb4 2**0
CONTENTS, READONLY, DEBUGGING
- 9 .debug_loc 000001e1 00000000 00000000 00000d2d 2**0
+ 9 .debug_loc 0000027e 00000000 00000000 00000cfd 2**0
CONTENTS, READONLY, DEBUGGING
- 10 .debug_ranges 00000068 00000000 00000000 00000f0e 2**0
+ 10 .debug_ranges 00000060 00000000 00000000 00000f7b 2**0
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
@@ -47,7 +47,7 @@ int main(void) {
7e04: 14 be out 0x34, r1 ; 52
if (!(ch & _BV(EXTRF))) appStart();
7e06: 81 ff sbrs r24, 1
- 7e08: e6 d0 rcall .+460 ; 0x7fd6 <appStart>
+ 7e08: e3 d0 rcall .+454 ; 0x7fd0 <appStart>
#if LED_START_FLASHES > 0
// Set up Timer 1 for timeout counter
@@ -77,7 +77,7 @@ int main(void) {
// Set up watchdog to trigger after 500ms
watchdogConfig(WATCHDOG_1S);
7e28: 8e e0 ldi r24, 0x0E ; 14
- 7e2a: cf d0 rcall .+414 ; 0x7fca <watchdogConfig>
+ 7e2a: bc d0 rcall .+376 ; 0x7fa4 <watchdogConfig>
/* Set LED pin as output */
LED_DDR |= _BV(LED);
@@ -111,8 +111,8 @@ void flash_led(uint8_t count) {
#else
LED_PIN |= _BV(LED);
7e44: 1d 9a sbi 0x03, 5 ; 3
- return getch();
}
+#endif
// Watchdog functions. These are only safe with interrupts turned off.
void watchdogReset() {
@@ -132,8 +132,8 @@ void watchdogReset() {
if(ch == STK_GET_PARAMETER) {
// GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
getNch(1);
- 7e4c: dd 24 eor r13, r13
- 7e4e: d3 94 inc r13
+ 7e4c: 99 24 eor r9, r9
+ 7e4e: 93 94 inc r9
__boot_page_fill_short((uint16_t)(void*)addrPtr,a);
addrPtr += 2;
} while (--ch);
@@ -141,21 +141,21 @@ void watchdogReset() {
// Write from programming buffer
__boot_page_write_short((uint16_t)(void*)address);
7e50: a5 e0 ldi r26, 0x05 ; 5
- 7e52: ea 2e mov r14, r26
+ 7e52: aa 2e mov r10, r26
boot_spm_busy_wait();
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
7e54: f1 e1 ldi r31, 0x11 ; 17
- 7e56: ff 2e mov r15, r31
+ 7e56: bf 2e mov r11, r31
#endif
/* Forever loop */
for (;;) {
/* get character from UART */
ch = getch();
- 7e58: ab d0 rcall .+342 ; 0x7fb0 <getch>
+ 7e58: 9d d0 rcall .+314 ; 0x7f94 <getch>
if(ch == STK_GET_PARAMETER) {
7e5a: 81 34 cpi r24, 0x41 ; 65
@@ -163,10 +163,10 @@ void watchdogReset() {
// GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
getNch(1);
7e5e: 81 e0 ldi r24, 0x01 ; 1
- 7e60: c5 d0 rcall .+394 ; 0x7fec <getNch>
+ 7e60: af d0 rcall .+350 ; 0x7fc0 <getNch>
putch(0x03);
7e62: 83 e0 ldi r24, 0x03 ; 3
- 7e64: 20 c0 rjmp .+64 ; 0x7ea6 <main+0xa6>
+ 7e64: 1f c0 rjmp .+62 ; 0x7ea4 <main+0xa4>
}
else if(ch == STK_SET_DEVICE) {
7e66: 82 34 cpi r24, 0x42 ; 66
@@ -182,71 +182,77 @@ void watchdogReset() {
// SET DEVICE EXT is ignored
getNch(5);
7e72: 85 e0 ldi r24, 0x05 ; 5
- 7e74: bb d0 rcall .+374 ; 0x7fec <getNch>
- 7e76: 91 c0 rjmp .+290 ; 0x7f9a <main+0x19a>
+ 7e74: a5 d0 rcall .+330 ; 0x7fc0 <getNch>
+ 7e76: 83 c0 rjmp .+262 ; 0x7f7e <main+0x17e>
}
else if(ch == STK_LOAD_ADDRESS) {
7e78: 85 35 cpi r24, 0x55 ; 85
- 7e7a: 81 f4 brne .+32 ; 0x7e9c <main+0x9c>
+ 7e7a: 79 f4 brne .+30 ; 0x7e9a <main+0x9a>
// LOAD ADDRESS
uint16_t newAddress;
newAddress = getch();
- 7e7c: 99 d0 rcall .+306 ; 0x7fb0 <getch>
+ 7e7c: 8b d0 rcall .+278 ; 0x7f94 <getch>
newAddress = (newAddress & 0xff) | (getch() << 8);
- 7e7e: 08 2f mov r16, r24
- 7e80: 10 e0 ldi r17, 0x00 ; 0
- 7e82: 96 d0 rcall .+300 ; 0x7fb0 <getch>
- 7e84: 90 e0 ldi r25, 0x00 ; 0
- 7e86: 98 2f mov r25, r24
- 7e88: 88 27 eor r24, r24
- 7e8a: 80 2b or r24, r16
- 7e8c: 91 2b or r25, r17
+ 7e7e: e8 2e mov r14, r24
+ 7e80: ff 24 eor r15, r15
+ 7e82: 88 d0 rcall .+272 ; 0x7f94 <getch>
+ 7e84: 08 2f mov r16, r24
+ 7e86: 10 e0 ldi r17, 0x00 ; 0
+ 7e88: 10 2f mov r17, r16
+ 7e8a: 00 27 eor r16, r16
+ 7e8c: 0e 29 or r16, r14
+ 7e8e: 1f 29 or r17, r15
#ifdef RAMPZ
// Transfer top bit to RAMPZ
RAMPZ = (newAddress & 0x8000) ? 1 : 0;
#endif
newAddress += newAddress; // Convert from word address to byte address
- 7e8e: 88 0f add r24, r24
- 7e90: 99 1f adc r25, r25
+ 7e90: 00 0f add r16, r16
+ 7e92: 11 1f adc r17, r17
address = newAddress;
- 7e92: 90 93 01 02 sts 0x0201, r25
- 7e96: 80 93 00 02 sts 0x0200, r24
- 7e9a: 7e c0 rjmp .+252 ; 0x7f98 <main+0x198>
verifySpace();
+ 7e94: 8d d0 rcall .+282 ; 0x7fb0 <verifySpace>
+ 7e96: 68 01 movw r12, r16
+ 7e98: 72 c0 rjmp .+228 ; 0x7f7e <main+0x17e>
}
else if(ch == STK_UNIVERSAL) {
- 7e9c: 86 35 cpi r24, 0x56 ; 86
- 7e9e: 29 f4 brne .+10 ; 0x7eaa <main+0xaa>
+ 7e9a: 86 35 cpi r24, 0x56 ; 86
+ 7e9c: 29 f4 brne .+10 ; 0x7ea8 <main+0xa8>
// UNIVERSAL command is ignored
getNch(4);
- 7ea0: 84 e0 ldi r24, 0x04 ; 4
- 7ea2: a4 d0 rcall .+328 ; 0x7fec <getNch>
+ 7e9e: 84 e0 ldi r24, 0x04 ; 4
+ 7ea0: 8f d0 rcall .+286 ; 0x7fc0 <getNch>
putch(0x00);
- 7ea4: 80 e0 ldi r24, 0x00 ; 0
- 7ea6: 7c d0 rcall .+248 ; 0x7fa0 <putch>
- 7ea8: 78 c0 rjmp .+240 ; 0x7f9a <main+0x19a>
+ 7ea2: 80 e0 ldi r24, 0x00 ; 0
+ 7ea4: 6f d0 rcall .+222 ; 0x7f84 <putch>
+ 7ea6: 6b c0 rjmp .+214 ; 0x7f7e <main+0x17e>
}
/* Write memory, length is big endian and is in bytes */
else if(ch == STK_PROG_PAGE) {
- 7eaa: 84 36 cpi r24, 0x64 ; 100
- 7eac: 09 f0 breq .+2 ; 0x7eb0 <main+0xb0>
- 7eae: 4e c0 rjmp .+156 ; 0x7f4c <main+0x14c>
+ 7ea8: 84 36 cpi r24, 0x64 ; 100
+ 7eaa: 09 f0 breq .+2 ; 0x7eae <main+0xae>
+ 7eac: 42 c0 rjmp .+132 ; 0x7f32 <main+0x132>
// PROGRAM PAGE - we support flash programming only, not EEPROM
uint8_t *bufPtr;
uint16_t addrPtr;
- getLen();
- 7eb0: 87 d0 rcall .+270 ; 0x7fc0 <getLen>
+ getch(); /* getlen() */
+ 7eae: 72 d0 rcall .+228 ; 0x7f94 <getch>
+ length = getch();
+ 7eb0: 71 d0 rcall .+226 ; 0x7f94 <getch>
+ 7eb2: 08 2f mov r16, r24
+ getch();
+ 7eb4: 6f d0 rcall .+222 ; 0x7f94 <getch>
// If we are in RWW section, immediately start page erase
if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
- 7eb2: e0 91 00 02 lds r30, 0x0200
- 7eb6: f0 91 01 02 lds r31, 0x0201
+ 7eb6: 80 e0 ldi r24, 0x00 ; 0
+ 7eb8: c8 16 cp r12, r24
7eba: 80 e7 ldi r24, 0x70 ; 112
- 7ebc: e0 30 cpi r30, 0x00 ; 0
- 7ebe: f8 07 cpc r31, r24
- 7ec0: 18 f4 brcc .+6 ; 0x7ec8 <main+0xc8>
- 7ec2: 83 e0 ldi r24, 0x03 ; 3
+ 7ebc: d8 06 cpc r13, r24
+ 7ebe: 20 f4 brcc .+8 ; 0x7ec8 <main+0xc8>
+ 7ec0: 83 e0 ldi r24, 0x03 ; 3
+ 7ec2: f6 01 movw r30, r12
7ec4: 87 bf out 0x37, r24 ; 55
7ec6: e8 95 spm
7ec8: c0 e0 ldi r28, 0x00 ; 0
@@ -255,302 +261,301 @@ void watchdogReset() {
// While that is going on, read in page contents
bufPtr = buff;
do *bufPtr++ = getch();
- 7ecc: 71 d0 rcall .+226 ; 0x7fb0 <getch>
+ 7ecc: 63 d0 rcall .+198 ; 0x7f94 <getch>
7ece: 89 93 st Y+, r24
while (--length);
- 7ed0: 80 91 02 02 lds r24, 0x0202
- 7ed4: 81 50 subi r24, 0x01 ; 1
- 7ed6: 80 93 02 02 sts 0x0202, r24
- 7eda: 88 23 and r24, r24
- 7edc: b9 f7 brne .-18 ; 0x7ecc <main+0xcc>
+ 7ed0: 0c 17 cp r16, r28
+ 7ed2: e1 f7 brne .-8 ; 0x7ecc <main+0xcc>
// If we are in NRWW section, page erase has to be delayed until now.
// Todo: Take RAMPZ into account
if (address >= NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
- 7ede: e0 91 00 02 lds r30, 0x0200
- 7ee2: f0 91 01 02 lds r31, 0x0201
- 7ee6: 80 e7 ldi r24, 0x70 ; 112
- 7ee8: e0 30 cpi r30, 0x00 ; 0
- 7eea: f8 07 cpc r31, r24
- 7eec: 18 f0 brcs .+6 ; 0x7ef4 <main+0xf4>
- 7eee: 83 e0 ldi r24, 0x03 ; 3
- 7ef0: 87 bf out 0x37, r24 ; 55
- 7ef2: e8 95 spm
+ 7ed4: f0 e0 ldi r31, 0x00 ; 0
+ 7ed6: cf 16 cp r12, r31
+ 7ed8: f0 e7 ldi r31, 0x70 ; 112
+ 7eda: df 06 cpc r13, r31
+ 7edc: 20 f0 brcs .+8 ; 0x7ee6 <main+0xe6>
+ 7ede: 83 e0 ldi r24, 0x03 ; 3
+ 7ee0: f6 01 movw r30, r12
+ 7ee2: 87 bf out 0x37, r24 ; 55
+ 7ee4: e8 95 spm
// Read command terminator, start reply
verifySpace();
- 7ef4: 75 d0 rcall .+234 ; 0x7fe0 <verifySpace>
+ 7ee6: 64 d0 rcall .+200 ; 0x7fb0 <verifySpace>
// If only a partial page is to be programmed, the erase might not be complete.
// So check that here
boot_spm_busy_wait();
- 7ef6: 07 b6 in r0, 0x37 ; 55
- 7ef8: 00 fc sbrc r0, 0
- 7efa: fd cf rjmp .-6 ; 0x7ef6 <main+0xf6>
- }
-#endif
-
- // Copy buffer into programming buffer
+ 7ee8: 07 b6 in r0, 0x37 ; 55
+ 7eea: 00 fc sbrc r0, 0
+ 7eec: fd cf rjmp .-6 ; 0x7ee8 <main+0xe8>
+ 7eee: a6 01 movw r20, r12
+ 7ef0: a0 e0 ldi r26, 0x00 ; 0
+ 7ef2: b1 e0 ldi r27, 0x01 ; 1
bufPtr = buff;
addrPtr = (uint16_t)(void*)address;
- 7efc: 40 91 00 02 lds r20, 0x0200
- 7f00: 50 91 01 02 lds r21, 0x0201
- 7f04: a0 e0 ldi r26, 0x00 ; 0
- 7f06: b1 e0 ldi r27, 0x01 ; 1
ch = SPM_PAGESIZE / 2;
do {
uint16_t a;
a = *bufPtr++;
- 7f08: 2c 91 ld r18, X
- 7f0a: 30 e0 ldi r19, 0x00 ; 0
+ 7ef4: 2c 91 ld r18, X
+ 7ef6: 30 e0 ldi r19, 0x00 ; 0
a |= (*bufPtr++) << 8;
- 7f0c: 11 96 adiw r26, 0x01 ; 1
- 7f0e: 8c 91 ld r24, X
- 7f10: 11 97 sbiw r26, 0x01 ; 1
- 7f12: 90 e0 ldi r25, 0x00 ; 0
- 7f14: 98 2f mov r25, r24
- 7f16: 88 27 eor r24, r24
- 7f18: 82 2b or r24, r18
- 7f1a: 93 2b or r25, r19
+ 7ef8: 11 96 adiw r26, 0x01 ; 1
+ 7efa: 8c 91 ld r24, X
+ 7efc: 11 97 sbiw r26, 0x01 ; 1
+ 7efe: 90 e0 ldi r25, 0x00 ; 0
+ 7f00: 98 2f mov r25, r24
+ 7f02: 88 27 eor r24, r24
+ 7f04: 82 2b or r24, r18
+ 7f06: 93 2b or r25, r19
#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
#endif
/* main program starts here */
int main(void) {
- 7f1c: 12 96 adiw r26, 0x02 ; 2
+ 7f08: 12 96 adiw r26, 0x02 ; 2
ch = SPM_PAGESIZE / 2;
do {
uint16_t a;
a = *bufPtr++;
a |= (*bufPtr++) << 8;
__boot_page_fill_short((uint16_t)(void*)addrPtr,a);
- 7f1e: fa 01 movw r30, r20
- 7f20: 0c 01 movw r0, r24
- 7f22: d7 be out 0x37, r13 ; 55
- 7f24: e8 95 spm
- 7f26: 11 24 eor r1, r1
+ 7f0a: fa 01 movw r30, r20
+ 7f0c: 0c 01 movw r0, r24
+ 7f0e: 97 be out 0x37, r9 ; 55
+ 7f10: e8 95 spm
+ 7f12: 11 24 eor r1, r1
addrPtr += 2;
- 7f28: 4e 5f subi r20, 0xFE ; 254
- 7f2a: 5f 4f sbci r21, 0xFF ; 255
+ 7f14: 4e 5f subi r20, 0xFE ; 254
+ 7f16: 5f 4f sbci r21, 0xFF ; 255
} while (--ch);
- 7f2c: f1 e0 ldi r31, 0x01 ; 1
- 7f2e: a0 38 cpi r26, 0x80 ; 128
- 7f30: bf 07 cpc r27, r31
- 7f32: 51 f7 brne .-44 ; 0x7f08 <main+0x108>
+ 7f18: f1 e0 ldi r31, 0x01 ; 1
+ 7f1a: a0 38 cpi r26, 0x80 ; 128
+ 7f1c: bf 07 cpc r27, r31
+ 7f1e: 51 f7 brne .-44 ; 0x7ef4 <main+0xf4>
// Write from programming buffer
__boot_page_write_short((uint16_t)(void*)address);
- 7f34: e0 91 00 02 lds r30, 0x0200
- 7f38: f0 91 01 02 lds r31, 0x0201
- 7f3c: e7 be out 0x37, r14 ; 55
- 7f3e: e8 95 spm
+ 7f20: f6 01 movw r30, r12
+ 7f22: a7 be out 0x37, r10 ; 55
+ 7f24: e8 95 spm
boot_spm_busy_wait();
- 7f40: 07 b6 in r0, 0x37 ; 55
- 7f42: 00 fc sbrc r0, 0
- 7f44: fd cf rjmp .-6 ; 0x7f40 <main+0x140>
+ 7f26: 07 b6 in r0, 0x37 ; 55
+ 7f28: 00 fc sbrc r0, 0
+ 7f2a: fd cf rjmp .-6 ; 0x7f26 <main+0x126>
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
- 7f46: f7 be out 0x37, r15 ; 55
- 7f48: e8 95 spm
- 7f4a: 27 c0 rjmp .+78 ; 0x7f9a <main+0x19a>
+ 7f2c: b7 be out 0x37, r11 ; 55
+ 7f2e: e8 95 spm
+ 7f30: 26 c0 rjmp .+76 ; 0x7f7e <main+0x17e>
#endif
}
/* Read memory block mode, length is big endian. */
else if(ch == STK_READ_PAGE) {
- 7f4c: 84 37 cpi r24, 0x74 ; 116
- 7f4e: b9 f4 brne .+46 ; 0x7f7e <main+0x17e>
+ 7f32: 84 37 cpi r24, 0x74 ; 116
+ 7f34: b1 f4 brne .+44 ; 0x7f62 <main+0x162>
// READ PAGE - we only read flash
- getLen();
- 7f50: 37 d0 rcall .+110 ; 0x7fc0 <getLen>
+ getch(); /* getlen() */
+ 7f36: 2e d0 rcall .+92 ; 0x7f94 <getch>
+ length = getch();
+ 7f38: 2d d0 rcall .+90 ; 0x7f94 <getch>
+ 7f3a: f8 2e mov r15, r24
+ getch();
+ 7f3c: 2b d0 rcall .+86 ; 0x7f94 <getch>
+
verifySpace();
- 7f52: 46 d0 rcall .+140 ; 0x7fe0 <verifySpace>
+ 7f3e: 38 d0 rcall .+112 ; 0x7fb0 <verifySpace>
+ 7f40: f6 01 movw r30, r12
+ 7f42: ef 2c mov r14, r15
putch(result);
address++;
}
while (--length);
#else
do putch(pgm_read_byte_near(address++));
- 7f54: e0 91 00 02 lds r30, 0x0200
- 7f58: f0 91 01 02 lds r31, 0x0201
- 7f5c: 31 96 adiw r30, 0x01 ; 1
- 7f5e: f0 93 01 02 sts 0x0201, r31
- 7f62: e0 93 00 02 sts 0x0200, r30
- 7f66: 31 97 sbiw r30, 0x01 ; 1
- 7f68: e4 91 lpm r30, Z+
- 7f6a: 8e 2f mov r24, r30
- 7f6c: 19 d0 rcall .+50 ; 0x7fa0 <putch>
+ 7f44: 8f 01 movw r16, r30
+ 7f46: 0f 5f subi r16, 0xFF ; 255
+ 7f48: 1f 4f sbci r17, 0xFF ; 255
+ 7f4a: 84 91 lpm r24, Z+
+ 7f4c: 1b d0 rcall .+54 ; 0x7f84 <putch>
while (--length);
- 7f6e: 80 91 02 02 lds r24, 0x0202
- 7f72: 81 50 subi r24, 0x01 ; 1
- 7f74: 80 93 02 02 sts 0x0202, r24
- 7f78: 88 23 and r24, r24
- 7f7a: 61 f7 brne .-40 ; 0x7f54 <main+0x154>
- 7f7c: 0e c0 rjmp .+28 ; 0x7f9a <main+0x19a>
+ 7f4e: ea 94 dec r14
+ 7f50: f8 01 movw r30, r16
+ 7f52: c1 f7 brne .-16 ; 0x7f44 <main+0x144>
+#define rstVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+4))
+#define wdtVect (*(uint16_t*)(RAMSTART+SPM_PAGESIZE*2+6))
+#endif
+
+/* main program starts here */
+int main(void) {
+ 7f54: 08 94 sec
+ 7f56: c1 1c adc r12, r1
+ 7f58: d1 1c adc r13, r1
+ 7f5a: fa 94 dec r15
+ 7f5c: cf 0c add r12, r15
+ 7f5e: d1 1c adc r13, r1
+ 7f60: 0e c0 rjmp .+28 ; 0x7f7e <main+0x17e>
#endif
#endif
}
/* Get device signature bytes */
else if(ch == STK_READ_SIGN) {
- 7f7e: 85 37 cpi r24, 0x75 ; 117
- 7f80: 39 f4 brne .+14 ; 0x7f90 <main+0x190>
+ 7f62: 85 37 cpi r24, 0x75 ; 117
+ 7f64: 39 f4 brne .+14 ; 0x7f74 <main+0x174>
// READ SIGN - return what Avrdude wants to hear
verifySpace();
- 7f82: 2e d0 rcall .+92 ; 0x7fe0 <verifySpace>
+ 7f66: 24 d0 rcall .+72 ; 0x7fb0 <verifySpace>
putch(SIGNATURE_0);
- 7f84: 8e e1 ldi r24, 0x1E ; 30
- 7f86: 0c d0 rcall .+24 ; 0x7fa0 <putch>
+ 7f68: 8e e1 ldi r24, 0x1E ; 30
+ 7f6a: 0c d0 rcall .+24 ; 0x7f84 <putch>
putch(SIGNATURE_1);
- 7f88: 85 e9 ldi r24, 0x95 ; 149
- 7f8a: 0a d0 rcall .+20 ; 0x7fa0 <putch>
+ 7f6c: 85 e9 ldi r24, 0x95 ; 149
+ 7f6e: 0a d0 rcall .+20 ; 0x7f84 <putch>
putch(SIGNATURE_2);
- 7f8c: 8f e0 ldi r24, 0x0F ; 15
- 7f8e: 8b cf rjmp .-234 ; 0x7ea6 <main+0xa6>
+ 7f70: 8f e0 ldi r24, 0x0F ; 15
+ 7f72: 98 cf rjmp .-208 ; 0x7ea4 <main+0xa4>
}
else if (ch == 'Q') {
- 7f90: 81 35 cpi r24, 0x51 ; 81
- 7f92: 11 f4 brne .+4 ; 0x7f98 <main+0x198>
+ 7f74: 81 35 cpi r24, 0x51 ; 81
+ 7f76: 11 f4 brne .+4 ; 0x7f7c <main+0x17c>
// Adaboot no-wait mod
watchdogConfig(WATCHDOG_16MS);
- 7f94: 88 e0 ldi r24, 0x08 ; 8
- 7f96: 19 d0 rcall .+50 ; 0x7fca <watchdogConfig>
+ 7f78: 88 e0 ldi r24, 0x08 ; 8
+ 7f7a: 14 d0 rcall .+40 ; 0x7fa4 <watchdogConfig>
verifySpace();
}
else {
// This covers the response to commands like STK_ENTER_PROGMODE
verifySpace();
- 7f98: 23 d0 rcall .+70 ; 0x7fe0 <verifySpace>
+ 7f7c: 19 d0 rcall .+50 ; 0x7fb0 <verifySpace>
}
putch(STK_OK);
- 7f9a: 80 e1 ldi r24, 0x10 ; 16
- 7f9c: 01 d0 rcall .+2 ; 0x7fa0 <putch>
- 7f9e: 5c cf rjmp .-328 ; 0x7e58 <main+0x58>
+ 7f7e: 80 e1 ldi r24, 0x10 ; 16
+ 7f80: 01 d0 rcall .+2 ; 0x7f84 <putch>
+ 7f82: 6a cf rjmp .-300 ; 0x7e58 <main+0x58>
-00007fa0 <putch>:
+00007f84 <putch>:
}
}
void putch(char ch) {
- 7fa0: 98 2f mov r25, r24
+ 7f84: 98 2f mov r25, r24
#ifndef SOFT_UART
while (!(UCSR0A & _BV(UDRE0)));
- 7fa2: 80 91 c0 00 lds r24, 0x00C0
- 7fa6: 85 ff sbrs r24, 5
- 7fa8: fc cf rjmp .-8 ; 0x7fa2 <putch+0x2>
+ 7f86: 80 91 c0 00 lds r24, 0x00C0
+ 7f8a: 85 ff sbrs r24, 5
+ 7f8c: fc cf rjmp .-8 ; 0x7f86 <putch+0x2>
UDR0 = ch;
- 7faa: 90 93 c6 00 sts 0x00C6, r25
+ 7f8e: 90 93 c6 00 sts 0x00C6, r25
[uartBit] "I" (UART_TX_BIT)
:
"r25"
);
#endif
}
- 7fae: 08 95 ret
+ 7f92: 08 95 ret
-00007fb0 <getch>:
- return getch();
+00007f94 <getch>:
}
+#endif
// Watchdog functions. These are only safe with interrupts turned off.
void watchdogReset() {
__asm__ __volatile__ (
- 7fb0: a8 95 wdr
+ 7f94: a8 95 wdr
[uartBit] "I" (UART_RX_BIT)
:
"r25"
);
#else
while(!(UCSR0A & _BV(RXC0)));
- 7fb2: 80 91 c0 00 lds r24, 0x00C0
- 7fb6: 87 ff sbrs r24, 7
- 7fb8: fc cf rjmp .-8 ; 0x7fb2 <getch+0x2>
+ 7f96: 80 91 c0 00 lds r24, 0x00C0
+ 7f9a: 87 ff sbrs r24, 7
+ 7f9c: fc cf rjmp .-8 ; 0x7f96 <getch+0x2>
ch = UDR0;
- 7fba: 80 91 c6 00 lds r24, 0x00C6
+ 7f9e: 80 91 c6 00 lds r24, 0x00C6
LED_PIN |= _BV(LED);
#endif
#endif
return ch;
}
- 7fbe: 08 95 ret
-
-00007fc0 <getLen>:
- } while (--count);
-}
-#endif
-
-uint8_t getLen() {
- getch();
- 7fc0: f7 df rcall .-18 ; 0x7fb0 <getch>
- length = getch();
- 7fc2: f6 df rcall .-20 ; 0x7fb0 <getch>
- 7fc4: 80 93 02 02 sts 0x0202, r24
- return getch();
-}
- 7fc8: f3 cf rjmp .-26 ; 0x7fb0 <getch>
+ 7fa2: 08 95 ret
-00007fca <watchdogConfig>:
+00007fa4 <watchdogConfig>:
"wdr\n"
);
}
void watchdogConfig(uint8_t x) {
WDTCSR = _BV(WDCE) | _BV(WDE);
- 7fca: e0 e6 ldi r30, 0x60 ; 96
- 7fcc: f0 e0 ldi r31, 0x00 ; 0
- 7fce: 98 e1 ldi r25, 0x18 ; 24
- 7fd0: 90 83 st Z, r25
+ 7fa4: e0 e6 ldi r30, 0x60 ; 96
+ 7fa6: f0 e0 ldi r31, 0x00 ; 0
+ 7fa8: 98 e1 ldi r25, 0x18 ; 24
+ 7faa: 90 83 st Z, r25
WDTCSR = x;
- 7fd2: 80 83 st Z, r24
+ 7fac: 80 83 st Z, r24
}
- 7fd4: 08 95 ret
-
-00007fd6 <appStart>:
-
-void appStart() {
- watchdogConfig(WATCHDOG_OFF);
- 7fd6: 80 e0 ldi r24, 0x00 ; 0
- 7fd8: f8 df rcall .-16 ; 0x7fca <watchdogConfig>
- __asm__ __volatile__ (
- 7fda: ee 27 eor r30, r30
- 7fdc: ff 27 eor r31, r31
- 7fde: 09 94 ijmp
+ 7fae: 08 95 ret
-00007fe0 <verifySpace>:
+00007fb0 <verifySpace>:
do getch(); while (--count);
verifySpace();
}
void verifySpace() {
- if (getch() != CRC_EOP) appStart();
- 7fe0: e7 df rcall .-50 ; 0x7fb0 <getch>
- 7fe2: 80 32 cpi r24, 0x20 ; 32
- 7fe4: 09 f0 breq .+2 ; 0x7fe8 <verifySpace+0x8>
- 7fe6: f7 df rcall .-18 ; 0x7fd6 <appStart>
+ if (getch() != CRC_EOP) {
+ 7fb0: f1 df rcall .-30 ; 0x7f94 <getch>
+ 7fb2: 80 32 cpi r24, 0x20 ; 32
+ 7fb4: 19 f0 breq .+6 ; 0x7fbc <verifySpace+0xc>
+ watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
+ 7fb6: 88 e0 ldi r24, 0x08 ; 8
+ 7fb8: f5 df rcall .-22 ; 0x7fa4 <watchdogConfig>
+ 7fba: ff cf rjmp .-2 ; 0x7fba <verifySpace+0xa>
+ while (1) // and busy-loop so that WD causes
+ ; // a reset and app start.
+ }
putch(STK_INSYNC);
- 7fe8: 84 e1 ldi r24, 0x14 ; 20
+ 7fbc: 84 e1 ldi r24, 0x14 ; 20
}
- 7fea: da cf rjmp .-76 ; 0x7fa0 <putch>
+ 7fbe: e2 cf rjmp .-60 ; 0x7f84 <putch>
-00007fec <getNch>:
+00007fc0 <getNch>:
::[count] "M" (UART_B_VALUE)
);
}
#endif
void getNch(uint8_t count) {
- 7fec: 1f 93 push r17
- 7fee: 18 2f mov r17, r24
+ 7fc0: 1f 93 push r17
+ 7fc2: 18 2f mov r17, r24
do getch(); while (--count);
- 7ff0: df df rcall .-66 ; 0x7fb0 <getch>
- 7ff2: 11 50 subi r17, 0x01 ; 1
- 7ff4: e9 f7 brne .-6 ; 0x7ff0 <getNch+0x4>
+ 7fc4: e7 df rcall .-50 ; 0x7f94 <getch>
+ 7fc6: 11 50 subi r17, 0x01 ; 1
+ 7fc8: e9 f7 brne .-6 ; 0x7fc4 <getNch+0x4>
verifySpace();
- 7ff6: f4 df rcall .-24 ; 0x7fe0 <verifySpace>
+ 7fca: f2 df rcall .-28 ; 0x7fb0 <verifySpace>
+}
+ 7fcc: 1f 91 pop r17
+ 7fce: 08 95 ret
+
+00007fd0 <appStart>:
+ WDTCSR = _BV(WDCE) | _BV(WDE);
+ WDTCSR = x;
}
- 7ff8: 1f 91 pop r17
- 7ffa: 08 95 ret
+
+void appStart() {
+ watchdogConfig(WATCHDOG_OFF);
+ 7fd0: 80 e0 ldi r24, 0x00 ; 0
+ 7fd2: e8 df rcall .-48 ; 0x7fa4 <watchdogConfig>
+ __asm__ __volatile__ (
+ 7fd4: ee 27 eor r30, r30
+ 7fd6: ff 27 eor r31, r31
+ 7fd8: 09 94 ijmp
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-22 21:34:08 +0000