diff --git a/Makefile b/Makefile index 65eafb3..2cd41dc 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Makefile to compile and link stk500boot bootloader # Author: Peter Fleury # File: $Id: Makefile,v 1.3 2006/03/04 19:26:17 peter Exp $ -# based on WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al. +# based on WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al. # # Adjust F_CPU below to the clock frequency in Mhz of your AVR target # Adjust BOOTLOADER_ADDRESS to your AVR target @@ -124,7 +124,7 @@ CINCS = CFLAGS = -g$(DEBUG) CFLAGS += $(CDEFS) $(CINCS) CFLAGS += -O$(OPT) -CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -mno-tablejump +CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -fno-jump-tables -Wno-deprecated-declarations -D__PROG_TYPES_COMPAT__ CFLAGS += -Wall -Wstrict-prototypes CFLAGS += -Wa,-adhlns=$(<:.c=.lst) CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) diff --git a/goodHexFiles/stk500boot_v2_mega2560.hex b/goodHexFiles/stk500boot_v2_mega2560.hex index acd0c6b..1939ff1 100644 --- a/goodHexFiles/stk500boot_v2_mega2560.hex +++ b/goodHexFiles/stk500boot_v2_mega2560.hex @@ -1,468 +1,391 @@ :020000023000CC -:10E000000D9489F10D94B2F10D94B2F10D94B2F129 -:10E010000D94B2F10D94B2F10D94B2F10D94B2F1F0 -:10E020000D94B2F10D94B2F10D94B2F10D94B2F1E0 -:10E030000D94B2F10D94B2F10D94B2F10D94B2F1D0 -:10E040000D94B2F10D94B2F10D94B2F10D94B2F1C0 -:10E050000D94B2F10D94B2F10D94B2F10D94B2F1B0 -:10E060000D94B2F10D94B2F10D94B2F10D94B2F1A0 -:10E070000D94B2F10D94B2F10D94B2F10D94B2F190 -:10E080000D94B2F10D94B2F10D94B2F10D94B2F180 -:10E090000D94B2F10D94B2F10D94B2F10D94B2F170 -:10E0A0000D94B2F10D94B2F10D94B2F10D94B2F160 -:10E0B0000D94B2F10D94B2F10D94B2F10D94B2F150 -:10E0C0000D94B2F10D94B2F10D94B2F10D94B2F140 -:10E0D0000D94B2F10D94B2F10D94B2F10D94B2F130 -:10E0E0000D94B2F141546D656761323536300041AF -:10E0F000726475696E6F206578706C6F72657220DE -:10E1000073746B3530305632206279204D4C530099 -:10E11000426F6F746C6F616465723E004875683F52 -:10E1200000436F6D70696C6564206F6E203D200048 -:10E130004350552054797065202020203D20005FF9 -:10E140005F4156525F415243485F5F3D2000415658 -:10E1500052204C696243205665723D20004743437C -:10E160002056657273696F6E203D20004350552024 -:10E1700049442020202020203D20004C6F7720663D -:10E18000757365202020203D20004869676820665F -:10E190007573652020203D200045787420667573D6 -:10E1A00065202020203D20004C6F636B2066757336 -:10E1B000652020203D20004D61792020382032301C -:10E1C000313200312E362E3700342E332E330056A6 -:10E1D00023202020414444522020206F7020636F70 -:10E1E00064652020202020696E73747275637469E1 -:10E1F0006F6E2061646472202020496E74657272B3 -:10E20000757074006E6F20766563746F7200726A49 -:10E210006D702020006A6D70200057686174207056 -:10E220006F72743A00506F7274206E6F7420737541 -:10E2300070706F72746564004D7573742062652030 -:10E2400061206C6574746572002000577269747483 -:10E25000696E672045450052656164696E672045B7 -:10E26000450045452065727220636E743D00504F35 -:10E27000525400303D5A65726F2061646472003FF1 -:10E280003D43505520737461747300403D454550C3 -:10E29000524F4D207465737400423D426C696E6B41 -:10E2A000204C454400453D44756D70204545505215 -:10E2B0004F4D00463D44756D7020464C415348001B -:10E2C000483D48656C70004C3D4C69737420492F83 -:10E2D0004F20506F72747300513D51756974005234 -:10E2E0003D44756D702052414D00563D73686F7707 -:10E2F00020696E7465727275707420566563746FF0 -:10E30000727300593D506F727420626C696E6B00BD -:10E310002A0011241FBECFEFD1E2DEBFCDBF01E046 -:10E320000CBF12E0A0E0B2E0EAE0FDEF03E00BBFBB -:10E3300002C007900D92A030B107D9F712E0A0E01B -:10E34000B2E001C01D92AE30B107E1F70F9464F363 -:10E350000D9483FE01E20EBF0FEF0DBF11241FBE0F -:10E360000D9464F30D9400F020E030E040ED57E0B0 -:10E3700005C0FA013197F1F72F5F3F4F2817390792 -:10E38000C0F308959C01442737FD4095542FDA01CE -:10E39000C901860F911DA11DB11DABBFFC01879165 -:10E3A000882369F08093C6008091C00086FFFCCF6F -:10E3B0008091C00080648093C0006F5FE8CF0895B3 -:10E3C0008DE08093C6008091C00086FFFCCF8091D5 -:10E3D000C00080648093C0008AE08093C600809172 -:10E3E000C00086FFFCCF8091C00080648093C00095 -:10E3F00008950F94C2F10F94E0F10895FC0190810B -:10E40000992359F09093C6008091C00086FFFCCFFD -:10E410008091C00080648093C0003196992379F781 -:10E420000895282F982F92959F70892F805D8A33A9 -:10E4300008F0895F8093C6008091C00086FFFCCF02 -:10E440008091C00080648093C000822F8F70982FCD -:10E45000905D9A3308F0995F9093C6008091C00058 -:10E4600086FFFCCF8091C00080648093C000089537 -:10E470009C01FB01853691051CF46330710594F015 -:10E48000C90164E670E00F9424FE605D7F4F6093E5 -:10E49000C6008091C00086FFFCCF8091C0008064E0 -:10E4A0008093C0002B30310514F43297B4F0C901C9 -:10E4B00064E670E00F9424FE6AE070E00F9424FE9E -:10E4C000605D7F4F6093C6008091C00086FFFCCFE7 -:10E4D0008091C00080648093C000C9016AE070E050 -:10E4E0000F9424FEC0968093C6008091C00086FFE2 -:10E4F000FCCF8091C00080648093C00008951F937A -:10E50000182F8EE692EE60E00F94C2F11093C600D1 -:10E510008091C00086FFFCCF8091C0008064809312 -:10E52000C0000F94E0F11F9108952F923F924F92F7 -:10E530005F926F927F928F929F92AF92BF92CF9293 -:10E54000DF92EF92FF920F931F93DF93CF93CDB79C -:10E55000DEB762970FB6F894DEBF0FBECDBF382E80 -:10E56000622ECA01DB015C016D01772420E2222EBC -:10E570002E010894411C511C8BC081E0A81680E03C -:10E58000B80681E0C80680E0D80628F0C601AA27B0 -:10E59000BB270F9411F2BB27AD2D9C2D8B2D0F9413 -:10E5A00011F28A2D0F9411F22092C6008091C000C2 -:10E5B00086FFFCCF8091C00080648093C0009DE204 -:10E5C0009093C6008091C00086FFFCCF8091C00070 -:10E5D00080648093C0002092C6008091C00086FFB6 -:10E5E000FCCF8091C00080648093C00019828601B6 -:10E5F000750188249924A1E03A1651F03A1620F0CA -:10E60000B2E03B1661F409C00BBFF701779007C079 -:10E61000C7010F946DFE782E02C0F7017080872D20 -:10E620000F9411F22092C6008091C00086FFFCCFAB -:10E630008091C00080648093C000872D8052F401D7 -:10E64000EF70F0708F3520F4E40DF51D708204C07A -:10E65000E40DF51D8EE280830894E11CF11C011D80 -:10E66000111D0894811C911C90E18916910409F0F8 -:10E67000C2CF80E190E0A0E0B0E0A80EB91ECA1EB3 -:10E68000DB1E198AC2010F94FEF10F94E0F16A9427 -:10E69000662009F072CF62960FB6F894DEBF0FBE07 -:10E6A000CDBFCF91DF911F910F91FF90EF90DF9041 -:10E6B000CF90BF90AF909F908F907F906F905F9022 -:10E6C0004F903F902F9008952F923F924F925F92DC -:10E6D0006F927F928F929F92AF92BF92CF92DF9272 -:10E6E000EF92FF920F931F93DF93CF93CDB7DEB7D7 -:10E6F000CD53D1400FB6F894DEBF0FBECDBF01E2BF -:10E700000EBF0FEF0DBF94B7F894A89514BE80917B -:10E71000600088618093600010926000789493FF9D -:10E7200005C0E0910002F09101021995279A2F9AF5 -:10E730008091C00082608093C00080E18093C4001B -:10E7400088E18093C1000000EE24FF24870194E05B -:10E75000A92EB12CCC24DD2424C0C5010197F1F7EA -:10E760000894E11CF11C011D111D21E2E2162EE4AA -:10E77000F20620E0020720E0120718F081E0C82E20 -:10E78000D12CC801B70127EC3BE140E050E00F94E9 -:10E7900037FE611571058105910519F485B1805821 -:10E7A00085B98091C00087FD03C0C114D104A9F2CE -:10E7B000A6014F5F5F4FC25EDE4F59834883CE5143 -:10E7C000D140C25EDE4F88819981CE51D140019700 -:10E7D00011F00D9406FEC05DDE4F19821882C05301 -:10E7E000D14060E0C15DDE4F1882CF52D140AA24F3 -:10E7F000BB24C35DDE4F19821882CD52D140C05E6A -:10E80000DE4F188219821A821B82C052D140CE5C20 -:10E81000DE4F188219821A821B82C253D140EE2425 -:10E82000FF2487010BBFF70107911691C45CDE4FEF -:10E8300019830883CC53D1400D9401FEC25EDE4F94 -:10E8400028813981CE51D1402130310509F52091FF -:10E85000C600C25EDE4F19821882CE51D14022C05E -:10E860002F5F3F4F4F4F5F4F213082E138078AE7DC -:10E87000480780E0580780F0C45CDE4FE881F981EA -:10E88000CC53D140EF5FFF4F19F0EE27FF270994DB -:10E8900020E030E040E050E08091C00087FFE0CF12 -:10E8A0002091C600C35DDE4F48815981CD52D140D1 -:10E8B0004F5F5F4FC35DDE4F59834883CD52D140D8 -:10E8C000213209F067C64A30510508F063C6089442 -:10E8D000A11CB11C53E0A516B10409F05DC600E00F -:10E8E00010E018C081E28093C6008091C00086FFCE -:10E8F000FCCF8091C00080648093C0002F5F3F4FA9 -:10E900002931310579F70F94E0F10F5F1F4F053082 -:10E91000110519F020E030E0E5CF10920A021092C4 -:10E920000B0210920C0210920D021092060210922D -:10E93000070210920802109209021092020210922D -:10E94000030210920402109205028FEE90EE60E036 -:10E950000F94F9F180E191EE60E00F94C2F18091A3 -:10E96000C00087FFFCCF9091C600903608F09F75DD -:10E970009032B8F09093C6008091C00086FFFCCF23 -:10E980008091C00080648093C000A0E2A093C60084 -:10E990008091C00086FFFCCF8091C000806480938E -:10E9A000C000983409F4DBC19934B8F4923409F406 -:10E9B0005DC1933458F4903319F1903308F4E7C5EE -:10E9C0009F33A1F1903409F0E2C5BDC0953409F43C -:10E9D00074C1963409F0DBC59CC1923509F42FC28D -:10E9E000933538F49C3409F4F9C1913509F0CFC559 -:10E9F0001CC2963509F449C2993509F0C8C56BC4E3 -:10EA000083E792EE62E00F94F9F110920602109201 -:10EA10000702109208021092090210920A02109244 -:10EA20000B0210920C0210920D0217C18FE792EEAA -:10EA300062E00F94F9F18FEE90EE60E00F94F9F13F -:10EA400081E291EE60E00F94C2F187EB91EE60E01D -:10EA50000F94F9F180E391EE60E00F94C2F184EE3F -:10EA600090EE60E00F94F9F18FE391EE60E00F9487 -:10EA7000C2F186E090E061E070E00F9438F20F940C -:10EA8000E0F18DE591EE60E00F94C2F189EC91EE3A -:10EA900060E00F94F9F18EE491EE60E00F94C2F122 -:10EAA00083EC91EE60E00F94F9F18CE691EE60E07A -:10EAB0000F94C2F18EE10F9411F288E90F9411F2D4 -:10EAC00081E00F9411F20F94E0F18BE791EE60E09A -:10EAD0000F94C2F119E0E0E0F0E010935700E491E8 -:10EAE0008E2F0F9411F20F94E0F18AE891EE60E01E -:10EAF0000F94C2F1E3E0F0E010935700E4918E2F01 -:10EB00000F9411F20F94E0F189E991EE60E00F9417 -:10EB1000C2F1E2E0F0E010935700E4918E2F0F94E1 -:10EB200011F20F94E0F188EA91EE60E00F94C2F1E7 -:10EB3000E1E0F0E0109357001491812F0F9411F24F -:10EB40000F94E0F107CF8BE892EE62E00F94F9F1B9 -:10EB50008BE492EE60E00F94F9F10F94E0F100E0A5 -:10EB600010E019C0C8016F2D0F9475FEFF2031F41D -:10EB700089E492EE60E00F94C2F10BC0F092C600FF -:10EB80008091C00086FFFCCF8091C000806480939C -:10EB9000C0000F5F1F4FC80181519F41AA2797FDF9 -:10EBA000A095BA2FABBFFC01F790BAE2FB1621F09B -:10EBB000E2E000301E07B1F60F94E0F10F94E0F1AF -:10EBC00087E592EE60E00F94F9F10F94E0F1CC2428 -:10EBD000DD2400E010E01EC0C8010F946DFEF82E89 -:10EBE000882331F489E492EE60E00F94C2F10BC007 -:10EBF0008093C6008091C00086FFFCCF8091C0004A -:10EC000080648093C000FE1419F00894C11CD11CCC -:10EC10000F5F1F4FC80181519F41AA2797FDA09503 -:10EC2000BA2FABBFFC01E790FAE2EF1621F022E029 -:10EC30000030120789F60F94E0F10F94E0F182E6BC -:10EC400092EE60E00F94C2F1C60161E070E00F94B3 -:10EC500038F20F94E0F10F94E0F11092020210925A -:10EC60000302109204021092050274CE89E992EE1A -:10EC700062E00F94F9F1279A2F9A16C02F9880E03E -:10EC800090E0E0EDF7E03197F1F7019684369105D9 -:10EC9000C1F72F9A80E090E0E0EDF7E03197F1F7CF -:10ECA000019684369105C1F78091C00087FFE6CFB9 -:10ECB0008091C00087FFFCCF64C485EA92EE62E0D9 -:10ECC0000F94F9F140910202509103026091040205 -:10ECD0007091050281E020E10F9495F2809102028B -:10ECE00090910302A0910402B091050280509F4FC1 -:10ECF000AF4FBF4F8093020290930302A093040290 -:10ED0000B093050280509041A040B04008F422CE5C -:10ED1000A4CF83EB92EE62E00F94F9F140910602EA -:10ED200050910702609108027091090280E020E191 -:10ED30000F9495F28091060290910702A09108022B -:10ED4000B091090280509F4FAF4FBF4F8093060292 -:10ED500090930702A0930802B0930902FBCD80ECC8 -:10ED600092EE62E00F94F9F183E792EE60E00F9487 -:10ED7000F9F18FE792EE60E00F94F9F18BE892EEF3 -:10ED800060E00F94F9F189E992EE60E00F94F9F1F7 -:10ED900085EA92EE60E00F94F9F183EB92EE60E089 -:10EDA0000F94F9F180EC92EE60E00F94F9F187ECAA -:10EDB00092EE60E00F94F9F188ED92EE60E00F942E -:10EDC000F9F18FED92EE60E00F94F9F18AEE92EE98 -:10EDD00060E00F94F9F183E093EEB9CD87EC92EE09 -:10EDE00062E00F94F9F181E40F947FF282E40F94D2 -:10EDF0007FF283E40F947FF284E40F947FF285E442 -:10EE00000F947FF286E40F947FF287E40F947FF2F1 -:10EE100088E40F947FF28AE40F947FF28BE40F94DE -:10EE20007FF28CE40F947FF295CD88ED92EE62E054 -:10EE30000F94F9F199249394AA24BB2409C48FED6B -:10EE400092EE62E00F94F9F140910A0250910B02A8 -:10EE500060910C0270910D0282E020E10F9495F216 -:10EE600080910A0290910B02A0910C02B0910D02C8 -:10EE700080509F4FAF4FBF4F80930A0290930B0279 -:10EE8000A0930C02B0930D0265CD8AEE92EE62E083 -:10EE90000F94F9F184EE90EE60E00F94F9F18FECAD -:10EEA00091EE60E00F94F9F1662477244301CC5D84 -:10EEB000DE4F19821882C452D140D401C301B695E5 -:10EEC000A79597958795CA5DDE4F88839983AA8316 -:10EED000BB83C652D140CC5DDE4FA881B981C452FC -:10EEE000D1401196CC5DDE4FB983A883C452D14086 -:10EEF000CD0162E070E00F9438F2B0E2B093C6004A -:10EF00008091C00086FFFCCF8091C0008064809318 -:10EF1000C000EDE2E093C6008091C00086FFFCCF08 -:10EF20008091C00080648093C000F0E2F093C6003E -:10EF30008091C00086FFFCCF8091C00080648093E8 -:10EF4000C000CA5DDE4FE880F9800A811B81C6528D -:10EF5000D140BB27A12F902F8F2D0F9411F2CA5DA6 -:10EF6000DE4F8881C652D1400F9411F2E0E2FE2EAE -:10EF7000F092C6008091C00086FFFCCF8091C00057 -:10EF800080648093C0000DE30093C6008091C000B0 -:10EF900086FFFCCF8091C00080648093C00010E2A7 -:10EFA0001093C6008091C00086FFFCCF8091C00006 -:10EFB00080648093C0008BBEF3012791C65DDE4F55 -:10EFC0002883CA52D140A22EBB24CC24DD2408942D -:10EFD000611C711C811C911C8BBEF3018791282E32 -:10EFE0003324442455240894611C711C811C911CF9 -:10EFF0008BBEF3013791C55DDE4F3883CB52D140D4 -:10F000000894611C711C811C911C8BBEF3014791FB -:10F01000C45DDE4F4883CC52D1407DEFE72E7FEFB9 -:10F02000F72E7FEF072F7FEF172F6E0C7F1C801EB0 -:10F03000911E142D032DF22CEE24EA0CFB1C0C1D4A -:10F040001D1D0F9411F220E22093C6008091C00094 -:10F0500086FFFCCF8091C00080648093C000C65DB5 -:10F06000DE4F8881CA52D1400F9411F230E23093C2 -:10F07000C6008091C00086FFFCCF8091C0008064F4 -:10F080008093C000C45DDE4F8881CC52D1400F9484 -:10F0900011F240E24093C6008091C00086FFFCCF91 -:10F0A0008091C00080648093C000C55DDE4F888180 -:10F0B000CB52D1400F9411F250E25093C600809190 -:10F0C000C00086FFFCCF8091C00080648093C000A8 -:10F0D0008FEFE8168FEFF80680E0080780E018074A -:10F0E00031F484E092EE60E00F94C2F1DFC0D80109 -:10F0F000C7018070907CA070B0708050904CA04090 -:10F10000B040D1F52FEF3FE340E050E0E222F322A0 -:10F1100004231523CA5DDE4FA880B980CA80DB8036 -:10F12000C652D140AE0CBF1CC01ED11EAA0CBB1CC7 -:10F13000CC1CDD1C8EE092EE60E00F94C2F1BB2788 -:10F14000A12F902F8F2D0F9411F28E2D0F9411F26D -:10F1500030E23093C6008091C00086FFFCCF8091E2 -:10F16000C00080648093C0004EE34093C60080914D -:10F17000C00086FFFCCF87C08EE09EEFA0E0B0E02D -:10F18000E822F9220A231B239CE0E91694E9F906F8 -:10F1900090E0090790E0190709F088C0C45DDE4FD0 -:10F1A000A881CC52D140EA2EFF2400E010E0102FBD -:10F1B0000F2DFE2CEE24C55DDE4FB881CB52D14021 -:10F1C000EB0EF11C011D111DD601C501817090705F -:10F1D000A070B070DC0199278827E80EF91E0A1F7D -:10F1E0001B1F20EF30E040E050E0A222B322C422F7 -:10F1F000D522A1E1AA0CBB1CCC1CDD1CAA95D1F721 -:10F20000EA0CFB1C0C1D1D1D81E090E0A0E0B0E0AD -:10F21000282239224A225B22F5E1220C331C441CAD -:10F22000551CFA95D1F7E20CF31C041D151D57016E -:10F230006801AA0CBB1CCC1CDD1C85E192EE60E0D1 -:10F240000F94C2F1C801AA27BB270F9411F2BB2764 -:10F25000A12F902F8F2D0F9411F28E2D0F9411F25C -:10F2600090E29093C6008091C00086FFFCCF809111 -:10F27000C00080648093C000AEE3A093C60080917C -:10F28000C00086FFFCCF8091C00080648093C000E6 -:10F29000C601AA27BB270F9411F2BB27AD2D9C2DC9 -:10F2A0008B2D0F9411F28A2D0F9411F20F94E0F12F -:10F2B000CC5DDE4FE881F981C452D140F99709F461 -:10F2C00049CB34E0E32EF12C012D112D6E0C7F1C67 -:10F2D000801E911EF2CD83E093EE62E00F94F9F16F -:10F2E0008AE192EE60E00F94C2F18091C00087FF46 -:10F2F000FCCF1091C6001F751093C6008091C0000E -:10F3000086FFFCCF8091C00080648093C0000F9482 -:10F31000E0F1812F81548A3108F036C1163409F4A6 -:10F3200095C0173490F4133409F44EC0143430F4FB -:10F330001134F1F0123409F01DC130C0143409F455 -:10F3400059C0153409F016C16BC01A3409F4C4C091 -:10F350001B3438F4173409F48FC0183409F00AC18B -:10F36000A1C01B3409F4D2C01C3409F003C1E8C0A9 -:10F370008FEF81B90DC082B1809582B980E090E0B5 -:10F38000E0EDF7E03197F1F70196883C9105C1F780 -:10F390008091C00087FFEFCF12B8EFC08FEF84B924 -:10F3A0000DC085B1809585B980E090E0E0EDF7E093 -:10F3B0003197F1F70196883C9105C1F78091C00023 -:10F3C00087FFEFCF15B8D9C08FEF87B90DC088B1CF -:10F3D000809588B980E090E0E0EDF7E03197F1F7B3 -:10F3E0000196883C9105C1F78091C00087FFEFCF5F -:10F3F00018B8C3C08FEF8AB90DC08BB180958BB997 -:10F4000080E090E0E0EDF7E03197F1F70196883C7D -:10F410009105C1F78091C00087FFEFCF1BB8ADC049 -:10F420008FEF8DB90DC08EB180958EB980E090E0E0 -:10F43000E0EDF7E03197F1F70196883C9105C1F7CF -:10F440008091C00087FFEFCF1EB897C08FEF80BBC1 -:10F450000DC081B3809581BB80E090E0E0EDF7E0E6 -:10F460003197F1F70196883C9105C1F78091C00072 -:10F4700087FFEFCF11BA81C08FEF83BB0DC084B37C -:10F48000809584BB80E090E0E0EDF7E03197F1F704 -:10F490000196883C9105C1F78091C00087FFEFCFAE -:10F4A00014BA6BC08FEF809301010FC080910201ED -:10F4B00080958093020180E090E0E0EDF7E03197E5 -:10F4C000F1F70196883C9105C1F78091C00087FF54 -:10F4D000EDCF1092020151C08FEF809304010FC055 -:10F4E0008091050180958093050180E090E0E0ED3A -:10F4F000F7E03197F1F70196883C9105C1F78091CB -:10F50000C00087FFEDCF1092050137C08FEF8093C9 -:10F5100007010FC08091080180958093080180E069 -:10F5200090E0E0EDF7E03197F1F70196883C910526 -:10F53000C1F78091C00087FFEDCF109208011DC078 -:10F540008FEF80930A010FC080910B01809580930B -:10F550000B0180E090E0E0EDF7E03197F1F70196E4 -:10F56000883C9105C1F78091C00087FFEDCF1092D4 -:10F570000B0103C085E292EEEAC98091C00087FFCB -:10F58000FCCF8091C600E6C988E392EEE0C98CE129 -:10F5900091EEDDC9AA24BB24933011F1943028F4F4 -:10F5A000913089F09230B8F408C0953061F195300F -:10F5B000F0F0963009F048C043C02B3109F03EC945 -:10F5C00091E06BE13BC96227C15DDE4F2883CF52DA -:10F5D000D14092E033C9B22FA0E0622793E02EC958 -:10F5E000822F90E0A82BB92B622794E027C92E30F8 -:10F5F00009F027C3622795E0C05DDE4F19821882AB -:10F60000C053D1401BC9E1E0F0E0EC0FFD1FC05D2D -:10F61000DE4F08811981C053D140E00FF11F2083D4 -:10F620000F5F1F4FC05DDE4F19830883C053D14069 -:10F6300062270A171B0709F001C9D80196E0FEC826 -:10F64000261709F0FEC203C0973009F0F7C89924C5 -:10F650009981933109F412C19431C8F4963009F4B8 -:10F66000D8C0973050F4923009F406C1933009F4B1 -:10F670006DC0913009F047C253C0913109F477C091 -:10F68000923108F0BBC0903109F03DC2F5C098310D -:10F6900009F487C0993150F4953109F4EFC09531E0 -:10F6A00008F4B4C1963109F02EC2B0C19A3109F400 -:10F6B0006CC09A3108F491C09B3109F45BC09D3154 -:10F6C00009F021C29D81903359F48F81882311F470 -:10F6D0009EE11CC0813011F091E018C098E916C07D -:10F6E000892F807591F0903539F4E0E0F0E089E001 -:10F6F0008093570094910AC0983539F4E3E0F0E024 -:10F7000089E080935700949101C090E01A821B8297 -:10F710008D818C831D829E831F8227E030E0F7C19C -:10F720001A8288E08B8381E48C8386E58D8382E571 -:10F730008E8389E48F8383E5888780E589878FE5D9 -:10F740008A8782E38B872BE030E0E1C18A818139AF -:10F7500041F0823941F0803911F48FE005C080E03A -:10F7600003C082E001C08AE01A828B8344C09924DE -:10F77000939482C08D81882311F48EE12CC0813056 -:10F7800011F081E028C088E926C01A82E1E0F0E0AB -:10F7900089E08093570084918B831C8224E030E0C1 -:10F7A000B6C18B81803589F48C81883039F4E2E0F0 -:10F7B000F0E089E08093570084910DC0E0E0F0E034 -:10F7C00089E080935700849106C0E3E0F0E089E08F -:10F7D0008093570084911A82DFCF8D81836C99E0EA -:10F7E000E1E0F0E0082E90935700E89507B600FCA2 -:10F7F000FDCF1A821B8223E030E089C180EC8A832E -:10F80000CE5CDE4F188219821A821B82C253D1400D -:10F810007CC18A8190E0A0E0B0E0582F44273327D4 -:10F8200022278B8190E0A0E0B0E0DC0199278827B7 -:10F83000282B392B4A2B5B2B8D8190E0A0E0B0E088 -:10F84000282B392B4A2B5B2B8C8190E0A0E0B0E079 -:10F85000BA2FA92F982F8827282B392B4A2B5B2BBF -:10F86000220F331F441F551FC05EDE4F288339838C -:10F870004A835B83C052D1401A8247C13A81C95C36 -:10F88000DE4F3883C753D140CA5CDE4F1882C6535F -:10F89000D1408B81A82FB0E0CA5CDE4F48815981EE -:10F8A000C653D140A42BB52B933109F077C0CE5C61 -:10F8B000DE4F088119812A813B81C253D14000303B -:10F8C00040EC140743E0240740E03407F0F483E001 -:10F8D000F80120935B0080935700E89507B600FC81 -:10F8E000FDCFCE5CDE4F088119812A813B81C25356 -:10F8F000D14000501F4F2F4F3F4FCE5CDE4F08834B -:10F9000019832A833B83C253D140C05EDE4F4881B6 -:10F9100059816A817B81C052D1408E01055F1F4FA2 -:10F9200031E0F801808121810E5F1F4FC75CDE4FFF -:10F930002883C953D140C85CDE4F1882C853D140D8 -:10F9400090E0C85CDE4FE880F980C853D1408E2932 -:10F950009F290C01FA0160935B0030935700E895F2 -:10F9600011244E5F5F4F6F4F7F4F1297D1F685E0A6 -:10F97000C05EDE4F088119812A813B81C052D1408F -:10F98000F80120935B0080935700E89507B600FCD0 -:10F99000FDCF81E180935700E8952EC0C05EDE4F19 -:10F9A000288139814A815B81C052D140FE013B965A -:10F9B00011977D0100E010E00894E11CF11C011D8D -:10F9C000111DE20EF31E041F151F21BDBB27A52F1D -:10F9D000942F832F82BD2F5F3F4F4F4F5F4F8191F9 -:10F9E00080BDFA9AF99AF999FECF2E153F05400786 -:10F9F000510759F7BA01A9011A82C05EDE4F488348 -:10FA000059836A837B83C052D1407FC01A81C55C11 -:10FA1000DE4F1883CB53D140C65CDE4F1882CA53E9 -:10FA2000D1408B81C82EDD24C65CDE4F2881398110 -:10FA3000CA53D140C22AD32A1A828981BE016D5F7E -:10FA40007F4F843121F59601C05EDE4FE880F9805A -:10FA50000A811B81C052D1400BBFF701879196915B -:10FA6000DB018C9311969C936E5F7F4FD801C70189 -:10FA70000296A11DB11DC05EDE4F88839983AA83C3 -:10FA8000BB83C052D14022503040F1F636C0C05E38 -:10FA9000DE4F288139814A815B81C052D140089470 -:10FAA000C108D108760100E010E00894C11CD11C07 -:10FAB0000894E11CF11C011D111DE20EF31E041F30 -:10FAC000151F21BDBB27A52F942F832F82BD2F5F2C -:10FAD0003F4F4F4F5F4FF89A80B5DB018D93BD01CB -:10FAE0002E153F054007510761F7C05EDE4F2883A2 -:10FAF00039834A835B83C052D14096012D5F3F4FCB -:10FB0000FB01108204C080EC8A8322E030E08BE1AC -:10FB10008093C6008091C00086FFFCCF8091C0001A -:10FB200080648093C000C15DDE4FF881CF52D14028 -:10FB3000F093C6008091C00086FFFCCF8091C0008A -:10FB400080648093C000432F3093C6008091C00032 -:10FB500086FFFCCF8091C00080648093C000922F0C -:10FB60002093C6008091C00086FFFCCF8091C0002A -:10FB700080648093C0008EE08093C6008091C000B6 -:10FB800086FFFCCF8091C00080648093C00065E157 -:10FB9000C15DDE4FE880CF52D1406E2569276427D2 -:10FBA000FE01319610C090819093C6008091C000F4 -:10FBB00086FFFCCF31968091C00080648093C000A6 -:10FBC0006927215030402115310569F76093C6003F -:10FBD0008091C00086FFFCCF8091C000806480933C -:10FBE000C00085B1805885B9992081F4C15DDE4F90 -:10FBF0000881CF52D1400F5FC15DDE4F0883CF52E5 -:10FC0000D14090E0A0E0B0E00D941EF427982F982A -:10FC100080E090E020ED37E0F9013197F1F70196AF -:10FC200084369105C9F700008091C0008D7F8093D4 -:10FC3000C00081E180935700E895EE27FF270994E3 -:10FC4000FFCF90E00D941EF497FB092E07260AD0F3 -:10FC500077FD04D02ED006D000201AF4709561955F -:10FC60007F4F0895F6F7909581959F4F0895A1E2F3 -:10FC70001A2EAA1BBB1BFD010DC0AA1FBB1FEE1F26 -:10FC8000FF1FA217B307E407F50720F0A21BB30B71 -:10FC9000E40BF50B661F771F881F991F1A9469F7ED -:10FCA00060957095809590959B01AC01BD01CF0149 -:10FCB0000895AA1BBB1B51E107C0AA1FBB1FA617B3 -:10FCC000B70710F0A61BB70B881F991F5A95A9F705 -:10FCD00080959095BC01CD010895F999FECF92BD14 -:10FCE00081BDF89A992780B50895262FF999FECFFE -:10FCF0001FBA92BD81BD20BD0FB6F894FA9AF99A49 -:0AFD00000FBE01960895F894FFCF9E +:10E000000D948AF10D94B3F10D94B3F10D94B3F125 +:10E010000D94B3F10D94B3F10D94B3F10D94B3F1EC +:10E020000D94B3F10D94B3F10D94B3F10D94B3F1DC +:10E030000D94B3F10D94B3F10D94B3F10D94B3F1CC +:10E040000D94B3F10D94B3F10D94B3F10D94B3F1BC +:10E050000D94B3F10D94B3F10D94B3F10D94B3F1AC +:10E060000D94B3F10D94B3F10D94B3F10D94B3F19C +:10E070000D94B3F10D94B3F10D94B3F10D94B3F18C +:10E080000D94B3F10D94B3F10D94B3F10D94B3F17C +:10E090000D94B3F10D94B3F10D94B3F10D94B3F16C +:10E0A0000D94B3F10D94B3F10D94B3F10D94B3F15C +:10E0B0000D94B3F10D94B3F10D94B3F10D94B3F14C +:10E0C0000D94B3F10D94B3F10D94B3F10D94B3F13C +:10E0D0000D94B3F10D94B3F10D94B3F10D94B3F12C +:10E0E0000D94B3F12A00593D506F727420626C692F +:10E0F0006E6B00563D73686F7720696E746572723F +:10E1000075707420566563746F727300523D447568 +:10E110006D702052414D00513D51756974004C3D68 +:10E120004C69737420492F4F20506F7274730048EC +:10E130003D48656C7000463D44756D7020464C410D +:10E14000534800453D44756D7020454550524F4D34 +:10E1500000423D426C696E6B204C454400403D4599 +:10E160004550524F4D2074657374003F3D435055E8 +:10E1700020737461747300303D5A65726F2061645E +:10E18000647200504F5254004545206572722063FE +:10E190006E743D0052656164696E672045450057A5 +:10E1A00072697474696E672045450020004D75736F +:10E1B000742062652061206C657474657200506F14 +:10E1C0007274206E6F7420737570706F72746564F2 +:10E1D000005768617420706F72743A006A6D702025 +:10E1E00000726A6D702020006E6F20766563746F18 +:10E1F00072005623202020414444522020206F707A +:10E2000020636F64652020202020696E737472750E +:10E210006374696F6E2061646472202020496E749B +:10E220006572727570740031312E322E3000322ECC +:10E23000302E3000446563202031203230323200ED +:10E240004C6F636B20667573652020203D20004570 +:10E2500078742066757365202020203D2000486971 +:10E26000676820667573652020203D20004C6F771D +:10E270002066757365202020203D200043505520E6 +:10E2800049442020202020203D20004743432056A1 +:10E29000657273696F6E203D2000415652204C69B3 +:10E2A0006243205665723D20005F5F4156525F41D8 +:10E2B0005243485F5F3D20004350552054797065BC +:10E2C000202020203D2000436F6D70696C65642024 +:10E2D0006F6E203D20004875683F00426F6F746C80 +:10E2E0006F616465723E0041726475696E6F20658E +:10E2F00078706C6F7265722073746B353030563283 +:10E30000206279204D4C530041546D656761323570 +:10E310003630000011241FBECFEFD1E2DEBFCDBFEB +:10E3200001E00CBF12E0A0E0B2E0E6E2F8EF03E0AB +:10E330000BBF02C007900D92A430B107D9F722E0BD +:10E34000A4E0B2E001C01D92A231B207E1F70F9440 +:10E35000F1F20D9411FC01E20EBF0FEF0DBF11247D +:10E360001FBE0D94F1F20D9400F08093C6008091D1 +:10E37000C00086FFFCCF8091C00080648093C00005 +:10E3800008958091C00087FFFCCF8091C60008955A +:10E390009C0190E080E08217930709F40895EFEC68 +:10E3A000F7E03197F1F700C000000196F4CF0F932A +:10E3B0001F93CF93DF938C01D62FC8018D0F911D32 +:10E3C000092E000CAA0BBB0BABBFFC01C791CC23E1 +:10E3D00019F08C2F0F94B5F1DF5FC111EECFDF91F3 +:10E3E000CF911F910F9108958DE00F94B5F18AE0C0 +:10E3F0000D94B5F1CF93C82F60E083E891EE0F94B0 +:10E40000D7F18C2F0F94B5F1CF910D94F4F10F94B7 +:10E41000D7F10D94F4F1CF93DF93EC018991882328 +:10E4200019F00F94B5F1FACFDF91CF910895CF9302 +:10E43000C82F982F92959F7080E3890F8A3310F030 +:10E4400087E3890F0F94B5F1CF7080E38C0F8A3387 +:10E4500010F087E38C0FCF910D94B5F12F923F927E +:10E460004F925F926F927F928F929F92AF92BF92E4 +:10E47000CF92DF92EF92FF920F931F93CF93DF9390 +:10E48000CDB7DEB762970FB6F894DEBF0FBECDBF33 +:10E49000982E6A017B0180E1882E81E0C816D104A4 +:10E4A000E806F10418F08E2D0F9417F28D2D0F94BD +:10E4B00017F20C2D8C2D0F9417F280E20F94B5F10A +:10E4C0008DE20F94B5F180E20F94B5F11982FE014F +:10E4D00031965F01260137011F01005FF1E09F16B1 +:10E4E00009F443C082E0981609F444C06BBEF201FF +:10E4F0001791812F0F9417F280E20F94B5F180EEFF +:10E50000810F8F3508F01EE2F50111935F01FFEFD7 +:10E510004F1A5F0A6F0A7F0A0411E0CF80E1C80E2C +:10E52000D11CE11CF11C198AC1010F940BF20F944C +:10E53000F4F18A948110B1CF62960FB6F894DEBFE1 +:10E540000FBECDBFDF91CF911F910F91FF90EF9044 +:10E55000DF90CF90BF90AF909F908F907F906F9003 +:10E560005F904F903F902F900895C2010F94FBFB56 +:10E57000182FBFCFF2011081BCCF0F931F93CF9301 +:10E58000DF93EC018B01853691051CF46330710536 +:10E590004CF0CE0164E670E00F94AAFB80E3860F96 +:10E5A0000F94B5F1CB30D1051CF4023011056CF09D +:10E5B000CE0164E670E00F94AAFB6AE070E00F946D +:10E5C000AAFB80E3860F0F94B5F1CE016AE070E0FC +:10E5D0000F94AAFB805DDF91CF911F910F910D9455 +:10E5E000B5F1CDB7DEB7C953D1400FB6F894DEBF51 +:10E5F0000FBECDBF01E20EBF0FEF0DBF94B7F89471 +:10E60000A89514BE8091600088618093600010928C +:10E610006000789493FF05C0E0911002F091110220 +:10E620001995279A2F9A8091C00082608093C0002C +:10E6300080E18093C40088E18093C100000010E075 +:10E6400000E0C12CD12C760137EC832E3BE1932ED8 +:10E65000A12CB12C8091C00087FD39C0012BA1F005 +:10E6600027982F9884E690E00F94C8F100008091DD +:10E67000C0008D7F8093C00081E180935700E895B2 +:10E68000EE27FF270994FFCF25E02A95F1F7000038 +:10E690003FEFC31AD30AE30AF30A81E041E2C4164A +:10E6A0004EE4D406E104F10408F480E0082F10E001 +:10E6B000C701B601A50194010F94BEFB672B682B1F +:10E6C000692B09F0C7CF85B1805885B9C3CF012B1D +:10E6D00009F0C6CFC35DDE4F19821882CD52D140FA +:10E6E000312C212CCC5DDE4F19821882C452D140CE +:10E6F000CA5DDE4F188219821A821B82C652D1402F +:10E70000412C512C320141E050E0C65DDE4F1882B1 +:10E71000CA52D140D12CFE013196C25EDE4FF98340 +:10E72000E883CE51D140C25EDE4FF881CE51D14058 +:10E73000C85CDE4FF883C853D140C15EDE4F2881EC +:10E74000CF51D140C75CDE4F2883C953D14030E060 +:10E7500020E080E04FC5415051096109710971F411 +:10E760006BBFFA01479156914F3F5F4F19F0EE276B +:10E77000FF27099441E052E16AE770E09091C00000 +:10E7800097FFE9CF3BC5123409F4F4C1153409F001 +:10E7900073C162E083E491EE0F9407F240910402AA +:10E7A00050910502609106027091070281E00F947A +:10E7B0002EF28091040290910502A0910602B09180 +:10E7C00007029F5FAF4FBF4F8115E0E19E07A10594 +:10E7D000B10508F09EC08093040290930502A093B7 +:10E7E0000602B093070226C1123509F445C208F0AB +:10E7F00049C01C3409F4FBC1113509F41FC2183497 +:10E8000009F03AC162E08FE291EE0F9407F260E006 +:10E8100087E791EE0F9407F260E08BE691EE0F949C +:10E8200007F260E08DE591EE0F9407F260E081E57C +:10E8300091EE0F9407F260E083E491EE0F9407F2FB +:10E8400060E086E391EE0F9407F260E08FE291EED4 +:10E850000F9407F260E08EE191EE0F9407F260E012 +:10E8600087E191EE0F9407F260E08CE091EE0F9457 +:10E8700007F260E083EF90EE0F9407F260E086EE1F +:10E8800090EE02C5163509F41BC2193509F0F4C023 +:10E8900062E086EE90EE0F9407F260E081ED91EE7B +:10E8A0000F94D7F10F94C1F1182F1F75812F0F947A +:10E8B000B5F10F94F4F18FEB810F8A3108F084C425 +:10E8C000163409F425C408F0B7C3133409F4F8C3A7 +:10E8D00008F0A4C3113409F4D3C3123409F4E0C31B +:10E8E00060E08EEB91EED0C462E087E791EE0F948A +:10E8F00007F2109208021092090210920A02109276 +:10E900000B0210920C0210920D0210920E02109245 +:10E910000F02109204021092050210920602109249 +:10E92000070288C062E08BE691EE0F9407F260E088 +:10E9300087EE92EE0F9407F260E087EC92EE0F9470 +:10E94000D7F160E084E392EE0F9407F260E088EB89 +:10E9500092EE0F94D7F160E088E093EE0F9407F207 +:10E9600060E089EA92EE0F94D7F186E30F94B5F157 +:10E970000F94F4F160E08BE892EE0F94D7F160E031 +:10E9800087E292EE0F9407F260E08AE992EE0F942C +:10E99000D7F160E08EE292EE0F9407F260E08CE730 +:10E9A00092EE0F94D7F18EE10F9417F288E90F944D +:10E9B00017F281E00F9417F20F94F4F160E08DE606 +:10E9C00092EE0F94D7F129E0F0E0E0E020935700B9 +:10E9D00084910F9417F20F94F4F160E08EE592EEBB +:10E9E0000F94D7F129E0E3E0F0E020935700849101 +:10E9F0000F9417F20F94F4F160E08FE492EE0F940D +:10EA0000D7F1E2E0F0E039E03093570084910F94C1 +:10EA100017F20F94F4F160E080E492EE0F94D7F1D6 +:10EA2000E1E0F0E049E04093570084910F9417F241 +:10EA30000F94F4F160E08BED92EE0F94D7F10F9408 +:10EA4000C1F1182F803608F01F751032A8F0812F01 +:10EA50000F94B5F180E20F94B5F1163409F4A3C018 +:10EA600008F0C2CE103461F008F08DCE103309F4F6 +:10EA70003BCF1F3309F456CF60E086ED92EE04C41D +:10EA800062E08DE591EE0F9407F260E08FE991EE80 +:10EA90000F9407F20F94F4F110E000E0C8018951DF +:10EAA0009D41092E000CAA0BBB0BABBFFC01F790DC +:10EAB0005AE2F51621F0011562E0160799F50F9458 +:10EAC000F4F10F94F4F160E084E991EE0F9407F211 +:10EAD0000F94F4F1F12CE12C10E000E0C801895111 +:10EAE0009D41092E000CAA0BBB0BABBFFC01D790BC +:10EAF0008AE2D81621F0011592E0190729F50F9442 +:10EB0000F4F10F94F4F160E088E891EE0F94D7F1FE +:10EB100061E070E0C7010F94BDF20F94F4F10F941F +:10EB2000F4F1F7CE6F2DC8010F9403FCF11008C06B +:10EB300060E08BEA91EE0F94D7F10F5F1F4FAECFDD +:10EB40008F2D0F94B5F1F9CFC8010F94FBFBC82EA0 +:10EB500081110DC060E08BEA91EE0F94D7F1CD14D6 +:10EB600019F07FEFE71AF70A0F5F1F4FB7CF0F9427 +:10EB7000B5F1F5CF62E081E591EE0F9407F2279AA7 +:10EB80002F9A8091C00087FF03C00F94C1F152CF2C +:10EB90002F9884E690E00F94C8F12F9A84E690E0D5 +:10EBA0000F94C8F1EECF62E086E391EE0F9407F286 +:10EBB000409108025091090260910A0270910B0283 +:10EBC00080E00F942EF28091080290910902A091AA +:10EBD0000A02B0910B029F5FAF4FBF4F80930802B4 +:10EBE00090930902A0930A02B0930B0223CF62E034 +:10EBF0008EE191EE0F9407F281E40F94FAF182E432 +:10EC00000F94FAF183E40F94FAF184E40F94FAF18B +:10EC100085E40F94FAF186E40F94FAF187E40F94F7 +:10EC2000FAF188E40F94FAF18AE40F94FAF18BE494 +:10EC30000F94FAF18CE40F94FAF1FCCE62E087E1D4 +:10EC400091EE0F9407F2CC24C3942981243109F466 +:10EC500022C508F088C3263009F4CCC408F073C379 +:10EC6000223009F47CC3233009F479C4213009F43B +:10EC700060C480EC8A8374C362E08CE091EE0F94F0 +:10EC800007F240910C0250910D0260910E027091BA +:10EC90000F0282E00F942EF280910C0290910D02EF +:10ECA000A0910E02B0910F029F5FAF4FBF4F8093B4 +:10ECB0000C0290930D02A0930E02B0930F02BACEF5 +:10ECC00062E083EF90EE0F9407F260E088E093EE4D +:10ECD0000F9407F260E082EF91EE0F9407F2C55DAA +:10ECE000DE4F19821882CB52D140C05EDE4F1882AF +:10ECF00019821A821B82C052D140C05EDE4F288129 +:10ED000039814A815B81C052D140569547953795EC +:10ED10002795C15DDE4F288339834A835B83CF52B9 +:10ED2000D140C55DDE4F48815981CB52D1404F5F04 +:10ED30005F4FC55DDE4F59834883CB52D14062E0BF +:10ED400070E0CA010F94BDF280E20F94B5F18DE23C +:10ED50000F94B5F180E20F94B5F180E00F9417F2B3 +:10ED6000C15DDE4F8881CF52D1400F9417F280E20F +:10ED70000F94B5F18DE30F94B5F180E20F94B5F1E6 +:10ED8000C05EDE4F688179818A819B81C052D1400B +:10ED90008BBFFB017791C95CDE4F7883C753D140AD +:10EDA000872E912CB12CA12CC05EDE4F88819981D9 +:10EDB000AA81BB81C052D1400196A11DB11DABBF3C +:10EDC000FC018791282F30E050E040E0CD5CDE4F21 +:10EDD000288339834A835B83C353D140C05EDE4FAF +:10EDE000088119812A813B81C052D1400E5F1F4F9B +:10EDF0002F4F3F4F2BBFF8010791C05EDE4F488178 +:10EE000059816A817B81C052D1404D5F5F4F6F4F06 +:10EE10007F4F6BBFFA011791C05EDE4F4881598169 +:10EE20006A817B81C052D1404C5F5F4F6F4F7F4FF3 +:10EE3000C05EDE4F488359836A837B83C052D140D2 +:10EE4000CD5CDE4F288139814A815B81C353D1403B +:10EE5000CC24D22EE32EF42EC80CD91CEA1CFB1CA9 +:10EE60000F9417F280E20F94B5F1C95CDE4F8881F0 +:10EE7000C753D1400F9417F280E20F94B5F1812F60 +:10EE80000F9417F280E20F94B5F1802F0F9417F2D0 +:10EE900080E20F94B5F13FEFC316D306E104F1040D +:10EEA00091F460E088EE91EE0F94D7F10F94F4F1B5 +:10EEB000C55DDE4F28813981CB52D14029333105E0 +:10EEC00009F01BCFB7CDD701C6018827907CAA27B0 +:10EED000BB278115904CA105B10579F55FE3D522DB +:10EEE000EE24FF24C15DDE4F88809980AA80BB801C +:10EEF000CF52D1408C0C9D1CAE1CBF1C880C991CA1 +:10EF0000AA1CBB1C60E081EE91EE0F94D7F18D2D11 +:10EF10000F9417F28C2D0F9417F280E20F94B5F135 +:10EF20008EE30F94B5F180E00F9417F2892D0F94C2 +:10EF300017F2882D0F9417F2B9CF6EE0C622E8942D +:10EF4000D0F8EE24FF247CE0C71674E9D706E1046C +:10EF5000F10409F0ABCF812F90E0B0E0A0E0BA2F30 +:10EF6000A92F982F8827800F911DA11DB11DCD5C61 +:10EF7000DE4F488159816A817B81C353D14035E19D +:10EF8000440F551F661F771F3A95D1F74427552721 +:10EF900060727727480F591F6A1F7B1FD40199277A +:10EFA000882788279927A170BB27F1E1880C991C35 +:10EFB000AA1CBB1CFA95D1F788249924E0EEAE2256 +:10EFC000E1E0BE2288299929AA29BB294A015B01CF +:10EFD000880E991EAA1EBB1E75016401CC0CDD1C97 +:10EFE000EE1CFF1C60E08CED91EE0F94D7F18A2DA2 +:10EFF0000F9417F2892D0F9417F2882D0F9417F2A2 +:10F0000080E20F94B5F18EE30F94B5F18E2D0F943D +:10F0100017F28D2D0F9417F28C2D8CCF143409F428 +:10F020005FC0153409F05CCC7FEF7DB98091C000E2 +:10F0300087FF66C01EB8A9CD1A3409F493C080F4C6 +:10F04000173409F475C0183409F04ACCAFEFA09317 +:10F0500001018091C00087FF7BC01092020195CD15 +:10F060001B3409F493C01C3409F03ACCFFEFF09341 +:10F070000A018091C00087FF9DC010920B0185CDD1 +:10F080003FEF31B98091C00087FF02C012B87DCD3B +:10F0900082B1809582B988EC90E00F94C8F1F2CFEC +:10F0A0004FEF44B98091C00087FF02C015B86DCD05 +:10F0B00085B1809585B988EC90E00F94C8F1F2CFC6 +:10F0C0005FEF57B98091C00087FF02C018B85DCDCF +:10F0D00088B1809588B988EC90E00F94C8F1F2CFA0 +:10F0E0006FEF6AB98091C00087FF02C01BB84DCD99 +:10F0F0008BB180958BB988EC90E00F94C8F1F2CF7A +:10F100008EB180958EB988EC90E00F94C8F18ECFC7 +:10F110008FEF80BB8091C00087FF02C011BA35CD50 +:10F1200081B3809581BB88EC90E00F94C8F1F2CF59 +:10F130009FEF93BB8091C00087FF02C014BA25CD1A +:10F1400084B3809584BB88EC90E00F94C8F1F2CF33 +:10F150008091020180958093020188EC90E00F94E9 +:10F16000C8F177CFBFEFB09304018091C00087FF53 +:10F1700003C01092050109CD80910501809580930F +:10F18000050188EC90E00F94C8F1EFCFEFEFE0932A +:10F1900007018091C00087FF03C010920801F5CCE1 +:10F1A0008091080180958093080188EC90E00F948D +:10F1B000C8F1EFCF80910B01809580930B0188EC13 +:10F1C00090E00F94C8F155CF60E08DEA91EE5CC0FD +:10F1D000312C212C833009F47CC008F058C08130D8 +:10F1E00009F468C0823009F46DC0882309F45BC05B +:10F1F00040E050E04130510509F0BCCA9091C60092 +:10F20000C35DDE4FA881B981CD52D1401196C35D57 +:10F21000DE4FB983A883CD52D1409132C9F61A97F7 +:10F22000B8F6BFEF2B1A3B0AE3E02E16310491F635 +:10F2300025E0222E312C09E110E081E20F94B5F196 +:10F2400001501109D1F70F94F4F1F1E02F1A3108B0 +:10F2500091F710920C0210920D0210920E02109271 +:10F260000F02109208021092090210920A021092E4 +:10F270000B021092040210920502109206021092E4 +:10F28000070260E087EE92EE0F9407F2D3CB853051 +:10F2900099F1863009F452C08430F9F0873009F0D2 +:10F2A000A7CFC12CD2CC9B3109F0A2CF8BE1D82EB5 +:10F2B00081E09ECFD926C65DDE4F9883CA52D140E9 +:10F2C00082E096CF292F30E0322F2227D92683E003 +:10F2D0008FCF292BD92684E08BCF9E3091F5D9266C +:10F2E000CC5DDE4F1882C452D140CB5DDE4F188218 +:10F2F000C552D14085E07CCFCC5DDE4F488159813D +:10F30000C452D1404F5F5F4FE1E0F0E0EC0FFD1FD2 +:10F31000CC5DDE4F68817981C452D140E60FF71F82 +:10F320009083D9264217530709F00DC2CC5DDE4FFA +:10F3300039832883C452D14086E05ACF9D1509F401 +:10F34000B0CF80E055CF223109F447C12331C9F055 +:10F35000203129F0213109F08CCCCC24C3941A82BD +:10F3600002E010E088C0293109F428C108F05BC030 +:10F37000263109F490C1283109F40BC1253109F077 +:10F3800078CC8A819B81982789279827233109F097 +:10F390005AC1CA5DDE4F488159816A817B81C6525C +:10F3A000D1404115A0EE5A07A3E06A077105E8F4C1 +:10F3B00023E0FA0160935B0020935700E89507B6BD +:10F3C00000FCFDCFCA5DDE4F288139814A815B8117 +:10F3D000C652D1403F5F4F4F5F4FCA5DDE4F28831B +:10F3E00039834A835B83C652D1402B85DE01119657 +:10F3F000B301A20111E01B963C911B970901FA0190 +:10F4000060935B0010935700E89511244E5F5F4FA7 +:10F410006F4F7F4F02971296009709F402C11A9618 +:10F420002C911A97E8CF2B3109F4A7C02D3179F030 +:10F430002A3109F01ECC1A8289E0E1E0F0E08093E5 +:10F44000570084918B831C8204E010E014C09D81DE +:10F45000903309F056C08F81882309F466C081304B +:10F4600009F465C081E01A821B829C831D828E8311 +:10F470001F8207E010E08BE10F94B5F1C65DDE4F0F +:10F480008881CA52D1400F94B5F1812F0F94B5F104 +:10F49000C65DDE4FD880CA52D140D126802F0F944E +:10F4A000B5F1D0268EE00F94B5F185E1D82661E064 +:10F4B00070E06C0F7D1F060F171FC85CDE4FE880E1 +:10F4C000C853D140C75CDE4FF880C953D1400E15F8 +:10F4D0001F0509F030C18D2D0F94B5F1C65DDE4FCB +:10F4E000B881CA52D140BF5FC65DDE4FB883CA52F1 +:10F4F000D14085B1805885B9C110B2C850E040E014 +:10F5000026C9892F807509F4AECF89E0F0E0E0E0EC +:10F51000903539F080E0983509F0A5CF89E0E3E037 +:10F52000F0E08093570084919ECF8EE19CCF88E9D4 +:10F530009ACF1A8288E08B8381E48C8386E58D8361 +:10F5400082E58E8389E48F8383E5888780E58987D8 +:10F550008FE58A8782E38B870BE010E08CCFEA810E +:10F56000E05980E0E33020F4F0E0E050FE4F80818D +:10F570001A828B8303E010E07ECF8D81882329F0EF +:10F58000813029F081E01A825DCF8EE1FCCF88E9DD +:10F59000FACF8B81803571F48C81883039F489E021 +:10F5A000E2E0F0E0809357008491EDCF89E0F0E055 +:10F5B000E0E0F8CF89E0E3E0F0E0F4CF8D81836C08 +:10F5C00099E0E1E0F0E0082E90935700E89507B647 +:10F5D00000FCFDCF1A821B82CDCF80EC8A8302E033 +:10F5E00010E0CA5DDE4F188219821A821B82C65251 +:10F5F000D14041CF2A813B814C815D81C05EDE4F8D +:10F60000288339834A835B83C052D140CA01B90140 +:10F610000F94E0FB2B013C01440C551C661C771C2D +:10F620009ECE35E0F20160925B0030935700E89582 +:10F6300007B600FCFDCF81E180935700E8951A8260 +:10F640002A013B018DCEFE0131969C012E0F3F1FFA +:10F65000B301A20141BD852E962EA72EBB2482BCEC +:10F660004F5F5F4F6F4F7F4FA285A0BDFA9AF99A07 +:10F67000F999FECF31962E173F0761F70197B0E059 +:10F68000A0E00196A11DB11DAC01BD01440D551DA9 +:10F69000661D771DD4CF8A819B819827892798275B +:10F6A0008C010D5F1F4F1A822431C9F4DE011196BF +:10F6B0006BBEF2012791369112962C931297FD01A1 +:10F6C000349613963C93139742E0440E511C611CF0 +:10F6D000711C02971296009759F71082CCCEFE014A +:10F6E00031969F01280F391FB301A20141BD852E1C +:10F6F000962EA72EBB2482BC4F5F5F4F6F4F7F4F6C +:10F70000F89AA0B5A2833196E217F30779F7AC0116 +:10F710004150510970E060E04F5F5F4F6F4F7F4F86 +:10F72000440E551E661E771EE3E0F0E0EC0FFD1F51 +:10F73000E80FF91FD2CFD701BD907D018B2D0F941B +:10F74000B5F1DB24C4CECC5DDE4F59834883C4526F +:10F75000D1404ECD97FB072E16F4009407D077FDCD +:10F7600009D00F94E7FB07FC05D03EF490958195F6 +:10F770009F4F0895709561957F4F0895A1E21A2ECD +:10F78000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1F45 +:10F79000A217B307E407F50720F0A21BB30BE40B95 +:10F7A000F50B661F771F881F991F1A9469F76095DC +:10F7B0007095809590959B01AC01BD01CF01089596 +:10F7C0006927962769277827872778270895AA1B0E +:10F7D000BB1B51E107C0AA1FBB1FA617B70710F03C +:10F7E000A61BB70B881F991F5A95A9F7809590956E +:10F7F000BC01CD010895F999FECF92BD81BDF89A63 +:10F80000992780B50895262FF999FECF1FBA92BD8A +:10F8100081BD20BD0FB6F894FA9AF99A0FBE0196F1 +:06F820000895F894FFCFEB +:04F826000F020A00C3 :040000033000E000E9 :00000001FF diff --git a/stk500boot.c b/stk500boot.c index 89eead1..dafaff3 100644 --- a/stk500boot.c +++ b/stk500boot.c @@ -268,12 +268,12 @@ Description: add timeout feature like previous Wiring bootloader //#define BOOTSIZE 1024 #if FLASHEND > 0x0F000 #define BOOTSIZE 8192 + #define APP_END ((FLASHEND - BOOTSIZE) + 1) #else #define BOOTSIZE 2048 + #define APP_END (FLASHEND - (2*BOOTSIZE) + 1) #endif -#define APP_END (FLASHEND -(2*BOOTSIZE) + 1) - /* * Signature bytes are not available in avr-gcc io_xxx.h */ @@ -1240,62 +1240,62 @@ unsigned long gEepromIndex; void PrintDecInt(int theNumber, int digitCnt); #ifdef _AVR_CPU_NAME_ - prog_char gTextMsg_CPU_Name[] PROGMEM = _AVR_CPU_NAME_; + const prog_char gTextMsg_CPU_Name[] PROGMEM = _AVR_CPU_NAME_; #else - prog_char gTextMsg_CPU_Name[] PROGMEM = "UNKNOWN"; + const prog_char gTextMsg_CPU_Name[] PROGMEM = "UNKNOWN"; #endif - prog_char gTextMsg_Explorer[] PROGMEM = "Arduino explorer stk500V2 by MLS"; - prog_char gTextMsg_Prompt[] PROGMEM = "Bootloader>"; - prog_char gTextMsg_HUH[] PROGMEM = "Huh?"; - prog_char gTextMsg_COMPILED_ON[] PROGMEM = "Compiled on = "; - prog_char gTextMsg_CPU_Type[] PROGMEM = "CPU Type = "; - prog_char gTextMsg_AVR_ARCH[] PROGMEM = "__AVR_ARCH__= "; - prog_char gTextMsg_AVR_LIBC[] PROGMEM = "AVR LibC Ver= "; - prog_char gTextMsg_GCC_VERSION[] PROGMEM = "GCC Version = "; - prog_char gTextMsg_CPU_SIGNATURE[] PROGMEM = "CPU ID = "; - prog_char gTextMsg_FUSE_BYTE_LOW[] PROGMEM = "Low fuse = "; - prog_char gTextMsg_FUSE_BYTE_HIGH[] PROGMEM = "High fuse = "; - prog_char gTextMsg_FUSE_BYTE_EXT[] PROGMEM = "Ext fuse = "; - prog_char gTextMsg_FUSE_BYTE_LOCK[] PROGMEM = "Lock fuse = "; - prog_char gTextMsg_GCC_DATE_STR[] PROGMEM = __DATE__; - prog_char gTextMsg_AVR_LIBC_VER_STR[] PROGMEM = __AVR_LIBC_VERSION_STRING__; - prog_char gTextMsg_GCC_VERSION_STR[] PROGMEM = __VERSION__; - prog_char gTextMsg_VECTOR_HEADER[] PROGMEM = "V# ADDR op code instruction addr Interrupt"; - prog_char gTextMsg_noVector[] PROGMEM = "no vector"; - prog_char gTextMsg_rjmp[] PROGMEM = "rjmp "; - prog_char gTextMsg_jmp[] PROGMEM = "jmp "; - prog_char gTextMsg_WHAT_PORT[] PROGMEM = "What port:"; - prog_char gTextMsg_PortNotSupported[] PROGMEM = "Port not supported"; - prog_char gTextMsg_MustBeLetter[] PROGMEM = "Must be a letter"; - prog_char gTextMsg_SPACE[] PROGMEM = " "; - prog_char gTextMsg_WriteToEEprom[] PROGMEM = "Writting EE"; - prog_char gTextMsg_ReadingEEprom[] PROGMEM = "Reading EE"; - prog_char gTextMsg_EEPROMerrorCnt[] PROGMEM = "EE err cnt="; - prog_char gTextMsg_PORT[] PROGMEM = "PORT"; + const prog_char gTextMsg_Explorer[] PROGMEM = "Arduino explorer stk500V2 by MLS"; + const prog_char gTextMsg_Prompt[] PROGMEM = "Bootloader>"; + const prog_char gTextMsg_HUH[] PROGMEM = "Huh?"; + const prog_char gTextMsg_COMPILED_ON[] PROGMEM = "Compiled on = "; + const prog_char gTextMsg_CPU_Type[] PROGMEM = "CPU Type = "; + const prog_char gTextMsg_AVR_ARCH[] PROGMEM = "__AVR_ARCH__= "; + const prog_char gTextMsg_AVR_LIBC[] PROGMEM = "AVR LibC Ver= "; + const prog_char gTextMsg_GCC_VERSION[] PROGMEM = "GCC Version = "; + const prog_char gTextMsg_CPU_SIGNATURE[] PROGMEM = "CPU ID = "; + const prog_char gTextMsg_FUSE_BYTE_LOW[] PROGMEM = "Low fuse = "; + const prog_char gTextMsg_FUSE_BYTE_HIGH[] PROGMEM = "High fuse = "; + const prog_char gTextMsg_FUSE_BYTE_EXT[] PROGMEM = "Ext fuse = "; + const prog_char gTextMsg_FUSE_BYTE_LOCK[] PROGMEM = "Lock fuse = "; + const prog_char gTextMsg_GCC_DATE_STR[] PROGMEM = __DATE__; + const prog_char gTextMsg_AVR_LIBC_VER_STR[] PROGMEM = __AVR_LIBC_VERSION_STRING__; + const prog_char gTextMsg_GCC_VERSION_STR[] PROGMEM = __VERSION__; + const prog_char gTextMsg_VECTOR_HEADER[] PROGMEM = "V# ADDR op code instruction addr Interrupt"; + const prog_char gTextMsg_noVector[] PROGMEM = "no vector"; + const prog_char gTextMsg_rjmp[] PROGMEM = "rjmp "; + const prog_char gTextMsg_jmp[] PROGMEM = "jmp "; + const prog_char gTextMsg_WHAT_PORT[] PROGMEM = "What port:"; + const prog_char gTextMsg_PortNotSupported[] PROGMEM = "Port not supported"; + const prog_char gTextMsg_MustBeLetter[] PROGMEM = "Must be a letter"; + const prog_char gTextMsg_SPACE[] PROGMEM = " "; + const prog_char gTextMsg_WriteToEEprom[] PROGMEM = "Writting EE"; + const prog_char gTextMsg_ReadingEEprom[] PROGMEM = "Reading EE"; + const prog_char gTextMsg_EEPROMerrorCnt[] PROGMEM = "EE err cnt="; + const prog_char gTextMsg_PORT[] PROGMEM = "PORT"; //************************************************************************ //* Help messages - prog_char gTextMsg_HELP_MSG_0[] PROGMEM = "0=Zero addr"; - prog_char gTextMsg_HELP_MSG_QM[] PROGMEM = "?=CPU stats"; - prog_char gTextMsg_HELP_MSG_AT[] PROGMEM = "@=EEPROM test"; - prog_char gTextMsg_HELP_MSG_B[] PROGMEM = "B=Blink LED"; - prog_char gTextMsg_HELP_MSG_E[] PROGMEM = "E=Dump EEPROM"; - prog_char gTextMsg_HELP_MSG_F[] PROGMEM = "F=Dump FLASH"; - prog_char gTextMsg_HELP_MSG_H[] PROGMEM = "H=Help"; - prog_char gTextMsg_HELP_MSG_L[] PROGMEM = "L=List I/O Ports"; -// prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit & jump to user pgm"; - prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit"; - prog_char gTextMsg_HELP_MSG_R[] PROGMEM = "R=Dump RAM"; - prog_char gTextMsg_HELP_MSG_V[] PROGMEM = "V=show interrupt Vectors"; - prog_char gTextMsg_HELP_MSG_Y[] PROGMEM = "Y=Port blink"; - - prog_char gTextMsg_END[] PROGMEM = "*"; + const prog_char gTextMsg_HELP_MSG_0[] PROGMEM = "0=Zero addr"; + const prog_char gTextMsg_HELP_MSG_QM[] PROGMEM = "?=CPU stats"; + const prog_char gTextMsg_HELP_MSG_AT[] PROGMEM = "@=EEPROM test"; + const prog_char gTextMsg_HELP_MSG_B[] PROGMEM = "B=Blink LED"; + const prog_char gTextMsg_HELP_MSG_E[] PROGMEM = "E=Dump EEPROM"; + const prog_char gTextMsg_HELP_MSG_F[] PROGMEM = "F=Dump FLASH"; + const prog_char gTextMsg_HELP_MSG_H[] PROGMEM = "H=Help"; + const prog_char gTextMsg_HELP_MSG_L[] PROGMEM = "L=List I/O Ports"; +// const prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit & jump to user pgm"; + const prog_char gTextMsg_HELP_MSG_Q[] PROGMEM = "Q=Quit"; + const prog_char gTextMsg_HELP_MSG_R[] PROGMEM = "R=Dump RAM"; + const prog_char gTextMsg_HELP_MSG_V[] PROGMEM = "V=show interrupt Vectors"; + const prog_char gTextMsg_HELP_MSG_Y[] PROGMEM = "Y=Port blink"; + + const prog_char gTextMsg_END[] PROGMEM = "*"; //************************************************************************ -void PrintFromPROGMEM(void *dataPtr, unsigned char offset) +void PrintFromPROGMEM(const void *dataPtr, unsigned char offset) { uint8_t ii; char theChar; @@ -1306,9 +1306,9 @@ char theChar; while (theChar != 0) { #if (FLASHEND > 0x10000) - theChar = pgm_read_byte_far((uint32_t)dataPtr + ii); + theChar = pgm_read_byte_far(dataPtr + ii); #else - theChar = pgm_read_byte_near((uint32_t)dataPtr + ii); + theChar = pgm_read_byte_near(dataPtr + ii); #endif if (theChar != 0) { @@ -1327,7 +1327,7 @@ void PrintNewLine(void) //************************************************************************ -void PrintFromPROGMEMln(void *dataPtr, unsigned char offset) +void PrintFromPROGMEMln(const void *dataPtr, unsigned char offset) { PrintFromPROGMEM(dataPtr, offset); @@ -1523,7 +1523,7 @@ unsigned char *ramPtr; break; case kDUMP_EEPROM: - theValue = eeprom_read_byte((void *)myAddressPointer); + theValue = eeprom_read_byte((uint8_t *)(uint16_t)myAddressPointer); break; case kDUMP_RAM: