From 288212e19a9341788772afcc0fb02d8240e5ffcc Mon Sep 17 00:00:00 2001 From: Jenna Fox Date: Sun, 23 Sep 2012 19:35:41 +1000 Subject: Giving up on HID - looks like OS wants to poll it which wont work with frozen writing/erasing chip, so going to make custom usb class mini bootloader based on this. This is the last commit where there was something which might be adaptable in to a hid driver --- firmware/main.map | 76 +++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'firmware/main.map') diff --git a/firmware/main.map b/firmware/main.map index 994016f..2b663ae 100644 --- a/firmware/main.map +++ b/firmware/main.map @@ -27,9 +27,6 @@ Discarded input sections .bss 0x00000000 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/../../../../avr/lib/avr25/crttn85.o .data 0x00000000 0x0 usbdrv/usbdrvasm.o .bss 0x00000000 0x0 usbdrv/usbdrvasm.o - .text 0x00000000 0x74 libs-device/osccal.o - .data 0x00000000 0x0 libs-device/osccal.o - .bss 0x00000000 0x0 libs-device/osccal.o .text 0x00000000 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) .data 0x00000000 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) .bss 0x00000000 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) @@ -59,7 +56,6 @@ Linker script and memory map LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/../../../../avr/lib/avr25/crttn85.o LOAD usbdrv/usbdrvasm.o LOAD main.o -LOAD libs-device/osccal.o Address of section .text set to 0x1500 LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/../../../../avr/lib/avr25/libc.a @@ -155,7 +151,7 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a .rela.plt *(.rela.plt) -.text 0x00001500 0x87e +.text 0x00001500 0x914 *(.vectors) .vectors 0x00001500 0x1e /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/../../../../avr/lib/avr25/crttn85.o 0x00001500 __vectors @@ -235,19 +231,21 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a 0x000015d8 __vector_8 0x000015d8 __vector_14 0x000015d8 __vector_1 - .text 0x000015da 0x2f6 usbdrv/usbdrvasm.o + .text 0x000015da 0x31c usbdrv/usbdrvasm.o 0x000015da usbCrc16 0x00001604 usbCrc16Append - 0x0000160c __vector_2 - .text 0x000018d0 0x4aa main.o - 0x000019b0 main - 0x00001d7a . = ALIGN (0x2) + 0x0000160c usbMeasureFrameLength + 0x00001632 __vector_2 + .text 0x000018f6 0x51a main.o + 0x000019b4 calibrateOscillator + 0x00001a2a main + 0x00001e10 . = ALIGN (0x2) *(.text.*) - 0x00001d7a . = ALIGN (0x2) + 0x00001e10 . = ALIGN (0x2) *(.fini9) - .fini9 0x00001d7a 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) - 0x00001d7a exit - 0x00001d7a _exit + .fini9 0x00001e10 0x0 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) + 0x00001e10 exit + 0x00001e10 _exit *(.fini9) *(.fini8) *(.fini8) @@ -266,11 +264,11 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a *(.fini1) *(.fini1) *(.fini0) - .fini0 0x00001d7a 0x4 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) + .fini0 0x00001e10 0x4 /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a(_exit.o) *(.fini0) - 0x00001d7e _etext = . + 0x00001e14 _etext = . -.data 0x00800060 0xa load address 0x00001d7e +.data 0x00800060 0xa load address 0x00001e14 0x00800060 PROVIDE (__data_start, .) *(.data) .data 0x00800060 0x9 main.o @@ -284,33 +282,33 @@ LOAD /usr/local/CrossPack-AVR-20120217/lib/gcc/avr/4.5.1/avr25/libgcc.a 0x0080006a _edata = . 0x0080006a PROVIDE (__data_end, .) -.bss 0x0080006a 0x33 +.bss 0x0080006a 0x34 0x0080006a PROVIDE (__bss_start, .) *(.bss) - .bss 0x0080006a 0x9 main.o + .bss 0x0080006a 0xa 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, .) - 0x00001d7e __data_load_start = LOADADDR (.data) - 0x00001d88 __data_load_end = (__data_load_start + SIZEOF (.data)) - -.noinit 0x0080009d 0x0 - 0x0080009d PROVIDE (__noinit_start, .) + COMMON 0x00800074 0x2a main.o + 0x00800074 usbTxBuf + 0x0080007f usbDeviceAddr + 0x00800080 usbRxToken + 0x00800081 usbInputBufOffset + 0x00800082 usbMsgPtr + 0x00800084 usbRxLen + 0x00800085 usbNewDeviceAddr + 0x00800086 usbCurrentTok + 0x00800087 usbConfiguration + 0x00800088 usbRxBuf + 0x0080009e PROVIDE (__bss_end, .) + 0x00001e14 __data_load_start = LOADADDR (.data) + 0x00001e1e __data_load_end = (__data_load_start + SIZEOF (.data)) + +.noinit 0x0080009e 0x0 + 0x0080009e PROVIDE (__noinit_start, .) *(.noinit*) - 0x0080009d PROVIDE (__noinit_end, .) - 0x0080009d _end = . - 0x0080009d PROVIDE (__heap_start, .) + 0x0080009e PROVIDE (__noinit_end, .) + 0x0080009e _end = . + 0x0080009e PROVIDE (__heap_start, .) .eeprom 0x00810000 0x0 *(.eeprom*) -- cgit v1.2.3