From 6bf6a20d268679daf3a6d489dee2f8dca5e8e1a1 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Tue, 25 Oct 2011 19:04:31 -0400 Subject: closer still - now up to 4680 --- bootloaders/nuevo_diskloader/DiskLoader.elf.hex | 253 ++++++++++++------------ bootloaders/nuevo_diskloader/DiskLoader.hex | 253 ++++++++++++------------ bootloaders/nuevo_diskloader/src/DiskLoader.cpp | 3 +- 3 files changed, 254 insertions(+), 255 deletions(-) (limited to 'bootloaders') diff --git a/bootloaders/nuevo_diskloader/DiskLoader.elf.hex b/bootloaders/nuevo_diskloader/DiskLoader.elf.hex index 6da99d0..4df1b58 100644 --- a/bootloaders/nuevo_diskloader/DiskLoader.elf.hex +++ b/bootloaders/nuevo_diskloader/DiskLoader.elf.hex @@ -1,6 +1,6 @@ :10700000BBC00000DEC00000DCC00000DAC0000031 :10701000D8C00000D6C00000D4C00000D2C000001C -:10702000D0C00000CEC0000065C30000D7C3000080 +:10702000D0C00000CEC0000061C30000D3C3000088 :10703000C8C00000C6C00000C4C00000C2C000003C :10704000C0C00000BEC00000BCC00000BAC000004C :10705000B8C00000B6C00000B4C00000B2C000005C @@ -21,20 +21,20 @@ :1071400069006E006F0020004C004C0043001201EB :1071500000020000004041238800000101020001FC :1071600012010002020000404123880000010102D8 -:10717000000100C18081DE3B11241FBECFEFDAE0A9 -:10718000DEBFCDBF11E0A0E0B1E0E8E3FAE702C066 +:10717000000100C18081DA3B11241FBECFEFDAE0AD +:10718000DEBFCDBF11E0A0E0B1E0E0E3FAE702C06E :1071900005900D92A830B107D9F711E0A8E0B1E051 :1071A00001C01D92A539B107E1F711E7C8E7D1E7A2 -:1071B00003C02297FE013AD4C637D107D1F772D067 -:1071C00039C41ECFFC0180818E5F808380E866EB2E -:1071D00070E742E450E040C2FC0181819081913A25 +:1071B00003C02297FE0136D4C637D107D1F772D06B +:1071C00035C41ECFFC0180818E5F808380E866EB32 +:1071D00070E742E450E03CC2FC0181819081913A29 :1071E00049F48132C1F480E060E071E047E050E0B2 -:1071F00033D20FC0913279F4803231F480E091E0E3 -:1072000067E070E065D205C0823229F48281809304 +:1071F0002FD20FC0913279F4803231F480E091E0E7 +:1072000067E070E061D205C0823229F48281809308 :10721000070181E0089580E00895FF920F931F9386 :10722000CF93DF93982F8B01FF2488E76030780796 :1072300038F4FF24F39483E0FB0180935700E89532 -:10724000C42FD0E0892F68E071E0AE0100D1FF20AB +:10724000C42FD0E0892F68E071E0AE01FCD0FF20B0 :1072500019F107B600FCFDCFD595C7954C2FF80165 :10726000A8E0B1E020E031E009C08D919D910C01D2 :1072700030935700E895112432962F5F2417A8F316 @@ -43,125 +43,124 @@ :1072A000FF90089588E10FB6F894809360001092E3 :1072B00060000FBE3F9A209A6E9A90E8909361000A :1072C0001092610081E885BF95BF01E005BF02E033 -:1072D00005BF769A289A479884E991E059D2789424 -:1072E00084E18093880180E18093890100E010E0CF -:1072F00082E0A4D08823E1F382E0FAD0C82E88EFA0 -:1073000090E7FC0124913196029644912C1511F0DE +:1072D00005BF769A289A479884E991E055D2789428 +:1072E00084E18093880180E180938901CC24DD24AE +:1072F00082E0A0D08823E1F382E0F6D0E82E88EF88 +:1073000090E7FC0124913196029644912E1511F0DC :107310002223B9F710928B0110928A0150E082E08B -:1073200068E071E094D0F1E4CF1679F4609108013F +:1073200068E071E090D0F1E4EF1679F46091080123 :107330006058633028F0683111F064E001C063E008 -:10734000C62FD0E0C55FDE4811C086E5C81691F4AF -:1073500080910801803321F07801DD24D3942BC083 -:1073600080910A01C82FD0E0C85FDE487801DD2493 -:10737000D3942AC0E5E7CE1631F4780123E0D22E6B -:10738000C8E0D1E721C0F5E5CF1639F4E090080157 -:10739000F0900901EE0CFF1C0DC084E6C81631F414 -:1073A00082E0B8014091090138DF03C0E4E7CE165E -:1073B00029F07801DD24CFE0D1E706C0D0900901A3 -:1073C000E8017801ED0CF11C08E813E101501040D0 -:1073D00009301105F1F082E031D08823D1F4F6CFE5 -:1073E00083E068E871E041E050E0AAD0DD2029F0B8 -:1073F0004D2D50E083E8BE01A3D083E469E871E03D -:1074000041E050E09DD0F1E5CF1609F46FCF870140 -:107410006FCF82E06DD000E010E0809709F068CF78 -:10742000DFCFFC0104C08091F1008193615066239D -:10743000D1F7289884E680938D0108959FB7F8943A -:1074400087708093E9008091F2009FBF0895FB014F -:107450008093E90024E69BE610C08091E80085FF58 -:10746000FCCF289820938D018091F1008193809129 -:10747000E80085FD02C09093E800415050408FEF36 -:107480004F3F580751F70895282F80918E01882388 -:10749000C1F057FF1AC015C0289890938D018091B4 -:1074A000F1008193E217F307B9F74115510539F05F -:1074B0008091F200882319F48BE68093E800AFBF37 -:1074C00002C04FEF5FEFCA010895AFB7F89427707D -:1074D0002093E9008091F200282F30E0241735072F -:1074E0000CF4A901FB019B01240F311D94E6DACFB6 -:1074F000DF93CF930F92CDB7DEB7BE016F5F7F4FA3 -:1075000041E050E0C1DF019719F08FEF9FEF02C01B -:10751000898190E00F90CF91DF9108952FB7F89473 -:1075200087708093E9008091E80085FD02C090E0BB -:1075300004C08091F20090E4981B2FBF892F08951A -:107540005F926F927F928F929F92AF92BF92CF92F3 -:10755000DF92EF92FF920F931F93CF93DF93F82E5A -:107560006A0180918E01882319F44FEF5FEF63C0A9 -:107570008B01EA0157E0E52EEF208F2D90E040E2ED -:10758000842E912C882299223AE3532E20E4A22EB5 -:10759000B12CA822B92280EA682E8FE0782E43C051 -:1075A0008F2DBCDF282F882321F4C3010197F1F729 -:1075B0003AC090E0C817D9070CF42C2FC21BD10990 -:1075C0004FB7F894E092E9008114910421F406C0C9 -:1075D0001092F10021502223D9F719C0F7FC03C003 -:1075E000F801922F10C0C801322F06C0FC0101968D -:1075F000E491E093F10031503323C1F706C081914B -:107600008093F10091509923D1F7020F111D8091C1 -:10761000E80085FF05C0209729F4A114B10411F0FA -:107620005092E8004FBF209709F0BACF769884E6D1 -:1076300080938C01A601CA01DF91CF911F910F9118 -:10764000FF90EF90DF90CF90BF90AF909F908F9082 -:107650007F906F905F9008950F931F93182FFB01F9 -:10766000A0919101B0919201BA010EEF2AC017FFCB -:1076700002C0949101C0908120918F0130919001BE -:107680002A173B07ACF48091E8008570E1F3809104 -:10769000E80082FF03C04FEF5FEF16C09093F10048 -:1076A000C90101968F739070892B11F40093E80043 -:1076B0002F5F3F4F3093900120938F0161507040B6 -:1076C00031966115710599F6CA011F910F910895C0 -:1076D000CF93DF939C01EB018091E80082FFFCCF08 -:1076E000C9016C2F9EDE8BEF8093E800CE01DF9105 -:1076F000CF9108951F920F920FB60F9211242F93DE -:107700003F938F938091E1001092E100282F83FF37 -:107710000FC01092E90081E08093EB001092EC0022 -:1077200082E38093ED0010928E0188E08093F00058 -:1077300022FF26C083E08093E9008091F200882335 -:1077400019F08AE38093E80080918C01882351F03E -:1077500080918C01815080938C0180918C018823D1 -:1077600009F4769A80918D01882351F080918D01E2 -:10777000815080938D0180918D01882309F4289A8E -:107780008F913F912F910F900FBE0F901F901895E2 -:1077900010928E0181E08093D70080EA8093D80018 -:1077A00082E189BD09B400FEFDCF80E98093D80055 -:1077B0008CE08093E2001092E00008950895DF933A -:1077C000CF930F92CDB7DEB71982CE010196FADCC6 -:1077D000898190E00F90CF91DF9108951F920F92D1 -:1077E0000FB60F921124EF92FF921F932F933F93A6 -:1077F0004F935F936F937F938F939F93AF93BF93B9 -:10780000EF93FF93DF93CF93CDB7DEB76197DEBFE2 -:10781000CDBF1092E9008091E80083FFECC0CE015B -:10782000019668E0FEDD82EF8093E800998197FF82 -:1078300005C08091E80080FFFCCF03C08EEF8093ED -:10784000E800292F30E0C90180769070892B09F07B -:10785000B3C08A81882329F41092F1001092F100BC -:10786000BFC0813009F4BCC0833009F4B9C0853091 -:1078700049F48091E80080FFFCCF8B818068809381 -:10788000E300AEC0863009F06DC01C81EF80F88443 -:107890001230A9F51092E9001092900110928F0118 -:1078A00010929201109291018ADF99E0FE013996BF -:1078B000DF01292F1D922A95E9F799871A8791E010 -:1078C0009E8790E8988B9AEF998B20918F01309149 -:1078D0009001275F3F4F3C872B878D871092E900EF -:1078E0001092900110928F01F0929201E09291011A -:1078F00080E0BF0149E050E0AFDE61DF71C010926F -:10790000E9001092900110928F01F0929201E092A2 -:107910009101113071F488E0E816F10411F410932C -:10792000930180919301882309F062C0EEE4F1E7AE -:1079300013C0133009F058C08B81882319F4E0E19B -:10794000F1E70AC0823019F4E4E1F1E705C08130C3 -:1079500009F04AC0E6E3F1E7449150E080E8BF0156 -:107960007BDE3EC0873009F43FC0883021F481E0DF -:107970008093F10035C0893099F523703070232B46 -:1079800099F5E3E7F1E791E031E026E39093E90030 -:107990003093EB0084918093EC002093ED009F5F87 -:1079A0003196943099F78EE78093EA001092EA00BE -:1079B0008B8180938E0114C08F8198851092E9008D -:1079C0001092900110928F019093920180939101F7 -:1079D0008D81882349F4CE010196FEDB882321F0B6 -:1079E0008EEF8093E80007C081E28093EB0003C034 -:1079F000E0E6F1E7B1CF6196DEBFCDBFCF91DF9179 -:107A0000FF91EF91BF91AF919F918F917F916F9176 -:107A10005F914F913F912F911F91FF90EF900F90A9 -:107A20000FBE0F901F901895EE0FFF1F0590F49159 -:087A3000E02D0994F894FFCF4A -:087A380000E100000000000065 +:10734000C62FD0E0C55FDE4810C026E5E21681F406 +:1073500080910801803319F0FF24F39428C08091B4 +:107360000A01C82FD0E0C85FDE48FF24F39427C08D +:1073700085E7E81629F423E0F22EC8E0D1E71FC024 +:10738000E5E5EE1639F4C0900801D0900901CC0C67 +:10739000DD1C0CC0F4E6EF1631F482E0B60140913A +:1073A00009013BDF03C024E7E21621F0FF24CFE010 +:1073B000D1E705C0F0900901E601CF0CD11C08E827 +:1073C00013E1015010400930110501F182E032D083 +:1073D0008823E1F4F6CF809709F088CF83E068E84E +:1073E00071E041E050E0A8D0FF2029F04F2D50E09F +:1073F00083E8BE01A1D083E469E871E041E050E098 +:107400009BD081E5E81609F073CF70CF82E06CD095 +:10741000EFEF8F3F9E07F9F6E1CFFC0104C08091AA +:10742000F100819361506623D1F7289884E6809318 +:107430008D0108959FB7F89487708093E90080913B +:10744000F2009FBF0895FB018093E90024E69BE6CC +:1074500010C08091E80085FFFCCF289820938D0113 +:107460008091F10081938091E80085FD02C09093A6 +:10747000E800415050408FEF4F3F580751F70895B3 +:10748000282F80918E018823C1F057FF1AC015C0A4 +:10749000289890938D018091F1008193E217F30772 +:1074A000B9F74115510539F08091F200882319F49C +:1074B0008BE68093E800AFBF02C04FEF5FEFCA01D9 +:1074C0000895AFB7F89427702093E9008091F200F7 +:1074D000282F30E0241735070CF4A901FB019B018C +:1074E000240F311D94E6DACFDF93CF930F92CDB7FF +:1074F000DEB7BE016F5F7F4F41E050E0C1DF019713 +:1075000019F08FEF9FEF02C0898190E00F90CF912B +:10751000DF9108952FB7F89487708093E9008091E8 +:10752000E80085FD02C090E004C08091F20090E484 +:10753000981B2FBF892F08955F926F927F928F9231 +:107540009F92AF92BF92CF92DF92EF92FF920F93F2 +:107550001F93CF93DF93F82E6A0180918E018823C9 +:1075600019F44FEF5FEF63C08B01EA0157E0E52E9E +:10757000EF208F2D90E040E2842E912C88229922DA +:107580003AE3532E20E4A22EB12CA822B92280EA9D +:10759000682E8FE0782E43C08F2DBCDF282F8823E4 +:1075A00021F4C3010197F1F73AC090E0C817D90759 +:1075B0000CF42C2FC21BD1094FB7F894E092E900CC +:1075C0008114910421F406C01092F100215022236D +:1075D000D9F719C0F7FC03C0F801922F10C0C801F9 +:1075E000322F06C0FC010196E491E093F100315086 +:1075F0003323C1F706C081918093F1009150992304 +:10760000D1F7020F111D8091E80085FF05C020977A +:1076100029F4A114B10411F05092E8004FBF209753 +:1076200009F0BACF769884E680938C01A601CA014E +:10763000DF91CF911F910F91FF90EF90DF90CF904E +:10764000BF90AF909F908F907F906F905F900895C4 +:107650000F931F93182FFB01A0919101B0919201FC +:10766000BA010EEF2AC017FF02C0949101C09081A9 +:1076700020918F01309190012A173B07ACF4809143 +:10768000E8008570E1F38091E80082FF03C04FEFCE +:107690005FEF16C09093F100C90101968F7390704F +:1076A000892B11F40093E8002F5F3F4F3093900136 +:1076B00020938F016150704031966115710599F6E4 +:1076C000CA011F910F910895CF93DF939C01EB01A5 +:1076D0008091E80082FFFCCFC9016C2F9EDE8BEF0A +:1076E0008093E800CE01DF91CF9108951F920F9211 +:1076F0000FB60F9211242F933F938F938091E10047 +:107700001092E100282F83FF0FC01092E90081E062 +:107710008093EB001092EC0082E38093ED001092D6 +:107720008E0188E08093F00022FF26C083E08093E2 +:10773000E9008091F200882319F08AE38093E80041 +:1077400080918C01882351F080918C01815080932D +:107750008C0180918C01882309F4769A80918D01A7 +:10776000882351F080918D01815080938D0180910B +:107770008D01882309F4289A8F913F912F910F90C2 +:107780000FBE0F901F90189510928E0181E080938C +:10779000D70080EA8093D80082E189BD09B400FE59 +:1077A000FDCF80E98093D8008CE08093E2001092B6 +:1077B000E00008950895DF93CF930F92CDB7DEB721 +:1077C0001982CE010196FEDC898190E00F90CF9165 +:1077D000DF9108951F920F920FB60F921124EF922E +:1077E000FF921F932F933F934F935F936F937F93DA +:1077F0008F939F93AF93BF93EF93FF93DF93CF93B9 +:10780000CDB7DEB76197DEBFCDBF1092E9008091A2 +:10781000E80083FFECC0CE01019668E0FEDD82EF58 +:107820008093E800998197FF05C08091E80080FF70 +:10783000FCCF03C08EEF8093E800292F30E0C90110 +:1078400080769070892B09F0B3C08A81882329F44F +:107850001092F1001092F100BFC0813009F4BCC059 +:10786000833009F4B9C0853049F48091E80080FF85 +:10787000FCCF8B8180688093E300AEC0863009F036 +:107880006DC01C81EF80F8841230A9F51092E900D8 +:107890001092900110928F0110929201109291011A +:1078A0008ADF99E0FE013996DF01292F1D922A9582 +:1078B000E9F799871A8791E09E8790E8988B9AEF6D +:1078C000998B20918F0130919001275F3F4F3C872A +:1078D0002B878D871092E9001092900110928F01F2 +:1078E000F0929201E092910180E0BF0149E050E006 +:1078F000AFDE61DF71C01092E9001092900110922A +:107900008F01F0929201E0929101113071F488E0C0 +:10791000E816F10411F410939301809193018823E8 +:1079200009F062C0EEE4F1E713C0133009F058C06B +:107930008B81882319F4E0E1F1E70AC0823019F461 +:10794000E4E1F1E705C0813009F04AC0E6E3F1E780 +:10795000449150E080E8BF017BDE3EC0873009F4EF +:107960003FC0883021F481E08093F10035C0893038 +:1079700099F523703070232B99F5E3E7F1E791E057 +:1079800031E026E39093E9003093EB0084918093FB +:10799000EC002093ED009F5F3196943099F78EE7CD +:1079A0008093EA001092EA008B8180938E0114C0CC +:1079B0008F8198851092E9001092900110928F01AA +:1079C00090939201809391018D81882349F4CE0197 +:1079D000019602DC882321F08EEF8093E80007C037 +:1079E00081E28093EB0003C0E0E6F1E7B1CF61965E +:1079F000DEBFCDBFCF91DF91FF91EF91BF91AF91EE +:107A00009F918F917F916F915F914F913F912F91B6 +:107A10001F91FF90EF900F900FBE0F901F90189541 +:107A2000EE0FFF1F0590F491E02D0994F894FFCF1D +:087A300000E10000000000006D :040000030000700089 :00000001FF diff --git a/bootloaders/nuevo_diskloader/DiskLoader.hex b/bootloaders/nuevo_diskloader/DiskLoader.hex index 6da99d0..4df1b58 100644 --- a/bootloaders/nuevo_diskloader/DiskLoader.hex +++ b/bootloaders/nuevo_diskloader/DiskLoader.hex @@ -1,6 +1,6 @@ :10700000BBC00000DEC00000DCC00000DAC0000031 :10701000D8C00000D6C00000D4C00000D2C000001C -:10702000D0C00000CEC0000065C30000D7C3000080 +:10702000D0C00000CEC0000061C30000D3C3000088 :10703000C8C00000C6C00000C4C00000C2C000003C :10704000C0C00000BEC00000BCC00000BAC000004C :10705000B8C00000B6C00000B4C00000B2C000005C @@ -21,20 +21,20 @@ :1071400069006E006F0020004C004C0043001201EB :1071500000020000004041238800000101020001FC :1071600012010002020000404123880000010102D8 -:10717000000100C18081DE3B11241FBECFEFDAE0A9 -:10718000DEBFCDBF11E0A0E0B1E0E8E3FAE702C066 +:10717000000100C18081DA3B11241FBECFEFDAE0AD +:10718000DEBFCDBF11E0A0E0B1E0E0E3FAE702C06E :1071900005900D92A830B107D9F711E0A8E0B1E051 :1071A00001C01D92A539B107E1F711E7C8E7D1E7A2 -:1071B00003C02297FE013AD4C637D107D1F772D067 -:1071C00039C41ECFFC0180818E5F808380E866EB2E -:1071D00070E742E450E040C2FC0181819081913A25 +:1071B00003C02297FE0136D4C637D107D1F772D06B +:1071C00035C41ECFFC0180818E5F808380E866EB32 +:1071D00070E742E450E03CC2FC0181819081913A29 :1071E00049F48132C1F480E060E071E047E050E0B2 -:1071F00033D20FC0913279F4803231F480E091E0E3 -:1072000067E070E065D205C0823229F48281809304 +:1071F0002FD20FC0913279F4803231F480E091E0E7 +:1072000067E070E061D205C0823229F48281809308 :10721000070181E0089580E00895FF920F931F9386 :10722000CF93DF93982F8B01FF2488E76030780796 :1072300038F4FF24F39483E0FB0180935700E89532 -:10724000C42FD0E0892F68E071E0AE0100D1FF20AB +:10724000C42FD0E0892F68E071E0AE01FCD0FF20B0 :1072500019F107B600FCFDCFD595C7954C2FF80165 :10726000A8E0B1E020E031E009C08D919D910C01D2 :1072700030935700E895112432962F5F2417A8F316 @@ -43,125 +43,124 @@ :1072A000FF90089588E10FB6F894809360001092E3 :1072B00060000FBE3F9A209A6E9A90E8909361000A :1072C0001092610081E885BF95BF01E005BF02E033 -:1072D00005BF769A289A479884E991E059D2789424 -:1072E00084E18093880180E18093890100E010E0CF -:1072F00082E0A4D08823E1F382E0FAD0C82E88EFA0 -:1073000090E7FC0124913196029644912C1511F0DE +:1072D00005BF769A289A479884E991E055D2789428 +:1072E00084E18093880180E180938901CC24DD24AE +:1072F00082E0A0D08823E1F382E0F6D0E82E88EF88 +:1073000090E7FC0124913196029644912E1511F0DC :107310002223B9F710928B0110928A0150E082E08B -:1073200068E071E094D0F1E4CF1679F4609108013F +:1073200068E071E090D0F1E4EF1679F46091080123 :107330006058633028F0683111F064E001C063E008 -:10734000C62FD0E0C55FDE4811C086E5C81691F4AF -:1073500080910801803321F07801DD24D3942BC083 -:1073600080910A01C82FD0E0C85FDE487801DD2493 -:10737000D3942AC0E5E7CE1631F4780123E0D22E6B -:10738000C8E0D1E721C0F5E5CF1639F4E090080157 -:10739000F0900901EE0CFF1C0DC084E6C81631F414 -:1073A00082E0B8014091090138DF03C0E4E7CE165E -:1073B00029F07801DD24CFE0D1E706C0D0900901A3 -:1073C000E8017801ED0CF11C08E813E101501040D0 -:1073D00009301105F1F082E031D08823D1F4F6CFE5 -:1073E00083E068E871E041E050E0AAD0DD2029F0B8 -:1073F0004D2D50E083E8BE01A3D083E469E871E03D -:1074000041E050E09DD0F1E5CF1609F46FCF870140 -:107410006FCF82E06DD000E010E0809709F068CF78 -:10742000DFCFFC0104C08091F1008193615066239D -:10743000D1F7289884E680938D0108959FB7F8943A -:1074400087708093E9008091F2009FBF0895FB014F -:107450008093E90024E69BE610C08091E80085FF58 -:10746000FCCF289820938D018091F1008193809129 -:10747000E80085FD02C09093E800415050408FEF36 -:107480004F3F580751F70895282F80918E01882388 -:10749000C1F057FF1AC015C0289890938D018091B4 -:1074A000F1008193E217F307B9F74115510539F05F -:1074B0008091F200882319F48BE68093E800AFBF37 -:1074C00002C04FEF5FEFCA010895AFB7F89427707D -:1074D0002093E9008091F200282F30E0241735072F -:1074E0000CF4A901FB019B01240F311D94E6DACFB6 -:1074F000DF93CF930F92CDB7DEB7BE016F5F7F4FA3 -:1075000041E050E0C1DF019719F08FEF9FEF02C01B -:10751000898190E00F90CF91DF9108952FB7F89473 -:1075200087708093E9008091E80085FD02C090E0BB -:1075300004C08091F20090E4981B2FBF892F08951A -:107540005F926F927F928F929F92AF92BF92CF92F3 -:10755000DF92EF92FF920F931F93CF93DF93F82E5A -:107560006A0180918E01882319F44FEF5FEF63C0A9 -:107570008B01EA0157E0E52EEF208F2D90E040E2ED -:10758000842E912C882299223AE3532E20E4A22EB5 -:10759000B12CA822B92280EA682E8FE0782E43C051 -:1075A0008F2DBCDF282F882321F4C3010197F1F729 -:1075B0003AC090E0C817D9070CF42C2FC21BD10990 -:1075C0004FB7F894E092E9008114910421F406C0C9 -:1075D0001092F10021502223D9F719C0F7FC03C003 -:1075E000F801922F10C0C801322F06C0FC0101968D -:1075F000E491E093F10031503323C1F706C081914B -:107600008093F10091509923D1F7020F111D8091C1 -:10761000E80085FF05C0209729F4A114B10411F0FA -:107620005092E8004FBF209709F0BACF769884E6D1 -:1076300080938C01A601CA01DF91CF911F910F9118 -:10764000FF90EF90DF90CF90BF90AF909F908F9082 -:107650007F906F905F9008950F931F93182FFB01F9 -:10766000A0919101B0919201BA010EEF2AC017FFCB -:1076700002C0949101C0908120918F0130919001BE -:107680002A173B07ACF48091E8008570E1F3809104 -:10769000E80082FF03C04FEF5FEF16C09093F10048 -:1076A000C90101968F739070892B11F40093E80043 -:1076B0002F5F3F4F3093900120938F0161507040B6 -:1076C00031966115710599F6CA011F910F910895C0 -:1076D000CF93DF939C01EB018091E80082FFFCCF08 -:1076E000C9016C2F9EDE8BEF8093E800CE01DF9105 -:1076F000CF9108951F920F920FB60F9211242F93DE -:107700003F938F938091E1001092E100282F83FF37 -:107710000FC01092E90081E08093EB001092EC0022 -:1077200082E38093ED0010928E0188E08093F00058 -:1077300022FF26C083E08093E9008091F200882335 -:1077400019F08AE38093E80080918C01882351F03E -:1077500080918C01815080938C0180918C018823D1 -:1077600009F4769A80918D01882351F080918D01E2 -:10777000815080938D0180918D01882309F4289A8E -:107780008F913F912F910F900FBE0F901F901895E2 -:1077900010928E0181E08093D70080EA8093D80018 -:1077A00082E189BD09B400FEFDCF80E98093D80055 -:1077B0008CE08093E2001092E00008950895DF933A -:1077C000CF930F92CDB7DEB71982CE010196FADCC6 -:1077D000898190E00F90CF91DF9108951F920F92D1 -:1077E0000FB60F921124EF92FF921F932F933F93A6 -:1077F0004F935F936F937F938F939F93AF93BF93B9 -:10780000EF93FF93DF93CF93CDB7DEB76197DEBFE2 -:10781000CDBF1092E9008091E80083FFECC0CE015B -:10782000019668E0FEDD82EF8093E800998197FF82 -:1078300005C08091E80080FFFCCF03C08EEF8093ED -:10784000E800292F30E0C90180769070892B09F07B -:10785000B3C08A81882329F41092F1001092F100BC -:10786000BFC0813009F4BCC0833009F4B9C0853091 -:1078700049F48091E80080FFFCCF8B818068809381 -:10788000E300AEC0863009F06DC01C81EF80F88443 -:107890001230A9F51092E9001092900110928F0118 -:1078A00010929201109291018ADF99E0FE013996BF -:1078B000DF01292F1D922A95E9F799871A8791E010 -:1078C0009E8790E8988B9AEF998B20918F01309149 -:1078D0009001275F3F4F3C872B878D871092E900EF -:1078E0001092900110928F01F0929201E09291011A -:1078F00080E0BF0149E050E0AFDE61DF71C010926F -:10790000E9001092900110928F01F0929201E092A2 -:107910009101113071F488E0E816F10411F410932C -:10792000930180919301882309F062C0EEE4F1E7AE -:1079300013C0133009F058C08B81882319F4E0E19B -:10794000F1E70AC0823019F4E4E1F1E705C08130C3 -:1079500009F04AC0E6E3F1E7449150E080E8BF0156 -:107960007BDE3EC0873009F43FC0883021F481E0DF -:107970008093F10035C0893099F523703070232B46 -:1079800099F5E3E7F1E791E031E026E39093E90030 -:107990003093EB0084918093EC002093ED009F5F87 -:1079A0003196943099F78EE78093EA001092EA00BE -:1079B0008B8180938E0114C08F8198851092E9008D -:1079C0001092900110928F019093920180939101F7 -:1079D0008D81882349F4CE010196FEDB882321F0B6 -:1079E0008EEF8093E80007C081E28093EB0003C034 -:1079F000E0E6F1E7B1CF6196DEBFCDBFCF91DF9179 -:107A0000FF91EF91BF91AF919F918F917F916F9176 -:107A10005F914F913F912F911F91FF90EF900F90A9 -:107A20000FBE0F901F901895EE0FFF1F0590F49159 -:087A3000E02D0994F894FFCF4A -:087A380000E100000000000065 +:10734000C62FD0E0C55FDE4810C026E5E21681F406 +:1073500080910801803319F0FF24F39428C08091B4 +:107360000A01C82FD0E0C85FDE48FF24F39427C08D +:1073700085E7E81629F423E0F22EC8E0D1E71FC024 +:10738000E5E5EE1639F4C0900801D0900901CC0C67 +:10739000DD1C0CC0F4E6EF1631F482E0B60140913A +:1073A00009013BDF03C024E7E21621F0FF24CFE010 +:1073B000D1E705C0F0900901E601CF0CD11C08E827 +:1073C00013E1015010400930110501F182E032D083 +:1073D0008823E1F4F6CF809709F088CF83E068E84E +:1073E00071E041E050E0A8D0FF2029F04F2D50E09F +:1073F00083E8BE01A1D083E469E871E041E050E098 +:107400009BD081E5E81609F073CF70CF82E06CD095 +:10741000EFEF8F3F9E07F9F6E1CFFC0104C08091AA +:10742000F100819361506623D1F7289884E6809318 +:107430008D0108959FB7F89487708093E90080913B +:10744000F2009FBF0895FB018093E90024E69BE6CC +:1074500010C08091E80085FFFCCF289820938D0113 +:107460008091F10081938091E80085FD02C09093A6 +:10747000E800415050408FEF4F3F580751F70895B3 +:10748000282F80918E018823C1F057FF1AC015C0A4 +:10749000289890938D018091F1008193E217F30772 +:1074A000B9F74115510539F08091F200882319F49C +:1074B0008BE68093E800AFBF02C04FEF5FEFCA01D9 +:1074C0000895AFB7F89427702093E9008091F200F7 +:1074D000282F30E0241735070CF4A901FB019B018C +:1074E000240F311D94E6DACFDF93CF930F92CDB7FF +:1074F000DEB7BE016F5F7F4F41E050E0C1DF019713 +:1075000019F08FEF9FEF02C0898190E00F90CF912B +:10751000DF9108952FB7F89487708093E9008091E8 +:10752000E80085FD02C090E004C08091F20090E484 +:10753000981B2FBF892F08955F926F927F928F9231 +:107540009F92AF92BF92CF92DF92EF92FF920F93F2 +:107550001F93CF93DF93F82E6A0180918E018823C9 +:1075600019F44FEF5FEF63C08B01EA0157E0E52E9E +:10757000EF208F2D90E040E2842E912C88229922DA +:107580003AE3532E20E4A22EB12CA822B92280EA9D +:10759000682E8FE0782E43C08F2DBCDF282F8823E4 +:1075A00021F4C3010197F1F73AC090E0C817D90759 +:1075B0000CF42C2FC21BD1094FB7F894E092E900CC +:1075C0008114910421F406C01092F100215022236D +:1075D000D9F719C0F7FC03C0F801922F10C0C801F9 +:1075E000322F06C0FC010196E491E093F100315086 +:1075F0003323C1F706C081918093F1009150992304 +:10760000D1F7020F111D8091E80085FF05C020977A +:1076100029F4A114B10411F05092E8004FBF209753 +:1076200009F0BACF769884E680938C01A601CA014E +:10763000DF91CF911F910F91FF90EF90DF90CF904E +:10764000BF90AF909F908F907F906F905F900895C4 +:107650000F931F93182FFB01A0919101B0919201FC +:10766000BA010EEF2AC017FF02C0949101C09081A9 +:1076700020918F01309190012A173B07ACF4809143 +:10768000E8008570E1F38091E80082FF03C04FEFCE +:107690005FEF16C09093F100C90101968F7390704F +:1076A000892B11F40093E8002F5F3F4F3093900136 +:1076B00020938F016150704031966115710599F6E4 +:1076C000CA011F910F910895CF93DF939C01EB01A5 +:1076D0008091E80082FFFCCFC9016C2F9EDE8BEF0A +:1076E0008093E800CE01DF91CF9108951F920F9211 +:1076F0000FB60F9211242F933F938F938091E10047 +:107700001092E100282F83FF0FC01092E90081E062 +:107710008093EB001092EC0082E38093ED001092D6 +:107720008E0188E08093F00022FF26C083E08093E2 +:10773000E9008091F200882319F08AE38093E80041 +:1077400080918C01882351F080918C01815080932D +:107750008C0180918C01882309F4769A80918D01A7 +:10776000882351F080918D01815080938D0180910B +:107770008D01882309F4289A8F913F912F910F90C2 +:107780000FBE0F901F90189510928E0181E080938C +:10779000D70080EA8093D80082E189BD09B400FE59 +:1077A000FDCF80E98093D8008CE08093E2001092B6 +:1077B000E00008950895DF93CF930F92CDB7DEB721 +:1077C0001982CE010196FEDC898190E00F90CF9165 +:1077D000DF9108951F920F920FB60F921124EF922E +:1077E000FF921F932F933F934F935F936F937F93DA +:1077F0008F939F93AF93BF93EF93FF93DF93CF93B9 +:10780000CDB7DEB76197DEBFCDBF1092E9008091A2 +:10781000E80083FFECC0CE01019668E0FEDD82EF58 +:107820008093E800998197FF05C08091E80080FF70 +:10783000FCCF03C08EEF8093E800292F30E0C90110 +:1078400080769070892B09F0B3C08A81882329F44F +:107850001092F1001092F100BFC0813009F4BCC059 +:10786000833009F4B9C0853049F48091E80080FF85 +:10787000FCCF8B8180688093E300AEC0863009F036 +:107880006DC01C81EF80F8841230A9F51092E900D8 +:107890001092900110928F0110929201109291011A +:1078A0008ADF99E0FE013996DF01292F1D922A9582 +:1078B000E9F799871A8791E09E8790E8988B9AEF6D +:1078C000998B20918F0130919001275F3F4F3C872A +:1078D0002B878D871092E9001092900110928F01F2 +:1078E000F0929201E092910180E0BF0149E050E006 +:1078F000AFDE61DF71C01092E9001092900110922A +:107900008F01F0929201E0929101113071F488E0C0 +:10791000E816F10411F410939301809193018823E8 +:1079200009F062C0EEE4F1E713C0133009F058C06B +:107930008B81882319F4E0E1F1E70AC0823019F461 +:10794000E4E1F1E705C0813009F04AC0E6E3F1E780 +:10795000449150E080E8BF017BDE3EC0873009F4EF +:107960003FC0883021F481E08093F10035C0893038 +:1079700099F523703070232B99F5E3E7F1E791E057 +:1079800031E026E39093E9003093EB0084918093FB +:10799000EC002093ED009F5F3196943099F78EE7CD +:1079A0008093EA001092EA008B8180938E0114C0CC +:1079B0008F8198851092E9001092900110928F01AA +:1079C00090939201809391018D81882349F4CE0197 +:1079D000019602DC882321F08EEF8093E80007C037 +:1079E00081E28093EB0003C0E0E6F1E7B1CF61965E +:1079F000DEBFCDBFCF91DF91FF91EF91BF91AF91EE +:107A00009F918F917F916F915F914F913F912F91B6 +:107A10001F91FF90EF900F900FBE0F901F90189541 +:107A2000EE0FFF1F0590F491E02D0994F894FFCF1D +:087A300000E10000000000006D :040000030000700089 :00000001FF diff --git a/bootloaders/nuevo_diskloader/src/DiskLoader.cpp b/bootloaders/nuevo_diskloader/src/DiskLoader.cpp index 3b8657e..8088b7b 100644 --- a/bootloaders/nuevo_diskloader/src/DiskLoader.cpp +++ b/bootloaders/nuevo_diskloader/src/DiskLoader.cpp @@ -242,7 +242,8 @@ int main() u16 countdown = 5000; while (countdown-- > 10 && !USB_Available(CDC_RX)) ; - if (USB_Recv(CDC_RX) != ' ') + int x = USB_Recv(CDC_RX); + if (x != -1 && x != ' ') break; USB_Send(CDC_TX, &_inSync, 1); -- cgit v1.2.3-18-g5258