summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--firmware/libs-device/osccal.c.lst20
-rwxr-xr-xfirmware/main.binbin8957 -> 8957 bytes
-rw-r--r--firmware/main.c18
-rw-r--r--firmware/main.c.lst133
-rw-r--r--firmware/main.hex148
-rw-r--r--firmware/main.map53
-rw-r--r--firmware/main.obin5940 -> 5936 bytes
-rw-r--r--firmware/upload.rb5
-rw-r--r--firmware/usbconfig.h2
-rw-r--r--firmware/usbdrv/oddebug.c.lst16
10 files changed, 196 insertions, 199 deletions
diff --git a/firmware/libs-device/osccal.c.lst b/firmware/libs-device/osccal.c.lst
index 03c6fe2..98f2445 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//ccmBVyO8.s page 1
+GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s page 1
1 .file "osccal.c"
@@ -58,7 +58,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.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//ccmBVyO8.s page 2
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s page 2
58 004c 01B7 in r16,81-32
@@ -85,18 +85,18 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.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//ccmBVyO8.s page 3
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s page 3
DEFINED SYMBOLS
*ABS*:00000000 osccal.c
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:2 *ABS*:0000003f __SREG__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:3 *ABS*:0000003e __SP_H__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:4 *ABS*:0000003d __SP_L__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:5 *ABS*:00000034 __CCP__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:6 *ABS*:00000000 __tmp_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:7 *ABS*:00000001 __zero_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccmBVyO8.s:11 .text:00000000 calibrateOscillator
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:2 *ABS*:0000003f __SREG__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:3 *ABS*:0000003e __SP_H__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:4 *ABS*:0000003d __SP_L__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:5 *ABS*:00000034 __CCP__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:6 *ABS*:00000000 __tmp_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:7 *ABS*:00000001 __zero_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//cc42bZUQ.s:11 .text:00000000 calibrateOscillator
UNDEFINED SYMBOLS
usbMeasureFrameLength
diff --git a/firmware/main.bin b/firmware/main.bin
index 5d678b8..5febd6d 100755
--- a/firmware/main.bin
+++ b/firmware/main.bin
Binary files differ
diff --git a/firmware/main.c b/firmware/main.c
index 1b0369c..3787850 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -8,6 +8,8 @@
* License: GNU GPL v2 (see License.txt)
* This Revision: $Id: main.c 786 2010-05-30 20:41:40Z cs $
*/
+
+#define UBOOT_VERSION 1
#include <avr/io.h>
#include <avr/interrupt.h>
@@ -23,7 +25,6 @@ static void leaveBootloader() __attribute__((__noreturn__));
#include "bootloaderconfig.h"
#include "usbdrv/usbdrv.c"
-#define UBOOT_VERSION 1
// how many milliseconds should host wait till it sends another write?
// this needs to be above 9, but 20 is only sensible for testing
#define UBOOT_WRITE_SLEEP 12
@@ -59,11 +60,11 @@ static void leaveBootloader() __attribute__((__noreturn__));
#define addr_t uint
-typedef union longConverter{
- addr_t l;
- uint w[sizeof(addr_t)/2];
- uchar b[sizeof(addr_t)];
-} longConverter_t;
+// typedef union longConverter{
+// addr_t l;
+// uint w[sizeof(addr_t)/2];
+// uchar b[sizeof(addr_t)];
+// } longConverter_t;
//////// Stuff Bluebie Added
#define PROGMEM_SIZE (BOOTLOADER_ADDRESS - 6)
@@ -170,8 +171,7 @@ static void fillFlashWithVectors(void) {
static uchar usbFunctionSetup(uchar data[8]) {
usbRequest_t *rq = (void *)data;
- static uchar replyBuffer[5] = {
- UBOOT_VERSION,
+ static uchar replyBuffer[4] = {
(((uint)PROGMEM_SIZE) >> 8) & 0xff,
((uint)PROGMEM_SIZE) & 0xff,
SPM_PAGESIZE,
@@ -180,7 +180,7 @@ static uchar usbFunctionSetup(uchar data[8]) {
if (rq->bRequest == 0) { // get device info
usbMsgPtr = replyBuffer;
- return 5;
+ return 4;
} else if (rq->bRequest == 1) { // write page
writeLength = rq->wValue.word;
diff --git a/firmware/main.c.lst b/firmware/main.c.lst
index 1a0b0a7..c47b50b 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//ccgRI40l.s page 1
+GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 1
1 .file "main.c"
@@ -18,7 +18,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
15 0000 81E0 ldi r24,lo8(1)
16 0002 8093 0000 sts didWriteSomething,r24
17 /* #APP */
- 18 ; 107 "main.c" 1
+ 18 ; 108 "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//ccgRI40l.s page
24 0010 3297 sbiw r30,2
25 0012 85E0 ldi r24,lo8(5)
26 /* #APP */
- 27 ; 108 "main.c" 1
+ 27 ; 109 "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//ccgRI40l.s page
35 001c 00FC sbrc __tmp_reg__,0
36 001e 00C0 rjmp .L2
37 /* #APP */
- 38 ; 110 "main.c" 1
+ 38 ; 111 "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//ccgRI40l.s page
55 0030 01F4 brne .+2
56 0032 00C0 rjmp .L4
57 0034 2430 cpi r18,4
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 2
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 2
58 0036 3105 cpc r19,__zero_reg__
@@ -87,7 +87,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
81 0068 9BEC ldi r25,hi8(-13441)
82 .L7:
83 /* #APP */
- 84 ; 144 "main.c" 1
+ 84 ; 145 "main.c" 1
85 006a F894 cli
86 ; 0 "" 2
87 /* #NOAPP */
@@ -95,14 +95,14 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
89 0070 F091 0000 lds r31,currentAddress+1
90 0074 21E0 ldi r18,lo8(1)
91 /* #APP */
- 92 ; 145 "main.c" 1
+ 92 ; 146 "main.c" 1
93 0076 0C01 movw r0, r24
94 0078 2093 5700 sts 87, r18
95 007c E895 spm
96 007e 1124 clr r1
97
98 ; 0 "" 2
- 99 ; 146 "main.c" 1
+ 99 ; 147 "main.c" 1
100 0080 7894 sei
101 ; 0 "" 2
102 /* #NOAPP */
@@ -110,7 +110,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
104 0086 5091 0000 lds r21,currentAddress+1
105 008a FA01 movw r30,r20
106 /* #APP */
- 107 ; 151 "main.c" 1
+ 107 ; 152 "main.c" 1
108 008c 2591 lpm r18, Z+
109 008e 3491 lpm r19, Z
110
@@ -118,7 +118,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
112 /* #NOAPP */
113 0090 2823 and r18,r24
114 0092 3923 and r19,r25
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 3
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 3
115 0094 2817 cp r18,r24
@@ -137,7 +137,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
128 .L4:
129 00b2 81E1 ldi r24,lo8(17)
130 /* #APP */
- 131 ; 142 "main.c" 1
+ 131 ; 143 "main.c" 1
132 00b4 8093 5700 sts 87, r24
133 00b8 E895 spm
134
@@ -178,7 +178,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
169 /* prologue: naked */
170 /* frame size = 0 */
171 /* stack size = 0 */
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 4
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 4
172 .L__stack_usage = 0
@@ -238,7 +238,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
226 0108 E4E0 ldi r30,lo8(4)
227 010a F0E0 ldi r31,hi8(4)
228 /* #APP */
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 5
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 5
229 ; 261 "main.c" 1
@@ -298,7 +298,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
283 016c 01F0 breq .+2
284 016e 00C0 rjmp .L18
285 0170 83EC ldi r24,lo8(-61)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 6
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 6
286 0172 8093 0000 sts usbTxBuf,r24
@@ -313,11 +313,11 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
295 018a 01F0 breq .L19
296 018c 8823 tst r24
297 018e 01F4 brne .L20
- 298 0190 80E0 ldi r24,lo8(replyBuffer.1750)
- 299 0192 90E0 ldi r25,hi8(replyBuffer.1750)
+ 298 0190 80E0 ldi r24,lo8(replyBuffer.1745)
+ 299 0192 90E0 ldi r25,hi8(replyBuffer.1745)
300 0194 9093 0000 sts usbMsgPtr+1,r25
301 0198 8093 0000 sts usbMsgPtr,r24
- 302 019c 25E0 ldi r18,lo8(5)
+ 302 019c 24E0 ldi r18,lo8(4)
303 019e 00C0 rjmp .L25
304 .L20:
305 01a0 8130 cpi r24,lo8(1)
@@ -358,7 +358,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
340 01ee 01F4 brne .L29
341 01f0 8381 ldd r24,Z+3
342 01f2 8130 cpi r24,lo8(1)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 7
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 7
343 01f4 01F4 brne .L30
@@ -418,7 +418,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
397 0262 9093 0000 sts usbConfiguration,r25
398 0266 00C0 rjmp .L73
399 .L36:
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 8
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 8
400 0268 8A30 cpi r24,lo8(10)
@@ -478,7 +478,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
454 02d0 9093 0000 sts vectorTemp+1,r25
455 02d4 8093 0000 sts vectorTemp,r24
456 02d8 00C0 rjmp .L39
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 9
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 9
457 .L38:
@@ -538,7 +538,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
511 0344 00F0 brlo .L44
512 0346 08E0 ldi r16,lo8(8)
513 .L44:
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 10
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 10
514 0348 801B sub r24,r16
@@ -598,7 +598,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
568 03b0 602F mov r22,r16
569 03b2 00D0 rcall usbCrc16Append
570 03b4 0C5F subi r16,lo8(-(4))
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 11
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 11
571 03b6 0C30 cpi r16,lo8(12)
@@ -658,12 +658,12 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
625 0410 FF24 clr r15
626 .L56:
627 0412 80FF sbrs r24,0
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 12
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 12
628 0414 00C0 rjmp .L57
629 /* #APP */
- 630 ; 99 "main.c" 1
+ 630 ; 100 "main.c" 1
631 0416 F894 cli
632 ; 0 "" 2
633 /* #NOAPP */
@@ -672,7 +672,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
636 0420 3297 sbiw r30,2
637 0422 83E0 ldi r24,lo8(3)
638 /* #APP */
- 639 ; 100 "main.c" 1
+ 639 ; 101 "main.c" 1
640 0424 8093 5700 sts 87, r24
641 0428 E895 spm
642
@@ -683,7 +683,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
647 042c 00FC sbrc __tmp_reg__,0
648 042e 00C0 rjmp .L58
649 /* #APP */
- 650 ; 102 "main.c" 1
+ 650 ; 103 "main.c" 1
651 0430 7894 sei
652 ; 0 "" 2
653 /* #NOAPP */
@@ -718,7 +718,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
682 046c 00F0 brlo .L62
683 .L61:
684 046e E1E2 ldi r30,lo8(-24287)
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 13
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 13
685 0470 F1EA ldi r31,hi8(-24287)
@@ -778,7 +778,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
739 .size usbDescriptorStringVendor, 34
740 usbDescriptorStringVendor:
741 0004 2203 .word 802
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page 14
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 14
742 0006 6300 .word 99
@@ -824,7 +824,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
782 003c DC .byte -36
783 003d 05 .byte 5
784 003e 01 .byte 1
- 785 003f 00 .byte 0
+ 785 003f 01 .byte 1
786 0040 01 .byte 1
787 0041 02 .byte 2
788 0042 00 .byte 0
@@ -838,7 +838,7 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
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//ccgRI40l.s page 15
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s page 15
799 0049 01 .byte 1
@@ -875,57 +875,56 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s page
830 0001 FF .byte -1
831 .lcomm usbMsgFlags,1
832 .lcomm writeLength,1
- 833 .type replyBuffer.1750, @object
- 834 .size replyBuffer.1750, 5
- 835 replyBuffer.1750:
- 836 0002 01 .byte 1
- 837 0003 16 .byte 22
- 838 0004 FA .byte -6
- 839 0005 40 .byte 64
- 840 0006 0C .byte 12
- 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//ccgRI40l.s page 16
+ 833 .type replyBuffer.1745, @object
+ 834 .size replyBuffer.1745, 4
+ 835 replyBuffer.1745:
+ 836 0002 16 .byte 22
+ 837 0003 FA .byte -6
+ 838 0004 40 .byte 64
+ 839 0005 0C .byte 12
+ 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//ccNt0sLK.s page 16
DEFINED SYMBOLS
*ABS*:00000000 main.c
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:2 *ABS*:0000003f __SREG__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:3 *ABS*:0000003e __SP_H__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:4 *ABS*:0000003d __SP_L__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:5 *ABS*:00000034 __CCP__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:6 *ABS*:00000000 __tmp_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:7 *ABS*:00000001 __zero_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:10 .text:00000000 writeFlashPage
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:824 .bss:00000007 didWriteSomething
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:2 *ABS*:0000003f __SREG__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:3 *ABS*:0000003e __SP_H__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:4 *ABS*:0000003d __SP_L__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:5 *ABS*:00000034 __CCP__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:6 *ABS*:00000000 __tmp_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:7 *ABS*:00000001 __zero_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:10 .text:00000000 writeFlashPage
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:824 .bss:00000007 didWriteSomething
.bss:00000000 currentAddress
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:46 .text:00000024 writeWordToPageBuffer
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:823 .bss:00000003 vectorTemp
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:822 .bss:00000002 events
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:140 .text:000000bc fillFlashWithVectors
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:168 .init3:00000000 PushMagicWord
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:192 .text:000000e2 main
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:46 .text:00000024 writeWordToPageBuffer
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:823 .bss:00000003 vectorTemp
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:822 .bss:00000002 events
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:140 .text:000000bc fillFlashWithVectors
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:168 .init3:00000000 PushMagicWord
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:192 .text:000000e2 main
*COM*:00000001 usbRxLen
*COM*:00000001 usbInputBufOffset
*COM*:00000016 usbRxBuf
*COM*:00000001 usbRxToken
*COM*:0000000b usbTxBuf
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:726 .data:00000000 usbTxLen
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:825 .bss:00000008 usbMsgFlags
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:835 .data:00000002 replyBuffer.1750
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:726 .data:00000000 usbTxLen
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:825 .bss:00000008 usbMsgFlags
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:835 .data:00000002 replyBuffer.1745
*COM*:00000002 usbMsgPtr
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:831 .bss:00000009 writeLength
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:831 .bss:00000009 writeLength
*COM*:00000001 usbNewDeviceAddr
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:771 .progmem.data:00000032 usbDescriptorDevice
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:793 .progmem.data:00000044 usbDescriptorConfiguration
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:732 .progmem.data:00000000 usbDescriptorString0
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:740 .progmem.data:00000004 usbDescriptorStringVendor
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:761 .progmem.data:00000026 usbDescriptorStringDevice
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:771 .progmem.data:00000032 usbDescriptorDevice
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:793 .progmem.data:00000044 usbDescriptorConfiguration
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:732 .progmem.data:00000000 usbDescriptorString0
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:740 .progmem.data:00000004 usbDescriptorStringVendor
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:761 .progmem.data:00000026 usbDescriptorStringDevice
*COM*:00000001 usbConfiguration
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:829 .data:00000001 usbMsgLen
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:829 .data:00000001 usbMsgLen
*COM*:00000001 usbDeviceAddr
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccgRI40l.s:832 .bss:0000000a wasReset.1698
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccNt0sLK.s:832 .bss:0000000a wasReset.1698
*COM*:00000001 usbCurrentTok
UNDEFINED SYMBOLS
diff --git a/firmware/main.hex b/firmware/main.hex
index 16520d4..b136b0f 100644
--- a/firmware/main.hex
+++ b/firmware/main.hex
@@ -3,12 +3,12 @@
:10172000090422036300720065006100740069000F
:101730007600650070006F006E0079002E00630077
:101740006F006D000C03750042006F006F007400A5
-:1017500012011001FF000008C016DC0501000102A3
+:1017500012011001FF000008C016DC0501010102A2
:10176000000109021200010100803209040000009A
:101770000000000011241FBECFE5D2E0DEBFCDBFC8
:1017800000EB0F9307E00F9310E0A0E6B0E0ECEE63
-:10179000FFE102C005900D92A836B107D9F710E01D
-:1017A000A8E6B0E001C01D92AD39B107E1F7FDD167
+:10179000FFE102C005900D92A636B107D9F710E01F
+:1017A000A6E6B0E001C01D92AB39B107E1F7FDD16B
:1017B0001BC4A6CFA82FB92F80E090E041E050EAEB
:1017C000609530E009C02D9182279795879510F09C
:1017D00084279527305EC8F36F5FA8F30895EADF8A
@@ -19,7 +19,7 @@
:1018200021F0CF91CFBFCF916ACFCC27C395B39B87
:10183000E9F7B39B0BC0B39B09C0B39B07C0B39B35
:1018400005C0B39B03C0B39B01C0D3C00F92DF930D
-:10185000C0918000DD27C957DF4F012EB39B03C025
+:10185000C0917E00DD27CB57DF4F012EB39B03C025
:10186000DF910F90E6CF2F930F931F934F932FEF9E
:101870004F6F06B303FB20F95F933F9350E03BE0CB
:1018800065C016B30126502953FDC89556B30127EC
@@ -42,98 +42,98 @@
:10199000102713FB24F90026502906B22F7939F2BB
:1019A00070CF10E21ABF002717C03B503195C31B00
:1019B000D04010E21ABF0881033CF9F00B34E9F083
-:1019C00020917E001981110F1213EDCF093651F1CC
-:1019D0000D3211F0013E39F7009385003F915F9180
+:1019C00020917C001981110F1213EDCF093651F1CE
+:1019D0000D3211F0013E39F7009383003F915F9182
:1019E0004F911F910F912F91DF910F90CAB7C5FDB5
-:1019F0001DCFCF91CFBFCF91189520918500222385
-:101A000069F310918300112321F5343022F13093D2
-:101A1000830020937F00109180003BE0311B3093C6
-:101A2000800019C00091830001309CF40AE53091D8
-:101A3000600034FD11C000936000C3E7D0E010C027
+:1019F0001DCFCF91CFBFCF91189520918300222387
+:101A000069F310918100112321F5343022F13093D4
+:101A1000810020937D0010917E003BE0311B3093CC
+:101A20007E0019C00091810001309CF40AE53091DC
+:101A3000600034FD11C000936000C1E7D0E010C029
:101A4000052710E000C021C0052710E0C89508BB9D
:101A500014C03AE501C032ED032EC0E0D0E032E020
:101A600017B31861C39A08B317BB58E120E84FEFCA
:101A700020FF052708BB279517951C3F28F7000076
:101A80004552B0F720FF0527279508BB17951C3F47
-:101A9000B8F629913A9561F7077E10918400110FED
-:101AA00008BBC250D04011F010937E0010E21ABF64
+:101A9000B8F629913A9561F7077E10918200110FEF
+:101AA00008BBC250D04011F010937C0010E21ABF66
:101AB000086017B3177E402F477E54E05A95F1F720
-:101AC00008BB17BB48BB8ACF81E080936F00F894B6
-:101AD000E0916800F0916900329785E080935700AB
-:101AE000E89507B600FCFDCF789408952091680032
-:101AF000309169002115310509F43FC024303105CA
-:101B0000B1F046E12C3F340739F480916B0090919D
-:101B10006C008E579B4F0DC046E12E3F340749F4B1
-:101B200080916D0090916E008D579B4F02C08FE7A2
-:101B30009BECF894E0916800F091690021E00C01C1
-:101B400020935700E89511247894409168005091B3
-:101B50006900FA0125913491282339232817390780
-:101B600029F080916A00816080936A004E5F5F4F28
-:101B70005093690040936800089581E18093570075
-:101B8000E895D5CFCF93DF93C0916800D0916900DD
+:101AC00008BB17BB48BB8ACF81E080936D00F894B8
+:101AD000E0916600F0916700329785E080935700AF
+:101AE000E89507B600FCFDCF789408952091660034
+:101AF000309167002115310509F43FC024303105CC
+:101B0000B1F046E12C3F340739F48091690090919F
+:101B10006A008E579B4F0DC046E12E3F340749F4B3
+:101B200080916B0090916C008D579B4F02C08FE7A6
+:101B30009BECF894E0916600F091670021E00C01C5
+:101B400020935700E89511247894409166005091B5
+:101B50006700FA0125913491282339232817390782
+:101B600029F0809168008160809368004E5F5F4F2C
+:101B70005093670040936600089581E18093570079
+:101B8000E895D5CFCF93DF93C0916600D0916700E1
:101B9000CF73D0708FEF9FEFA9DF2296C034D105AD
:101BA000CCF392DFDF91CF910895DF93CF930F9223
:101BB000CDB7DEB788E10FB6F89481BD11BC0FBE7A
:101BC000E0E0F0E0859194912BEC8F37920741F49F
:101BD000E4E0F0E0859194913BEC8F37930709F0B6
-:101BE000D1DF1092690010926800AC9A8BB78062C6
+:101BE000D1DF1092670010926600AC9A8BB78062CA
:101BF0008BBFBB9A8FE49DE2A9E181509040A04049
:101C0000E1F700C00000BB987894EE24FF242091F7
-:101C10008300235027FDEFC080918000ECE0F0E0CE
-:101C2000E81BF109E957FF4F80917F008D3209F0E1
-:101C30009FC0283009F0DDC083EC809373008AE5F3
-:101C400080936000109270002081922F90768181A5
-:101C5000992301F1882341F482E690E09093820079
-:101C60008093810025E07AC0813069F4828180937D
-:101C7000710084819581909369008093680027FDAD
-:101C800068C02FEF67C080916A00846080936A000B
-:101C900020E064C0928110927C00882331F410927D
-:101CA0007D008CE790E022E04FC0853019F49093DE
-:101CB000840040C08630A9F58381813019F480E525
-:101CC00097E104C0823041F482E697E1909382006C
-:101CD0008093810022E121C08330F1F4992341F403
-:101CE0008EE197E1909382008093810024E015C0FB
-:101CF000913041F482E297E19093820080938100D9
-:101D000022E20BC0923041F484E497E19093820088
-:101D1000809381002CE001C020E080E4809370007B
-:101D20001DC0883059F0893019F49093860002C0A4
-:101D30008A3039F08CE790E020E006C086E890E039
-:101D400002C08CE790E021E09093820080938100B4
-:101D500005C0268180E88093700007C087818823B2
+:101C10008100235027FDEFC080917E00ECE0F0E0D2
+:101C2000E81BF109EB57FF4F80917D008D3209F0E1
+:101C30009FC0283009F0DDC083EC809371008AE5F5
+:101C40008093600010926E002081922F90768181A7
+:101C5000992301F1882341F482E690E0909380007B
+:101C600080937F0024E07AC0813069F48281809380
+:101C70006F0084819581909367008093660027FDB3
+:101C800068C02FEF67C0809168008460809368000F
+:101C900020E064C0928110927A00882331F410927F
+:101CA0007B008AE790E022E04FC0853019F49093E2
+:101CB000820040C08630A9F58381813019F480E527
+:101CC00097E104C0823041F482E697E1909380006E
+:101CD00080937F0022E121C08330F1F4992341F405
+:101CE0008EE197E19093800080937F0024E015C0FF
+:101CF000913041F482E297E19093800080937F00DD
+:101D000022E20BC0923041F484E497E1909380008A
+:101D100080937F002CE001C020E080E480936E007F
+:101D20001DC0883059F0893019F49093840002C0A6
+:101D30008A3039F08AE790E020E006C084E890E03D
+:101D400002C08AE790E021E09093800080937F00BA
+:101D500005C0268180E880936E0007C087818823B4
:101D600021F48681821708F4282F2093610041C056
-:101D70008091700087FF3DC080917100821B80932D
-:101D800071008F018091680090916900009749F47B
-:101D9000D8018D919C91119790936C0080936B006A
+:101D700080916E0087FF3DC080916F00821B809331
+:101D80006F008F018091660090916700009749F481
+:101D9000D8018D919C91119790936A00809369006E
:101DA00014C08430910541F4F801808191819093B1
-:101DB0006E0080936D0009C0F6E18A3F9F0728F00E
+:101DB0006C0080936B0009C0F6E18A3F9F0728F012
:101DC00081E180935700E89509C0D8018D919D91DC
-:101DD0008D0129838BDE29812250A1F6809171002B
-:101DE000882339F480916A00826080936A0010929F
-:101DF0006100109283008091600084FF47C0809151
+:101DD0008D0129838BDE29812250A1F680916F002D
+:101DE000882339F4809168008260809368001092A3
+:101DF0006100109281008091600084FF47C0809153
:101E000061008F3F09F442C0082F893008F008E0D4
-:101E1000801B809361008091730098E889278093EC
-:101E20007300002339F1E0918100F09182009091DC
-:101E30007000802F815096FF0CC090E08B589F4F10
-:101E4000A4E7B0E024912D933196A817B907D1F7F4
-:101E50000DC09F0190E08B589F4FA4E7B0E0F901BF
-:101E600041919F014D93A817B907C9F7F0938200DC
-:101E7000E093810084E790E0602FB1DC0C5F0C30D0
+:101E1000801B809361008091710098E889278093EE
+:101E20007100002339F1E0917F00F09180009091E2
+:101E30006E00802F815096FF0CC090E08D589F4F10
+:101E4000A2E7B0E024912D933196A817B907D1F7F6
+:101E50000DC09F0190E08D589F4FA2E7B0E0F901BF
+:101E600041919F014D93A817B907C9F7F0938000DE
+:101E7000E0937F0082E790E0602FB1DC0C5F0C30D4
:101E800019F08FEF809361000093600084E196B3B6
-:101E9000987131F48150D9F71092840010927E002D
-:101EA00001E0811100E080917200801739F0002379
-:101EB00019F4F8945FD07894009372008CE991E063
-:101EC0000197F1F7000080916A00882321F40894BB
+:101E9000987131F48150D9F71092820010927C0031
+:101EA00001E0811100E080917000801739F000237B
+:101EB00019F4F8945FD07894009370008CE991E065
+:101EC0000197F1F7000080916800882321F40894BD
:101ED000E11CF11C02C0EE24FF2480FF0EC0F89428
-:101EE000E0916800F0916900329783E08093570099
-:101EF000E89507B600FCFDCF789480916A0081FFD9
+:101EE000E0916600F0916700329783E0809357009D
+:101EF000E89507B600FCFDCF78948091680081FFDB
:101F000011C0A9E3B0E21197F1F700C00000809181
-:101F10006800909169008F739070009711F032DE25
-:101F200001C0D2DD80916A0082FD05C0B1E5EB16EB
+:101F10006600909167008F739070009711F032DE29
+:101F200001C0D2DD8091680082FD05C0B1E5EB16ED
:101F3000B3ECFB06E0F0E1E2F1EA3197F1F700C023
-:101F40000000F8941BBE15BA80916F00882311F42D
-:101F500009C018DE8091680090916900F7E1803037
+:101F40000000F8941BBE15BA80916D00882311F42F
+:101F500009C018DE8091660090916700F7E180303B
:101F60009F07B8F310925F0210925E02C7CB1092E7
-:101F70006A004DCEFF920F931F93CF93DF93C8E07B
+:101F700068004DCEFF920F931F93CF93DF93C8E07D
:101F8000D0E010E000E8F12EF00EF1BE2CDC29E0EC
:101F9000843392070CF41F2D06952197A1F7212F6A
:101FA000215021BFEC01012F10C01DDC845399404A
@@ -141,6 +141,6 @@
:101FC00001B7EC0181B78F5F81BF21B730E0812F6E
:101FD00090E001968217930744F701BFDF91CF91FC
:0C1FE0001F910F91FF900895F894FFCF1F
-:081FEC005AFF0116FA400C0037
+:061FEC005AFF16FA400C3A
:0400000300001700E2
:00000001FF
diff --git a/firmware/main.map b/firmware/main.map
index 8418305..5bf5ec7 100644
--- a/firmware/main.map
+++ b/firmware/main.map
@@ -274,47 +274,46 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a
*(.fini0)
0x00001fec _etext = .
-.data 0x00800060 0x8 load address 0x00001fec
+.data 0x00800060 0x6 load address 0x00001fec
0x00800060 PROVIDE (__data_start, .)
*(.data)
- .data 0x00800060 0x7 main.o
+ .data 0x00800060 0x6 main.o
0x00800060 usbTxLen
*(.data*)
*(.rodata)
*(.rodata*)
*(.gnu.linkonce.d*)
- 0x00800068 . = ALIGN (0x2)
- *fill* 0x00800067 0x1 00
- 0x00800068 _edata = .
- 0x00800068 PROVIDE (__data_end, .)
+ 0x00800066 . = ALIGN (0x2)
+ 0x00800066 _edata = .
+ 0x00800066 PROVIDE (__data_end, .)
-.bss 0x00800068 0x35
- 0x00800068 PROVIDE (__bss_start, .)
+.bss 0x00800066 0x35
+ 0x00800066 PROVIDE (__bss_start, .)
*(.bss)
- .bss 0x00800068 0xb main.o
+ .bss 0x00800066 0xb main.o
*(.bss*)
*(COMMON)
- COMMON 0x00800073 0x2a main.o
- 0x00800073 usbTxBuf
- 0x0080007e usbDeviceAddr
- 0x0080007f usbRxToken
- 0x00800080 usbInputBufOffset
- 0x00800081 usbMsgPtr
- 0x00800083 usbRxLen
- 0x00800084 usbNewDeviceAddr
- 0x00800085 usbCurrentTok
- 0x00800086 usbConfiguration
- 0x00800087 usbRxBuf
- 0x0080009d PROVIDE (__bss_end, .)
+ COMMON 0x00800071 0x2a main.o
+ 0x00800071 usbTxBuf
+ 0x0080007c usbDeviceAddr
+ 0x0080007d usbRxToken
+ 0x0080007e usbInputBufOffset
+ 0x0080007f usbMsgPtr
+ 0x00800081 usbRxLen
+ 0x00800082 usbNewDeviceAddr
+ 0x00800083 usbCurrentTok
+ 0x00800084 usbConfiguration
+ 0x00800085 usbRxBuf
+ 0x0080009b PROVIDE (__bss_end, .)
0x00001fec __data_load_start = LOADADDR (.data)
- 0x00001ff4 __data_load_end = (__data_load_start + SIZEOF (.data))
+ 0x00001ff2 __data_load_end = (__data_load_start + SIZEOF (.data))
-.noinit 0x0080009d 0x0
- 0x0080009d PROVIDE (__noinit_start, .)
+.noinit 0x0080009b 0x0
+ 0x0080009b PROVIDE (__noinit_start, .)
*(.noinit*)
- 0x0080009d PROVIDE (__noinit_end, .)
- 0x0080009d _end = .
- 0x0080009d PROVIDE (__heap_start, .)
+ 0x0080009b PROVIDE (__noinit_end, .)
+ 0x0080009b _end = .
+ 0x0080009b PROVIDE (__heap_start, .)
.eeprom 0x00810000 0x0
*(.eeprom*)
diff --git a/firmware/main.o b/firmware/main.o
index 93ca9ee..6e5e3ab 100644
--- a/firmware/main.o
+++ b/firmware/main.o
Binary files differ
diff --git a/firmware/upload.rb b/firmware/upload.rb
index 7d7f0bc..85e2c20 100644
--- a/firmware/upload.rb
+++ b/firmware/upload.rb
@@ -24,13 +24,12 @@ class MicroBoot
def info
unless defined? @info
- result = control_transfer(function: :get_info, dataIn: 5)
- version, flash_length, page_size, write_sleep = result.unpack('CS>CC')
+ result = control_transfer(function: :get_info, dataIn: 4)
+ flash_length, page_size, write_sleep = result.unpack('S>CC')
@info = {
flash_length: flash_length,
page_size: page_size,
- version: version,
write_sleep: write_sleep.to_f / 1000.0
}
end
diff --git a/firmware/usbconfig.h b/firmware/usbconfig.h
index e046c00..d8ec6c1 100644
--- a/firmware/usbconfig.h
+++ b/firmware/usbconfig.h
@@ -189,7 +189,7 @@
* you may use one of obdev's free shared VID/PID pairs. See the file
* USB-IDs-for-free.txt for details!
*/
-#define USB_CFG_DEVICE_VERSION 0x01, 0x00
+#define USB_CFG_DEVICE_VERSION UBOOT_VERSION, 0x01
/* Version number of the device: Minor number first, then major number.
*/
#define USB_CFG_VENDOR_NAME 'c','r','e','a','t','i','v','e','p','o','n','y','.','c','o','m'
diff --git a/firmware/usbdrv/oddebug.c.lst b/firmware/usbdrv/oddebug.c.lst
index 956d42d..60ee3cd 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//ccderNW0.s page 1
+GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s page 1
1 .file "oddebug.c"
@@ -8,16 +8,16 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s page
5 __CCP__ = 0x34
6 __tmp_reg__ = 0
7 __zero_reg__ = 1
- GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s page 2
+ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s page 2
DEFINED SYMBOLS
*ABS*:00000000 oddebug.c
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s:2 *ABS*:0000003f __SREG__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s:3 *ABS*:0000003e __SP_H__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s:4 *ABS*:0000003d __SP_L__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s:5 *ABS*:00000034 __CCP__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s:6 *ABS*:00000000 __tmp_reg__
-/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccderNW0.s:7 *ABS*:00000001 __zero_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s:2 *ABS*:0000003f __SREG__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s:3 *ABS*:0000003e __SP_H__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s:4 *ABS*:0000003d __SP_L__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s:5 *ABS*:00000034 __CCP__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s:6 *ABS*:00000000 __tmp_reg__
+/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccGAYCT2.s:7 *ABS*:00000001 __zero_reg__
NO UNDEFINED SYMBOLS