summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenna Fox <a@creativepony.com>2012-09-24 13:49:41 +1000
committerJenna Fox <a@creativepony.com>2012-09-24 13:49:41 +1000
commit1539320a76f6be5f14a426461b1999b5ce401001 (patch)
treef7f08f18d1f3942836663007d57a51a1a0a24344
parentab6db42bceb1e50bdc77c720109d5e9fbac4ff7d (diff)
downloadmicronucleus-1539320a76f6be5f14a426461b1999b5ce401001.tar.gz
micronucleus-1539320a76f6be5f14a426461b1999b5ce401001.tar.bz2
micronucleus-1539320a76f6be5f14a426461b1999b5ce401001.zip
Making progress fixing issue where it never properly erases first page
Diffstat
-rw-r--r--firmware/libs-device/osccal.c.lst20
-rwxr-xr-xfirmware/main.binbin8969 -> 8965 bytes
-rw-r--r--firmware/main.c26
-rw-r--r--firmware/main.c.lst583
-rw-r--r--firmware/main.hex48
-rw-r--r--firmware/main.map28
-rw-r--r--firmware/main.obin6024 -> 6004 bytes
-rw-r--r--firmware/temp-dump.binbin8192 -> 8188 bytes
-rw-r--r--firmware/upload.rb25
-rw-r--r--firmware/usbconfig.h3
-rw-r--r--firmware/usbdrv/oddebug.c.lst16
11 files changed, 389 insertions, 360 deletions
diff --git a/firmware/libs-device/osccal.c.lst b/firmware/libs-device/osccal.c.lst
index 6ce3b5d..91fc0a2 100644
--- a/firmware/libs-device/osccal.c.lst
+++ b/firmware/libs-device/osccal.c.lst
@@ -1,4 +1,4 @@
-GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s page 1
+GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s page 1
1 .file "osccal.c"
@@ -58,7 +58,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s page
55 0046 8C17 cp r24,r28
56 0048 9D07 cpc r25,r29
57 004a 04F4 brge .L6
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s page 2
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s page 2
58 004c 01B7 in r16,81-32
@@ -85,18 +85,18 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s page
79 0070 FF90 pop r15
80 0072 0895 ret
81 .size calibrateOscillator, .-calibrateOscillator
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s page 3
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s page 3
DEFINED SYMBOLS
*ABS*:00000000 osccal.c
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:2 *ABS*:0000003f __SREG__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:3 *ABS*:0000003e __SP_H__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:4 *ABS*:0000003d __SP_L__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:5 *ABS*:00000034 __CCP__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:6 *ABS*:00000000 __tmp_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:7 *ABS*:00000001 __zero_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cccllqfj.s:11 .text:00000000 calibrateOscillator
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:2 *ABS*:0000003f __SREG__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:3 *ABS*:0000003e __SP_H__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:4 *ABS*:0000003d __SP_L__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:5 *ABS*:00000034 __CCP__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:6 *ABS*:00000000 __tmp_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:7 *ABS*:00000001 __zero_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccKidBAm.s:11 .text:00000000 calibrateOscillator
UNDEFINED SYMBOLS
usbMeasureFrameLength
diff --git a/firmware/main.bin b/firmware/main.bin
index a5a6933..43378b0 100755
--- a/firmware/main.bin
+++ b/firmware/main.bin
Binary files differ
diff --git a/firmware/main.c b/firmware/main.c
index 84cc11e..34628c6 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -95,18 +95,32 @@ static addr_t currentAddress; /* in bytes */
/* ------------------------------------------------------------------------ */
+static inline void eraseApplication(void);
+static void writeFlashPage(void);
+static void writeWordToPageBuffer(uint16_t data);
+static void fillFlashWithVectors(void);
+static uchar usbFunctionSetup(uchar data[8]);
+static uchar usbFunctionWrite(uchar *data, uchar length);
+static inline void initForUsbConnectivity(void);
+static inline void tiny85FlashInit(void);
+static inline void tiny85FlashWrites(void);
+static inline __attribute__((noreturn)) void leaveBootloader(void);
+
static inline void eraseApplication(void) {
- // erase all pages starting from end of application section down to page 1 (leaving page 0)
- currentAddress = BOOTLOADER_ADDRESS - SPM_PAGESIZE;
+ // xxxxxx erase all pages starting from end of application section down to page 1 (leaving page 0)
+ // erase all pages (every last one!)
+ currentAddress = BOOTLOADER_ADDRESS;
+ cli();
while (currentAddress) {
- cli();
+ currentAddress -= SPM_PAGESIZE;
+
boot_page_erase(currentAddress);
boot_spm_busy_wait();
- sei();
-
- currentAddress -= SPM_PAGESIZE;
}
+
+ fillFlashWithVectors();
+ sei();
}
static void writeFlashPage(void) {
diff --git a/firmware/main.c.lst b/firmware/main.c.lst
index 376b81d..ad16cc5 100644
--- a/firmware/main.c.lst
+++ b/firmware/main.c.lst
@@ -1,4 +1,4 @@
-GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 1
+GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 1
1 .file "main.c"
@@ -18,7 +18,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
15 0000 81E0 ldi r24,lo8(1)
16 0002 8093 0000 sts didWriteSomething,r24
17 /* #APP */
- 18 ; 114 "main.c" 1
+ 18 ; 128 "main.c" 1
19 0006 F894 cli
20 ; 0 "" 2
21 /* #NOAPP */
@@ -27,7 +27,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
24 0010 3297 sbiw r30,2
25 0012 85E0 ldi r24,lo8(5)
26 /* #APP */
- 27 ; 115 "main.c" 1
+ 27 ; 129 "main.c" 1
28 0014 8093 5700 sts 87, r24
29 0018 E895 spm
30
@@ -38,7 +38,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
35 001c 00FC sbrc __tmp_reg__,0
36 001e 00C0 rjmp .L2
37 /* #APP */
- 38 ; 117 "main.c" 1
+ 38 ; 131 "main.c" 1
39 0020 7894 sei
40 ; 0 "" 2
41 /* epilogue start */
@@ -58,7 +58,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
55 0030 01F0 breq .L4
56 0032 2430 cpi r18,4
57 0034 3105 cpc r19,__zero_reg__
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 2
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 2
58 0036 01F0 breq .L8
@@ -86,7 +86,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
80 0066 9BEC ldi r25,hi8(-13441)
81 .L7:
82 /* #APP */
- 83 ; 151 "main.c" 1
+ 83 ; 165 "main.c" 1
84 0068 F894 cli
85 ; 0 "" 2
86 /* #NOAPP */
@@ -94,14 +94,14 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
88 006e F091 0000 lds r31,currentAddress+1
89 0072 21E0 ldi r18,lo8(1)
90 /* #APP */
- 91 ; 152 "main.c" 1
+ 91 ; 166 "main.c" 1
92 0074 0C01 movw r0, r24
93 0076 2093 5700 sts 87, r18
94 007a E895 spm
95 007c 1124 clr r1
96
97 ; 0 "" 2
- 98 ; 153 "main.c" 1
+ 98 ; 167 "main.c" 1
99 007e 7894 sei
100 ; 0 "" 2
101 /* #NOAPP */
@@ -115,10 +115,10 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
109 .L4:
110 0094 81E1 ldi r24,lo8(17)
111 /* #APP */
- 112 ; 149 "main.c" 1
+ 112 ; 163 "main.c" 1
113 0096 8093 5700 sts 87, r24
114 009a E895 spm
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 3
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 3
115
@@ -161,16 +161,16 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
152 /* stack size = 0 */
153 .L__stack_usage = 0
154 /* #APP */
- 155 ; 248 "main.c" 1
+ 155 ; 262 "main.c" 1
156 0000 00EB ldi r16, 0xB0
157 ; 0 "" 2
- 158 ; 249 "main.c" 1
+ 158 ; 263 "main.c" 1
159 0002 0F93 push r16
160 ; 0 "" 2
- 161 ; 250 "main.c" 1
+ 161 ; 264 "main.c" 1
162 0004 07E0 ldi r16, 0x07
163 ; 0 "" 2
- 164 ; 251 "main.c" 1
+ 164 ; 265 "main.c" 1
165 0006 0F93 push r16
166 ; 0 "" 2
167 /* epilogue start */
@@ -178,7 +178,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
169 .size PushMagicWord, .-PushMagicWord
170 .text
171 .global main
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 4
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 4
172 .type main, @function
@@ -194,7 +194,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
182 .L__stack_usage = 3
183 00ce 88E1 ldi r24,lo8(24)
184 /* #APP */
- 185 ; 316 "main.c" 1
+ 185 ; 330 "main.c" 1
186 00d0 0FB6 in __tmp_reg__, __SREG__
187 00d2 F894 cli
188 00d4 81BD out 33, r24
@@ -206,7 +206,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
194 00da E0E0 ldi r30,lo8(0)
195 00dc F0E0 ldi r31,hi8(0)
196 /* #APP */
- 197 ; 269 "main.c" 1
+ 197 ; 283 "main.c" 1
198 00de 8591 lpm r24, Z+
199 00e0 9491 lpm r25, Z
200
@@ -219,7 +219,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
207 00ea E4E0 ldi r30,lo8(4)
208 00ec F0E0 ldi r31,hi8(4)
209 /* #APP */
- 210 ; 270 "main.c" 1
+ 210 ; 284 "main.c" 1
211 00ee 8591 lpm r24, Z+
212 00f0 9491 lpm r25, Z
213
@@ -238,7 +238,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
226 0106 8BB7 in r24,91-32
227 0108 8062 ori r24,lo8(32)
228 010a 8BBF out 91-32,r24
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 5
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 5
229 010c BB9A sbi 55-32,3
@@ -253,7 +253,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
238 011e 0000 nop
239 0120 BB98 cbi 55-32,3
240 /* #APP */
- 241 ; 262 "main.c" 1
+ 241 ; 276 "main.c" 1
242 0122 7894 sei
243 ; 0 "" 2
244 /* #NOAPP */
@@ -291,14 +291,14 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
276 016c 01F0 breq .L18
277 016e 8823 tst r24
278 0170 01F4 brne .L19
- 279 0172 80E0 ldi r24,lo8(replyBuffer.1745)
- 280 0174 90E0 ldi r25,hi8(replyBuffer.1745)
+ 279 0172 80E0 ldi r24,lo8(replyBuffer.1766)
+ 280 0174 90E0 ldi r25,hi8(replyBuffer.1766)
281 0176 9093 0000 sts usbMsgPtr+1,r25
282 017a 8093 0000 sts usbMsgPtr,r24
283 017e 24E0 ldi r18,lo8(4)
284 0180 00C0 rjmp .L25
285 .L19:
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 6
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 6
286 0182 8130 cpi r24,lo8(1)
@@ -358,7 +358,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
340 01ee 9093 0000 sts usbMsgPtr+1,r25
341 01f2 8093 0000 sts usbMsgPtr,r24
342 01f6 22E1 ldi r18,lo8(18)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 7
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 7
343 01f8 00C0 rjmp .L31
@@ -418,7 +418,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
397 0262 00C0 rjmp .L76
398 .L72:
399 0264 80E0 ldi r24,lo8(usbTxBuf+9)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 8
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 8
400 0266 90E0 ldi r25,hi8(usbTxBuf+9)
@@ -478,14 +478,14 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
454 .L40:
455 02da F6E1 ldi r31,hi8(5882)
456 02dc 8A3F cpi r24,lo8(5882)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 9
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 9
457 02de 9F07 cpc r25,r31
458 02e0 00F0 brlo .L39
459 02e2 81E1 ldi r24,lo8(17)
460 /* #APP */
- 461 ; 225 "main.c" 1
+ 461 ; 239 "main.c" 1
462 02e4 8093 5700 sts 87, r24
463 02e8 E895 spm
464
@@ -538,7 +538,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
511 0350 9091 0000 lds r25,usbMsgFlags
512 0354 802F mov r24,r16
513 0356 8150 subi r24,lo8(-(-1))
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 10
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 10
514 0358 96FF sbrs r25,6
@@ -598,7 +598,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
568 03b2 9871 andi r25,lo8(24)
569 03b4 01F4 brne .L51
570 03b6 8150 subi r24,lo8(-(-1))
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 11
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 11
571 03b8 01F4 brne .L52
@@ -646,286 +646,285 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page
613 .L56:
614 03fc 80FF sbrs r24,0
615 03fe 00C0 rjmp .L57
- 616 0400 80EC ldi r24,lo8(5824)
- 617 0402 96E1 ldi r25,hi8(5824)
- 618 0404 00C0 rjmp .L78
- 619 .L60:
+ 616 0400 80E0 ldi r24,lo8(5888)
+ 617 0402 97E1 ldi r25,hi8(5888)
+ 618 0404 9093 0000 sts currentAddress+1,r25
+ 619 0408 8093 0000 sts currentAddress,r24
620 /* #APP */
- 621 ; 103 "main.c" 1
- 622 0406 F894 cli
+ 621 ; 114 "main.c" 1
+ 622 040c F894 cli
623 ; 0 "" 2
624 /* #NOAPP */
- 625 0408 E091 0000 lds r30,currentAddress
- 626 040c F091 0000 lds r31,currentAddress+1
- 627 0410 83E0 ldi r24,lo8(3)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 12
-
-
- 628 /* #APP */
- 629 ; 104 "main.c" 1
- 630 0412 8093 5700 sts 87, r24
- 631 0416 E895 spm
- 632
- 633 ; 0 "" 2
- 634 /* #NOAPP */
- 635 .L59:
- 636 0418 07B6 in __tmp_reg__,87-32
- 637 041a 00FC sbrc __tmp_reg__,0
- 638 041c 00C0 rjmp .L59
- 639 /* #APP */
- 640 ; 106 "main.c" 1
- 641 041e 7894 sei
- 642 ; 0 "" 2
- 643 /* #NOAPP */
- 644 0420 8091 0000 lds r24,currentAddress
- 645 0424 9091 0000 lds r25,currentAddress+1
- 646 0428 8054 subi r24,lo8(-(-64))
- 647 042a 9040 sbci r25,hi8(-(-64))
- 648 .L78:
- 649 042c 9093 0000 sts currentAddress+1,r25
- 650 0430 8093 0000 sts currentAddress,r24
- 651 0434 8091 0000 lds r24,currentAddress
- 652 0438 9091 0000 lds r25,currentAddress+1
- 653 043c 0097 sbiw r24,0
- 654 043e 01F4 brne .L60
- 655 .L57:
- 656 0440 8091 0000 lds r24,events
- 657 0444 81FF sbrs r24,1
- 658 0446 00C0 rjmp .L61
- 659 0448 A9E3 ldi r26,lo8(8249)
- 660 044a B0E2 ldi r27,hi8(8249)
- 661 044c 1197 1:sbiw r26,1
- 662 044e 01F4 brne 1b
- 663 0450 00C0 rjmp .
- 664 0452 0000 nop
- 665 0454 8091 0000 lds r24,currentAddress
- 666 0458 9091 0000 lds r25,currentAddress+1
- 667 045c 8F73 andi r24,lo8(63)
- 668 045e 9070 andi r25,hi8(63)
- 669 0460 0097 sbiw r24,0
- 670 0462 01F0 breq .L62
- 671 0464 00D0 rcall fillFlashWithVectors
- 672 0466 00C0 rjmp .L61
- 673 .L62:
- 674 0468 00D0 rcall writeFlashPage
- 675 .L61:
- 676 046a 8091 0000 lds r24,events
- 677 046e 82FD sbrc r24,2
- 678 0470 00C0 rjmp .L63
- 679 0472 B1E5 ldi r27,lo8(-15535)
- 680 0474 EB16 cp r14,r27
- 681 0476 B3EC ldi r27,hi8(-15535)
- 682 0478 FB06 cpc r15,r27
- 683 047a 00F0 brlo .L64
- 684 .L63:
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 13
-
-
- 685 047c E1E2 ldi r30,lo8(-24287)
- 686 047e F1EA ldi r31,hi8(-24287)
- 687 0480 3197 1:sbiw r30,1
- 688 0482 01F4 brne 1b
- 689 0484 00C0 rjmp .
- 690 0486 0000 nop
- 691 /* #APP */
- 692 ; 293 "main.c" 1
- 693 0488 F894 cli
- 694 ; 0 "" 2
- 695 /* #NOAPP */
- 696 048a 1BBE out 91-32,__zero_reg__
- 697 048c 15BA out 53-32,__zero_reg__
- 698 048e 8091 0000 lds r24,didWriteSomething
- 699 0492 8823 tst r24
- 700 0494 01F4 brne .L65
- 701 0496 00C0 rjmp .L66
- 702 .L67:
- 703 0498 00D0 rcall fillFlashWithVectors
- 704 .L65:
- 705 049a 8091 0000 lds r24,currentAddress
- 706 049e 9091 0000 lds r25,currentAddress+1
- 707 04a2 F7E1 ldi r31,hi8(5888)
- 708 04a4 8030 cpi r24,lo8(5888)
- 709 04a6 9F07 cpc r25,r31
- 710 04a8 00F0 brlo .L67
- 711 .L66:
- 712 04aa 1092 5F02 sts 607,__zero_reg__
- 713 04ae 1092 5E02 sts 606,__zero_reg__
- 714 /* #APP */
- 715 ; 309 "main.c" 1
- 716 04b2 00C0 rjmp __vectors - 4
- 717 ; 0 "" 2
- 718 /* #NOAPP */
- 719 .L64:
- 720 04b4 1092 0000 sts events,__zero_reg__
- 721 04b8 00C0 rjmp .L68
- 722 .size main, .-main
- 723 .global usbTxLen
- 724 .data
- 725 .type usbTxLen, @object
- 726 .size usbTxLen, 1
- 727 usbTxLen:
- 728 0000 5A .byte 90
- 729 .global usbDescriptorString0
- 730 .section .progmem.data,"a",@progbits
- 731 .type usbDescriptorString0, @object
- 732 .size usbDescriptorString0, 4
- 733 usbDescriptorString0:
- 734 0000 04 .byte 4
- 735 0001 03 .byte 3
- 736 0002 09 .byte 9
- 737 0003 04 .byte 4
- 738 .global usbDescriptorStringVendor
- 739 .type usbDescriptorStringVendor, @object
- 740 .size usbDescriptorStringVendor, 34
- 741 usbDescriptorStringVendor:
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 14
-
-
- 742 0004 2203 .word 802
- 743 0006 6300 .word 99
- 744 0008 7200 .word 114
- 745 000a 6500 .word 101
- 746 000c 6100 .word 97
- 747 000e 7400 .word 116
- 748 0010 6900 .word 105
- 749 0012 7600 .word 118
- 750 0014 6500 .word 101
- 751 0016 7000 .word 112
- 752 0018 6F00 .word 111
- 753 001a 6E00 .word 110
- 754 001c 7900 .word 121
- 755 001e 2E00 .word 46
- 756 0020 6300 .word 99
- 757 0022 6F00 .word 111
- 758 0024 6D00 .word 109
- 759 .global usbDescriptorStringDevice
- 760 .type usbDescriptorStringDevice, @object
- 761 .size usbDescriptorStringDevice, 12
- 762 usbDescriptorStringDevice:
- 763 0026 0C03 .word 780
- 764 0028 7500 .word 117
- 765 002a 4200 .word 66
- 766 002c 6F00 .word 111
- 767 002e 6F00 .word 111
- 768 0030 7400 .word 116
- 769 .global usbDescriptorDevice
- 770 .type usbDescriptorDevice, @object
- 771 .size usbDescriptorDevice, 18
- 772 usbDescriptorDevice:
- 773 0032 12 .byte 18
- 774 0033 01 .byte 1
- 775 0034 10 .byte 16
- 776 0035 01 .byte 1
- 777 0036 FF .byte -1
- 778 0037 00 .byte 0
- 779 0038 00 .byte 0
- 780 0039 08 .byte 8
- 781 003a C0 .byte -64
- 782 003b 16 .byte 22
- 783 003c DC .byte -36
- 784 003d 05 .byte 5
- 785 003e 01 .byte 1
- 786 003f 01 .byte 1
- 787 0040 01 .byte 1
- 788 0041 02 .byte 2
- 789 0042 00 .byte 0
- 790 0043 01 .byte 1
- 791 .global usbDescriptorConfiguration
- 792 .type usbDescriptorConfiguration, @object
- 793 .size usbDescriptorConfiguration, 18
- 794 usbDescriptorConfiguration:
- 795 0044 09 .byte 9
- 796 0045 02 .byte 2
- 797 0046 12 .byte 18
- 798 0047 00 .byte 0
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 15
-
-
- 799 0048 01 .byte 1
- 800 0049 01 .byte 1
- 801 004a 00 .byte 0
- 802 004b 80 .byte -128
- 803 004c 32 .byte 50
- 804 004d 09 .byte 9
- 805 004e 04 .byte 4
- 806 004f 00 .byte 0
- 807 0050 00 .byte 0
- 808 0051 00 .byte 0
- 809 0052 00 .byte 0
- 810 0053 00 .byte 0
- 811 0054 00 .byte 0
- 812 0055 00 .byte 0
- 813 .comm usbMsgPtr,2,1
- 814 .comm usbRxToken,1,1
- 815 .comm usbConfiguration,1,1
- 816 .comm usbRxBuf,22,1
- 817 .comm usbInputBufOffset,1,1
- 818 .comm usbDeviceAddr,1,1
- 819 .comm usbNewDeviceAddr,1,1
- 820 .comm usbRxLen,1,1
- 821 .comm usbCurrentTok,1,1
- 822 .comm usbTxBuf,11,1
- 823 .lcomm events,1
- 824 .lcomm currentAddress,2
- 825 .lcomm vectorTemp,4
- 826 .lcomm didWriteSomething,1
- 827 .data
- 828 .type usbMsgLen, @object
- 829 .size usbMsgLen, 1
- 830 usbMsgLen:
- 831 0001 FF .byte -1
- 832 .lcomm usbMsgFlags,1
- 833 .lcomm writeLength,1
- 834 .type replyBuffer.1745, @object
- 835 .size replyBuffer.1745, 4
- 836 replyBuffer.1745:
- 837 0002 16 .byte 22
- 838 0003 FA .byte -6
- 839 0004 40 .byte 64
- 840 0005 14 .byte 20
- 841 .lcomm wasReset.1698,1
- 842 .global __do_copy_data
- 843 .global __do_clear_bss
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s page 16
+ 625 040e E091 0000 lds r30,currentAddress
+ 626 0412 F091 0000 lds r31,currentAddress+1
+ 627 0416 00C0 rjmp .L58
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 12
+
+
+ 628 .L60:
+ 629 0418 E054 subi r30,lo8(-(-64))
+ 630 041a F040 sbci r31,hi8(-(-64))
+ 631 041c 83E0 ldi r24,lo8(3)
+ 632 /* #APP */
+ 633 ; 118 "main.c" 1
+ 634 041e 8093 5700 sts 87, r24
+ 635 0422 E895 spm
+ 636
+ 637 ; 0 "" 2
+ 638 /* #NOAPP */
+ 639 .L59:
+ 640 0424 07B6 in __tmp_reg__,87-32
+ 641 0426 00FC sbrc __tmp_reg__,0
+ 642 0428 00C0 rjmp .L59
+ 643 .L58:
+ 644 042a 3097 sbiw r30,0
+ 645 042c 01F4 brne .L60
+ 646 042e 1092 0000 sts currentAddress+1,__zero_reg__
+ 647 0432 1092 0000 sts currentAddress,__zero_reg__
+ 648 0436 00D0 rcall fillFlashWithVectors
+ 649 /* #APP */
+ 650 ; 123 "main.c" 1
+ 651 0438 7894 sei
+ 652 ; 0 "" 2
+ 653 /* #NOAPP */
+ 654 .L57:
+ 655 043a 8091 0000 lds r24,events
+ 656 043e 81FF sbrs r24,1
+ 657 0440 00C0 rjmp .L61
+ 658 0442 A9E3 ldi r26,lo8(8249)
+ 659 0444 B0E2 ldi r27,hi8(8249)
+ 660 0446 1197 1:sbiw r26,1
+ 661 0448 01F4 brne 1b
+ 662 044a 00C0 rjmp .
+ 663 044c 0000 nop
+ 664 044e 8091 0000 lds r24,currentAddress
+ 665 0452 9091 0000 lds r25,currentAddress+1
+ 666 0456 8F73 andi r24,lo8(63)
+ 667 0458 9070 andi r25,hi8(63)
+ 668 045a 0097 sbiw r24,0
+ 669 045c 01F0 breq .L62
+ 670 045e 00D0 rcall fillFlashWithVectors
+ 671 0460 00C0 rjmp .L61
+ 672 .L62:
+ 673 0462 00D0 rcall writeFlashPage
+ 674 .L61:
+ 675 0464 8091 0000 lds r24,events
+ 676 0468 82FD sbrc r24,2
+ 677 046a 00C0 rjmp .L63
+ 678 046c B1E5 ldi r27,lo8(-15535)
+ 679 046e EB16 cp r14,r27
+ 680 0470 B3EC ldi r27,hi8(-15535)
+ 681 0472 FB06 cpc r15,r27
+ 682 0474 00F0 brlo .L64
+ 683 .L63:
+ 684 0476 E1E2 ldi r30,lo8(-24287)
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 13
+
+
+ 685 0478 F1EA ldi r31,hi8(-24287)
+ 686 047a 3197 1:sbiw r30,1
+ 687 047c 01F4 brne 1b
+ 688 047e 00C0 rjmp .
+ 689 0480 0000 nop
+ 690 /* #APP */
+ 691 ; 307 "main.c" 1
+ 692 0482 F894 cli
+ 693 ; 0 "" 2
+ 694 /* #NOAPP */
+ 695 0484 1BBE out 91-32,__zero_reg__
+ 696 0486 15BA out 53-32,__zero_reg__
+ 697 0488 8091 0000 lds r24,didWriteSomething
+ 698 048c 8823 tst r24
+ 699 048e 01F4 brne .L65
+ 700 0490 00C0 rjmp .L66
+ 701 .L67:
+ 702 0492 00D0 rcall fillFlashWithVectors
+ 703 .L65:
+ 704 0494 8091 0000 lds r24,currentAddress
+ 705 0498 9091 0000 lds r25,currentAddress+1
+ 706 049c F7E1 ldi r31,hi8(5888)
+ 707 049e 8030 cpi r24,lo8(5888)
+ 708 04a0 9F07 cpc r25,r31
+ 709 04a2 00F0 brlo .L67
+ 710 .L66:
+ 711 04a4 1092 5F02 sts 607,__zero_reg__
+ 712 04a8 1092 5E02 sts 606,__zero_reg__
+ 713 /* #APP */
+ 714 ; 323 "main.c" 1
+ 715 04ac 00C0 rjmp __vectors - 4
+ 716 ; 0 "" 2
+ 717 /* #NOAPP */
+ 718 .L64:
+ 719 04ae 1092 0000 sts events,__zero_reg__
+ 720 04b2 00C0 rjmp .L68
+ 721 .size main, .-main
+ 722 .global usbTxLen
+ 723 .data
+ 724 .type usbTxLen, @object
+ 725 .size usbTxLen, 1
+ 726 usbTxLen:
+ 727 0000 5A .byte 90
+ 728 .global usbDescriptorString0
+ 729 .section .progmem.data,"a",@progbits
+ 730 .type usbDescriptorString0, @object
+ 731 .size usbDescriptorString0, 4
+ 732 usbDescriptorString0:
+ 733 0000 04 .byte 4
+ 734 0001 03 .byte 3
+ 735 0002 09 .byte 9
+ 736 0003 04 .byte 4
+ 737 .global usbDescriptorStringVendor
+ 738 .type usbDescriptorStringVendor, @object
+ 739 .size usbDescriptorStringVendor, 34
+ 740 usbDescriptorStringVendor:
+ 741 0004 2203 .word 802
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 14
+
+
+ 742 0006 6300 .word 99
+ 743 0008 7200 .word 114
+ 744 000a 6500 .word 101
+ 745 000c 6100 .word 97
+ 746 000e 7400 .word 116
+ 747 0010 6900 .word 105
+ 748 0012 7600 .word 118
+ 749 0014 6500 .word 101
+ 750 0016 7000 .word 112
+ 751 0018 6F00 .word 111
+ 752 001a 6E00 .word 110
+ 753 001c 7900 .word 121
+ 754 001e 2E00 .word 46
+ 755 0020 6300 .word 99
+ 756 0022 6F00 .word 111
+ 757 0024 6D00 .word 109
+ 758 .global usbDescriptorStringDevice
+ 759 .type usbDescriptorStringDevice, @object
+ 760 .size usbDescriptorStringDevice, 12
+ 761 usbDescriptorStringDevice:
+ 762 0026 0C03 .word 780
+ 763 0028 7500 .word 117
+ 764 002a 4200 .word 66
+ 765 002c 6F00 .word 111
+ 766 002e 6F00 .word 111
+ 767 0030 7400 .word 116
+ 768 .global usbDescriptorDevice
+ 769 .type usbDescriptorDevice, @object
+ 770 .size usbDescriptorDevice, 18
+ 771 usbDescriptorDevice:
+ 772 0032 12 .byte 18
+ 773 0033 01 .byte 1
+ 774 0034 10 .byte 16
+ 775 0035 01 .byte 1
+ 776 0036 FF .byte -1
+ 777 0037 00 .byte 0
+ 778 0038 00 .byte 0
+ 779 0039 08 .byte 8
+ 780 003a C0 .byte -64
+ 781 003b 16 .byte 22
+ 782 003c DC .byte -36
+ 783 003d 05 .byte 5
+ 784 003e 01 .byte 1
+ 785 003f 01 .byte 1
+ 786 0040 01 .byte 1
+ 787 0041 02 .byte 2
+ 788 0042 00 .byte 0
+ 789 0043 01 .byte 1
+ 790 .global usbDescriptorConfiguration
+ 791 .type usbDescriptorConfiguration, @object
+ 792 .size usbDescriptorConfiguration, 18
+ 793 usbDescriptorConfiguration:
+ 794 0044 09 .byte 9
+ 795 0045 02 .byte 2
+ 796 0046 12 .byte 18
+ 797 0047 00 .byte 0
+ 798 0048 01 .byte 1
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 15
+
+
+ 799 0049 01 .byte 1
+ 800 004a 00 .byte 0
+ 801 004b 80 .byte -128
+ 802 004c 32 .byte 50
+ 803 004d 09 .byte 9
+ 804 004e 04 .byte 4
+ 805 004f 00 .byte 0
+ 806 0050 00 .byte 0
+ 807 0051 00 .byte 0
+ 808 0052 00 .byte 0
+ 809 0053 00 .byte 0
+ 810 0054 00 .byte 0
+ 811 0055 00 .byte 0
+ 812 .comm usbMsgPtr,2,1
+ 813 .comm usbRxToken,1,1
+ 814 .comm usbConfiguration,1,1
+ 815 .comm usbRxBuf,22,1
+ 816 .comm usbInputBufOffset,1,1
+ 817 .comm usbDeviceAddr,1,1
+ 818 .comm usbNewDeviceAddr,1,1
+ 819 .comm usbRxLen,1,1
+ 820 .comm usbCurrentTok,1,1
+ 821 .comm usbTxBuf,11,1
+ 822 .lcomm events,1
+ 823 .lcomm currentAddress,2
+ 824 .lcomm vectorTemp,4
+ 825 .lcomm didWriteSomething,1
+ 826 .data
+ 827 .type usbMsgLen, @object
+ 828 .size usbMsgLen, 1
+ 829 usbMsgLen:
+ 830 0001 FF .byte -1
+ 831 .lcomm usbMsgFlags,1
+ 832 .lcomm writeLength,1
+ 833 .type replyBuffer.1766, @object
+ 834 .size replyBuffer.1766, 4
+ 835 replyBuffer.1766:
+ 836 0002 16 .byte 22
+ 837 0003 FA .byte -6
+ 838 0004 40 .byte 64
+ 839 0005 14 .byte 20
+ 840 .lcomm wasReset.1698,1
+ 841 .global __do_copy_data
+ 842 .global __do_clear_bss
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s page 16
DEFINED SYMBOLS
*ABS*:00000000 main.c
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:2 *ABS*:0000003f __SREG__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:3 *ABS*:0000003e __SP_H__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:4 *ABS*:0000003d __SP_L__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:5 *ABS*:00000034 __CCP__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:6 *ABS*:00000000 __tmp_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:7 *ABS*:00000001 __zero_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:10 .text:00000000 writeFlashPage
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:825 .bss:00000007 didWriteSomething
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:823 .bss:00000001 currentAddress
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:46 .text:00000024 writeWordToPageBuffer
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:824 .bss:00000003 vectorTemp
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:121 .text:0000009e fillFlashWithVectors
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:149 .init3:00000000 PushMagicWord
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:173 .text:000000c4 main
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:2 *ABS*:0000003f __SREG__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:3 *ABS*:0000003e __SP_H__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:4 *ABS*:0000003d __SP_L__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:5 *ABS*:00000034 __CCP__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:6 *ABS*:00000000 __tmp_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:7 *ABS*:00000001 __zero_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:10 .text:00000000 writeFlashPage
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:824 .bss:00000007 didWriteSomething
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:822 .bss:00000001 currentAddress
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:46 .text:00000024 writeWordToPageBuffer
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:823 .bss:00000003 vectorTemp
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:121 .text:0000009e fillFlashWithVectors
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:149 .init3:00000000 PushMagicWord
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:173 .text:000000c4 main
*COM*:00000001 usbRxLen
*COM*:00000001 usbInputBufOffset
*COM*:00000016 usbRxBuf
*COM*:00000001 usbRxToken
*COM*:0000000b usbTxBuf
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:727 .data:00000000 usbTxLen
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:826 .bss:00000008 usbMsgFlags
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:836 .data:00000002 replyBuffer.1745
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:726 .data:00000000 usbTxLen
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:825 .bss:00000008 usbMsgFlags
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:835 .data:00000002 replyBuffer.1766
*COM*:00000002 usbMsgPtr
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:832 .bss:00000009 writeLength
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:831 .bss:00000009 writeLength
.bss:00000000 events
*COM*:00000001 usbNewDeviceAddr
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:772 .progmem.data:00000032 usbDescriptorDevice
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:794 .progmem.data:00000044 usbDescriptorConfiguration
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:733 .progmem.data:00000000 usbDescriptorString0
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:741 .progmem.data:00000004 usbDescriptorStringVendor
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:762 .progmem.data:00000026 usbDescriptorStringDevice
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:771 .progmem.data:00000032 usbDescriptorDevice
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:793 .progmem.data:00000044 usbDescriptorConfiguration
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:732 .progmem.data:00000000 usbDescriptorString0
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:740 .progmem.data:00000004 usbDescriptorStringVendor
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:761 .progmem.data:00000026 usbDescriptorStringDevice
*COM*:00000001 usbConfiguration
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:830 .data:00000001 usbMsgLen
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:829 .data:00000001 usbMsgLen
*COM*:00000001 usbDeviceAddr
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccsUuzSz.s:833 .bss:0000000a wasReset.1698
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccQ4lgkR.s:832 .bss:0000000a wasReset.1698
*COM*:00000001 usbCurrentTok
UNDEFINED SYMBOLS
diff --git a/firmware/main.hex b/firmware/main.hex
index ebe2a3c..ca30409 100644
--- a/firmware/main.hex
+++ b/firmware/main.hex
@@ -6,10 +6,10 @@
:1017500012011001FF000008C016DC0501010102A2
:10176000000109021200010100803209040000009A
:101770000000000011241FBECFE5D2E0DEBFCDBFC8
-:1017800000EB0F9307E00F9310E0A0E6B0E0EAEF64
+:1017800000EB0F9307E00F9310E0A0E6B0E0E4EF6A
:10179000FFE102C005900D92A636B107D9F710E01F
:1017A000A6E6B0E001C01D92AB39B107E1F7EED17A
-:1017B00022C4A6CFA82FB92F80E090E041E050EAE4
+:1017B0001FC4A6CFA82FB92F80E090E041E050EAE7
:1017C000609530E009C02D9182279795879510F09C
:1017D00084279527305EC8F36F5FA8F30895EADF8A
:1017E0008D939D930895A6E088279927AA9569F07F
@@ -119,29 +119,29 @@
:101E600090E0602FBCDC0C5F0C3019F08FEF80939A
:101E700061000093600084E196B3987131F4815061
:101E8000D9F71092820010927C0001E0811100E0ED
-:101E900080917000801739F0002319F4F89471D004
+:101E900080917000801739F0002319F4F8946ED007
:101EA0007894009370008CE991E00197F1F70000BD
:101EB00080916600882321F40894E11CF11C02C083
-:101EC000EE24FF2480FF20C080EC96E113C0F8943C
-:101ED000E0916700F091680083E080935700E895F7
-:101EE00007B600FCFDCF7894809167009091680060
-:101EF00080549040909368008093670080916700C1
-:101F000090916800009719F78091660081FF11C0D9
-:101F1000A9E3B0E21197F1F700C0000080916700DB
-:101F2000909168008F739070009711F01CDE01C0D3
-:101F3000CBDD8091660082FD05C0B1E5EB16B3EC08
-:101F4000FB06E0F0E1E2F1EA3197F1F700C00000B2
-:101F5000F8941BBE15BA80916D00882311F409C056
-:101F600002DE8091670090916800F7E180309F0762
-:101F7000B8F310925F0210925E02C0CB109266001E
-:101F800037CEFF920F931F93CF93DF93C8E0D0E03B
-:101F900010E000E8F12EF00EF1BE25DC29E08433DC
-:101FA00092070CF41F2D06952197A1F7212F2150A0
-:101FB00021BFEC01012F10C016DC8453994097FF1C
-:101FC00003C0909581959F4F8C179D0714F401B71E
-:101FD000EC0181B78F5F81BF21B730E0812F90E0A6
-:101FE00001968217930744F701BFDF91CF911F91AC
-:0A1FF0000F91FF900895F894FFCFC1
-:061FFA005AFF16FA401424
+:101EC000EE24FF2480FF1DC080E097E1909368001E
+:101ED00080936700F894E0916700F091680009C072
+:101EE000E054F04083E080935700E89507B600FC8B
+:101EF000FDCF3097A9F7109268001092670033DE8B
+:101F000078948091660081FF11C0A9E3B0E2119737
+:101F1000F1F700C0000080916700909168008F7316
+:101F20009070009711F01FDE01C0CEDD8091660039
+:101F300082FD05C0B1E5EB16B3ECFB06E0F0E1E293
+:101F4000F1EA3197F1F700C00000F8941BBE15BA12
+:101F500080916D00882311F409C005DE809167002F
+:101F600090916800F7E180309F07B8F310925F020C
+:101F700010925E02C3CB109266003ACEFF920F938E
+:101F80001F93CF93DF93C8E0D0E010E000E8F12E7C
+:101F9000F00EF1BE28DC29E0843392070CF41F2DEB
+:101FA00006952197A1F7212F215021BFEC01012F88
+:101FB00010C019DC8453994097FF03C09095819518
+:101FC0009F4F8C179D0714F401B7EC0181B78F5F09
+:101FD00081BF21B730E0812F90E0019682179307EF
+:101FE00044F701BFDF91CF911F910F91FF900895AA
+:041FF000F894FFCF93
+:061FF4005AFF16FA40142A
:0400000300001700E2
:00000001FF
diff --git a/firmware/main.map b/firmware/main.map
index fd83c87..2b46135 100644
--- a/firmware/main.map
+++ b/firmware/main.map
@@ -158,7 +158,7 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a
.rela.plt
*(.rela.plt)
-.text 0x00001700 0x8fa
+.text 0x00001700 0x8f4
*(.vectors)
.vectors 0x00001700 0x1e /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/../../../../avr/lib/avr25/crttn85.o
0x00001700 __vectors
@@ -241,17 +241,17 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a
0x000017de usbCrc16Append
0x000017e6 usbMeasureFrameLength
0x0000180c __vector_2
- .text 0x00001ac8 0x4ba main.o
+ .text 0x00001ac8 0x4b4 main.o
0x00001b8c main
- .text 0x00001f82 0x74 libs-device/osccal.o
- 0x00001f82 calibrateOscillator
- 0x00001ff6 . = ALIGN (0x2)
+ .text 0x00001f7c 0x74 libs-device/osccal.o
+ 0x00001f7c calibrateOscillator
+ 0x00001ff0 . = ALIGN (0x2)
*(.text.*)
- 0x00001ff6 . = ALIGN (0x2)
+ 0x00001ff0 . = ALIGN (0x2)
*(.fini9)
- .fini9 0x00001ff6 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o)
- 0x00001ff6 exit
- 0x00001ff6 _exit
+ .fini9 0x00001ff0 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o)
+ 0x00001ff0 exit
+ 0x00001ff0 _exit
*(.fini9)
*(.fini8)
*(.fini8)
@@ -270,11 +270,11 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a
*(.fini1)
*(.fini1)
*(.fini0)
- .fini0 0x00001ff6 0x4 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o)
+ .fini0 0x00001ff0 0x4 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o)
*(.fini0)
- 0x00001ffa _etext = .
+ 0x00001ff4 _etext = .
-.data 0x00800060 0x6 load address 0x00001ffa
+.data 0x00800060 0x6 load address 0x00001ff4
0x00800060 PROVIDE (__data_start, .)
*(.data)
.data 0x00800060 0x6 main.o
@@ -305,8 +305,8 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a
0x00800084 usbConfiguration
0x00800085 usbRxBuf
0x0080009b PROVIDE (__bss_end, .)
- 0x00001ffa __data_load_start = LOADADDR (.data)
- 0x00002000 __data_load_end = (__data_load_start + SIZEOF (.data))
+ 0x00001ff4 __data_load_start = LOADADDR (.data)
+ 0x00001ffa __data_load_end = (__data_load_start + SIZEOF (.data))
.noinit 0x0080009b 0x0
0x0080009b PROVIDE (__noinit_start, .)
diff --git a/firmware/main.o b/firmware/main.o
index de18981..d593d89 100644
--- a/firmware/main.o
+++ b/firmware/main.o
Binary files differ
diff --git a/firmware/temp-dump.bin b/firmware/temp-dump.bin
index e7c029c..4648afa 100644
--- a/firmware/temp-dump.bin
+++ b/firmware/temp-dump.bin
Binary files differ
diff --git a/firmware/upload.rb b/firmware/upload.rb
index f49a94f..3da7dad 100644
--- a/firmware/upload.rb
+++ b/firmware/upload.rb
@@ -31,7 +31,8 @@ class MicroBoot
@info = {
flash_length: flash_length,
page_size: page_size,
- write_sleep: 0.020, #write_sleep.to_f / 1000.0,
+ pages: (flash_length.to_f / page_size).ceil,
+ write_sleep: write_sleep.to_f / 1000.0,
version: "#{@device.bcdDevice >> 8}.#{@device.bcdDevice & 0xFF}",
version_numeric: @device.bcdDevice
}
@@ -40,9 +41,13 @@ class MicroBoot
end
def erase!
+ puts "erasing"
info = self.info
control_transfer(function: :erase_application)
- sleep(info[:write_sleep] * ((info[:flash_length] / info[:page_size]) + 1)) # sleep for as many pages as the chip has
+ info[:pages].times do
+ sleep(info[:write_sleep]) # sleep for as many pages as the chip has to erase
+ end
+ puts "erased chip"
end
# upload a new program
@@ -54,16 +59,24 @@ class MicroBoot
erase!
address = 0
- bytes.each_slice(info[:page_size]) do |bytes|
- control_transfer(function: :write_page, wIndex: address, wValue: bytes.length, dataOut: bytes.pack('C*'))
+ bytes.each_slice(info[:page_size]) do |slice|
+ puts "uploading @ #{address} of #{bytes.length}"
+ control_transfer(function: :write_page, wIndex: address, wValue: slice.length, dataOut: slice.pack('C*'))
+ sleep(info[:write_sleep]) if address == 0 # additional sleep just for first page, as it includes an erase too
sleep(info[:write_sleep])
- address += bytes.length
+ address += slice.length
end
end
def finished
+ puts "asking device to finish writing"
control_transfer(function: :run_program)
- sleep(info[:write_sleep]) # not sure if this is worth having? It's okay if USB fails now...
+ puts "waiting for device to finish"
+
+ # sleep for as many pages as the chip could potentially need to write - this could be smarter
+ info[:pages].times do
+ sleep(info[:write_sleep])
+ end
@io.close
@io = nil
diff --git a/firmware/usbconfig.h b/firmware/usbconfig.h
index d8ec6c1..bca0ec0 100644
--- a/firmware/usbconfig.h
+++ b/firmware/usbconfig.h
@@ -192,6 +192,9 @@
#define USB_CFG_DEVICE_VERSION UBOOT_VERSION, 0x01
/* Version number of the device: Minor number first, then major number.
*/
+ // electric arrow - not compliant with obdev's rules but we'll have our own vid-pid soon
+//#define USB_CFG_VENDOR_NAME 0x2301
+//#define USB_CFG_VENDOR_NAME_LEN 1
#define USB_CFG_VENDOR_NAME 'c','r','e','a','t','i','v','e','p','o','n','y','.','c','o','m'
#define USB_CFG_VENDOR_NAME_LEN 16
/* These two values define the vendor name returned by the USB device. The name
diff --git a/firmware/usbdrv/oddebug.c.lst b/firmware/usbdrv/oddebug.c.lst
index 695c960..b755b89 100644
--- a/firmware/usbdrv/oddebug.c.lst
+++ b/firmware/usbdrv/oddebug.c.lst
@@ -1,4 +1,4 @@
-GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s page 1
+GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s page 1
1 .file "oddebug.c"
@@ -8,16 +8,16 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s page
5 __CCP__ = 0x34
6 __tmp_reg__ = 0
7 __zero_reg__ = 1
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s page 2
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s page 2
DEFINED SYMBOLS
*ABS*:00000000 oddebug.c
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s:2 *ABS*:0000003f __SREG__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s:3 *ABS*:0000003e __SP_H__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s:4 *ABS*:0000003d __SP_L__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s:5 *ABS*:00000034 __CCP__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s:6 *ABS*:00000000 __tmp_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccoH6fZ5.s:7 *ABS*:00000001 __zero_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s:2 *ABS*:0000003f __SREG__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s:3 *ABS*:0000003e __SP_H__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s:4 *ABS*:0000003d __SP_L__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s:5 *ABS*:00000034 __CCP__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s:6 *ABS*:00000000 __tmp_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccOLeWCz.s:7 *ABS*:00000001 __zero_reg__
NO UNDEFINED SYMBOLS
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 05:10:42 +0000