brought nuevo_diskloader changes over to diskloader

Moved nuevo_diskloader files into diskloader directory.  Changed back to real PID for Leonardo

10 files changed, 0 insertions, 2098 deletions

diff --git a/bootloaders/nuevo_diskloader/DiskLoader.elf.hex b/bootloaders/nuevo_diskloader/DiskLoader.elf.hex
deleted file mode 100644
index df5f1da..0000000
--- a/bootloaders/nuevo_diskloader/DiskLoader.elf.hex
+++ /dev/null
@@ -1,172 +0,0 @@
-:10700000BDC00000E0C00000DEC00000DCC0000029

-:10701000DAC00000D8C00000D6C00000D4C0000014

-:10702000D2C00000D0C000008AC30000FCC3000032

-:10703000CAC00000C8C00000C6C00000C4C0000034

-:10704000C2C00000C0C00000BEC00000BCC0000044

-:10705000BAC00000B8C00000B6C00000B4C0000054

-:10706000B2C00000B0C00000AEC00000ACC0000064

-:10707000AAC00000A8C00000A6C00000A4C0000074

-:10708000A2C00000A0C000009EC000009CC0000084

-:107090009AC0000098C0000096C0000094C0000094

-:1070A00092C0000090C000008EC0000011241FBEDE

-:1070B000CFEFDAE0DEBFCDBFF7C0080B000202025F

-:1070C0000100090400000102020000052400100173

-:1070D0000524010101042402060524060001070518

-:1070E000810310004009040100020A0000000705A6

-:1070F00002024000000705830240000041014214E3

-:107100004505560455026403740300001E9587026A

-:107110000110030004030904220300000000000022

-:10712000000000000000000000000000000000005F

-:107130000000000000000000000018034100720081

-:107140006400750069006E006F0020004C004C0068

-:1071500043001201000200000040412389000001A9

-:1071600001020001120100020200004041238900D7

-:1071700000010102000100C18081033C11241FBEF7

-:10718000CFEFDAE0DEBFCDBF11E0A0E0B1E0E2E892

-:10719000FAE702C005900D92A830B107D9F711E0C7

-:1071A000A8E0B1E001C01D92A539B107E1F711E7F0

-:1071B000CCE7D1E703C02297FE015DD4CA37D107DF

-:1071C000D1F772D05CC41CCFFC0180818E5F8083BC

-:1071D00080E86AEB70E742E450E063C2FC01818121

-:1071E0009081913A49F48132C1F480E060E071E02D

-:1071F00047E050E056D20FC0913279F4803231F43A

-:1072000080E091E067E070E088D205C0823229F426

-:1072100082818093070181E0089580E00895FF92C4

-:107220000F931F93CF93DF93982F8B01FF2480E759

-:107230006030780738F4FF24F39483E0FB018093F7

-:107240005700E895C42FD0E0892F68E071E0AE01C7

-:107250001AD1FF2019F107B600FCFDCFD595C795CF

-:107260004C2FF801A8E0B1E020E031E009C08D9199

-:107270009D910C0130935700E895112432962F5FB1

-:107280002417A8F385E0F80180935700E89507B626

-:1072900000FCFDCF81E180935700E895DF91CF910D

-:1072A0001F910F91FF90089588E10FB6F894809395

-:1072B0006000109260000FBE3F9A209A6E9A90E88C

-:1072C000909361001092610081E885BF95BF01E055

-:1072D00005BF02E005BF769A289A479884E991E0B5

-:1072E0007CD2789484E18093880180E18093890145

-:1072F000CC24DD2430E9A32E31E0B32E99249394DD

-:1073000002C0CC24DD2482E0B5D08823E1F382E002

-:107310000FD1E82E8CEF90E7FC0124913196029674

-:1073200044912E1511F02223B9F710928B0110927F

-:107330008A0150E082E068E071E0A5D0F1E4EF1648

-:1073400079F4609108016058633028F0683111F0D9

-:1073500064E001C063E0C62FD0E0C15FDE4810C02A

-:1073600026E5E21681F480910801803319F0FF24AC

-:10737000F39428C080910A01C82FD0E0C45FDE4892

-:10738000FF24F39427C085E7E81629F423E0F22EC2

-:10739000CCE0D1E71FC0E5E5EE1639F4C090080156

-:1073A000D0900901CC0CDD1C0CC0F4E6EF1631F4D2

-:1073B00082E0B6014091090132DF03C024E7E21602

-:1073C00021F0FF24C3E1D1E705C0F0900901E601F7

-:1073D000CF0CD11C08E813E1015010400930110511

-:1073E00009F433C082E046D0882309F02EC0F4CFE0

-:1073F000809709F086CF83E068E871E041E050E0D3

-:10740000BFD0FF2029F04F2D50E083E8BE01B8D057

-:1074100083E469E871E041E050E0B2D081E5E8162C

-:1074200009F071CF88EE93E0F5013197F1F70197FC

-:10743000D9F701E005BF00E005BF9092E00010928F

-:10744000E200EE27FF2709945ECF82E071D0EFEFD4

-:107450008F3F9E0709F0CCCFCECFFC0104C08091B6

-:10746000F100819361506623D1F7289884E68093D8

-:107470008D0108959FB7F89487708093E9008091FB

-:10748000F2009FBF0895FB019FB7F8948770809327

-:10749000E90034E62BE610C08091E80085FFFCCFC0

-:1074A000289830938D018091F10081938091E800BC

-:1074B00085FD02C02093E800415050408FEF4F3FC0

-:1074C000580751F79FBF0895282F80918E01882378

-:1074D000C1F057FF1AC015C0289890938D01809174

-:1074E000F1008193E217F307B9F74115510539F01F

-:1074F0008091F200882319F48BE68093E800AFBFF7

-:1075000002C04FEF5FEFCA010895AFB7F89427703C

-:107510002093E9008091F200282F30E024173507EE

-:107520000CF4A901FB019B01240F311D94E6DACF75

-:10753000DF93CF930F92CDB7DEB7BE016F5F7F4F62

-:1075400041E050E0C1DF019719F08FEF9FEF02C0DB

-:10755000898190E00F90CF91DF9108952FB7F89433

-:1075600087708093E9008091E80085FD02C090E07B

-:1075700004C08091F20090E4981B2FBF892F0895DA

-:107580005F926F927F928F929F92AF92BF92CF92B3

-:10759000DF92EF92FF920F931F93CF93DF93F82E1A

-:1075A0006A0180918E01882319F44FEF5FEF68C064

-:1075B0008B01EA0157E0E52EEF208F2D90E040E2AD

-:1075C000842E912C882299223AE3532E20E4A22E75

-:1075D000B12CA822B92280EA682E8FE0782E43C011

-:1075E0008F2DBCDF282F882321F4C3010197F1F7E9

-:1075F0003AC090E0C817D9070CF42C2FC21BD10950

-:107600004FB7F894E092E9008114910421F406C088

-:107610001092F10021502223D9F719C0F7FC03C0C2

-:10762000F801922F10C0C801322F06C0FC0101964C

-:10763000E491E093F10031503323C1F706C081910A

-:107640008093F10091509923D1F7020F111D809181

-:10765000E80085FF05C0209729F4A114B10411F0BA

-:107660005092E8004FBF209709F0BACFF6FE03C052

-:107670008AE38093E800769884E680938C01A601E3

-:10768000CA01DF91CF911F910F91FF90EF90DF9092

-:10769000CF90BF90AF909F908F907F906F905F90B2

-:1076A00008950F931F93182FFB01A0919101B091A2

-:1076B0009201BA010EEF2AC017FF02C0949101C0D7

-:1076C000908120918F01309190012A173B07ACF4F3

-:1076D0008091E8008570E1F38091E80082FF03C0AB

-:1076E0004FEF5FEF16C09093F100C90101968F73C1

-:1076F0009070892B11F40093E8002F5F3F4F309377

-:10770000900120938F016150704031966115710591

-:1077100099F6CA011F910F910895CF93DF939C01B1

-:10772000EB018091E80082FFFCCFC9016C2F95DE50

-:107730008BEF8093E800CE01DF91CF9108951F92E7

-:107740000F920FB60F9211242F933F938F93809136

-:10775000E1001092E100282F83FF0FC01092E90092

-:1077600081E08093EB001092EC0082E38093ED00C7

-:1077700010928E0188E08093F00022FF26C083E003

-:107780008093E9008091F200882319F08AE38093C6

-:10779000E80080918C01882351F080918C01815008

-:1077A00080938C0180918C01882309F4769A8091D2

-:1077B0008D01882351F080918D01815080938D013E

-:1077C00080918D01882309F4289A8F913F912F9100

-:1077D0000F900FBE0F901F90189510928E0181E0B0

-:1077E0008093D70080EA8093D80082E189BD09B4F4

-:1077F00000FEFDCF80E98093D8008CE08093E2000A

-:107800001092E00008950895DF93CF930F92CDB7C3

-:10781000DEB71982CE010196D7DC898190E00F9006

-:10782000CF91DF9108951F920F920FB60F921124FE

-:10783000EF92FF921F932F933F934F935F936F931A

-:107840007F938F939F93AF93BF93EF93FF93DF93B8

-:10785000CF93CDB7DEB76197DEBFCDBF1092E90001

-:107860008091E80083FFECC0CE01019668E0F5DD71

-:1078700082EF8093E800998197FF05C08091E8002E

-:1078800080FFFCCF03C08EEF8093E800292F30E00B

-:10789000C90180769070892B09F0B3C08A81882352

-:1078A00029F41092F1001092F100BFC0813009F468

-:1078B000BCC0833009F4B9C0853049F48091E80038

-:1078C00080FFFCCF8B8180688093E300AEC0863060

-:1078D00009F06DC01C81EF80F8841230A9F5109278

-:1078E000E9001092900110928F0110929201109273

-:1078F00091018ADF99E0FE013996DF01292F1D925F

-:107900002A95E9F799871A8791E09E8790E8988BE6

-:107910009AEF998B20918F0130919001275F3F4F13

-:107920003C872B878D871092E9001092900110926E

-:107930008F01F0929201E092910180E0BF0149E055

-:1079400050E0AFDE61DF71C01092E900109290014B

-:1079500010928F01F0929201E0929101113071F436

-:1079600088E0E816F10411F41093930180919301DB

-:10797000882309F062C0E2E5F1E713C0133009F093

-:1079800058C08B81882319F4E4E1F1E70AC0823002

-:1079900019F4E8E1F1E705C0813009F04AC0EAE3F3

-:1079A000F1E7449150E080E8BF017BDE3EC08730C4

-:1079B00009F43FC0883021F481E08093F10035C0A4

-:1079C000893099F523703070232B99F5E7E7F1E7BB

-:1079D00091E031E026E39093E9003093EB0084914D

-:1079E0008093EC002093ED009F5F3196943099F7DF

-:1079F0008EE78093EA001092EA008B8180938E01DB

-:107A000014C08F8198851092E90010929001109215

-:107A10008F0190939201809391018D81882349F485

-:107A2000CE010196DBDB882321F08EEF8093E80006

-:107A300007C081E28093EB0003C0E4E6F1E7B1CF39

-:107A40006196DEBFCDBFCF91DF91FF91EF91BF91E6

-:107A5000AF919F918F917F916F915F914F913F91E6

-:107A60002F911F91FF90EF900F900FBE0F901F90DE

-:107A70001895EE0FFF1F0590F491E02D0994F894EE

-:027A8000FFCF36

-:087A820000E10000000000001B

-:040000030000700089

-:00000001FF

diff --git a/bootloaders/nuevo_diskloader/DiskLoader.hex b/bootloaders/nuevo_diskloader/DiskLoader.hex
deleted file mode 100644
index df5f1da..0000000
--- a/bootloaders/nuevo_diskloader/DiskLoader.hex
+++ /dev/null
@@ -1,172 +0,0 @@
-:10700000BDC00000E0C00000DEC00000DCC0000029

-:10701000DAC00000D8C00000D6C00000D4C0000014

-:10702000D2C00000D0C000008AC30000FCC3000032

-:10703000CAC00000C8C00000C6C00000C4C0000034

-:10704000C2C00000C0C00000BEC00000BCC0000044

-:10705000BAC00000B8C00000B6C00000B4C0000054

-:10706000B2C00000B0C00000AEC00000ACC0000064

-:10707000AAC00000A8C00000A6C00000A4C0000074

-:10708000A2C00000A0C000009EC000009CC0000084

-:107090009AC0000098C0000096C0000094C0000094

-:1070A00092C0000090C000008EC0000011241FBEDE

-:1070B000CFEFDAE0DEBFCDBFF7C0080B000202025F

-:1070C0000100090400000102020000052400100173

-:1070D0000524010101042402060524060001070518

-:1070E000810310004009040100020A0000000705A6

-:1070F00002024000000705830240000041014214E3

-:107100004505560455026403740300001E9587026A

-:107110000110030004030904220300000000000022

-:10712000000000000000000000000000000000005F

-:107130000000000000000000000018034100720081

-:107140006400750069006E006F0020004C004C0068

-:1071500043001201000200000040412389000001A9

-:1071600001020001120100020200004041238900D7

-:1071700000010102000100C18081033C11241FBEF7

-:10718000CFEFDAE0DEBFCDBF11E0A0E0B1E0E2E892

-:10719000FAE702C005900D92A830B107D9F711E0C7

-:1071A000A8E0B1E001C01D92A539B107E1F711E7F0

-:1071B000CCE7D1E703C02297FE015DD4CA37D107DF

-:1071C000D1F772D05CC41CCFFC0180818E5F8083BC

-:1071D00080E86AEB70E742E450E063C2FC01818121

-:1071E0009081913A49F48132C1F480E060E071E02D

-:1071F00047E050E056D20FC0913279F4803231F43A

-:1072000080E091E067E070E088D205C0823229F426

-:1072100082818093070181E0089580E00895FF92C4

-:107220000F931F93CF93DF93982F8B01FF2480E759

-:107230006030780738F4FF24F39483E0FB018093F7

-:107240005700E895C42FD0E0892F68E071E0AE01C7

-:107250001AD1FF2019F107B600FCFDCFD595C795CF

-:107260004C2FF801A8E0B1E020E031E009C08D9199

-:107270009D910C0130935700E895112432962F5FB1

-:107280002417A8F385E0F80180935700E89507B626

-:1072900000FCFDCF81E180935700E895DF91CF910D

-:1072A0001F910F91FF90089588E10FB6F894809395

-:1072B0006000109260000FBE3F9A209A6E9A90E88C

-:1072C000909361001092610081E885BF95BF01E055

-:1072D00005BF02E005BF769A289A479884E991E0B5

-:1072E0007CD2789484E18093880180E18093890145

-:1072F000CC24DD2430E9A32E31E0B32E99249394DD

-:1073000002C0CC24DD2482E0B5D08823E1F382E002

-:107310000FD1E82E8CEF90E7FC0124913196029674

-:1073200044912E1511F02223B9F710928B0110927F

-:107330008A0150E082E068E071E0A5D0F1E4EF1648

-:1073400079F4609108016058633028F0683111F0D9

-:1073500064E001C063E0C62FD0E0C15FDE4810C02A

-:1073600026E5E21681F480910801803319F0FF24AC

-:10737000F39428C080910A01C82FD0E0C45FDE4892

-:10738000FF24F39427C085E7E81629F423E0F22EC2

-:10739000CCE0D1E71FC0E5E5EE1639F4C090080156

-:1073A000D0900901CC0CDD1C0CC0F4E6EF1631F4D2

-:1073B00082E0B6014091090132DF03C024E7E21602

-:1073C00021F0FF24C3E1D1E705C0F0900901E601F7

-:1073D000CF0CD11C08E813E1015010400930110511

-:1073E00009F433C082E046D0882309F02EC0F4CFE0

-:1073F000809709F086CF83E068E871E041E050E0D3

-:10740000BFD0FF2029F04F2D50E083E8BE01B8D057

-:1074100083E469E871E041E050E0B2D081E5E8162C

-:1074200009F071CF88EE93E0F5013197F1F70197FC

-:10743000D9F701E005BF00E005BF9092E00010928F

-:10744000E200EE27FF2709945ECF82E071D0EFEFD4

-:107450008F3F9E0709F0CCCFCECFFC0104C08091B6

-:10746000F100819361506623D1F7289884E68093D8

-:107470008D0108959FB7F89487708093E9008091FB

-:10748000F2009FBF0895FB019FB7F8948770809327

-:10749000E90034E62BE610C08091E80085FFFCCFC0

-:1074A000289830938D018091F10081938091E800BC

-:1074B00085FD02C02093E800415050408FEF4F3FC0

-:1074C000580751F79FBF0895282F80918E01882378

-:1074D000C1F057FF1AC015C0289890938D01809174

-:1074E000F1008193E217F307B9F74115510539F01F

-:1074F0008091F200882319F48BE68093E800AFBFF7

-:1075000002C04FEF5FEFCA010895AFB7F89427703C

-:107510002093E9008091F200282F30E024173507EE

-:107520000CF4A901FB019B01240F311D94E6DACF75

-:10753000DF93CF930F92CDB7DEB7BE016F5F7F4F62

-:1075400041E050E0C1DF019719F08FEF9FEF02C0DB

-:10755000898190E00F90CF91DF9108952FB7F89433

-:1075600087708093E9008091E80085FD02C090E07B

-:1075700004C08091F20090E4981B2FBF892F0895DA

-:107580005F926F927F928F929F92AF92BF92CF92B3

-:10759000DF92EF92FF920F931F93CF93DF93F82E1A

-:1075A0006A0180918E01882319F44FEF5FEF68C064

-:1075B0008B01EA0157E0E52EEF208F2D90E040E2AD

-:1075C000842E912C882299223AE3532E20E4A22E75

-:1075D000B12CA822B92280EA682E8FE0782E43C011

-:1075E0008F2DBCDF282F882321F4C3010197F1F7E9

-:1075F0003AC090E0C817D9070CF42C2FC21BD10950

-:107600004FB7F894E092E9008114910421F406C088

-:107610001092F10021502223D9F719C0F7FC03C0C2

-:10762000F801922F10C0C801322F06C0FC0101964C

-:10763000E491E093F10031503323C1F706C081910A

-:107640008093F10091509923D1F7020F111D809181

-:10765000E80085FF05C0209729F4A114B10411F0BA

-:107660005092E8004FBF209709F0BACFF6FE03C052

-:107670008AE38093E800769884E680938C01A601E3

-:10768000CA01DF91CF911F910F91FF90EF90DF9092

-:10769000CF90BF90AF909F908F907F906F905F90B2

-:1076A00008950F931F93182FFB01A0919101B091A2

-:1076B0009201BA010EEF2AC017FF02C0949101C0D7

-:1076C000908120918F01309190012A173B07ACF4F3

-:1076D0008091E8008570E1F38091E80082FF03C0AB

-:1076E0004FEF5FEF16C09093F100C90101968F73C1

-:1076F0009070892B11F40093E8002F5F3F4F309377

-:10770000900120938F016150704031966115710591

-:1077100099F6CA011F910F910895CF93DF939C01B1

-:10772000EB018091E80082FFFCCFC9016C2F95DE50

-:107730008BEF8093E800CE01DF91CF9108951F92E7

-:107740000F920FB60F9211242F933F938F93809136

-:10775000E1001092E100282F83FF0FC01092E90092

-:1077600081E08093EB001092EC0082E38093ED00C7

-:1077700010928E0188E08093F00022FF26C083E003

-:107780008093E9008091F200882319F08AE38093C6

-:10779000E80080918C01882351F080918C01815008

-:1077A00080938C0180918C01882309F4769A8091D2

-:1077B0008D01882351F080918D01815080938D013E

-:1077C00080918D01882309F4289A8F913F912F9100

-:1077D0000F900FBE0F901F90189510928E0181E0B0

-:1077E0008093D70080EA8093D80082E189BD09B4F4

-:1077F00000FEFDCF80E98093D8008CE08093E2000A

-:107800001092E00008950895DF93CF930F92CDB7C3

-:10781000DEB71982CE010196D7DC898190E00F9006

-:10782000CF91DF9108951F920F920FB60F921124FE

-:10783000EF92FF921F932F933F934F935F936F931A

-:107840007F938F939F93AF93BF93EF93FF93DF93B8

-:10785000CF93CDB7DEB76197DEBFCDBF1092E90001

-:107860008091E80083FFECC0CE01019668E0F5DD71

-:1078700082EF8093E800998197FF05C08091E8002E

-:1078800080FFFCCF03C08EEF8093E800292F30E00B

-:10789000C90180769070892B09F0B3C08A81882352

-:1078A00029F41092F1001092F100BFC0813009F468

-:1078B000BCC0833009F4B9C0853049F48091E80038

-:1078C00080FFFCCF8B8180688093E300AEC0863060

-:1078D00009F06DC01C81EF80F8841230A9F5109278

-:1078E000E9001092900110928F0110929201109273

-:1078F00091018ADF99E0FE013996DF01292F1D925F

-:107900002A95E9F799871A8791E09E8790E8988BE6

-:107910009AEF998B20918F0130919001275F3F4F13

-:107920003C872B878D871092E9001092900110926E

-:107930008F01F0929201E092910180E0BF0149E055

-:1079400050E0AFDE61DF71C01092E900109290014B

-:1079500010928F01F0929201E0929101113071F436

-:1079600088E0E816F10411F41093930180919301DB

-:10797000882309F062C0E2E5F1E713C0133009F093

-:1079800058C08B81882319F4E4E1F1E70AC0823002

-:1079900019F4E8E1F1E705C0813009F04AC0EAE3F3

-:1079A000F1E7449150E080E8BF017BDE3EC08730C4

-:1079B00009F43FC0883021F481E08093F10035C0A4

-:1079C000893099F523703070232B99F5E7E7F1E7BB

-:1079D00091E031E026E39093E9003093EB0084914D

-:1079E0008093EC002093ED009F5F3196943099F7DF

-:1079F0008EE78093EA001092EA008B8180938E01DB

-:107A000014C08F8198851092E90010929001109215

-:107A10008F0190939201809391018D81882349F485

-:107A2000CE010196DBDB882321F08EEF8093E80006

-:107A300007C081E28093EB0003C0E4E6F1E7B1CF39

-:107A40006196DEBFCDBFCF91DF91FF91EF91BF91E6

-:107A5000AF919F918F917F916F915F914F913F91E6

-:107A60002F911F91FF90EF900F900FBE0F901F90DE

-:107A70001895EE0FFF1F0590F491E02D0994F894EE

-:027A8000FFCF36

-:087A820000E10000000000001B

-:040000030000700089

-:00000001FF

diff --git a/bootloaders/nuevo_diskloader/Makefile b/bootloaders/nuevo_diskloader/Makefile
deleted file mode 100644
index 88e0cfe..0000000
--- a/bootloaders/nuevo_diskloader/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-###############################################################################

-# Makefile for DiskLoader

-###############################################################################

-

-## General Flags

-PROJECT = DiskLoader

-TARGET = DiskLoader.elf

-CC = avr-gcc

-

-# BOARD2

-MCU = atmega32u4

-AVR_FREQ   = 16000000L

-

-# Specify the Arduino model using the assigned PID.  This is used by Descriptors.c

-#   to set PID and product descriptor string

-# Arduino Leonardo PID

-ARDUINO_MODEL_PID = 0x0089

-# Arduino Micro PID

-#ARDUINO_MODEL_PID = 0x0035

-

-# Change if your programmer is different

-AVRDUDE_PROGRAMMER = avrispmkII

-AVRDUDE_PORT = usb	   

-

-# program name should not be changed...

-PROGRAM    = DiskLoader

-

-AVRDUDE = avrdude

-AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -p $(MCU)

-

-## Options common to compile, link and assembly rules

-COMMON = -mmcu=$(MCU)

-

-override CFLAGS = -g -Wall -Os -mmcu=$(MCU) -DF_CPU=$(AVR_FREQ) -DARDUINO_MODEL_PID=$(ARDUINO_MODEL_PID) $(DEFS) -ffunction-sections -gdwarf-2 -fdata-sections -fno-split-wide-types

-

-## Assembly specific flags

-ASMFLAGS = $(COMMON)

-ASMFLAGS += $(CFLAGS)

-ASMFLAGS += -x assembler-with-cpp -Wa,-gdwarf2

-

-## Linker flags

-LDFLAGS = $(COMMON)

-#LDFLAGS += -Wl,-gc-sections,-Map=DiskLoader.map,--cref

-#LDFLAGS += -Wl,--section-start=.text=0x7000,--relax

-#LDFLAGS += -Wl,--gc-sections

-#LDFLAGS += -nodefaultlibs -nostartfiles

-#LDFLAGS += -nostartfiles

-LDFLAGS += -Wl,-gc-sections,-Map=DiskLoader.map,--section-start=.text=0x7000,--relax

-

-

-## Intel Hex file production flags

-HEX_EEPROM_FLAGS = -j .eeprom

-HEX_EEPROM_FLAGS += --set-section-flags=.eeprom="alloc,load"

-HEX_EEPROM_FLAGS += --change-section-lma .eeprom=0 --no-change-warnings

-

-## Objects explicitly added by the user

-LINKONLYOBJECTS = 

-

-MODULES   := .

-SRC_DIR   := $(addprefix src/,$(MODULES))

-BUILD_DIR := $(addprefix build/,$(MODULES))

-

-SRC       := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))

-OBJ       := $(patsubst src/%.cpp,build/%.o,$(SRC))

-DEP		  := $(OBJ:%.o=%.d)

-INCLUDES  := $(addprefix -I,$(SRC_DIR))

-

-vpath %.cpp $(SRC_DIR)

-

-.PHONY: all checkdirs clean

-

-all: checkdirs $(TARGET) DiskLoader.hex DiskLoader.lss size

-

--include $(DEP)

-

-checkdirs: $(BUILD_DIR)

-

-$(BUILD_DIR):

-	@mkdir -p $@

-

-clean:

-	@rm -rf build/

-	@rm -f *.hex

-	@rm -f *.elf

-	@rm -f *.lss

-	@rm -f *.map

-

-define make-goal

-$1/%.o: %.cpp

-	$(CC) $(INCLUDES) $(CFLAGS) -c $$< -MD -o $$@

-endef

-

-$(foreach bdir,$(BUILD_DIR),$(eval $(call make-goal,$(bdir))))

-

-$(TARGET): $(OBJ)

-	$(CC) $(LDFLAGS) $(LINKONLYOBJECTS) $(LIBDIRS) $(LIBS) $^ -o $@

-

-%.hex: $(TARGET)

-	avr-objcopy -O ihex $(HEX_FLASH_FLAGS)  $< $@

-	

-%.lss: $(TARGET)

-	avr-objdump -h -S $< > $@

-

-size: $(TARGET)

-	@echo

-#	@avr-size -C --mcu=${MCU} ${TARGET}.elf

-

-program: $(TARGET).hex

-	$(AVRDUDE) $(AVRDUDE_FLAGS) -B 1 -u -U flash:w:$(TARGET).hex

diff --git a/bootloaders/nuevo_diskloader/src/CDC.cpp b/bootloaders/nuevo_diskloader/src/CDC.cpp
deleted file mode 100644
index cc798b4..0000000
--- a/bootloaders/nuevo_diskloader/src/CDC.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-/* Copyright (c) 2011, Peter Barrett  
-**  
-** Permission to use, copy, modify, and/or distribute this software for  
-** any purpose with or without fee is hereby granted, provided that the  
-** above copyright notice and this permission notice appear in all copies.  
-** 
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL  
-** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED  
-** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR  
-** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES  
-** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,  
-** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  
-** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS  
-** SOFTWARE.  
-*/
-
-#include "Platform.h"
-#include "USBAPI.h"
-#include <avr/wdt.h>
-
-#if defined(USBCON)
-#ifdef CDC_ENABLED
-
-void Reboot()
-{
-	USB.detach();
-	cli();
-	asm volatile("jmp 0x7800");		// jump to bootloader - DiskLoader takes up last 2 kB
-}
-
-typedef struct
-{
-	u32	dwDTERate;
-	u8	bCharFormat;
-	u8 	bParityType;
-	u8 	bDataBits;
-	u8	lineState;
-} LineInfo;
-
-static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
-
-#define WEAK __attribute__ ((weak))
-
-extern const CDCDescriptor _cdcInterface PROGMEM;
-const CDCDescriptor _cdcInterface =
-{
-	D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
-
-	//	CDC communication interface
-	D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
-	D_CDCCS(CDC_HEADER,0x10,0x01),								// Header (1.10 bcd)
-	D_CDCCS(CDC_CALL_MANAGEMENT,1,1),							// Device handles call management (not)
-	D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,6),				// SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
-	D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE),	// Communication interface is master, data interface is slave 0
-	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
-
-	//	CDC data interface
-	D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
-	D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
-	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
-};
-
-int WEAK CDC_GetInterface(u8* interfaceNum)
-{
-	interfaceNum[0] += 2;	// uses 2
-	return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
-}
-
-bool WEAK CDC_Setup(Setup& setup)
-{
-	u8 r = setup.bRequest;
-	u8 requestType = setup.bmRequestType;
-
-	if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
-	{
-		if (CDC_GET_LINE_CODING == r)
-		{
-			USB_SendControl(0,(void*)&_usbLineInfo,7);
-			return true;
-		}
-	}
-
-	if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
-	{
-		if (CDC_SET_LINE_CODING == r)
-		{
-			USB_RecvControl((void*)&_usbLineInfo,7);
-			return true;
-		}
-
-		if (CDC_SET_CONTROL_LINE_STATE == r)
-		{
-//			if (0 != _usbLineInfo.lineState && 1200 == _usbLineInfo.dwDTERate)	// auto-reset is triggered when the port, already open at 1200 bps, is closed
-//				Reboot();
-			_usbLineInfo.lineState = setup.wValueL;
-			return true;
-		}
-	}
-	return false;
-}
-
-/*
-int _serialPeek = -1;
-void Serial_::begin(uint16_t baud_count)
-{
-}
-
-void Serial_::end(void)
-{
-}
-
-int Serial_::available(void)
-{
-	u8 avail = USB_Available(CDC_RX);
-	if (_serialPeek != -1)
-		avail++;
-	return avail;
-}
-
-//	peek is nasty
-int Serial_::peek(void)
-{
-	if (_serialPeek == -1)
-		_serialPeek = read();
-	return _serialPeek;
-}
-
-int Serial_::read(void)
-{
-	int c;
-	if (_serialPeek != -1)
-	{
-		c = _serialPeek;
-		_serialPeek = -1;
-	} else {
-		c = USB_Recv(CDC_RX);
-	}
-	return c;
-}
-
-
-
-void Serial_::flush(void)
-{
-	USB_Flush(CDC_TX);
-}
-
-size_t Serial_::write(uint8_t c)
-{
-	
-	// TODO - ZE - check behavior on different OSes and test what happens if an
-	// open connection isn't broken cleanly (cable is yanked out, host dies
-	// or locks up, or host virtual serial port hangs)
-	if (_usbLineInfo.lineState > 0)	{
-		int r = USB_Send(CDC_TX,&c,1);
-		if (r > 0) {
-			return r;
-		} else {
-//			setWriteError();
-			return 0;
-		}
-	}
-//	setWriteError();
-	return 0;
-}
-
-Serial_ Serial;
-*/
-
-#endif
-#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/bootloaders/nuevo_diskloader/src/DiskLoader.cpp b/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
deleted file mode 100644
index 216ddc6..0000000
--- a/bootloaders/nuevo_diskloader/src/DiskLoader.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- *  DiskLoader.cpp
- */
-
-#include "Platform.h"
-//#include "USBCore.h"
-
-
-extern "C"
-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" // Y-register
-				  "ldi	r29,	0x0A\n"	// Y-register
-				  "out	0x3E,	r29\n"	// SPH
-				  "out	0x3D,	r28\n"	// SPL
-				  "rjmp	main"			// Stack is all set up, start the main code
-				  ::);
-}
-
-u8 _flashbuf[128];
-u8 _inSync;
-u8 _ok;
-u16 do_reset = 0;
-volatile u16 _timeout;
-
-void Program(u8 ep, u16 page, u8 count)
-{
-	u8 write = page < 28*1024;		// Don't write over bootloader please
-	if (write)
-		boot_page_erase(page);
-	
-	USB_Recv_block(ep,_flashbuf,count);	// Read while page is erasing
-	
-	if (!write)
-		return;
-	
-	boot_spm_busy_wait();			// Wait until the memory is erased.
-	
-	count >>= 1;
-	u16* p = (u16*)page;
-	u16* b = (u16*)_flashbuf;
-	for (u8 i = 0; i < count; i++)
-		boot_page_fill(p++, b[i]);
-	
-    boot_page_write(page);
-    boot_spm_busy_wait();
-    boot_rww_enable ();
-}
-
-#define HW_VER	 0x02
-#define SW_MAJOR 0x01
-#define SW_MINOR 0x10
-
-#define STK_OK              0x10
-#define STK_INSYNC          0x14  // ' '
-#define CRC_EOP             0x20  // 'SPACE'
-#define STK_GET_SYNC        0x30  // '0'
-
-#define STK_GET_PARAMETER   0x41  // 'A'
-#define STK_SET_DEVICE      0x42  // 'B'
-#define STK_SET_DEVICE_EXT  0x45  // 'E'
-#define STK_LOAD_ADDRESS    0x55  // 'U'
-#define STK_UNIVERSAL       0x56  // 'V'
-#define STK_PROG_PAGE       0x64  // 'd'
-#define STK_READ_PAGE       0x74  // 't'
-#define STK_READ_SIGN       0x75  // 'u'
-
-extern const u8 _readSize[] PROGMEM;
-const u8 _readSize[] = 
-{
-	STK_GET_PARAMETER,	1,
-	STK_SET_DEVICE,		20,
-	STK_SET_DEVICE_EXT,	5,
-	STK_UNIVERSAL,		4,
-	STK_LOAD_ADDRESS,	2,
-	STK_PROG_PAGE,		3,
-	STK_READ_PAGE,		3,
-	0,0
-};
-
-extern const u8 _consts[] PROGMEM;
-const u8 _consts[] = 
-{
-	SIGNATURE_0,
-	SIGNATURE_1,
-	SIGNATURE_2,
-	HW_VER,		// Hardware version
-	SW_MAJOR,	// Software major version
-	SW_MINOR,	// Software minor version
-	0x03,		// Unknown but seems to be required by avr studio 3.56
-	0x00,		// 
-};
-
-//int getch(void) 
-//{
-//	u16 timeout;
-//	u8 c;
-//	for (timeout = 0; timeout; timeout--) 
-//	{
-//		c = USB_Recv(CDC_RX);
-//		if (c != -1)
-//			return c;
-//	}
-//	return -1;
-//}
-	
-
-void start_sketch()
-{
-	UDCON = 1;		// Detatch USB
-	UDIEN = 0;
-	asm volatile (	// Reset vector to run firmware
-				  "clr r30\n"
-				  "clr r31\n"
-				  "ijmp\n"
-				  ::);
-}
-
-int main(void) __attribute__ ((naked));
-int main() 
-{		
-	wdt_disable();
-	BOARD_INIT();
-	/* move interrupts to boot section:
-	 * uses inline assembly because the procedure must be completed in four cycles.
-	 * seems to fail if called before disabling WDT and calling BOARD_INIT()
-	 */
-	asm volatile (
-				  "ldi r16,	  0x01\n"		// (1<<IVCE)	/* Enable change of interrupt vectors */
-				  "out 0x35,  r16\n"		// MCUCR
-				  "ldi r16,	  0x02\n"		// (1<<IVSEL)	/* Move interrupts to boot flash section */
-				  "out 0x35,  r16\n"		// MCUCR				  
-				  );	
-	TX_LED_OFF();
-	RX_LED_OFF();
-	L_LED_OFF();
-	USB.attach();	
-	sei();
-	
-	_inSync = STK_INSYNC;
-	_ok = STK_OK;
-	
-	for (;;) 
-	{
-		u8* packet = _flashbuf;
-		u16 address = 0;
-		for (;;)
-		{
-//			while (!USB_Available(CDC_RX))
-//				;
-			if (USB_Available(CDC_RX)) 
-			{
-				u8 cmd = USB_Recv(CDC_RX);
-				
-				// Read packet contents
-				u8 len;
-				const u8* rs = _readSize;
-				for (;;) 
-				{
-					u8 c = pgm_read_byte(rs++);
-					len = pgm_read_byte(rs++);
-					if (c == cmd || c == 0)
-						break;
-				}
-				_timeout = 0;
-				// Read params
-				USB_Recv_block(CDC_RX, packet, len);
-				
-				// Send a response
-				u8 send = 0;
-				const u8* pgm = _consts+7;
-				if (STK_GET_PARAMETER == cmd)
-				{
-					u8 i = packet[0] - 0x80;
-					if (i > 2)
-						i = (i==0x18) ? 3 : 4;	// 0x80:HW_VER,0x81:SW_MAJOR,0x82:SW_MINOR,0x18:3 or 0
-					pgm = _consts + i + 3;
-					send = 1;
-				} 
-				else if (STK_UNIVERSAL == cmd) 
-				{
-					if (packet[0] == 0x30)
-						pgm = _consts + packet[2];	
-					send = 1;
-				}
-				else if (STK_READ_SIGN == cmd)
-				{ 
-					pgm = _consts;
-					send = 3;
-				}
-				else if (STK_LOAD_ADDRESS == cmd) 
-				{
-					address = *((u16*)packet);	// word address
-					address += address;
-				}
-				else if (STK_PROG_PAGE == cmd)
-				{
-					Program(CDC_RX, address, packet[1]);
-				}
-				else if (STK_READ_PAGE == cmd)
-				{
-					send = packet[1];
-					pgm = (const u8*)address;
-					address += send;
-				}
-				
-				// Check sync
-	//			if (Serial.available() > 0 && Serial.read() != ' ')
-	//				break;			
-	//			if (USB_Available(CDC_RX) && USB_Recv(CDC_RX) != ' ')
-				
-	//			u8 countdown = 10;
-	//			while (!USB_Available(CDC_RX))
-	//			{
-	//				if (countdown-- == 0)
-	//					break;
-	//			}
-	//			u8 x = USB_Recv(CDC_RX);
-	//			if (x != -1 && x != ' ')
-	//			{
-	//				L_LED_ON();
-	//				break;
-	//			}
-				
-	//			if (getch() != ' ')
-	//				break;
-				
-	//			while (!USB_Available(CDC_RX)) 
-	//				;
-	//
-	//			int x = USB_Recv(CDC_RX);
-	//			if (x == -1)
-	//			{
-	//				UEINTX = 0x6B;
-	//				break;
-	//			}
-	//			else if (x != ' ')
-	//			{
-	////				UEINTX = 0x6B;
-	//				break;
-	//			}
-				
-				u16 countdown = 5000;
-				while (countdown-- > 10 && !USB_Available(CDC_RX)) 
-					;
-				int x = USB_Recv(CDC_RX);
-				if (x != -1 && x != ' ')
-					break;
-				
-				USB_Send(CDC_TX, &_inSync, 1);
-				
-				if (send) 
-					USB_Send(CDC_TX|TRANSFER_PGM, pgm, send);
-				
-				// Send ok
-				USB_Send(CDC_TX|TRANSFER_RELEASE, &_ok, 1);
-				
-				if ('Q' == cmd) 
-				{
-					_delay_ms(100);
-					/* move interrupts to application section:
-					 * uses inline assembly because the procedure must be completed in four cycles.
-					 */
-					asm volatile (
-								  "ldi r16,	  0x01\n"		// (1<<IVCE)	/* Enable change of interrupt vectors */
-								  "out 0x35,  r16\n"		// MCUCR
-								  "ldi r16,	  0x00\n"		// (1<<IVSEL)	/* Move interrupts to application flash section */
-								  "out 0x35,  r16\n"		// MCUCR				  
-								  );						
-					start_sketch();
-	//				break;
-				}
-			}
-		}
-	}
-}
diff --git a/bootloaders/nuevo_diskloader/src/Platform.h b/bootloaders/nuevo_diskloader/src/Platform.h
deleted file mode 100644
index 4b58f9f..0000000
--- a/bootloaders/nuevo_diskloader/src/Platform.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Platform.h
- */
-
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
-
-#include <inttypes.h>
-#include <avr/io.h>
-#include <avr/pgmspace.h>
-#include <avr/boot.h>
-#include <util/delay.h>
-#include <avr/interrupt.h>
-#include <avr/wdt.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-
-#define CDC_ENABLED
-
-#define USB_PID_LEONARDO 0x0034
-#define USB_PID_MICRO 0x0035
-#define USB_VID 0x2341	// arduino LLC vid
-#define USB_PID ARDUINO_MODEL_PID	// passed in by Makefile - 0x0034 for Leonardo, 0x0035 for MIcro
-
-//#include "USBDesc.h"
-//#include "../../../cores/arduino/USBCore.h"
-
-
-#define min(a,b) ((a)<(b)?(a):(b))
-
-#define CPU_PRESCALE(n)	(CLKPR = 0x80, CLKPR = (n))
-#define DISABLE_JTAG()  MCUCR = (1 << JTD) | (1 << IVCE) | (0 << PUD); MCUCR = (1 << JTD) | (0 << IVSEL) | (0 << IVCE) | (0 << PUD)
-
-#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRE |= (1<<6); CPU_PRESCALE(0); DISABLE_JTAG();	// for XXX-series boards
-//#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG();	// for non-XXX boards
-
-// for XXX-series boards
-#define TX_LED_OFF()		PORTE |= (1<<6)
-#define TX_LED_ON()			PORTE &= ~(1<<6)
-#define RX_LED_OFF()		PORTB |= (1<<0)
-#define RX_LED_ON()			PORTB &= ~(1<<0)
-#define L_LED_OFF()			PORTC &= ~(1<<7)
-#define L_LED_ON()			PORTC |= (1<<7)
-#define L_LED_TOGGLE()		PORTC ^= (1<<7)
-
-// these for non-XXX boards
-//#define LED0			PORTC &= ~(1<<7)
-//#define LED1			PORTC |= (1<<7)
-//#define TXLED0			PORTD |= (1<<5)
-//#define TXLED1			PORTD &= ~(1<<5)
-//#define RXLED0			PORTB |= (1<<0)
-//#define RXLED1			PORTB &= ~(1<<0)
-
-#ifdef __cplusplus
-}	/* extern "C"{ */
-#endif 
-
-#include "USBDesc.h"
-#include "USBCore.h"	
-#include "USBAPI.h"
-
-#endif /* __PLATFORM_H__ */
diff --git a/bootloaders/nuevo_diskloader/src/USBAPI.h b/bootloaders/nuevo_diskloader/src/USBAPI.h
deleted file mode 100644
index 1724ce1..0000000
--- a/bootloaders/nuevo_diskloader/src/USBAPI.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-#ifndef __USBAPI__
-#define __USBAPI__
-
-#if defined(USBCON)
-
-//================================================================================
-//================================================================================
-//	USB
-
-class USB_
-{
-public:
-	USB_();
-	bool configured();
-
-	void attach();
-	void detach();	// Serial port goes down too...
-	void poll();
-};
-extern USB_ USB;
-
-//================================================================================
-//================================================================================
-//	Serial over CDC (Serial1 is the physical port)
-
-class Serial_
-{
-public:
-	void begin(uint16_t baud_count);
-	void end(void);
-
-	virtual int available(void);
-	virtual int peek(void);
-	virtual int read(void);
-	virtual void flush(void);
-	virtual size_t write(uint8_t);
-};
-extern Serial_ Serial;
-
-//================================================================================
-//================================================================================
-//	Low level API
-
-typedef struct
-{
-	uint8_t bmRequestType;
-	uint8_t bRequest;
-	uint8_t wValueL;
-	uint8_t wValueH;
-	uint16_t wIndex;
-	uint16_t wLength;
-} Setup;
-
-//================================================================================
-//================================================================================
-//	CDC 'Driver'
-
-int		CDC_GetInterface(uint8_t* interfaceNum);
-int		CDC_GetDescriptor(int i);
-bool	CDC_Setup(Setup& setup);
-
-//================================================================================
-//================================================================================
-
-#define TRANSFER_PGM		0x80
-#define TRANSFER_RELEASE	0x40
-#define TRANSFER_ZERO		0x20
-
-int USB_SendControl(uint8_t flags, const void* d, int len);
-int USB_RecvControl(void* d, int len);
-
-uint8_t	USB_Available(uint8_t ep);
-int USB_Send(uint8_t ep, const void* data, int len);	// blocking
-int USB_Recv(uint8_t ep, void* data, int len);		// non-blocking
-void USB_Recv_block(u8 ep, u8* dst, int len);		// blocking
-int USB_Recv(uint8_t ep);							// non-blocking
-void USB_Flush(uint8_t ep);
-
-#endif
-
-#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/bootloaders/nuevo_diskloader/src/USBCore.cpp b/bootloaders/nuevo_diskloader/src/USBCore.cpp
deleted file mode 100644
index 56944e5..0000000
--- a/bootloaders/nuevo_diskloader/src/USBCore.cpp
+++ /dev/null
@@ -1,669 +0,0 @@
-
-
-/* Copyright (c) 2010, Peter Barrett  
-**  
-** Permission to use, copy, modify, and/or distribute this software for  
-** any purpose with or without fee is hereby granted, provided that the  
-** above copyright notice and this permission notice appear in all copies.  
-** 
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL  
-** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED  
-** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR  
-** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES  
-** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,  
-** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  
-** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS  
-** SOFTWARE.  
-*/
-
-#include "Platform.h"
-#include "USBAPI.h"
-#include "USBDesc.h"
-
-#if defined(USBCON)
-
-#define EP_TYPE_CONTROL				0x00
-#define EP_TYPE_BULK_IN				0x81
-#define EP_TYPE_BULK_OUT			0x80
-#define EP_TYPE_INTERRUPT_IN		0xC1
-#define EP_TYPE_INTERRUPT_OUT		0xC0
-#define EP_TYPE_ISOCHRONOUS_IN		0x41
-#define EP_TYPE_ISOCHRONOUS_OUT		0x40
-
-/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
-#define TX_RX_LED_PULSE_MS 100
-volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
-volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
-
-//==================================================================
-//==================================================================
-
-extern const u16 STRING_LANGUAGE[] PROGMEM;
-extern const u16 STRING_IPRODUCT[] PROGMEM;
-extern const u16 STRING_IMANUFACTURER[] PROGMEM;
-extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
-extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
-
-const u16 STRING_LANGUAGE[2] = {
-	(3<<8) | (2+2),
-	0x0409	// English
-};
-
-const u16 STRING_IPRODUCT[17] = {
-	(3<<8) | (2+2*16),
-#if USB_PID == USB_PID_LEONARDO	
-	'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
-#elif USB_PID == USB_PID_MICRO
-	'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
-#endif
-};
-
-const u16 STRING_IMANUFACTURER[12] = {
-	(3<<8) | (2+2*11),
-	'A','r','d','u','i','n','o',' ','L','L','C'
-};
-
-#ifdef CDC_ENABLED
-#define DEVICE_CLASS 0x02
-#else
-#define DEVICE_CLASS 0x00
-#endif
-
-//	DEVICE DESCRIPTOR
-const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
-
-const DeviceDescriptor USB_DeviceDescriptorA =
-	D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
-
-//==================================================================
-//==================================================================
-
-volatile u8 _usbConfiguration = 0;
-
-static inline void WaitIN(void)
-{
-	while (!(UEINTX & (1<<TXINI)));
-}
-
-static inline void ClearIN(void)
-{
-	UEINTX = ~(1<<TXINI);
-}
-
-static inline void WaitOUT(void)
-{
-	while (!(UEINTX & (1<<RXOUTI)))
-		;
-}
-
-static inline u8 WaitForINOrOUT()
-{
-	while (!(UEINTX & ((1<<TXINI)|(1<<RXOUTI))))
-		;
-	return (UEINTX & (1<<RXOUTI)) == 0;
-}
-
-static inline void ClearOUT(void)
-{
-	UEINTX = ~(1<<RXOUTI);
-}
-
-void Recv(volatile u8* data, u8 count)
-{
-	while (count--)
-		*data++ = UEDATX;
-	
-	RX_LED_ON();
-	RxLEDPulse = TX_RX_LED_PULSE_MS;	
-}
-
-static inline u8 Recv8()
-{
-	RX_LED_ON();
-	RxLEDPulse = TX_RX_LED_PULSE_MS;
-
-	return UEDATX;	
-}
-
-static inline void Send8(u8 d)
-{
-	UEDATX = d;
-}
-
-static inline void SetEP(u8 ep)
-{
-	UENUM = ep;
-}
-
-static inline u8 FifoByteCount()
-{
-	return UEBCLX;
-}
-
-static inline u8 ReceivedSetupInt()
-{
-	return UEINTX & (1<<RXSTPI);
-}
-
-static inline void ClearSetupInt()
-{
-	UEINTX = ~((1<<RXSTPI) | (1<<RXOUTI) | (1<<TXINI));
-}
-
-static inline void Stall()
-{
-	UECONX = (1<<STALLRQ) | (1<<EPEN);
-}
-
-static inline u8 ReadWriteAllowed()
-{
-	return UEINTX & (1<<RWAL);
-}
-
-static inline u8 Stalled()
-{
-	return UEINTX & (1<<STALLEDI);
-}
-
-static inline u8 FifoFree()
-{
-	return UEINTX & (1<<FIFOCON);
-}
-
-static inline void ReleaseRX()
-{
-	UEINTX = 0x6B;	// FIFOCON=0 NAKINI=1 RWAL=1 NAKOUTI=0 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=1
-}
-
-static inline void ReleaseTX()
-{
-	UEINTX = 0x3A;	// FIFOCON=0 NAKINI=0 RWAL=1 NAKOUTI=1 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=0
-}
-
-static inline u8 FrameNumber()
-{
-	return UDFNUML;
-}
-
-//==================================================================
-//==================================================================
-
-u8 USBGetConfiguration(void)
-{
-	return _usbConfiguration;
-}
-
-#define USB_RECV_TIMEOUT
-class LockEP
-{
-	u8 _sreg;
-public:
-	LockEP(u8 ep) : _sreg(SREG)
-	{
-		cli();
-		SetEP(ep & 7);
-	}
-	~LockEP()
-	{
-		SREG = _sreg;
-	}
-};
-
-//	Number of bytes, assumes a rx endpoint
-u8 USB_Available(u8 ep)
-{
-	LockEP lock(ep);
-	return FifoByteCount();
-}
-
-void USB_Recv_block(u8 ep, u8* dst, int len)
-{
-//	SetEP(ep & 7);
-	LockEP lock(ep);
-	while (len--)
-	{
-		while (!ReadWriteAllowed())
-			;
-		*dst++ = Recv8();
-		if (!ReadWriteAllowed())	// release empty buffer
-			ReleaseRX();
-	}	
-}
-
-//	Non Blocking receive
-//	Return number of bytes read
-int USB_Recv(u8 ep, void* d, int len)
-{
-	if (!_usbConfiguration || len < 0)
-		return -1;
-	
-	LockEP lock(ep);
-	u8 n = FifoByteCount();
-	len = min(n,len);
-	n = len;
-	u8* dst = (u8*)d;
-	while (n--)
-		*dst++ = Recv8();
-	if (len && !FifoByteCount())	// release empty buffer
-		ReleaseRX();
-	
-	return len;
-}
-
-//	Recv 1 byte if ready
-int USB_Recv(u8 ep)
-{
-	u8 c;
-	if (USB_Recv(ep,&c,1) != 1)
-		return -1;
-	return c;
-}
-
-//	Space in send EP
-u8 USB_SendSpace(u8 ep)
-{
-	LockEP lock(ep);
-	if (!ReadWriteAllowed())
-		return 0;
-	return 64 - FifoByteCount();
-}
-
-//	Blocking Send of data to an endpoint
-int USB_Send(u8 ep, const void* d, int len)
-{
-	if (!_usbConfiguration)
-		return -1;
-
-	int r = len;
-	const u8* data = (const u8*)d;
-//	u8 zero = ep & TRANSFER_ZERO;
-	u8 timeout = 250;		// 250ms timeout on send? TODO
-	while (len)
-	{
-		u8 n = USB_SendSpace(ep);
-		if (n == 0)
-		{
-//			if (!(--timeout))
-//				return -1;
-//			delay(1);
-			_delay_ms(1);
-			continue;
-		}
-
-		if (n > len)
-			n = len;
-		len -= n;
-		{
-			LockEP lock(ep);
-			if (ep & TRANSFER_ZERO)
-			{
-				while (n--)
-					Send8(0);
-			}
-			else if (ep & TRANSFER_PGM)
-			{
-				while (n--)
-					Send8(pgm_read_byte(data++));
-			}
-			else
-			{
-				while (n--)
-					Send8(*data++);
-			}
-			if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE)))	// Release full buffer
-				ReleaseTX();
-		}
-	}
-	if (ep & TRANSFER_RELEASE)
-		ReleaseTX();
-	
-	TX_LED_ON();
-	TxLEDPulse = TX_RX_LED_PULSE_MS;
-	return r;
-}
-
-extern const u8 _initEndpoints[] PROGMEM;
-const u8 _initEndpoints[] = 
-{
-	0,
-	
-#ifdef CDC_ENABLED
-	EP_TYPE_INTERRUPT_IN,		// CDC_ENDPOINT_ACM
-	EP_TYPE_BULK_OUT,			// CDC_ENDPOINT_OUT
-	EP_TYPE_BULK_IN,			// CDC_ENDPOINT_IN
-#endif
-
-#ifdef HID_ENABLED
-	EP_TYPE_INTERRUPT_IN		// HID_ENDPOINT_INT
-#endif
-};
-
-#define EP_SINGLE_64 0x32	// EP0
-#define EP_DOUBLE_64 0x36	// Other endpoints
-
-static
-void InitEP(u8 index, u8 type, u8 size)
-{
-	UENUM = index;
-	UECONX = 1;
-	UECFG0X = type;
-	UECFG1X = size;
-}
-
-static
-void InitEndpoints()
-{
-	for (u8 i = 1; i < sizeof(_initEndpoints); i++)
-	{
-		UENUM = i;
-		UECONX = 1;
-		UECFG0X = pgm_read_byte(_initEndpoints+i);
-		UECFG1X = EP_DOUBLE_64;
-	}
-	UERST = 0x7E;	// And reset them
-	UERST = 0;
-}
-
-//	Handle CLASS_INTERFACE requests
-static
-bool ClassInterfaceRequest(Setup& setup)
-{
-	u8 i = setup.wIndex;
-
-#ifdef CDC_ENABLED
-	if (CDC_ACM_INTERFACE == i)
-		return CDC_Setup(setup);
-#endif
-
-	return false;
-}
-
-int _cmark;
-int _cend;
-void InitControl(int end)
-{
-	SetEP(0);
-	_cmark = 0;
-	_cend = end;
-}
-
-static
-bool SendControl(u8 d)
-{
-	if (_cmark < _cend)
-	{
-		if (!WaitForINOrOUT())
-			return false;
-		Send8(d);
-		if (!((_cmark + 1) & 0x3F))
-			ClearIN();	// Fifo is full, release this packet
-	}
-	_cmark++;
-	return true;
-};
-
-//	Clipped by _cmark/_cend
-int USB_SendControl(u8 flags, const void* d, int len)
-{
-	int sent = len;
-	const u8* data = (const u8*)d;
-	bool pgm = flags & TRANSFER_PGM;
-	while (len--)
-	{
-		u8 c = pgm ? pgm_read_byte(data++) : *data++;
-		if (!SendControl(c))
-			return -1;
-	}
-	return sent;
-}
-
-//	Does not timeout or cross fifo boundaries
-//	Will only work for transfers <= 64 bytes
-//	TODO
-int USB_RecvControl(void* d, int len)
-{
-	WaitOUT();
-	Recv((u8*)d,len);
-	ClearOUT();
-	return len;
-}
-
-int SendInterfaces()
-{
-	int total = 0;
-	u8 interfaces = 0;
-
-#ifdef CDC_ENABLED
-	total = CDC_GetInterface(&interfaces);
-#endif
-
-	return interfaces;
-}
-
-//	Construct a dynamic configuration descriptor
-//	This really needs dynamic endpoint allocation etc
-//	TODO
-static
-bool SendConfiguration(int maxlen)
-{
-	//	Count and measure interfaces
-	InitControl(0);	
-	int interfaces = SendInterfaces();
-	ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);
-
-	//	Now send them
-	InitControl(maxlen);
-	USB_SendControl(0,&config,sizeof(ConfigDescriptor));
-	SendInterfaces();
-	return true;
-}
-
-u8 _cdcComposite = 0;
-
-static
-bool SendDescriptor(Setup& setup)
-{
-	u8 t = setup.wValueH;
-	if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
-		return SendConfiguration(setup.wLength);
-
-	InitControl(setup.wLength);
-#ifdef HID_ENABLED
-	if (HID_REPORT_DESCRIPTOR_TYPE == t)
-		return HID_GetDescriptor(t);
-#endif
-
-	u8 desc_length = 0;
-	const u8* desc_addr = 0;
-	if (USB_DEVICE_DESCRIPTOR_TYPE == t)
-	{
-		if (setup.wLength == 8)
-			_cdcComposite = 1;
-		desc_addr = _cdcComposite ?  (const u8*)&USB_DeviceDescriptorA : (const u8*)&USB_DeviceDescriptor;
-	}
-	else if (USB_STRING_DESCRIPTOR_TYPE == t)
-	{
-		if (setup.wValueL == 0)
-			desc_addr = (const u8*)&STRING_LANGUAGE;
-		else if (setup.wValueL == IPRODUCT) 
-			desc_addr = (const u8*)&STRING_IPRODUCT;
-		else if (setup.wValueL == IMANUFACTURER)
-			desc_addr = (const u8*)&STRING_IMANUFACTURER;
-		else
-			return false;
-	}
-
-	if (desc_addr == 0)
-		return false;
-	if (desc_length == 0)
-		desc_length = pgm_read_byte(desc_addr);
-
-	USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
-	return true;
-}
-
-//	Endpoint 0 interrupt
-ISR(USB_COM_vect)
-{
-    SetEP(0);
-	if (!ReceivedSetupInt())
-		return;
-
-	Setup setup;
-	Recv((u8*)&setup,8);
-	ClearSetupInt();
-
-	u8 requestType = setup.bmRequestType;
-	if (requestType & REQUEST_DEVICETOHOST)
-		WaitIN();
-	else
-		ClearIN();
-
-    bool ok = true;
-	if (REQUEST_STANDARD == (requestType & REQUEST_TYPE))
-	{
-		//	Standard Requests
-		u8 r = setup.bRequest;
-		if (GET_STATUS == r)
-		{
-			Send8(0);		// TODO
-			Send8(0);
-		}
-		else if (CLEAR_FEATURE == r)
-		{
-		}
-		else if (SET_FEATURE == r)
-		{
-		}
-		else if (SET_ADDRESS == r)
-		{
-			WaitIN();
-			UDADDR = setup.wValueL | (1<<ADDEN);
-		}
-		else if (GET_DESCRIPTOR == r)
-		{
-			ok = SendDescriptor(setup);
-		}
-		else if (SET_DESCRIPTOR == r)
-		{
-			ok = false;
-		}
-		else if (GET_CONFIGURATION == r)
-		{
-			Send8(1);
-		}
-		else if (SET_CONFIGURATION == r)
-		{
-			if (REQUEST_DEVICE == (requestType & REQUEST_RECIPIENT))
-			{
-				InitEndpoints();
-				_usbConfiguration = setup.wValueL;
-			} else
-				ok = false;
-		}
-		else if (GET_INTERFACE == r)
-		{
-		}
-		else if (SET_INTERFACE == r)
-		{
-		}
-	}
-	else
-	{
-		InitControl(setup.wLength);		//	Max length of transfer
-		ok = ClassInterfaceRequest(setup);
-	}
-
-	if (ok)
-		ClearIN();
-	else
-	{
-		Stall();
-	}
-}
-
-void USB_Flush(u8 ep)
-{
-	SetEP(ep);
-	if (FifoByteCount())
-		ReleaseTX();
-}
-
-//	General interrupt
-ISR(USB_GEN_vect)
-{
-	u8 udint = UDINT;
-	UDINT = 0;
-
-	//	End of Reset
-	if (udint & (1<<EORSTI))
-	{
-		InitEP(0,EP_TYPE_CONTROL,EP_SINGLE_64);	// init ep0
-		_usbConfiguration = 0;			// not configured yet
-		UEIENX = 1 << RXSTPE;			// Enable interrupts for ep0
-	}
-
-	//	Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
-	if (udint & (1<<SOFI))
-	{
-//#ifdef CDC_ENABLED
-		USB_Flush(CDC_TX);				// Send a tx frame if found
-//#endif
-		
-		// check whether the one-shot period has elapsed.  if so, turn off the LED
-		if (TxLEDPulse && !(--TxLEDPulse))
-			TX_LED_OFF();
-		if (RxLEDPulse && !(--RxLEDPulse))
-			RX_LED_OFF();
-	}
-}
-
-//	VBUS or counting frames
-//	Any frame counting?
-u8 USBConnected()
-{
-	u8 f = UDFNUML;
-//	delay(3);
-	_delay_ms(3);
-	return f != UDFNUML;
-}
-
-//=======================================================================
-//=======================================================================
-
-USB_ USB;
-
-USB_::USB_()
-{
-}
-
-void USB_::attach()
-{
-	_usbConfiguration = 0;
-	UHWCON = 0x01;						// power internal reg
-	USBCON = (1<<USBE)|(1<<FRZCLK);		// clock frozen, usb enabled
-	PLLCSR = 0x12;						// Need 16 MHz xtal
-	while (!(PLLCSR & (1<<PLOCK)))		// wait for lock pll
-		;
-	USBCON = ((1<<USBE)|(1<<OTGPADE));	// start USB clock
-	UDIEN = (1<<EORSTE)|(1<<SOFE);		// Enable interrupts for EOR (End of Reset) and SOF (start of frame)
-	UDCON = 0;							// enable attach resistor
-}
-
-void USB_::detach()
-{
-}
-
-//	Check for interrupts
-//	TODO: VBUS detection
-bool USB_::configured()
-{
-	return _usbConfiguration;
-}
-
-void USB_::poll()
-{
-}
-
-#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/bootloaders/nuevo_diskloader/src/USBCore.h b/bootloaders/nuevo_diskloader/src/USBCore.h
deleted file mode 100644
index 8d13806..0000000
--- a/bootloaders/nuevo_diskloader/src/USBCore.h
+++ /dev/null
@@ -1,303 +0,0 @@
-
-// Copyright (c) 2010, Peter Barrett 
-/*
-** Permission to use, copy, modify, and/or distribute this software for  
-** any purpose with or without fee is hereby granted, provided that the  
-** above copyright notice and this permission notice appear in all copies.  
-**  
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL  
-** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED  
-** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR  
-** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES  
-** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,  
-** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  
-** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS  
-** SOFTWARE.  
-*/
-
-#ifndef __USBCORE_H__
-#define __USBCORE_H__
-
-//	Standard requests
-#define GET_STATUS			0
-#define CLEAR_FEATURE		1
-#define SET_FEATURE			3
-#define SET_ADDRESS			5
-#define GET_DESCRIPTOR		6
-#define SET_DESCRIPTOR		7
-#define GET_CONFIGURATION	8
-#define SET_CONFIGURATION	9
-#define GET_INTERFACE		10
-#define SET_INTERFACE		11
-
-
-// bmRequestType
-#define REQUEST_HOSTTODEVICE	0x00
-#define REQUEST_DEVICETOHOST	0x80
-#define REQUEST_DIRECTION		0x80
-
-#define REQUEST_STANDARD		0x00
-#define REQUEST_CLASS			0x20
-#define REQUEST_VENDOR			0x40
-#define REQUEST_TYPE			0x60
-
-#define REQUEST_DEVICE			0x00
-#define REQUEST_INTERFACE		0x01
-#define REQUEST_ENDPOINT		0x02
-#define REQUEST_OTHER			0x03
-#define REQUEST_RECIPIENT		0x03
-
-#define REQUEST_DEVICETOHOST_CLASS_INTERFACE  (REQUEST_DEVICETOHOST + REQUEST_CLASS + REQUEST_INTERFACE)
-#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE  (REQUEST_HOSTTODEVICE + REQUEST_CLASS + REQUEST_INTERFACE)
-
-//	Class requests
-
-#define CDC_SET_LINE_CODING			0x20
-#define CDC_GET_LINE_CODING			0x21
-#define CDC_SET_CONTROL_LINE_STATE	0x22
-
-#define MSC_RESET					0xFF
-#define MSC_GET_MAX_LUN				0xFE
-
-#define HID_GET_REPORT				0x01
-#define HID_GET_IDLE				0x02
-#define HID_GET_PROTOCOL			0x03
-#define HID_SET_REPORT				0x09
-#define HID_SET_IDLE				0x0A
-#define HID_SET_PROTOCOL			0x0B
-
-//	Descriptors
-
-#define USB_DEVICE_DESC_SIZE 18
-#define USB_CONFIGUARTION_DESC_SIZE 9
-#define USB_INTERFACE_DESC_SIZE 9
-#define USB_ENDPOINT_DESC_SIZE 7
-
-#define USB_DEVICE_DESCRIPTOR_TYPE             1
-#define USB_CONFIGURATION_DESCRIPTOR_TYPE      2
-#define USB_STRING_DESCRIPTOR_TYPE             3
-#define USB_INTERFACE_DESCRIPTOR_TYPE          4
-#define USB_ENDPOINT_DESCRIPTOR_TYPE           5
-
-#define USB_DEVICE_CLASS_COMMUNICATIONS        0x02
-#define USB_DEVICE_CLASS_HUMAN_INTERFACE       0x03
-#define USB_DEVICE_CLASS_STORAGE               0x08
-#define USB_DEVICE_CLASS_VENDOR_SPECIFIC       0xFF
-
-#define USB_CONFIG_POWERED_MASK                0x40
-#define USB_CONFIG_BUS_POWERED                 0x80
-#define USB_CONFIG_SELF_POWERED                0xC0
-#define USB_CONFIG_REMOTE_WAKEUP               0x20
-
-// bMaxPower in Configuration Descriptor
-#define USB_CONFIG_POWER_MA(mA)                ((mA)/2)
-
-// bEndpointAddress in Endpoint Descriptor
-#define USB_ENDPOINT_DIRECTION_MASK            0x80
-#define USB_ENDPOINT_OUT(addr)                 ((addr) | 0x00)
-#define USB_ENDPOINT_IN(addr)                  ((addr) | 0x80)
-
-#define USB_ENDPOINT_TYPE_MASK                 0x03
-#define USB_ENDPOINT_TYPE_CONTROL              0x00
-#define USB_ENDPOINT_TYPE_ISOCHRONOUS          0x01
-#define USB_ENDPOINT_TYPE_BULK                 0x02
-#define USB_ENDPOINT_TYPE_INTERRUPT            0x03
-
-#define TOBYTES(x) ((x) & 0xFF),(((x) >> 8) & 0xFF)
-
-#define CDC_V1_10                               0x0110
-#define CDC_COMMUNICATION_INTERFACE_CLASS       0x02
-
-#define CDC_CALL_MANAGEMENT                     0x01
-#define CDC_ABSTRACT_CONTROL_MODEL              0x02
-#define CDC_HEADER                              0x00
-#define CDC_ABSTRACT_CONTROL_MANAGEMENT         0x02
-#define CDC_UNION                               0x06
-#define CDC_CS_INTERFACE                        0x24
-#define CDC_CS_ENDPOINT                         0x25
-#define CDC_DATA_INTERFACE_CLASS                0x0A
-
-#define MSC_SUBCLASS_SCSI						0x06 
-#define MSC_PROTOCOL_BULK_ONLY					0x50 
-
-#define HID_HID_DESCRIPTOR_TYPE					0x21
-#define HID_REPORT_DESCRIPTOR_TYPE				0x22
-#define HID_PHYSICAL_DESCRIPTOR_TYPE			0x23
-
-
-//	Device
-typedef struct {
-	u8 len;				// 18
-	u8 dtype;			// 1 USB_DEVICE_DESCRIPTOR_TYPE
-	u16 usbVersion;		// 0x200
-	u8	deviceClass;
-	u8	deviceSubClass;
-	u8	deviceProtocol;
-	u8	packetSize0;	// Packet 0
-	u16	idVendor;
-	u16	idProduct;
-	u16	deviceVersion;	// 0x100
-	u8	iManufacturer;
-	u8	iProduct;
-	u8	iSerialNumber;
-	u8	bNumConfigurations;
-} DeviceDescriptor;
-
-//	Config
-typedef struct {
-	u8	len;			// 9
-	u8	dtype;			// 2
-	u16 clen;			// total length
-	u8	numInterfaces;
-	u8	config;
-	u8	iconfig;
-	u8	attributes;
-	u8	maxPower;
-} ConfigDescriptor;
-
-//	String
-
-//	Interface
-typedef struct
-{
-	u8 len;		// 9
-	u8 dtype;	// 4
-	u8 number;
-	u8 alternate;
-	u8 numEndpoints;
-	u8 interfaceClass;
-	u8 interfaceSubClass;
-	u8 protocol;
-	u8 iInterface;
-} InterfaceDescriptor;
-
-//	Endpoint
-typedef struct
-{
-	u8 len;		// 7
-	u8 dtype;	// 5
-	u8 addr;
-	u8 attr;
-	u16 packetSize;
-	u8 interval;
-} EndpointDescriptor;
-
-// Interface Association Descriptor
-// Used to bind 2 interfaces together in CDC compostite device
-typedef struct
-{
-	u8 len;				// 8
-	u8 dtype;			// 11
-	u8 firstInterface;
-	u8 interfaceCount;
-	u8 functionClass;
-	u8 funtionSubClass;
-	u8 functionProtocol;
-	u8 iInterface;
-} IADDescriptor;
-
-//	CDC CS interface descriptor
-typedef struct
-{
-	u8 len;		// 5
-	u8 dtype;	// 0x24
-	u8 subtype;
-	u8 d0;
-	u8 d1;
-} CDCCSInterfaceDescriptor;
-
-typedef struct
-{
-	u8 len;		// 4
-	u8 dtype;	// 0x24
-	u8 subtype;
-	u8 d0;
-} CDCCSInterfaceDescriptor4;
-
-typedef struct 
-{
-    u8	len;
-    u8 	dtype;		// 0x24
-    u8 	subtype;	// 1
-    u8 	bmCapabilities;
-    u8 	bDataInterface;
-} CMFunctionalDescriptor;
-	
-typedef struct 
-{
-    u8	len;
-    u8 	dtype;		// 0x24
-    u8 	subtype;	// 1
-    u8 	bmCapabilities;
-} ACMFunctionalDescriptor;
-
-typedef struct 
-{
-	//	IAD
-	IADDescriptor				iad;	// Only needed on compound device
-
-	//	Control
-	InterfaceDescriptor			cif;	// 
-	CDCCSInterfaceDescriptor	header;
-	CMFunctionalDescriptor		callManagement;			// Call Management
-	ACMFunctionalDescriptor		controlManagement;		// ACM
-	CDCCSInterfaceDescriptor	functionalDescriptor;	// CDC_UNION
-	EndpointDescriptor			cifin;
-
-	//	Data
-	InterfaceDescriptor			dif;
-	EndpointDescriptor			in;
-	EndpointDescriptor			out;
-} CDCDescriptor;
-
-typedef struct 
-{
-	InterfaceDescriptor			msc;
-	EndpointDescriptor			in;
-	EndpointDescriptor			out;
-} MSCDescriptor;
-
-typedef struct
-{
-	u8 len;			// 9
-	u8 dtype;		// 0x21
-	u8 addr;
-	u8	versionL;	// 0x101
-	u8	versionH;	// 0x101
-	u8	country;
-	u8	desctype;	// 0x22 report
-	u8	descLenL;
-	u8	descLenH;
-} HIDDescDescriptor;
-
-typedef struct 
-{
-	InterfaceDescriptor			hid;
-	HIDDescDescriptor			desc;
-	EndpointDescriptor			in;
-} HIDDescriptor;
-
-
-#define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
-	{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
-
-#define D_CONFIG(_totalLength,_interfaces) \
-	{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(500) }
-
-#define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
-	{ 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
-
-#define D_ENDPOINT(_addr,_attr,_packetSize, _interval) \
-	{ 7, 5, _addr,_attr,_packetSize, _interval }
-
-#define D_IAD(_firstInterface, _count, _class, _subClass, _protocol) \
-	{ 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
-
-#define D_HIDREPORT(_descriptorLength) \
-	{ 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
-
-#define D_CDCCS(_subtype,_d0,_d1)	{ 5, 0x24, _subtype, _d0, _d1 }
-#define D_CDCCS4(_subtype,_d0)		{ 4, 0x24, _subtype, _d0 }
-
-
-#endif
\ No newline at end of file
diff --git a/bootloaders/nuevo_diskloader/src/USBDesc.h b/bootloaders/nuevo_diskloader/src/USBDesc.h
deleted file mode 100644
index a3f1b0f..0000000
--- a/bootloaders/nuevo_diskloader/src/USBDesc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-/* Copyright (c) 2011, Peter Barrett  
-**  
-** Permission to use, copy, modify, and/or distribute this software for  
-** any purpose with or without fee is hereby granted, provided that the  
-** above copyright notice and this permission notice appear in all copies.  
-** 
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL  
-** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED  
-** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR  
-** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES  
-** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,  
-** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  
-** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS  
-** SOFTWARE.  
-*/
-
-#define CDC_ENABLED
-
-#ifdef CDC_ENABLED
-#define CDC_INTERFACE_COUNT	2
-#define CDC_ENPOINT_COUNT	3
-#else
-#define CDC_INTERFACE_COUNT	0
-#define CDC_ENPOINT_COUNT	0
-#endif
-
-#ifdef HID_ENABLED
-#define HID_INTERFACE_COUNT	1
-#define HID_ENPOINT_COUNT	1
-#else
-#define HID_INTERFACE_COUNT	0
-#define HID_ENPOINT_COUNT	0
-#endif
-
-#define CDC_ACM_INTERFACE	0	// CDC ACM
-#define CDC_DATA_INTERFACE	1	// CDC Data
-#define CDC_FIRST_ENDPOINT	1
-#define CDC_ENDPOINT_ACM	(CDC_FIRST_ENDPOINT)							// CDC First
-#define CDC_ENDPOINT_OUT	(CDC_FIRST_ENDPOINT+1)
-#define CDC_ENDPOINT_IN		(CDC_FIRST_ENDPOINT+2)
-
-#define HID_INTERFACE		(CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT)		// HID Interface
-#define HID_FIRST_ENDPOINT	(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
-#define HID_ENDPOINT_INT	(HID_FIRST_ENDPOINT)
-
-#define INTERFACE_COUNT		(MSC_INTERFACE + MSC_INTERFACE_COUNT)
-
-#ifdef CDC_ENABLED
-#define CDC_RX CDC_ENDPOINT_OUT
-#define CDC_TX CDC_ENDPOINT_IN
-#endif
-
-#ifdef HID_ENABLED
-#define HID_TX HID_ENDPOINT_INT
-#endif
-
-#define IMANUFACTURER	1
-#define IPRODUCT		2
-#define USB_PID_LEONARDO 0x0034
-#define USB_PID_MICRO 0x0035
-#define USB_VID 0x2341	// arduino LLC vid
-//#define USB_PID	ARDUINO_MODEL_USB_PID	
-