From b6f5fae14f4eb9c0cc21f45b9e8f6211cb1dc1f4 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Mon, 24 Oct 2011 21:36:06 -0400 Subject: removed old comments --- bootloaders/nuevo_diskloader/DiskLoader.elf.hex | 346 ++++++++++++------------ bootloaders/nuevo_diskloader/DiskLoader.hex | 346 ++++++++++++------------ bootloaders/nuevo_diskloader/src/CDC.cpp | 2 + bootloaders/nuevo_diskloader/src/DiskLoader.cpp | 50 +--- 4 files changed, 364 insertions(+), 380 deletions(-) (limited to 'bootloaders/nuevo_diskloader') diff --git a/bootloaders/nuevo_diskloader/DiskLoader.elf.hex b/bootloaders/nuevo_diskloader/DiskLoader.elf.hex index 4c4e33e..565b0ae 100644 --- a/bootloaders/nuevo_diskloader/DiskLoader.elf.hex +++ b/bootloaders/nuevo_diskloader/DiskLoader.elf.hex @@ -1,172 +1,178 @@ -:10700000B8C00000DBC00000D9C00000D7C000003D -:10701000D5C00000D3C00000D1C00000CFC0000028 -:10702000CDC00000CBC0000089C30000FBC300003E -:10703000C5C00000C3C00000C1C00000BFC0000048 -:10704000BDC00000BBC00000B9C00000B7C0000058 -:10705000B5C00000B3C00000B1C00000AFC0000068 -:10706000ADC00000ABC00000A9C00000A7C0000078 -:10707000A5C00000A3C00000A1C000009FC0000088 -:107080009DC000009BC0000099C0000097C0000098 -:1070900095C0000093C0000091C000008FC00000A8 -:1070A0008DC000008BC0000089C0000056C1080BD5 -:1070B00000020202010009040000010202000005B2 -:1070C0002400100105240101010424020605240600 -:1070D00000010705810310004009040100020A00B5 -:1070E000000007050202400000070583024000007F -:1070F000410142144505560455026403740300001F -:107100001E958702011003000403090422030000F6 -:10711000000000000000000000000000000000006F -:107120000000000000000000000000000000180344 -:10713000410072006400750069006E006F0020005D -:107140004C004C00430012010002000000404123AB -:10715000880000010102000112010002020000404B -:107160004123880000010102000100C18081F8383C -:10717000023C11241FBECFEFDAE0DEBFCDBF11E02D -:10718000A0E0B1E0E0E8FAE702C005900D92A83176 -:10719000B107D9F711E0A8E1B1E001C01D92A73A0B -:1071A000B107E1F711E7C2E7D1E703C02297FE017B -:1071B00061D4CE36D107D1F7D0D060C421CFDC0165 -:1071C00080910001909101018F5F9F4F61F4ED91DB -:1071D000FC9111970480F581E02DCD0109959093E4 -:1071E00001018093000180910001909101010895B7 -:1071F0008EE091E090931901809318010895DF9338 -:10720000CF930F92CDB7DEB76983809109018823B0 -:1072100051F083E0BE016F5F7F4F41E050E0AAD1A3 -:107220001816190614F080E090E00F90CF91DF91CE -:10723000089583E079C220910001309101018FEF20 -:107240002F3F380739F08FEF9FEF90930101809324 -:10725000000103C082E066D19C01C901089582E06B -:1072600024D1282F80910001909101018F5F9F4FC1 -:1072700009F02F5F822F90E00895FC0180818E5FDE -:10728000808380E86EEA70E742E450E0FFC1FC01D1 -:1072900081819081913A49F48132C1F480E062E0C9 -:1072A00071E047E050E0F2D10FC0913279F48032C2 -:1072B00031F482E091E067E070E024D205C08232D0 -:1072C00029F482818093090181E0089580E0089586 -:1072D000FF920F931F93CF93DF93982F8B01FF247F -:1072E00088E76030780738F4FF24F39483E0FB01EB -:1072F00080935700E895C42FD0E0892F6AE171E0B0 -:10730000AE01DCD0FF2019F107B600FCFDCFD5950A -:10731000C7954C2FF801AAE1B1E020E031E009C0A7 -:107320008D919D910C0130935700E8951124329670 -:107330002F5F2417A8F385E0F80180935700E895A4 -:1073400007B600FCFDCF81E180935700E895DF91FF -:10735000CF911F910F91FF90089588E10FB6F89497 -:1073600080936000109260000FBE3F9A209A6E9A40 -:1073700090E8909361001092610081E885BF95BF0D -:1073800001E005BF02E005BF769A289A479886EA91 -:1073900091E022D2789484E180939A0180E18093F5 -:1073A0009B01EE24FF2488E191E059DF18161906AD -:1073B000D4F788E191E03FDF182F80EF90E7FC01E0 -:1073C0002491319602964491211711F02223B9F7A6 -:1073D00010929D0110929C0150E082E06AE171E000 -:1073E0006DD0113479F460911A016058633028F03F -:1073F000683111F064E001C063E0C62FD0E0CD5FDA -:10740000DE480EC0163571F480911A01803311F0F8 -:1074100011E022C080911C01C82FD0E0C050DF488D -:1074200011E022C0153721F413E0C0E0D1E71CC001 -:10743000153539F4E0901A01F0901B01EE0CFF1C99 -:107440000AC0143631F482E0B70140911B0140DFDD -:1074500002C0143721F010E0C7E0D1E705C0109159 -:107460001B01E701E10EF11C83E06AE971E041E0F4 -:1074700050E080D0112329F0412F50E083E8BE0175 -:1074800079D083E46BE971E041E050E073D08BCFB9 -:10749000FC0104C08091F100819361506623D1F713 -:1074A000289884E680939F0108959FB7F894877089 -:1074B0008093E9008091F2009FBF0895282F80916A -:1074C000A0018823C1F057FF1AC015C028989093D7 -:1074D0009F018091F1008193E217F307B9F74115FD -:1074E000510539F08091F200882319F48BE68093DE -:1074F000E800AFBF02C04FEF5FEFCA010895AFB71A -:10750000F89427702093E9008091F200282F30E052 -:10751000241735070CF4A901FB019B01240F311D31 -:1075200094E6DACFDF93CF930F92CDB7DEB7BE01EB -:107530006F5F7F4F41E050E0C1DF019719F08FEF9F -:107540009FEF02C0898190E00F90CF91DF91089565 -:107550002FB7F89487708093E9008091E80085FD4B -:1075600002C090E004C08091F20090E4981B2FBF0D -:10757000892F08955F926F927F928F929F92AF9220 -:10758000BF92CF92DF92EF92FF920F931F93CF9310 -:10759000DF93F82E6A018091A001882319F44FEF40 -:1075A0005FEF63C08B01EA0157E0E52EEF208F2DDE -:1075B00090E040E2842E912C882299223AE3532EC7 -:1075C00020E4A22EB12CA822B92280EE682E8EE2F1 -:1075D000782E43C08F2DBCDF282F882321F4C301D0 -:1075E0000197F1F73AC090E0C817D9070CF42C2F97 -:1075F000C21BD1094FB7F894E092E90081149104BD -:1076000021F406C01092F10021502223D9F719C0AD -:10761000F7FC03C0F801922F10C0C801322F06C03A -:10762000FC010196E491E093F10031503323C1F75E -:1076300006C081918093F10091509923D1F7020FF8 -:10764000111D8091E80085FF05C0209729F4A11441 -:10765000B10411F05092E8004FBF209709F0BACF63 -:10766000769884E680939E01A601CA01DF91CF91AE -:107670001F910F91FF90EF90DF90CF90BF90AF9050 -:107680009F908F907F906F905F9008950F931F93BE -:10769000182FFB01A091A301B091A401BA010EEF34 -:1076A0002AC017FF02C0949101C090812091A101CE -:1076B0003091A2012A173B07ACF48091E800857055 -:1076C000E1F38091E80082FF03C04FEF5FEF16C047 -:1076D0009093F100C90101968F739070892B11F47A -:1076E0000093E8002F5F3F4F3093A2012093A10148 -:1076F0006150704031966115710599F6CA011F916C -:107700000F910895CF93DF939C01EB018091E800E6 -:1077100082FFFCCFC9016C2FBBDE8BEF8093E800AA -:10772000CE01DF91CF9108958093E9008091F2001E -:10773000882319F08AE38093E80008951F920F923E -:107740000FB60F9211242F933F938F938091E100F6 -:107750001092E100282F83FF0FC01092E90081E012 -:107760008093EB001092EC0082E38093ED00109286 -:10777000A00188E08093F00022FF26C083E0809380 -:10778000E9008091F200882319F08AE38093E800F1 -:1077900080919E01882351F080919E0181508093B9 -:1077A0009E0180919E01882309F4769A80919F0121 -:1077B000882351F080919F01815080939F01809197 -:1077C0009F01882309F4289A8F913F912F910F9060 -:1077D0000FBE0F901F9018951092A00181E080932A -:1077E000D70080EA8093D80082E189BD09B400FE09 -:1077F000FDCF80E98093D8008CE08093E200109266 -:10780000E00008950895DF93CF930F92CDB7DEB7D0 -:107810001982CE01019631DD898190E00F90CF91E0 -:10782000DF9108951F920F920FB60F921124EF92DD -:10783000FF921F932F933F934F935F936F937F9389 -:107840008F939F93AF93BF93EF93FF93DF93CF9368 -:10785000CDB7DEB76197DEBFCDBF1092E900809152 -:10786000E80083FFECC0CE01019668E011DE82EFF4 -:107870008093E800998197FF05C08091E80080FF20 -:10788000FCCF03C08EEF8093E800292F30E0C901C0 -:1078900080769070892B09F0B3C08A81882329F4FF -:1078A0001092F1001092F100BFC0813009F4BCC009 -:1078B000833009F4B9C0853049F48091E80080FF35 -:1078C000FCCF8B8180688093E300AEC0863009F0E6 -:1078D0006DC01C81EF80F8841230A9F51092E90088 -:1078E0001092A2011092A1011092A4011092A30182 -:1078F0008ADF99E0FE013996DF01292F1D922A9532 -:10790000E9F799871A8791E09E8790E8988B9AEF1C -:10791000998B2091A1013091A201275F3F4F3C87B5 -:107920002B878D871092E9001092A2011092A1017D -:10793000F092A401E092A30180E0BF0149E050E091 -:10794000A5DE61DF71C01092E9001092A2011092D1 -:10795000A101F092A401E092A301113071F488E03A -:10796000E816F10411F41093A5018091A501882374 -:1079700009F062C0E6E4F1E713C0133009F058C023 -:107980008B81882319F4E8E0F1E70AC0823019F40A -:10799000ECE0F1E705C0813009F04AC0EEE2F1E722 -:1079A000449150E080E8BF0171DE3EC0873009F4A9 -:1079B0003FC0883021F481E08093F10035C08930E8 -:1079C00099F523703070232B99F5EBE6F1E791E000 -:1079D00031E026E39093E9003093EB0084918093AB -:1079E000EC002093ED009F5F3196943099F78EE77D -:1079F0008093EA001092EA008B818093A00114C06A -:107A00008F8198851092E9001092A2011092A10135 -:107A10009093A4018093A3018D81882349F4CE0122 -:107A2000019635DC882321F08EEF8093E80007C0B3 -:107A300081E28093EB0003C0E8E5F1E7B1CF619606 -:107A4000DEBFCDBFCF91DF91FF91EF91BF91AF919D -:107A50009F918F917F916F915F914F913F912F9166 -:107A60001F91FF90EF900F900FBE0F901F901895F1 -:107A7000EE0FFF1F0590F491E02D0994F894FFCFCD -:107A8000FFFF00E1000000000000000000002F39AF -:087A9000DF381B391939FF38FA +:10700000BEC00000E1C00000DFC00000DDC0000025 +:10701000DBC00000D9C00000D7C00000D5C0000010 +:10702000D3C00000D1C00000B2C3000024C40000DF +:10703000CBC00000C9C00000C7C00000C5C0000030 +:10704000C3C00000C1C00000BFC00000BDC0000040 +:10705000BBC00000B9C00000B7C00000B5C0000050 +:10706000B3C00000B1C00000AFC00000ADC0000060 +:10707000ABC00000A9C00000A7C00000A5C0000070 +:10708000A3C00000A1C000009FC000009DC0000080 +:107090009BC0000099C0000097C0000095C0000090 +:1070A00093C0000091C000008FC0000011241FBEDB +:1070B000CFEFDAE0DEBFCDBF56C1080B00020202FF +:1070C0000100090400000102020000052400100173 +:1070D0000524010101042402060524060001070518 +:1070E000810310004009040100020A0000000705A6 +:1070F00002024000000705830240000041014214E3 +:107100004505560455026403740300001E9587026A +:107110000110030004030904220300000000000022 +:10712000000000000000000000000000000000005F +:107130000000000000000000000018034100720081 +:107140006400750069006E006F0020004C004C0068 +:1071500043001201000200000040412388000001AA +:1071600001020001120100020200004041238800D8 +:1071700000010102000100C18081FE382B3C112476 +:107180001FBECFEFDAE0DEBFCDBF11E0A0E0B1E07F +:10719000E2EDFAE702C005900D92A831B107D9F7E8 +:1071A00011E0A8E1B1E001C01D92A73AB107E1F7F3 +:1071B00011E7CEE7D1E703C02297FE0184D4CA3796 +:1071C000D107D1F7D0D083C41BCFDC01809100015F +:1071D000909101018F5F9F4F61F4ED91FC911197A8 +:1071E0000480F581E02DCD010995909301018093F4 +:1071F0000001809100019091010108958EE091E0DD +:1072000090931901809318010895DF93CF930F9203 +:10721000CDB7DEB7698380910901882351F083E0FF +:10722000BE016F5F7F4F41E050E0CDD118161906C7 +:1072300014F080E090E00F90CF91DF91089583E00B +:107240009CC220910001309101018FEF2F3F380740 +:1072500039F08FEF9FEF909301018093000103C0FD +:1072600082E089D19C01C901089582E047D1282F8D +:1072700080910001909101018F5F9F4F09F02F5F76 +:10728000822F90E00895FC0180818E5F808380E8EA +:107290006AEB70E742E450E022C2FC0181819081F8 +:1072A000913A49F48132C1F480E062E071E047E054 +:1072B00050E015D20FC0913279F4803231F482E07F +:1072C00091E067E070E047D205C0823229F4828104 +:1072D0008093090181E0089580E00895FF920F9363 +:1072E0001F93CF93DF93982F8B01FF2480E76030AB +:1072F000780738F4FF24F39483E0FB018093570070 +:10730000E895C42FD0E0892F6AE171E0AE01FFD08B +:10731000FF2019F107B600FCFDCFD595C7954C2F7E +:10732000F801AAE1B1E020E031E009C08D919D9122 +:107330000C0130935700E895112432962F5F2417E3 +:10734000A8F385E0F80180935700E89507B600FCA4 +:10735000FDCF81E180935700E895DF91CF911F9198 +:107360000F91FF90089588E10FB6F8948093600024 +:10737000109260000FBE3F9A209A6E9A90E8909308 +:1073800061001092610081E885BF95BF01E005BFF3 +:1073900002E005BF769A289A479886EA91E045D29E +:1073A000789484E180939A0180E180939B01EE249C +:1073B000FF2488E191E059DF18161906D4F788E117 +:1073C00091E03FDFC82E8CEF90E7FC0124913196CD +:1073D000029644912C1511F02223B9F710929D01C9 +:1073E00010929C0150E082E06AE171E090D0F1E4FB +:1073F000CF1679F460911A016058633028F0683133 +:1074000011F064E001C063E0C62FD0E0C15FDE4848 +:1074100011C086E5C81691F480911A01803321F0DD +:107420008701DD24D3942BC080911C01C82FD0E0AC +:10743000C45FDE488701DD24D3942AC0E5E7CE1679 +:1074400031F4870123E0D22ECCE0D1E721C0F5E56D +:10745000CF1639F400911A0110911B01000F111F72 +:107460000DC084E6C81631F482E0B70140911B01DB +:1074700035DF03C0E4E7CE1629F08701DD24C3E140 +:10748000D1E706C0D0901B01E70187010D0D111D4A +:1074900088E191E0EADE18161906D4F488E191E05B +:1074A000D0DEEE24FF24809709F083CF11C04D2D4C +:1074B00050E083E8BE0187D083E46BE971E041E0EE +:1074C00050E081D0F1E5CF1609F471CF780171CF8A +:1074D00083E06AE971E041E050E075D0DD2061F3BE +:1074E000E6CFFC0104C08091F100819361506623D6 +:1074F000D1F7289884E680939F0108959FB7F89468 +:1075000087708093E9008091F2009FBF0895282F33 +:107510008091A0018823C1F057FF1AC015C0289898 +:1075200090939F018091F1008193E217F307B9F7DF +:107530004115510539F08091F200882319F48BE64A +:107540008093E800AFBF02C04FEF5FEFCA0108951C +:10755000AFB7F89427702093E9008091F200282FAC +:1075600030E0241735070CF4A901FB019B01240F1F +:10757000311D94E6DACFDF93CF930F92CDB7DEB70C +:10758000BE016F5F7F4F41E050E0C1DF019719F00E +:107590008FEF9FEF02C0898190E00F90CF91DF9134 +:1075A00008952FB7F89487708093E9008091E800E0 +:1075B00085FD02C090E004C08091F20090E4981B29 +:1075C0002FBF892F08955F926F927F928F929F9223 +:1075D000AF92BF92CF92DF92EF92FF920F931F93E1 +:1075E000CF93DF93F82E6A018091A001882319F4CC +:1075F0004FEF5FEF63C08B01EA0157E0E52EEF200C +:107600008F2D90E040E2842E912C882299223AE33B +:10761000532E20E4A22EB12CA822B92280EE682E8F +:107620008EE2782E43C08F2DBCDF282F882321F4D3 +:10763000C3010197F1F73AC090E0C817D9070CF4DD +:107640002C2FC21BD1094FB7F894E092E9008114A6 +:10765000910421F406C01092F10021502223D9F7A1 +:1076600019C0F7FC03C0F801922F10C0C801322FD7 +:1076700006C0FC010196E491E093F1003150332300 +:10768000C1F706C081918093F10091509923D1F701 +:10769000020F111D8091E80085FF05C0209729F495 +:1076A000A114B10411F05092E8004FBF209709F0E7 +:1076B000BACF769884E680939E01A601CA01DF9135 +:1076C000CF911F910F91FF90EF90DF90CF90BF90DF +:1076D000AF909F908F907F906F905F9008950F93E1 +:1076E0001F93182FFB01A091A301B091A401BA012F +:1076F0000EEF2AC017FF02C0949101C09081209123 +:10770000A1013091A2012A173B07ACF48091E80057 +:107710008570E1F38091E80082FF03C04FEF5FEFD7 +:1077200016C09093F100C90101968F739070892B58 +:1077300011F40093E8002F5F3F4F3093A201209394 +:10774000A1016150704031966115710599F6CA0129 +:107750001F910F910895CF93DF939C01EB018091CE +:10776000E80082FFFCCFC9016C2FBBDE8BEF80935A +:10777000E800CE01DF91CF9108958093E9008091D8 +:10778000F200882319F08AE38093E80008951F929D +:107790000F920FB60F9211242F933F938F938091E6 +:1077A000E1001092E100282F83FF0FC01092E90042 +:1077B00081E08093EB001092EC0082E38093ED0077 +:1077C0001092A00188E08093F00022FF26C083E0A1 +:1077D0008093E9008091F200882319F08AE3809376 +:1077E000E80080919E01882351F080919E01815094 +:1077F00080939E0180919E01882309F4769A80915E +:107800009F01882351F080919F01815080939F01B7 +:1078100080919F01882309F4289A8F913F912F919D +:107820000F900FBE0F901F9018951092A00181E04D +:107830008093D70080EA8093D80082E189BD09B4A3 +:1078400000FEFDCF80E98093D8008CE08093E200B9 +:107850001092E00008950895DF93CF930F92CDB773 +:10786000DEB71982CE0101960EDD898190E00F907E +:10787000CF91DF9108951F920F920FB60F921124AE +:10788000EF92FF921F932F933F934F935F936F93CA +:107890007F938F939F93AF93BF93EF93FF93DF9368 +:1078A000CF93CDB7DEB76197DEBFCDBF1092E900B1 +:1078B0008091E80083FFECC0CE01019668E011DE04 +:1078C00082EF8093E800998197FF05C08091E800DE +:1078D00080FFFCCF03C08EEF8093E800292F30E0BB +:1078E000C90180769070892B09F0B3C08A81882302 +:1078F00029F41092F1001092F100BFC0813009F418 +:10790000BCC0833009F4B9C0853049F48091E800E7 +:1079100080FFFCCF8B8180688093E300AEC086300F +:1079200009F06DC01C81EF80F8841230A9F5109227 +:10793000E9001092A2011092A1011092A4011092EC +:10794000A3018ADF99E0FE013996DF01292F1D92FC +:107950002A95E9F799871A8791E09E8790E8988B96 +:107960009AEF998B2091A1013091A201275F3F4F9F +:107970003C872B878D871092E9001092A20110920C +:10798000A101F092A401E092A30180E0BF0149E0CF +:1079900050E0A5DE61DF71C01092E9001092A201F3 +:1079A0001092A101F092A401E092A301113071F4B0 +:1079B00088E0E816F10411F41093A5018091A50167 +:1079C000882309F062C0E2E5F1E713C0133009F043 +:1079D00058C08B81882319F4E4E1F1E70AC08230B2 +:1079E00019F4E8E1F1E705C0813009F04AC0EAE3A3 +:1079F000F1E7449150E080E8BF0171DE3EC087307E +:107A000009F43FC0883021F481E08093F10035C053 +:107A1000893099F523703070232B99F5E7E7F1E76A +:107A200091E031E026E39093E9003093EB008491FC +:107A30008093EC002093ED009F5F3196943099F78E +:107A40008EE78093EA001092EA008B818093A00178 +:107A500014C08F8198851092E9001092A2011092B3 +:107A6000A1019093A4018093A3018D81882349F4FF +:107A7000CE01019612DC882321F08EEF8093E8007E +:107A800007C081E28093EB0003C0E4E6F1E7B1CFE9 +:107A90006196DEBFCDBFCF91DF91FF91EF91BF9196 +:107AA000AF919F918F917F916F915F914F913F9196 +:107AB0002F911F91FF90EF900F900FBE0F901F908E +:107AC0001895EE0FFF1F0590F491E02D0994F8949E +:027AD000FFCFE6 +:107AD200FFFF00E100000000000000000000353957 +:087AE200E53821391F3905398F :040000030000700089 :00000001FF diff --git a/bootloaders/nuevo_diskloader/DiskLoader.hex b/bootloaders/nuevo_diskloader/DiskLoader.hex index 4c4e33e..565b0ae 100644 --- a/bootloaders/nuevo_diskloader/DiskLoader.hex +++ b/bootloaders/nuevo_diskloader/DiskLoader.hex @@ -1,172 +1,178 @@ -:10700000B8C00000DBC00000D9C00000D7C000003D -:10701000D5C00000D3C00000D1C00000CFC0000028 -:10702000CDC00000CBC0000089C30000FBC300003E -:10703000C5C00000C3C00000C1C00000BFC0000048 -:10704000BDC00000BBC00000B9C00000B7C0000058 -:10705000B5C00000B3C00000B1C00000AFC0000068 -:10706000ADC00000ABC00000A9C00000A7C0000078 -:10707000A5C00000A3C00000A1C000009FC0000088 -:107080009DC000009BC0000099C0000097C0000098 -:1070900095C0000093C0000091C000008FC00000A8 -:1070A0008DC000008BC0000089C0000056C1080BD5 -:1070B00000020202010009040000010202000005B2 -:1070C0002400100105240101010424020605240600 -:1070D00000010705810310004009040100020A00B5 -:1070E000000007050202400000070583024000007F -:1070F000410142144505560455026403740300001F -:107100001E958702011003000403090422030000F6 -:10711000000000000000000000000000000000006F -:107120000000000000000000000000000000180344 -:10713000410072006400750069006E006F0020005D -:107140004C004C00430012010002000000404123AB -:10715000880000010102000112010002020000404B -:107160004123880000010102000100C18081F8383C -:10717000023C11241FBECFEFDAE0DEBFCDBF11E02D -:10718000A0E0B1E0E0E8FAE702C005900D92A83176 -:10719000B107D9F711E0A8E1B1E001C01D92A73A0B -:1071A000B107E1F711E7C2E7D1E703C02297FE017B -:1071B00061D4CE36D107D1F7D0D060C421CFDC0165 -:1071C00080910001909101018F5F9F4F61F4ED91DB -:1071D000FC9111970480F581E02DCD0109959093E4 -:1071E00001018093000180910001909101010895B7 -:1071F0008EE091E090931901809318010895DF9338 -:10720000CF930F92CDB7DEB76983809109018823B0 -:1072100051F083E0BE016F5F7F4F41E050E0AAD1A3 -:107220001816190614F080E090E00F90CF91DF91CE -:10723000089583E079C220910001309101018FEF20 -:107240002F3F380739F08FEF9FEF90930101809324 -:10725000000103C082E066D19C01C901089582E06B -:1072600024D1282F80910001909101018F5F9F4FC1 -:1072700009F02F5F822F90E00895FC0180818E5FDE -:10728000808380E86EEA70E742E450E0FFC1FC01D1 -:1072900081819081913A49F48132C1F480E062E0C9 -:1072A00071E047E050E0F2D10FC0913279F48032C2 -:1072B00031F482E091E067E070E024D205C08232D0 -:1072C00029F482818093090181E0089580E0089586 -:1072D000FF920F931F93CF93DF93982F8B01FF247F -:1072E00088E76030780738F4FF24F39483E0FB01EB -:1072F00080935700E895C42FD0E0892F6AE171E0B0 -:10730000AE01DCD0FF2019F107B600FCFDCFD5950A -:10731000C7954C2FF801AAE1B1E020E031E009C0A7 -:107320008D919D910C0130935700E8951124329670 -:107330002F5F2417A8F385E0F80180935700E895A4 -:1073400007B600FCFDCF81E180935700E895DF91FF -:10735000CF911F910F91FF90089588E10FB6F89497 -:1073600080936000109260000FBE3F9A209A6E9A40 -:1073700090E8909361001092610081E885BF95BF0D -:1073800001E005BF02E005BF769A289A479886EA91 -:1073900091E022D2789484E180939A0180E18093F5 -:1073A0009B01EE24FF2488E191E059DF18161906AD -:1073B000D4F788E191E03FDF182F80EF90E7FC01E0 -:1073C0002491319602964491211711F02223B9F7A6 -:1073D00010929D0110929C0150E082E06AE171E000 -:1073E0006DD0113479F460911A016058633028F03F -:1073F000683111F064E001C063E0C62FD0E0CD5FDA -:10740000DE480EC0163571F480911A01803311F0F8 -:1074100011E022C080911C01C82FD0E0C050DF488D -:1074200011E022C0153721F413E0C0E0D1E71CC001 -:10743000153539F4E0901A01F0901B01EE0CFF1C99 -:107440000AC0143631F482E0B70140911B0140DFDD -:1074500002C0143721F010E0C7E0D1E705C0109159 -:107460001B01E701E10EF11C83E06AE971E041E0F4 -:1074700050E080D0112329F0412F50E083E8BE0175 -:1074800079D083E46BE971E041E050E073D08BCFB9 -:10749000FC0104C08091F100819361506623D1F713 -:1074A000289884E680939F0108959FB7F894877089 -:1074B0008093E9008091F2009FBF0895282F80916A -:1074C000A0018823C1F057FF1AC015C028989093D7 -:1074D0009F018091F1008193E217F307B9F74115FD -:1074E000510539F08091F200882319F48BE68093DE -:1074F000E800AFBF02C04FEF5FEFCA010895AFB71A -:10750000F89427702093E9008091F200282F30E052 -:10751000241735070CF4A901FB019B01240F311D31 -:1075200094E6DACFDF93CF930F92CDB7DEB7BE01EB -:107530006F5F7F4F41E050E0C1DF019719F08FEF9F -:107540009FEF02C0898190E00F90CF91DF91089565 -:107550002FB7F89487708093E9008091E80085FD4B -:1075600002C090E004C08091F20090E4981B2FBF0D -:10757000892F08955F926F927F928F929F92AF9220 -:10758000BF92CF92DF92EF92FF920F931F93CF9310 -:10759000DF93F82E6A018091A001882319F44FEF40 -:1075A0005FEF63C08B01EA0157E0E52EEF208F2DDE -:1075B00090E040E2842E912C882299223AE3532EC7 -:1075C00020E4A22EB12CA822B92280EE682E8EE2F1 -:1075D000782E43C08F2DBCDF282F882321F4C301D0 -:1075E0000197F1F73AC090E0C817D9070CF42C2F97 -:1075F000C21BD1094FB7F894E092E90081149104BD -:1076000021F406C01092F10021502223D9F719C0AD -:10761000F7FC03C0F801922F10C0C801322F06C03A -:10762000FC010196E491E093F10031503323C1F75E -:1076300006C081918093F10091509923D1F7020FF8 -:10764000111D8091E80085FF05C0209729F4A11441 -:10765000B10411F05092E8004FBF209709F0BACF63 -:10766000769884E680939E01A601CA01DF91CF91AE -:107670001F910F91FF90EF90DF90CF90BF90AF9050 -:107680009F908F907F906F905F9008950F931F93BE -:10769000182FFB01A091A301B091A401BA010EEF34 -:1076A0002AC017FF02C0949101C090812091A101CE -:1076B0003091A2012A173B07ACF48091E800857055 -:1076C000E1F38091E80082FF03C04FEF5FEF16C047 -:1076D0009093F100C90101968F739070892B11F47A -:1076E0000093E8002F5F3F4F3093A2012093A10148 -:1076F0006150704031966115710599F6CA011F916C -:107700000F910895CF93DF939C01EB018091E800E6 -:1077100082FFFCCFC9016C2FBBDE8BEF8093E800AA -:10772000CE01DF91CF9108958093E9008091F2001E -:10773000882319F08AE38093E80008951F920F923E -:107740000FB60F9211242F933F938F938091E100F6 -:107750001092E100282F83FF0FC01092E90081E012 -:107760008093EB001092EC0082E38093ED00109286 -:10777000A00188E08093F00022FF26C083E0809380 -:10778000E9008091F200882319F08AE38093E800F1 -:1077900080919E01882351F080919E0181508093B9 -:1077A0009E0180919E01882309F4769A80919F0121 -:1077B000882351F080919F01815080939F01809197 -:1077C0009F01882309F4289A8F913F912F910F9060 -:1077D0000FBE0F901F9018951092A00181E080932A -:1077E000D70080EA8093D80082E189BD09B400FE09 -:1077F000FDCF80E98093D8008CE08093E200109266 -:10780000E00008950895DF93CF930F92CDB7DEB7D0 -:107810001982CE01019631DD898190E00F90CF91E0 -:10782000DF9108951F920F920FB60F921124EF92DD -:10783000FF921F932F933F934F935F936F937F9389 -:107840008F939F93AF93BF93EF93FF93DF93CF9368 -:10785000CDB7DEB76197DEBFCDBF1092E900809152 -:10786000E80083FFECC0CE01019668E011DE82EFF4 -:107870008093E800998197FF05C08091E80080FF20 -:10788000FCCF03C08EEF8093E800292F30E0C901C0 -:1078900080769070892B09F0B3C08A81882329F4FF -:1078A0001092F1001092F100BFC0813009F4BCC009 -:1078B000833009F4B9C0853049F48091E80080FF35 -:1078C000FCCF8B8180688093E300AEC0863009F0E6 -:1078D0006DC01C81EF80F8841230A9F51092E90088 -:1078E0001092A2011092A1011092A4011092A30182 -:1078F0008ADF99E0FE013996DF01292F1D922A9532 -:10790000E9F799871A8791E09E8790E8988B9AEF1C -:10791000998B2091A1013091A201275F3F4F3C87B5 -:107920002B878D871092E9001092A2011092A1017D -:10793000F092A401E092A30180E0BF0149E050E091 -:10794000A5DE61DF71C01092E9001092A2011092D1 -:10795000A101F092A401E092A301113071F488E03A -:10796000E816F10411F41093A5018091A501882374 -:1079700009F062C0E6E4F1E713C0133009F058C023 -:107980008B81882319F4E8E0F1E70AC0823019F40A -:10799000ECE0F1E705C0813009F04AC0EEE2F1E722 -:1079A000449150E080E8BF0171DE3EC0873009F4A9 -:1079B0003FC0883021F481E08093F10035C08930E8 -:1079C00099F523703070232B99F5EBE6F1E791E000 -:1079D00031E026E39093E9003093EB0084918093AB -:1079E000EC002093ED009F5F3196943099F78EE77D -:1079F0008093EA001092EA008B818093A00114C06A -:107A00008F8198851092E9001092A2011092A10135 -:107A10009093A4018093A3018D81882349F4CE0122 -:107A2000019635DC882321F08EEF8093E80007C0B3 -:107A300081E28093EB0003C0E8E5F1E7B1CF619606 -:107A4000DEBFCDBFCF91DF91FF91EF91BF91AF919D -:107A50009F918F917F916F915F914F913F912F9166 -:107A60001F91FF90EF900F900FBE0F901F901895F1 -:107A7000EE0FFF1F0590F491E02D0994F894FFCFCD -:107A8000FFFF00E1000000000000000000002F39AF -:087A9000DF381B391939FF38FA +:10700000BEC00000E1C00000DFC00000DDC0000025 +:10701000DBC00000D9C00000D7C00000D5C0000010 +:10702000D3C00000D1C00000B2C3000024C40000DF +:10703000CBC00000C9C00000C7C00000C5C0000030 +:10704000C3C00000C1C00000BFC00000BDC0000040 +:10705000BBC00000B9C00000B7C00000B5C0000050 +:10706000B3C00000B1C00000AFC00000ADC0000060 +:10707000ABC00000A9C00000A7C00000A5C0000070 +:10708000A3C00000A1C000009FC000009DC0000080 +:107090009BC0000099C0000097C0000095C0000090 +:1070A00093C0000091C000008FC0000011241FBEDB +:1070B000CFEFDAE0DEBFCDBF56C1080B00020202FF +:1070C0000100090400000102020000052400100173 +:1070D0000524010101042402060524060001070518 +:1070E000810310004009040100020A0000000705A6 +:1070F00002024000000705830240000041014214E3 +:107100004505560455026403740300001E9587026A +:107110000110030004030904220300000000000022 +:10712000000000000000000000000000000000005F +:107130000000000000000000000018034100720081 +:107140006400750069006E006F0020004C004C0068 +:1071500043001201000200000040412388000001AA +:1071600001020001120100020200004041238800D8 +:1071700000010102000100C18081FE382B3C112476 +:107180001FBECFEFDAE0DEBFCDBF11E0A0E0B1E07F +:10719000E2EDFAE702C005900D92A831B107D9F7E8 +:1071A00011E0A8E1B1E001C01D92A73AB107E1F7F3 +:1071B00011E7CEE7D1E703C02297FE0184D4CA3796 +:1071C000D107D1F7D0D083C41BCFDC01809100015F +:1071D000909101018F5F9F4F61F4ED91FC911197A8 +:1071E0000480F581E02DCD010995909301018093F4 +:1071F0000001809100019091010108958EE091E0DD +:1072000090931901809318010895DF93CF930F9203 +:10721000CDB7DEB7698380910901882351F083E0FF +:10722000BE016F5F7F4F41E050E0CDD118161906C7 +:1072300014F080E090E00F90CF91DF91089583E00B +:107240009CC220910001309101018FEF2F3F380740 +:1072500039F08FEF9FEF909301018093000103C0FD +:1072600082E089D19C01C901089582E047D1282F8D +:1072700080910001909101018F5F9F4F09F02F5F76 +:10728000822F90E00895FC0180818E5F808380E8EA +:107290006AEB70E742E450E022C2FC0181819081F8 +:1072A000913A49F48132C1F480E062E071E047E054 +:1072B00050E015D20FC0913279F4803231F482E07F +:1072C00091E067E070E047D205C0823229F4828104 +:1072D0008093090181E0089580E00895FF920F9363 +:1072E0001F93CF93DF93982F8B01FF2480E76030AB +:1072F000780738F4FF24F39483E0FB018093570070 +:10730000E895C42FD0E0892F6AE171E0AE01FFD08B +:10731000FF2019F107B600FCFDCFD595C7954C2F7E +:10732000F801AAE1B1E020E031E009C08D919D9122 +:107330000C0130935700E895112432962F5F2417E3 +:10734000A8F385E0F80180935700E89507B600FCA4 +:10735000FDCF81E180935700E895DF91CF911F9198 +:107360000F91FF90089588E10FB6F8948093600024 +:10737000109260000FBE3F9A209A6E9A90E8909308 +:1073800061001092610081E885BF95BF01E005BFF3 +:1073900002E005BF769A289A479886EA91E045D29E +:1073A000789484E180939A0180E180939B01EE249C +:1073B000FF2488E191E059DF18161906D4F788E117 +:1073C00091E03FDFC82E8CEF90E7FC0124913196CD +:1073D000029644912C1511F02223B9F710929D01C9 +:1073E00010929C0150E082E06AE171E090D0F1E4FB +:1073F000CF1679F460911A016058633028F0683133 +:1074000011F064E001C063E0C62FD0E0C15FDE4848 +:1074100011C086E5C81691F480911A01803321F0DD +:107420008701DD24D3942BC080911C01C82FD0E0AC +:10743000C45FDE488701DD24D3942AC0E5E7CE1679 +:1074400031F4870123E0D22ECCE0D1E721C0F5E56D +:10745000CF1639F400911A0110911B01000F111F72 +:107460000DC084E6C81631F482E0B70140911B01DB +:1074700035DF03C0E4E7CE1629F08701DD24C3E140 +:10748000D1E706C0D0901B01E70187010D0D111D4A +:1074900088E191E0EADE18161906D4F488E191E05B +:1074A000D0DEEE24FF24809709F083CF11C04D2D4C +:1074B00050E083E8BE0187D083E46BE971E041E0EE +:1074C00050E081D0F1E5CF1609F471CF780171CF8A +:1074D00083E06AE971E041E050E075D0DD2061F3BE +:1074E000E6CFFC0104C08091F100819361506623D6 +:1074F000D1F7289884E680939F0108959FB7F89468 +:1075000087708093E9008091F2009FBF0895282F33 +:107510008091A0018823C1F057FF1AC015C0289898 +:1075200090939F018091F1008193E217F307B9F7DF +:107530004115510539F08091F200882319F48BE64A +:107540008093E800AFBF02C04FEF5FEFCA0108951C +:10755000AFB7F89427702093E9008091F200282FAC +:1075600030E0241735070CF4A901FB019B01240F1F +:10757000311D94E6DACFDF93CF930F92CDB7DEB70C +:10758000BE016F5F7F4F41E050E0C1DF019719F00E +:107590008FEF9FEF02C0898190E00F90CF91DF9134 +:1075A00008952FB7F89487708093E9008091E800E0 +:1075B00085FD02C090E004C08091F20090E4981B29 +:1075C0002FBF892F08955F926F927F928F929F9223 +:1075D000AF92BF92CF92DF92EF92FF920F931F93E1 +:1075E000CF93DF93F82E6A018091A001882319F4CC +:1075F0004FEF5FEF63C08B01EA0157E0E52EEF200C +:107600008F2D90E040E2842E912C882299223AE33B +:10761000532E20E4A22EB12CA822B92280EE682E8F +:107620008EE2782E43C08F2DBCDF282F882321F4D3 +:10763000C3010197F1F73AC090E0C817D9070CF4DD +:107640002C2FC21BD1094FB7F894E092E9008114A6 +:10765000910421F406C01092F10021502223D9F7A1 +:1076600019C0F7FC03C0F801922F10C0C801322FD7 +:1076700006C0FC010196E491E093F1003150332300 +:10768000C1F706C081918093F10091509923D1F701 +:10769000020F111D8091E80085FF05C0209729F495 +:1076A000A114B10411F05092E8004FBF209709F0E7 +:1076B000BACF769884E680939E01A601CA01DF9135 +:1076C000CF911F910F91FF90EF90DF90CF90BF90DF +:1076D000AF909F908F907F906F905F9008950F93E1 +:1076E0001F93182FFB01A091A301B091A401BA012F +:1076F0000EEF2AC017FF02C0949101C09081209123 +:10770000A1013091A2012A173B07ACF48091E80057 +:107710008570E1F38091E80082FF03C04FEF5FEFD7 +:1077200016C09093F100C90101968F739070892B58 +:1077300011F40093E8002F5F3F4F3093A201209394 +:10774000A1016150704031966115710599F6CA0129 +:107750001F910F910895CF93DF939C01EB018091CE +:10776000E80082FFFCCFC9016C2FBBDE8BEF80935A +:10777000E800CE01DF91CF9108958093E9008091D8 +:10778000F200882319F08AE38093E80008951F929D +:107790000F920FB60F9211242F933F938F938091E6 +:1077A000E1001092E100282F83FF0FC01092E90042 +:1077B00081E08093EB001092EC0082E38093ED0077 +:1077C0001092A00188E08093F00022FF26C083E0A1 +:1077D0008093E9008091F200882319F08AE3809376 +:1077E000E80080919E01882351F080919E01815094 +:1077F00080939E0180919E01882309F4769A80915E +:107800009F01882351F080919F01815080939F01B7 +:1078100080919F01882309F4289A8F913F912F919D +:107820000F900FBE0F901F9018951092A00181E04D +:107830008093D70080EA8093D80082E189BD09B4A3 +:1078400000FEFDCF80E98093D8008CE08093E200B9 +:107850001092E00008950895DF93CF930F92CDB773 +:10786000DEB71982CE0101960EDD898190E00F907E +:10787000CF91DF9108951F920F920FB60F921124AE +:10788000EF92FF921F932F933F934F935F936F93CA +:107890007F938F939F93AF93BF93EF93FF93DF9368 +:1078A000CF93CDB7DEB76197DEBFCDBF1092E900B1 +:1078B0008091E80083FFECC0CE01019668E011DE04 +:1078C00082EF8093E800998197FF05C08091E800DE +:1078D00080FFFCCF03C08EEF8093E800292F30E0BB +:1078E000C90180769070892B09F0B3C08A81882302 +:1078F00029F41092F1001092F100BFC0813009F418 +:10790000BCC0833009F4B9C0853049F48091E800E7 +:1079100080FFFCCF8B8180688093E300AEC086300F +:1079200009F06DC01C81EF80F8841230A9F5109227 +:10793000E9001092A2011092A1011092A4011092EC +:10794000A3018ADF99E0FE013996DF01292F1D92FC +:107950002A95E9F799871A8791E09E8790E8988B96 +:107960009AEF998B2091A1013091A201275F3F4F9F +:107970003C872B878D871092E9001092A20110920C +:10798000A101F092A401E092A30180E0BF0149E0CF +:1079900050E0A5DE61DF71C01092E9001092A201F3 +:1079A0001092A101F092A401E092A301113071F4B0 +:1079B00088E0E816F10411F41093A5018091A50167 +:1079C000882309F062C0E2E5F1E713C0133009F043 +:1079D00058C08B81882319F4E4E1F1E70AC08230B2 +:1079E00019F4E8E1F1E705C0813009F04AC0EAE3A3 +:1079F000F1E7449150E080E8BF0171DE3EC087307E +:107A000009F43FC0883021F481E08093F10035C053 +:107A1000893099F523703070232B99F5E7E7F1E76A +:107A200091E031E026E39093E9003093EB008491FC +:107A30008093EC002093ED009F5F3196943099F78E +:107A40008EE78093EA001092EA008B818093A00178 +:107A500014C08F8198851092E9001092A2011092B3 +:107A6000A1019093A4018093A3018D81882349F4FF +:107A7000CE01019612DC882321F08EEF8093E8007E +:107A800007C081E28093EB0003C0E4E6F1E7B1CFE9 +:107A90006196DEBFCDBFCF91DF91FF91EF91BF9196 +:107AA000AF919F918F917F916F915F914F913F9196 +:107AB0002F911F91FF90EF900F900FBE0F901F908E +:107AC0001895EE0FFF1F0590F491E02D0994F8949E +:027AD000FFCFE6 +:107AD200FFFF00E100000000000000000000353957 +:087AE200E53821391F3905398F :040000030000700089 :00000001FF diff --git a/bootloaders/nuevo_diskloader/src/CDC.cpp b/bootloaders/nuevo_diskloader/src/CDC.cpp index 827899d..8bc4b51 100644 --- a/bootloaders/nuevo_diskloader/src/CDC.cpp +++ b/bootloaders/nuevo_diskloader/src/CDC.cpp @@ -140,6 +140,8 @@ int Serial_::read(void) return c; } + + void Serial_::flush(void) { USB_Flush(CDC_TX); diff --git a/bootloaders/nuevo_diskloader/src/DiskLoader.cpp b/bootloaders/nuevo_diskloader/src/DiskLoader.cpp index 2f41f25..724a130 100644 --- a/bootloaders/nuevo_diskloader/src/DiskLoader.cpp +++ b/bootloaders/nuevo_diskloader/src/DiskLoader.cpp @@ -9,12 +9,12 @@ void entrypoint(void) __attribute__ ((naked)) __attribute__ ((section (".vectors void entrypoint(void) { asm volatile ( -// "eor r1, r1\n" // Zero register -// "out 0x3F, r1\n" // SREG -// "ldi r28, 0xFF\n" -// "ldi r29, 0x0A\n" -// "out 0x3E, r29\n" // SPH -// "out 0x3D, r28\n" // SPL + "eor r1, r1\n" // Zero register + "out 0x3F, r1\n" // SREG + "ldi r28, 0xFF\n" + "ldi r29, 0x0A\n" + "out 0x3E, r29\n" // SPH + "out 0x3D, r28\n" // SPL "rjmp main" // Stack is all set up, start the main code ::); } @@ -26,7 +26,7 @@ volatile u16 _timeout; void Program(u8 ep, u16 page, u8 count) { - u8 write = page < 30*1024; // Don't write over firmware please + u8 write = page < 28*1024; // Don't write over firmware please if (write) boot_page_erase(page); @@ -182,46 +182,16 @@ int main() // Check sync if (Serial.available() > 0 && Serial.read() != ' ') break; -// Serial.write(STK_INSYNC); USB_Send(CDC_TX, &_inSync, 1); - if (send) { -// u8 i; -// for (i=0; i