diff options
| author | Jenna Fox <a@creativepony.com> | 2012-09-24 11:37:45 +1000 |
|---|---|---|
| committer | Jenna Fox <a@creativepony.com> | 2012-09-24 11:37:45 +1000 |
| commit | f7d3ec87196a19323ead9419894c20d694339ee5 (patch) | |
| tree | 05367dd8ec4e562d60237fc77a954935a2a0209e /firmware/libs-device | |
| parent | 1661106325194bb00b50b01a92ee4dffef41545b (diff) | |
| parent | f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 (diff) | |
| download | micronucleus-f7d3ec87196a19323ead9419894c20d694339ee5.tar.gz micronucleus-f7d3ec87196a19323ead9419894c20d694339ee5.tar.bz2 micronucleus-f7d3ec87196a19323ead9419894c20d694339ee5.zip | |
Revert get rid of writeLength
Diffstat (limited to 'firmware/libs-device')
| -rw-r--r-- | firmware/libs-device/osccal.c.lst | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/firmware/libs-device/osccal.c.lst b/firmware/libs-device/osccal.c.lst index 9b29699..3c9c840 100644 --- a/firmware/libs-device/osccal.c.lst +++ b/firmware/libs-device/osccal.c.lst @@ -1,4 +1,8 @@ +<<<<<<< HEAD GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s page 1 +======= +GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s page 1 +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 1 .file "osccal.c" @@ -58,7 +62,11 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s page 55 0046 8C17 cp r24,r28 56 0048 9D07 cpc r25,r29 57 004a 04F4 brge .L6 +<<<<<<< HEAD GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s page 2 +======= + GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s page 2 +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 58 004c 01B7 in r16,81-32 @@ -85,11 +93,16 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s page 79 0070 FF90 pop r15 80 0072 0895 ret 81 .size calibrateOscillator, .-calibrateOscillator +<<<<<<< HEAD GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s page 3 +======= + GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s page 3 +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 DEFINED SYMBOLS *ABS*:00000000 osccal.c +<<<<<<< HEAD /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s:2 *ABS*:0000003f __SREG__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s:3 *ABS*:0000003e __SP_H__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s:4 *ABS*:0000003d __SP_L__ @@ -97,6 +110,15 @@ DEFINED SYMBOLS /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s:6 *ABS*:00000000 __tmp_reg__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s:7 *ABS*:00000001 __zero_reg__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccZRYW1t.s:11 .text:00000000 calibrateOscillator +======= +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:2 *ABS*:0000003f __SREG__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:3 *ABS*:0000003e __SP_H__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:4 *ABS*:0000003d __SP_L__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:5 *ABS*:00000034 __CCP__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:6 *ABS*:00000000 __tmp_reg__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:7 *ABS*:00000001 __zero_reg__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccUlOqDi.s:11 .text:00000000 calibrateOscillator +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 UNDEFINED SYMBOLS usbMeasureFrameLength |