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/usbdrv | |
| 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/usbdrv')
| -rw-r--r-- | firmware/usbdrv/oddebug.c.lst | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/firmware/usbdrv/oddebug.c.lst b/firmware/usbdrv/oddebug.c.lst index 0bd953e..09c11d6 100644 --- a/firmware/usbdrv/oddebug.c.lst +++ b/firmware/usbdrv/oddebug.c.lst @@ -1,4 +1,8 @@ +<<<<<<< HEAD GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s page 1 +======= +GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s page 1 +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 1 .file "oddebug.c" @@ -8,16 +12,29 @@ GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s page 5 __CCP__ = 0x34 6 __tmp_reg__ = 0 7 __zero_reg__ = 1 +<<<<<<< HEAD GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s page 2 +======= + GAS LISTING /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s page 2 +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 DEFINED SYMBOLS *ABS*:00000000 oddebug.c +<<<<<<< HEAD /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s:2 *ABS*:0000003f __SREG__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s:3 *ABS*:0000003e __SP_H__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s:4 *ABS*:0000003d __SP_L__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s:5 *ABS*:00000034 __CCP__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s:6 *ABS*:00000000 __tmp_reg__ /var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccpdcMtI.s:7 *ABS*:00000001 __zero_reg__ +======= +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s:2 *ABS*:0000003f __SREG__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s:3 *ABS*:0000003e __SP_H__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s:4 *ABS*:0000003d __SP_L__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s:5 *ABS*:00000034 __CCP__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s:6 *ABS*:00000000 __tmp_reg__ +/var/folders/nd/dq8cd7_x03d_z3x899kwf__80000gn/T//ccHqVECK.s:7 *ABS*:00000001 __zero_reg__ +>>>>>>> f6c4c6f65e540aa373199fd6e6f99dea43d68ce6 NO UNDEFINED SYMBOLS |