[gnoduino: 58/237] Allow the READ PARAMETER command to return our version number. (significant size impact: 14 bytes!)
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino: 58/237] Allow the READ PARAMETER command to return our version number. (significant size impact: 14 bytes!)
- Date: Sat, 31 Mar 2012 20:19:42 +0000 (UTC)
commit 5f6b1fffe2f735695f092320d53ca152f6c8fd8a
Author: WestfW <westfw gmail com>
Date: Tue Jun 14 10:24:27 2011 -0700
Allow the READ PARAMETER command to return our version number.
(significant size impact: 14 bytes!)
Initialized "address" to eliminate compiler warning (4 bytes!)
Add "atmega168" as a more accurate target name than "diecimila"
(keep diecimila as well for backward compatibility)
Reduce the .hex and .lst targets that are stored in source control
to the three basics: atmega8, atmega168, atmega328. The other
targets remain in the makefile and makeall, but will need to be
built from source if wanted. Which should be less of a problem
now that the source is buildable without installing crosspack.
arduino/bootloaders/optiboot/Makefile | 21 +-
arduino/bootloaders/optiboot/README.TXT | 11 +
arduino/bootloaders/optiboot/makeall | 11 +-
arduino/bootloaders/optiboot/optiboot.c | 28 +-
.../bootloaders/optiboot/optiboot_atmega328.hex | 61 +-
.../bootloaders/optiboot/optiboot_atmega328.lst | 479 ++++++++-------
.../optiboot/optiboot_atmega328_pro_8MHz.hex | 34 --
.../optiboot/optiboot_atmega328_pro_8MHz.lst | 571 ------------------
.../bootloaders/optiboot/optiboot_diecimila.hex | 34 --
.../bootloaders/optiboot/optiboot_diecimila.lst | 571 ------------------
arduino/bootloaders/optiboot/optiboot_lilypad.hex | 34 --
arduino/bootloaders/optiboot/optiboot_lilypad.lst | 571 ------------------
.../optiboot/optiboot_lilypad_resonator.hex | 34 --
.../optiboot/optiboot_lilypad_resonator.lst | 571 ------------------
arduino/bootloaders/optiboot/optiboot_luminet.hex | 40 --
arduino/bootloaders/optiboot/optiboot_luminet.lst | 617 --------------------
.../bootloaders/optiboot/optiboot_pro_16MHz.hex | 34 --
.../bootloaders/optiboot/optiboot_pro_16MHz.lst | 571 ------------------
.../bootloaders/optiboot/optiboot_pro_20mhz.hex | 34 --
.../bootloaders/optiboot/optiboot_pro_20mhz.lst | 571 ------------------
arduino/bootloaders/optiboot/optiboot_pro_8MHz.hex | 34 --
arduino/bootloaders/optiboot/optiboot_pro_8MHz.lst | 571 ------------------
22 files changed, 346 insertions(+), 5157 deletions(-)
---
diff --git a/arduino/bootloaders/optiboot/Makefile b/arduino/bootloaders/optiboot/Makefile
index f6ba374..c2e03e3 100644
--- a/arduino/bootloaders/optiboot/Makefile
+++ b/arduino/bootloaders/optiboot/Makefile
@@ -177,8 +177,27 @@ pro16_isp: LFUSE = C6
pro16_isp: EFUSE = 04
pro16_isp: isp
-# Diecimila and NG use identical bootloaders
+# Diecimila, Duemilanove with m168, and NG use identical bootloaders
+# Call it "atmega168" for generality and clarity, keep "diecimila" for
+# backward compatibility of makefile
#
+atmega168: TARGET = atmega168
+atmega168: MCU_TARGET = atmega168
+atmega168: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
+atmega168: AVR_FREQ = 16000000L
+atmega168: $(PROGRAM)_atmega168.hex
+atmega168: $(PROGRAM)_atmega168.lst
+
+atmega168_isp: atmega168
+atmega168_isp: TARGET = atmega168
+# 2.7V brownout
+atmega168_isp: HFUSE = DD
+# Low power xtal (16MHz) 16KCK/14CK+65ms
+atmega168_isp: LFUSE = FF
+# 512 byte boot
+atmega168_isp: EFUSE = 04
+atmega168_isp: isp
+
diecimila: TARGET = diecimila
diecimila: MCU_TARGET = atmega168
diecimila: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
diff --git a/arduino/bootloaders/optiboot/README.TXT b/arduino/bootloaders/optiboot/README.TXT
index 7e2f46d..cd79cd9 100644
--- a/arduino/bootloaders/optiboot/README.TXT
+++ b/arduino/bootloaders/optiboot/README.TXT
@@ -68,3 +68,14 @@ variables when you invoke make:
make ISPTOOL=stk500v1 ISPPORT=/dev/tty.usbserial-A20e1eAN \
ISPSPEED=-b19200 atmega328_isp
+
+The "atmega8_isp" target does not currently work, because the mega8
+doesn't have the "extended" fuse that the generic ISP target wants to
+pass on to avrdude. You'll need to run avrdude manually.
+
+
+Standard Targets
+
+I've reduced the pre-built and source-version-controlled targets
+(.hex and .lst files included in the git repository) to just the
+three basic 16MHz targets: atmega8, atmega16, atmega328.
diff --git a/arduino/bootloaders/optiboot/makeall b/arduino/bootloaders/optiboot/makeall
index b92c56e..f076bc7 100755
--- a/arduino/bootloaders/optiboot/makeall
+++ b/arduino/bootloaders/optiboot/makeall
@@ -1,15 +1,20 @@
#!/bin/bash
make clean
+#
+# The "big three" standard bootloaders.
+make atmega8
+make atmega168
+make atmega328
+#
+# additional buildable platforms of
+# somewhat questionable support level
make lilypad
make lilypad_resonator
make pro8
make pro16
make pro20
-make diecimila
-make atmega328
make atmega328_pro8
make sanguino
make mega
-make atmega8
make atmega88
make luminet
diff --git a/arduino/bootloaders/optiboot/optiboot.c b/arduino/bootloaders/optiboot/optiboot.c
index 3f4404d..d499d85 100644
--- a/arduino/bootloaders/optiboot/optiboot.c
+++ b/arduino/bootloaders/optiboot/optiboot.c
@@ -132,6 +132,9 @@
/**********************************************************/
/* Edit History: */
/* */
+/* 4.4 WestfW: add initialization of address to keep */
+/* the compiler happy. Change SC'ed targets. */
+/* Return the SW version via READ PARAM */
/* 4.3 WestfW: catch framing errors in getch(), so that */
/* AVRISP works without HW kludges. */
/* http://code.google.com/p/arduino/issues/detail?id=368n*/
@@ -141,7 +144,7 @@
/**********************************************************/
#define OPTIBOOT_MAJVER 4
-#define OPTIBOOT_MINVER 3
+#define OPTIBOOT_MINVER 4
#define MAKESTR(a) #a
#define MAKEVER(a, b) MAKESTR(a*256+b)
@@ -261,8 +264,10 @@ int main(void) {
/*
* Making these local and in registers prevents the need for initializing
* them, and also saves space because code no longer stores to memory.
+ * (initializing address keeps the compiler happy, but isn't really
+ * necessary, and uses 4 bytes of flash.)
*/
- register uint16_t address;
+ register uint16_t address = 0;
register uint8_t length;
// After the zero init loop, this is the first code to run.
@@ -324,9 +329,22 @@ int main(void) {
ch = getch();
if(ch == STK_GET_PARAMETER) {
- // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
- getNch(1);
- putch(0x03);
+ unsigned char which = getch();
+ verifySpace();
+ if (which == 0x82) {
+ /*
+ * Send optiboot version as "minor SW version"
+ */
+ putch(OPTIBOOT_MINVER);
+ } else if (which == 0x81) {
+ putch(OPTIBOOT_MAJVER);
+ } else {
+ /*
+ * GET PARAMETER returns a generic 0x03 reply for
+ * other parameters - enough to keep Avrdude happy
+ */
+ putch(0x03);
+ }
}
else if(ch == STK_SET_DEVICE) {
// SET DEVICE is ignored
diff --git a/arduino/bootloaders/optiboot/optiboot_atmega328.hex b/arduino/bootloaders/optiboot/optiboot_atmega328.hex
index f147e81..a219f08 100644
--- a/arduino/bootloaders/optiboot/optiboot_atmega328.hex
+++ b/arduino/bootloaders/optiboot/optiboot_atmega328.hex
@@ -1,34 +1,35 @@
-:107E0000112484B714BE81FFE7D085E08093810000
+:107E0000112484B714BE81FFF0D085E080938100F7
:107E100082E08093C00088E18093C10086E0809377
-:107E2000C20080E18093C4008EE0C0D0259A86E035
+:107E2000C20080E18093C4008EE0C9D0259A86E02C
:107E300020E33CEF91E0309385002093840096BBD3
-:107E4000B09BFECF1D9AA8958150A9F799249394D1
-:107E5000A5E0AA2EF1E1BF2E9DD0813421F481E06E
-:107E6000B3D083E01FC0823411F484E103C08534B1
-:107E700019F485E0A9D083C0853579F48BD0E82E3C
-:107E8000FF2488D0082F10E0102F00270E291F296B
-:107E9000000F111F91D0680172C0863529F484E06B
-:107EA00093D080E06FD06BC0843609F042C072D0AE
-:107EB00071D0082F6FD080E0C81680E7D80620F474
-:107EC00083E0F60187BFE895C0E0D1E063D08993F5
-:107ED0000C17E1F7F0E0CF16F0E7DF0620F083E0C3
-:107EE000F60187BFE89568D007B600FCFDCFA60174
-:107EF000A0E0B1E02C9130E011968C91119790E0C8
-:107F0000982F8827822B932B1296FA010C0197BE8B
-:107F1000E89511244E5F5F4FF1E0A038BF0751F79D
-:107F2000F601A7BEE89507B600FCFDCFB7BEE89501
-:107F300026C08437B1F42ED02DD0F82E2BD03CD0D3
-:107F4000F601EF2C8F010F5F1F4F84911BD0EA9435
-:107F5000F801C1F70894C11CD11CFA94CF0CD11CB4
-:107F60000EC0853739F428D08EE10CD085E90AD0CF
-:107F70008FE098CF813511F488E018D01DD080E1D2
-:107F800001D06ACF982F8091C00085FFFCCF9093DD
-:107F9000C60008958091C00087FFFCCF8091C0008B
-:107FA00084FD01C0A8958091C6000895E0E6F0E048
-:107FB00098E1908380830895EDDF803219F088E0A6
-:107FC000F5DFFFCF84E1DECF1F93182FE3DF1150E1
-:107FD000E9F7F2DF1F91089580E0E8DFEE27FF2741
-:027FE000099402
-:027FFE0003047A
+:107E4000B09BFECF1D9AA8958150A9F7CC24DD24C4
+:107E500088248394B5E0AB2EA1E19A2EF3E0BF2EE7
+:107E6000A2D0813461F49FD0082FAFD0023811F036
+:107E7000013811F484E001C083E08DD089C08234E0
+:107E800011F484E103C0853419F485E0A6D080C0E4
+:107E9000853579F488D0E82EFF2485D0082F10E0AE
+:107EA000102F00270E291F29000F111F8ED06801E7
+:107EB0006FC0863521F484E090D080E0DECF843638
+:107EC00009F040C070D06FD0082F6DD080E0C81688
+:107ED00080E7D80618F4F601B7BEE895C0E0D1E017
+:107EE00062D089930C17E1F7F0E0CF16F0E7DF06D8
+:107EF00018F0F601B7BEE89568D007B600FCFDCFD4
+:107F0000A601A0E0B1E02C9130E011968C91119780
+:107F100090E0982F8827822B932B1296FA010C0160
+:107F200087BEE89511244E5F5F4FF1E0A038BF0790
+:107F300051F7F601A7BEE89507B600FCFDCF97BE46
+:107F4000E89526C08437B1F42ED02DD0F82E2BD052
+:107F50003CD0F601EF2C8F010F5F1F4F84911BD097
+:107F6000EA94F801C1F70894C11CD11CFA94CF0C13
+:107F7000D11C0EC0853739F428D08EE10CD085E9AC
+:107F80000AD08FE07ACF813511F488E018D01DD067
+:107F900080E101D065CF982F8091C00085FFFCCF94
+:107FA0009093C60008958091C00087FFFCCF809118
+:107FB000C00084FD01C0A8958091C6000895E0E648
+:107FC000F0E098E1908380830895EDDF803219F02E
+:107FD00088E0F5DFFFCF84E1DECF1F93182FE3DFCA
+:107FE0001150E9F7F2DF1F91089580E0E8DFEE27F6
+:047FF000FF270994CA
+:027FFE00040479
:0400000300007E007B
:00000001FF
diff --git a/arduino/bootloaders/optiboot/optiboot_atmega328.lst b/arduino/bootloaders/optiboot/optiboot_atmega328.lst
index db45462..d9dd4cc 100644
--- a/arduino/bootloaders/optiboot/optiboot_atmega328.lst
+++ b/arduino/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 000001e2 00007e00 00007e00 00000054 2**1
+ 0 .text 000001f4 00007e00 00007e00 00000054 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 .version 00000002 00007ffe 00007ffe 00000236 2**0
+ 1 .version 00000002 00007ffe 00007ffe 00000248 2**0
CONTENTS, READONLY
- 2 .debug_aranges 00000028 00000000 00000000 00000238 2**0
+ 2 .debug_aranges 00000028 00000000 00000000 0000024a 2**0
CONTENTS, READONLY, DEBUGGING
- 3 .debug_pubnames 0000005f 00000000 00000000 00000260 2**0
+ 3 .debug_pubnames 0000005f 00000000 00000000 00000272 2**0
CONTENTS, READONLY, DEBUGGING
- 4 .debug_info 0000028e 00000000 00000000 000002bf 2**0
+ 4 .debug_info 000002a8 00000000 00000000 000002d1 2**0
CONTENTS, READONLY, DEBUGGING
- 5 .debug_abbrev 00000171 00000000 00000000 0000054d 2**0
+ 5 .debug_abbrev 00000178 00000000 00000000 00000579 2**0
CONTENTS, READONLY, DEBUGGING
- 6 .debug_line 0000045e 00000000 00000000 000006be 2**0
+ 6 .debug_line 00000488 00000000 00000000 000006f1 2**0
CONTENTS, READONLY, DEBUGGING
- 7 .debug_frame 00000080 00000000 00000000 00000b1c 2**2
+ 7 .debug_frame 00000080 00000000 00000000 00000b7c 2**2
CONTENTS, READONLY, DEBUGGING
- 8 .debug_str 00000149 00000000 00000000 00000b9c 2**0
+ 8 .debug_str 0000014f 00000000 00000000 00000bfc 2**0
CONTENTS, READONLY, DEBUGGING
- 9 .debug_loc 0000027e 00000000 00000000 00000ce5 2**0
+ 9 .debug_loc 000002d8 00000000 00000000 00000d4b 2**0
CONTENTS, READONLY, DEBUGGING
- 10 .debug_ranges 00000060 00000000 00000000 00000f63 2**0
+ 10 .debug_ranges 00000078 00000000 00000000 00001023 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: e7 d0 rcall .+462 ; 0x7fd8 <appStart>
+ 7e08: f0 d0 rcall .+480 ; 0x7fea <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: c0 d0 rcall .+384 ; 0x7fac <watchdogConfig>
+ 7e2a: c9 d0 rcall .+402 ; 0x7fbe <watchdogConfig>
/* Set LED pin as output */
LED_DDR |= _BV(LED);
@@ -126,446 +126,473 @@ void watchdogReset() {
} while (--count);
7e48: 81 50 subi r24, 0x01 ; 1
7e4a: a9 f7 brne .-22 ; 0x7e36 <main+0x36>
- /* get character from UART */
- ch = getch();
-
- if(ch == STK_GET_PARAMETER) {
- // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
- getNch(1);
- 7e4c: 99 24 eor r9, r9
- 7e4e: 93 94 inc r9
+ 7e4c: cc 24 eor r12, r12
+ 7e4e: dd 24 eor r13, r13
+ ch = SPM_PAGESIZE / 2;
+ do {
+ uint16_t a;
+ a = *bufPtr++;
+ a |= (*bufPtr++) << 8;
__boot_page_fill_short((uint16_t)(void*)addrPtr,a);
+ 7e50: 88 24 eor r8, r8
+ 7e52: 83 94 inc r8
addrPtr += 2;
} while (--ch);
// Write from programming buffer
__boot_page_write_short((uint16_t)(void*)address);
- 7e50: a5 e0 ldi r26, 0x05 ; 5
- 7e52: aa 2e mov r10, r26
+ 7e54: b5 e0 ldi r27, 0x05 ; 5
+ 7e56: ab 2e mov r10, r27
boot_spm_busy_wait();
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
- 7e54: f1 e1 ldi r31, 0x11 ; 17
- 7e56: bf 2e mov r11, r31
+ 7e58: a1 e1 ldi r26, 0x11 ; 17
+ 7e5a: 9a 2e mov r9, r26
+ do *bufPtr++ = getch();
+ while (--length);
+
+ // 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);
+ 7e5c: f3 e0 ldi r31, 0x03 ; 3
+ 7e5e: bf 2e mov r11, r31
#endif
/* Forever loop */
for (;;) {
/* get character from UART */
ch = getch();
- 7e58: 9d d0 rcall .+314 ; 0x7f94 <getch>
+ 7e60: a2 d0 rcall .+324 ; 0x7fa6 <getch>
if(ch == STK_GET_PARAMETER) {
- 7e5a: 81 34 cpi r24, 0x41 ; 65
- 7e5c: 21 f4 brne .+8 ; 0x7e66 <main+0x66>
- // GET PARAMETER returns a generic 0x03 reply - enough to keep Avrdude happy
- getNch(1);
- 7e5e: 81 e0 ldi r24, 0x01 ; 1
- 7e60: b3 d0 rcall .+358 ; 0x7fc8 <getNch>
- putch(0x03);
- 7e62: 83 e0 ldi r24, 0x03 ; 3
- 7e64: 1f c0 rjmp .+62 ; 0x7ea4 <main+0xa4>
+ 7e62: 81 34 cpi r24, 0x41 ; 65
+ 7e64: 61 f4 brne .+24 ; 0x7e7e <main+0x7e>
+ unsigned char which = getch();
+ 7e66: 9f d0 rcall .+318 ; 0x7fa6 <getch>
+ 7e68: 08 2f mov r16, r24
+ verifySpace();
+ 7e6a: af d0 rcall .+350 ; 0x7fca <verifySpace>
+ if (which == 0x82) {
+ 7e6c: 02 38 cpi r16, 0x82 ; 130
+ 7e6e: 11 f0 breq .+4 ; 0x7e74 <main+0x74>
+ /*
+ * Send optiboot version as "minor SW version"
+ */
+ putch(OPTIBOOT_MINVER);
+ } else if (which == 0x81) {
+ 7e70: 01 38 cpi r16, 0x81 ; 129
+ 7e72: 11 f4 brne .+4 ; 0x7e78 <main+0x78>
+ putch(OPTIBOOT_MAJVER);
+ 7e74: 84 e0 ldi r24, 0x04 ; 4
+ 7e76: 01 c0 rjmp .+2 ; 0x7e7a <main+0x7a>
+ } else {
+ /*
+ * GET PARAMETER returns a generic 0x03 reply for
+ * other parameters - enough to keep Avrdude happy
+ */
+ putch(0x03);
+ 7e78: 83 e0 ldi r24, 0x03 ; 3
+ 7e7a: 8d d0 rcall .+282 ; 0x7f96 <putch>
+ 7e7c: 89 c0 rjmp .+274 ; 0x7f90 <main+0x190>
+ }
}
else if(ch == STK_SET_DEVICE) {
- 7e66: 82 34 cpi r24, 0x42 ; 66
- 7e68: 11 f4 brne .+4 ; 0x7e6e <main+0x6e>
+ 7e7e: 82 34 cpi r24, 0x42 ; 66
+ 7e80: 11 f4 brne .+4 ; 0x7e86 <main+0x86>
// SET DEVICE is ignored
getNch(20);
- 7e6a: 84 e1 ldi r24, 0x14 ; 20
- 7e6c: 03 c0 rjmp .+6 ; 0x7e74 <main+0x74>
+ 7e82: 84 e1 ldi r24, 0x14 ; 20
+ 7e84: 03 c0 rjmp .+6 ; 0x7e8c <main+0x8c>
}
else if(ch == STK_SET_DEVICE_EXT) {
- 7e6e: 85 34 cpi r24, 0x45 ; 69
- 7e70: 19 f4 brne .+6 ; 0x7e78 <main+0x78>
+ 7e86: 85 34 cpi r24, 0x45 ; 69
+ 7e88: 19 f4 brne .+6 ; 0x7e90 <main+0x90>
// SET DEVICE EXT is ignored
getNch(5);
- 7e72: 85 e0 ldi r24, 0x05 ; 5
- 7e74: a9 d0 rcall .+338 ; 0x7fc8 <getNch>
- 7e76: 83 c0 rjmp .+262 ; 0x7f7e <main+0x17e>
+ 7e8a: 85 e0 ldi r24, 0x05 ; 5
+ 7e8c: a6 d0 rcall .+332 ; 0x7fda <getNch>
+ 7e8e: 80 c0 rjmp .+256 ; 0x7f90 <main+0x190>
}
else if(ch == STK_LOAD_ADDRESS) {
- 7e78: 85 35 cpi r24, 0x55 ; 85
- 7e7a: 79 f4 brne .+30 ; 0x7e9a <main+0x9a>
+ 7e90: 85 35 cpi r24, 0x55 ; 85
+ 7e92: 79 f4 brne .+30 ; 0x7eb2 <main+0xb2>
// LOAD ADDRESS
uint16_t newAddress;
newAddress = getch();
- 7e7c: 8b d0 rcall .+278 ; 0x7f94 <getch>
+ 7e94: 88 d0 rcall .+272 ; 0x7fa6 <getch>
newAddress = (newAddress & 0xff) | (getch() << 8);
- 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
+ 7e96: e8 2e mov r14, r24
+ 7e98: ff 24 eor r15, r15
+ 7e9a: 85 d0 rcall .+266 ; 0x7fa6 <getch>
+ 7e9c: 08 2f mov r16, r24
+ 7e9e: 10 e0 ldi r17, 0x00 ; 0
+ 7ea0: 10 2f mov r17, r16
+ 7ea2: 00 27 eor r16, r16
+ 7ea4: 0e 29 or r16, r14
+ 7ea6: 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
- 7e90: 00 0f add r16, r16
- 7e92: 11 1f adc r17, r17
+ 7ea8: 00 0f add r16, r16
+ 7eaa: 11 1f adc r17, r17
address = newAddress;
verifySpace();
- 7e94: 91 d0 rcall .+290 ; 0x7fb8 <verifySpace>
- 7e96: 68 01 movw r12, r16
- 7e98: 72 c0 rjmp .+228 ; 0x7f7e <main+0x17e>
+ 7eac: 8e d0 rcall .+284 ; 0x7fca <verifySpace>
+ 7eae: 68 01 movw r12, r16
+ 7eb0: 6f c0 rjmp .+222 ; 0x7f90 <main+0x190>
}
else if(ch == STK_UNIVERSAL) {
- 7e9a: 86 35 cpi r24, 0x56 ; 86
- 7e9c: 29 f4 brne .+10 ; 0x7ea8 <main+0xa8>
+ 7eb2: 86 35 cpi r24, 0x56 ; 86
+ 7eb4: 21 f4 brne .+8 ; 0x7ebe <main+0xbe>
// UNIVERSAL command is ignored
getNch(4);
- 7e9e: 84 e0 ldi r24, 0x04 ; 4
- 7ea0: 93 d0 rcall .+294 ; 0x7fc8 <getNch>
+ 7eb6: 84 e0 ldi r24, 0x04 ; 4
+ 7eb8: 90 d0 rcall .+288 ; 0x7fda <getNch>
putch(0x00);
- 7ea2: 80 e0 ldi r24, 0x00 ; 0
- 7ea4: 6f d0 rcall .+222 ; 0x7f84 <putch>
- 7ea6: 6b c0 rjmp .+214 ; 0x7f7e <main+0x17e>
+ 7eba: 80 e0 ldi r24, 0x00 ; 0
+ 7ebc: de cf rjmp .-68 ; 0x7e7a <main+0x7a>
}
/* Write memory, length is big endian and is in bytes */
else if(ch == STK_PROG_PAGE) {
- 7ea8: 84 36 cpi r24, 0x64 ; 100
- 7eaa: 09 f0 breq .+2 ; 0x7eae <main+0xae>
- 7eac: 42 c0 rjmp .+132 ; 0x7f32 <main+0x132>
+ 7ebe: 84 36 cpi r24, 0x64 ; 100
+ 7ec0: 09 f0 breq .+2 ; 0x7ec4 <main+0xc4>
+ 7ec2: 40 c0 rjmp .+128 ; 0x7f44 <main+0x144>
// PROGRAM PAGE - we support flash programming only, not EEPROM
uint8_t *bufPtr;
uint16_t addrPtr;
getch(); /* getlen() */
- 7eae: 72 d0 rcall .+228 ; 0x7f94 <getch>
+ 7ec4: 70 d0 rcall .+224 ; 0x7fa6 <getch>
length = getch();
- 7eb0: 71 d0 rcall .+226 ; 0x7f94 <getch>
- 7eb2: 08 2f mov r16, r24
+ 7ec6: 6f d0 rcall .+222 ; 0x7fa6 <getch>
+ 7ec8: 08 2f mov r16, r24
getch();
- 7eb4: 6f d0 rcall .+222 ; 0x7f94 <getch>
+ 7eca: 6d d0 rcall .+218 ; 0x7fa6 <getch>
// If we are in RWW section, immediately start page erase
if (address < NRWWSTART) __boot_page_erase_short((uint16_t)(void*)address);
- 7eb6: 80 e0 ldi r24, 0x00 ; 0
- 7eb8: c8 16 cp r12, r24
- 7eba: 80 e7 ldi r24, 0x70 ; 112
- 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
- 7eca: d1 e0 ldi r29, 0x01 ; 1
+ 7ecc: 80 e0 ldi r24, 0x00 ; 0
+ 7ece: c8 16 cp r12, r24
+ 7ed0: 80 e7 ldi r24, 0x70 ; 112
+ 7ed2: d8 06 cpc r13, r24
+ 7ed4: 18 f4 brcc .+6 ; 0x7edc <main+0xdc>
+ 7ed6: f6 01 movw r30, r12
+ 7ed8: b7 be out 0x37, r11 ; 55
+ 7eda: e8 95 spm
+ 7edc: c0 e0 ldi r28, 0x00 ; 0
+ 7ede: d1 e0 ldi r29, 0x01 ; 1
// While that is going on, read in page contents
bufPtr = buff;
do *bufPtr++ = getch();
- 7ecc: 63 d0 rcall .+198 ; 0x7f94 <getch>
- 7ece: 89 93 st Y+, r24
+ 7ee0: 62 d0 rcall .+196 ; 0x7fa6 <getch>
+ 7ee2: 89 93 st Y+, r24
while (--length);
- 7ed0: 0c 17 cp r16, r28
- 7ed2: e1 f7 brne .-8 ; 0x7ecc <main+0xcc>
+ 7ee4: 0c 17 cp r16, r28
+ 7ee6: e1 f7 brne .-8 ; 0x7ee0 <main+0xe0>
// 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);
- 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
+ 7ee8: f0 e0 ldi r31, 0x00 ; 0
+ 7eea: cf 16 cp r12, r31
+ 7eec: f0 e7 ldi r31, 0x70 ; 112
+ 7eee: df 06 cpc r13, r31
+ 7ef0: 18 f0 brcs .+6 ; 0x7ef8 <main+0xf8>
+ 7ef2: f6 01 movw r30, r12
+ 7ef4: b7 be out 0x37, r11 ; 55
+ 7ef6: e8 95 spm
// Read command terminator, start reply
verifySpace();
- 7ee6: 68 d0 rcall .+208 ; 0x7fb8 <verifySpace>
+ 7ef8: 68 d0 rcall .+208 ; 0x7fca <verifySpace>
// If only a partial page is to be programmed, the erase might not be complete.
// So check that here
boot_spm_busy_wait();
- 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
+ 7efa: 07 b6 in r0, 0x37 ; 55
+ 7efc: 00 fc sbrc r0, 0
+ 7efe: fd cf rjmp .-6 ; 0x7efa <main+0xfa>
+ 7f00: a6 01 movw r20, r12
+ 7f02: a0 e0 ldi r26, 0x00 ; 0
+ 7f04: b1 e0 ldi r27, 0x01 ; 1
bufPtr = buff;
addrPtr = (uint16_t)(void*)address;
ch = SPM_PAGESIZE / 2;
do {
uint16_t a;
a = *bufPtr++;
- 7ef4: 2c 91 ld r18, X
- 7ef6: 30 e0 ldi r19, 0x00 ; 0
+ 7f06: 2c 91 ld r18, X
+ 7f08: 30 e0 ldi r19, 0x00 ; 0
a |= (*bufPtr++) << 8;
- 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
+ 7f0a: 11 96 adiw r26, 0x01 ; 1
+ 7f0c: 8c 91 ld r24, X
+ 7f0e: 11 97 sbiw r26, 0x01 ; 1
+ 7f10: 90 e0 ldi r25, 0x00 ; 0
+ 7f12: 98 2f mov r25, r24
+ 7f14: 88 27 eor r24, r24
+ 7f16: 82 2b or r24, r18
+ 7f18: 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) {
- 7f08: 12 96 adiw r26, 0x02 ; 2
+ 7f1a: 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);
- 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
+ 7f1c: fa 01 movw r30, r20
+ 7f1e: 0c 01 movw r0, r24
+ 7f20: 87 be out 0x37, r8 ; 55
+ 7f22: e8 95 spm
+ 7f24: 11 24 eor r1, r1
addrPtr += 2;
- 7f14: 4e 5f subi r20, 0xFE ; 254
- 7f16: 5f 4f sbci r21, 0xFF ; 255
+ 7f26: 4e 5f subi r20, 0xFE ; 254
+ 7f28: 5f 4f sbci r21, 0xFF ; 255
} while (--ch);
- 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>
+ 7f2a: f1 e0 ldi r31, 0x01 ; 1
+ 7f2c: a0 38 cpi r26, 0x80 ; 128
+ 7f2e: bf 07 cpc r27, r31
+ 7f30: 51 f7 brne .-44 ; 0x7f06 <main+0x106>
// Write from programming buffer
__boot_page_write_short((uint16_t)(void*)address);
- 7f20: f6 01 movw r30, r12
- 7f22: a7 be out 0x37, r10 ; 55
- 7f24: e8 95 spm
+ 7f32: f6 01 movw r30, r12
+ 7f34: a7 be out 0x37, r10 ; 55
+ 7f36: e8 95 spm
boot_spm_busy_wait();
- 7f26: 07 b6 in r0, 0x37 ; 55
- 7f28: 00 fc sbrc r0, 0
- 7f2a: fd cf rjmp .-6 ; 0x7f26 <main+0x126>
+ 7f38: 07 b6 in r0, 0x37 ; 55
+ 7f3a: 00 fc sbrc r0, 0
+ 7f3c: fd cf rjmp .-6 ; 0x7f38 <main+0x138>
#if defined(RWWSRE)
// Reenable read access to flash
boot_rww_enable();
- 7f2c: b7 be out 0x37, r11 ; 55
- 7f2e: e8 95 spm
- 7f30: 26 c0 rjmp .+76 ; 0x7f7e <main+0x17e>
+ 7f3e: 97 be out 0x37, r9 ; 55
+ 7f40: e8 95 spm
+ 7f42: 26 c0 rjmp .+76 ; 0x7f90 <main+0x190>
#endif
}
/* Read memory block mode, length is big endian. */
else if(ch == STK_READ_PAGE) {
- 7f32: 84 37 cpi r24, 0x74 ; 116
- 7f34: b1 f4 brne .+44 ; 0x7f62 <main+0x162>
+ 7f44: 84 37 cpi r24, 0x74 ; 116
+ 7f46: b1 f4 brne .+44 ; 0x7f74 <main+0x174>
// READ PAGE - we only read flash
getch(); /* getlen() */
- 7f36: 2e d0 rcall .+92 ; 0x7f94 <getch>
+ 7f48: 2e d0 rcall .+92 ; 0x7fa6 <getch>
length = getch();
- 7f38: 2d d0 rcall .+90 ; 0x7f94 <getch>
- 7f3a: f8 2e mov r15, r24
+ 7f4a: 2d d0 rcall .+90 ; 0x7fa6 <getch>
+ 7f4c: f8 2e mov r15, r24
getch();
- 7f3c: 2b d0 rcall .+86 ; 0x7f94 <getch>
+ 7f4e: 2b d0 rcall .+86 ; 0x7fa6 <getch>
verifySpace();
- 7f3e: 3c d0 rcall .+120 ; 0x7fb8 <verifySpace>
- 7f40: f6 01 movw r30, r12
- 7f42: ef 2c mov r14, r15
+ 7f50: 3c d0 rcall .+120 ; 0x7fca <verifySpace>
+ 7f52: f6 01 movw r30, r12
+ 7f54: ef 2c mov r14, r15
putch(result);
address++;
}
while (--length);
#else
do putch(pgm_read_byte_near(address++));
- 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>
+ 7f56: 8f 01 movw r16, r30
+ 7f58: 0f 5f subi r16, 0xFF ; 255
+ 7f5a: 1f 4f sbci r17, 0xFF ; 255
+ 7f5c: 84 91 lpm r24, Z+
+ 7f5e: 1b d0 rcall .+54 ; 0x7f96 <putch>
while (--length);
- 7f4e: ea 94 dec r14
- 7f50: f8 01 movw r30, r16
- 7f52: c1 f7 brne .-16 ; 0x7f44 <main+0x144>
+ 7f60: ea 94 dec r14
+ 7f62: f8 01 movw r30, r16
+ 7f64: c1 f7 brne .-16 ; 0x7f56 <main+0x156>
#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>
+ 7f66: 08 94 sec
+ 7f68: c1 1c adc r12, r1
+ 7f6a: d1 1c adc r13, r1
+ 7f6c: fa 94 dec r15
+ 7f6e: cf 0c add r12, r15
+ 7f70: d1 1c adc r13, r1
+ 7f72: 0e c0 rjmp .+28 ; 0x7f90 <main+0x190>
#endif
#endif
}
/* Get device signature bytes */
else if(ch == STK_READ_SIGN) {
- 7f62: 85 37 cpi r24, 0x75 ; 117
- 7f64: 39 f4 brne .+14 ; 0x7f74 <main+0x174>
+ 7f74: 85 37 cpi r24, 0x75 ; 117
+ 7f76: 39 f4 brne .+14 ; 0x7f86 <main+0x186>
// READ SIGN - return what Avrdude wants to hear
verifySpace();
- 7f66: 28 d0 rcall .+80 ; 0x7fb8 <verifySpace>
+ 7f78: 28 d0 rcall .+80 ; 0x7fca <verifySpace>
putch(SIGNATURE_0);
- 7f68: 8e e1 ldi r24, 0x1E ; 30
- 7f6a: 0c d0 rcall .+24 ; 0x7f84 <putch>
+ 7f7a: 8e e1 ldi r24, 0x1E ; 30
+ 7f7c: 0c d0 rcall .+24 ; 0x7f96 <putch>
putch(SIGNATURE_1);
- 7f6c: 85 e9 ldi r24, 0x95 ; 149
- 7f6e: 0a d0 rcall .+20 ; 0x7f84 <putch>
+ 7f7e: 85 e9 ldi r24, 0x95 ; 149
+ 7f80: 0a d0 rcall .+20 ; 0x7f96 <putch>
putch(SIGNATURE_2);
- 7f70: 8f e0 ldi r24, 0x0F ; 15
- 7f72: 98 cf rjmp .-208 ; 0x7ea4 <main+0xa4>
+ 7f82: 8f e0 ldi r24, 0x0F ; 15
+ 7f84: 7a cf rjmp .-268 ; 0x7e7a <main+0x7a>
}
else if (ch == 'Q') {
- 7f74: 81 35 cpi r24, 0x51 ; 81
- 7f76: 11 f4 brne .+4 ; 0x7f7c <main+0x17c>
+ 7f86: 81 35 cpi r24, 0x51 ; 81
+ 7f88: 11 f4 brne .+4 ; 0x7f8e <main+0x18e>
// Adaboot no-wait mod
watchdogConfig(WATCHDOG_16MS);
- 7f78: 88 e0 ldi r24, 0x08 ; 8
- 7f7a: 18 d0 rcall .+48 ; 0x7fac <watchdogConfig>
+ 7f8a: 88 e0 ldi r24, 0x08 ; 8
+ 7f8c: 18 d0 rcall .+48 ; 0x7fbe <watchdogConfig>
verifySpace();
}
else {
// This covers the response to commands like STK_ENTER_PROGMODE
verifySpace();
- 7f7c: 1d d0 rcall .+58 ; 0x7fb8 <verifySpace>
+ 7f8e: 1d d0 rcall .+58 ; 0x7fca <verifySpace>
}
putch(STK_OK);
- 7f7e: 80 e1 ldi r24, 0x10 ; 16
- 7f80: 01 d0 rcall .+2 ; 0x7f84 <putch>
- 7f82: 6a cf rjmp .-300 ; 0x7e58 <main+0x58>
+ 7f90: 80 e1 ldi r24, 0x10 ; 16
+ 7f92: 01 d0 rcall .+2 ; 0x7f96 <putch>
+ 7f94: 65 cf rjmp .-310 ; 0x7e60 <main+0x60>
-00007f84 <putch>:
+00007f96 <putch>:
}
}
void putch(char ch) {
- 7f84: 98 2f mov r25, r24
+ 7f96: 98 2f mov r25, r24
#ifndef SOFT_UART
while (!(UCSR0A & _BV(UDRE0)));
- 7f86: 80 91 c0 00 lds r24, 0x00C0
- 7f8a: 85 ff sbrs r24, 5
- 7f8c: fc cf rjmp .-8 ; 0x7f86 <putch+0x2>
+ 7f98: 80 91 c0 00 lds r24, 0x00C0
+ 7f9c: 85 ff sbrs r24, 5
+ 7f9e: fc cf rjmp .-8 ; 0x7f98 <putch+0x2>
UDR0 = ch;
- 7f8e: 90 93 c6 00 sts 0x00C6, r25
+ 7fa0: 90 93 c6 00 sts 0x00C6, r25
[uartBit] "I" (UART_TX_BIT)
:
"r25"
);
#endif
}
- 7f92: 08 95 ret
+ 7fa4: 08 95 ret
-00007f94 <getch>:
+00007fa6 <getch>:
[uartBit] "I" (UART_RX_BIT)
:
"r25"
);
#else
while(!(UCSR0A & _BV(RXC0)))
- 7f94: 80 91 c0 00 lds r24, 0x00C0
- 7f98: 87 ff sbrs r24, 7
- 7f9a: fc cf rjmp .-8 ; 0x7f94 <getch>
+ 7fa6: 80 91 c0 00 lds r24, 0x00C0
+ 7faa: 87 ff sbrs r24, 7
+ 7fac: fc cf rjmp .-8 ; 0x7fa6 <getch>
;
if (!(UCSR0A & _BV(FE0))) {
- 7f9c: 80 91 c0 00 lds r24, 0x00C0
- 7fa0: 84 fd sbrc r24, 4
- 7fa2: 01 c0 rjmp .+2 ; 0x7fa6 <getch+0x12>
+ 7fae: 80 91 c0 00 lds r24, 0x00C0
+ 7fb2: 84 fd sbrc r24, 4
+ 7fb4: 01 c0 rjmp .+2 ; 0x7fb8 <getch+0x12>
}
#endif
// Watchdog functions. These are only safe with interrupts turned off.
void watchdogReset() {
__asm__ __volatile__ (
- 7fa4: a8 95 wdr
+ 7fb6: a8 95 wdr
* don't care that an invalid char is returned...)
*/
watchdogReset();
}
ch = UDR0;
- 7fa6: 80 91 c6 00 lds r24, 0x00C6
+ 7fb8: 80 91 c6 00 lds r24, 0x00C6
LED_PIN |= _BV(LED);
#endif
#endif
return ch;
}
- 7faa: 08 95 ret
+ 7fbc: 08 95 ret
-00007fac <watchdogConfig>:
+00007fbe <watchdogConfig>:
"wdr\n"
);
}
void watchdogConfig(uint8_t x) {
WDTCSR = _BV(WDCE) | _BV(WDE);
- 7fac: e0 e6 ldi r30, 0x60 ; 96
- 7fae: f0 e0 ldi r31, 0x00 ; 0
- 7fb0: 98 e1 ldi r25, 0x18 ; 24
- 7fb2: 90 83 st Z, r25
+ 7fbe: e0 e6 ldi r30, 0x60 ; 96
+ 7fc0: f0 e0 ldi r31, 0x00 ; 0
+ 7fc2: 98 e1 ldi r25, 0x18 ; 24
+ 7fc4: 90 83 st Z, r25
WDTCSR = x;
- 7fb4: 80 83 st Z, r24
+ 7fc6: 80 83 st Z, r24
}
- 7fb6: 08 95 ret
+ 7fc8: 08 95 ret
-00007fb8 <verifySpace>:
+00007fca <verifySpace>:
do getch(); while (--count);
verifySpace();
}
void verifySpace() {
if (getch() != CRC_EOP) {
- 7fb8: ed df rcall .-38 ; 0x7f94 <getch>
- 7fba: 80 32 cpi r24, 0x20 ; 32
- 7fbc: 19 f0 breq .+6 ; 0x7fc4 <verifySpace+0xc>
+ 7fca: ed df rcall .-38 ; 0x7fa6 <getch>
+ 7fcc: 80 32 cpi r24, 0x20 ; 32
+ 7fce: 19 f0 breq .+6 ; 0x7fd6 <verifySpace+0xc>
watchdogConfig(WATCHDOG_16MS); // shorten WD timeout
- 7fbe: 88 e0 ldi r24, 0x08 ; 8
- 7fc0: f5 df rcall .-22 ; 0x7fac <watchdogConfig>
- 7fc2: ff cf rjmp .-2 ; 0x7fc2 <verifySpace+0xa>
+ 7fd0: 88 e0 ldi r24, 0x08 ; 8
+ 7fd2: f5 df rcall .-22 ; 0x7fbe <watchdogConfig>
+ 7fd4: ff cf rjmp .-2 ; 0x7fd4 <verifySpace+0xa>
while (1) // and busy-loop so that WD causes
; // a reset and app start.
}
putch(STK_INSYNC);
- 7fc4: 84 e1 ldi r24, 0x14 ; 20
+ 7fd6: 84 e1 ldi r24, 0x14 ; 20
}
- 7fc6: de cf rjmp .-68 ; 0x7f84 <putch>
+ 7fd8: de cf rjmp .-68 ; 0x7f96 <putch>
-00007fc8 <getNch>:
+00007fda <getNch>:
::[count] "M" (UART_B_VALUE)
);
}
#endif
void getNch(uint8_t count) {
- 7fc8: 1f 93 push r17
- 7fca: 18 2f mov r17, r24
+ 7fda: 1f 93 push r17
+ 7fdc: 18 2f mov r17, r24
do getch(); while (--count);
- 7fcc: e3 df rcall .-58 ; 0x7f94 <getch>
- 7fce: 11 50 subi r17, 0x01 ; 1
- 7fd0: e9 f7 brne .-6 ; 0x7fcc <getNch+0x4>
+ 7fde: e3 df rcall .-58 ; 0x7fa6 <getch>
+ 7fe0: 11 50 subi r17, 0x01 ; 1
+ 7fe2: e9 f7 brne .-6 ; 0x7fde <getNch+0x4>
verifySpace();
- 7fd2: f2 df rcall .-28 ; 0x7fb8 <verifySpace>
+ 7fe4: f2 df rcall .-28 ; 0x7fca <verifySpace>
}
- 7fd4: 1f 91 pop r17
- 7fd6: 08 95 ret
+ 7fe6: 1f 91 pop r17
+ 7fe8: 08 95 ret
-00007fd8 <appStart>:
+00007fea <appStart>:
WDTCSR = _BV(WDCE) | _BV(WDE);
WDTCSR = x;
}
void appStart() {
watchdogConfig(WATCHDOG_OFF);
- 7fd8: 80 e0 ldi r24, 0x00 ; 0
- 7fda: e8 df rcall .-48 ; 0x7fac <watchdogConfig>
+ 7fea: 80 e0 ldi r24, 0x00 ; 0
+ 7fec: e8 df rcall .-48 ; 0x7fbe <watchdogConfig>
__asm__ __volatile__ (
- 7fdc: ee 27 eor r30, r30
- 7fde: ff 27 eor r31, r31
- 7fe0: 09 94 ijmp
+ 7fee: ee 27 eor r30, r30
+ 7ff0: ff 27 eor r31, r31
+ 7ff2: 09 94 ijmp
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
