brought nuevo_diskloader changes over to diskloader

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

11 files changed, 1245 insertions, 843 deletions

diff --git a/bootloaders/diskloader/DiskLoader-Leonardo.hex b/bootloaders/diskloader/DiskLoader-Leonardo.hex
index 4528a8b..6683263 100644
--- a/bootloaders/diskloader/DiskLoader-Leonardo.hex
+++ b/bootloaders/diskloader/DiskLoader-Leonardo.hex
@@ -1,113 +1,172 @@
-:1078000011241FBECFEFDAE0DEBFCDBFF2C04101D1

-:1078100042144505560455026403740300001E9586

-:1078200087020110030000C18081C106C0FF0A0069

-:107830000CA10185037508150026FF00954009017C

-:107840008102954009029102C004030904380341F2

-:107850000072006400750069006E006F0020004C2B

-:107860000065006F006E006100720064006F002010

-:107870000062006F006F0074006C006F00610064B4

-:107880000065007200180341007200640075006911

-:10789000006E006F0020004C004C004300120100FD

-:1078A00002020000404123340000010102000112E5

-:1078B00001000200000040412334000001010200E9

-:1078C00001090264000301008032080B0002020279

-:1078D000010009040000010202000005240010015B

-:1078E0000524010101042402020524060001070504

-:1078F000810310004009040100020A00000007058E

-:107900000202400000070583024000000904020053

-:107910000103000000092101010001221E000705EA

-:1079200084034000400020918A0130918B012C5F3C

-:107930003F4F30938B0120938A01C901892F9927EA

-:107940008695982F803418F08FE7891B982F990F10

-:10795000921710F447980895479A08955D9A289AC7

-:1079600081E08093E0001092E200EE27FF27099467

-:1079700008950F931F93CF93DF93982FEB01042F5C

-:1079800010E088E76030780730F411E083E0FB0115

-:1079900080935700E895892F68E071E0402FF8D078

-:1079A000112311F107B600FCFDCF402F4695FE01D3

-:1079B000A8E0B1E020E031E009C08D919D910C017B

-:1079C00030935700E895112432962F5F2417A8F3BF

-:1079D00085E0FE0180935700E89507B600FCFDCFD7

-:1079E00081E180935700E895DF91CF911F910F912E

-:1079F000089588E10FB6F8948093600010926000BB

-:107A00000FBE5D9A289A47983F9A209A559A90E817

-:107A1000909361001092610081E885BF95BF9FD06F

-:107A200084E18093880180E180938901E0E0F0E0C7

-:107A3000859194918F5F9F4F19F081E080938F0122

-:107A4000EE24FF24BB24B39454EFC52E51E0D52E71

-:107A50000ED2082F8EE098E7FC0124913196029611

-:107A60004491201711F02223B9F71092910110923E

-:107A7000900182E068E071E08BD0013479F460918C

-:107A800008016058633028F0683111F064E001C0EB

-:107A900063E0C62FD0E0CF5DD7480EC0063571F445

-:107AA00080910801803311F011E022C080910A0119

-:107AB000C82FD0E0C25ED74811E022C0053721F4BC

-:107AC00013E0CEE1D8E71CC0053539F4E090080199

-:107AD000F0900901EE0CFF1C0AC0043631F482E07C

-:107AE000B7014091090145DF02C0043721F010E0E1

-:107AF000C5E2D8E705C010910901E701E10EF11CCC

-:107B0000B6D18097B1F483E068E871E041E050E0DD

-:107B100059D0112329F0412F50E083E8BE0152D003

-:107B200083E469E871E041E050E04CD0013509F0B0

-:107B30008FCFD0929101C0929001B0928F01EE242C

-:107B4000FF2486CFFC01289884E680938D0104C031

-:107B50008091F100819361506623D1F708951092CE

-:107B600091011092900110928E0110928F0181E08C

-:107B70008093D70080EA8093D80082E189BD09B460

-:107B800000FEFDCF80E98093D8001092E0000895B8

-:107B9000FB018093E90024E69BE611C08091E80098

-:107BA00085FFFCCF289820938D018091F10081936F

-:107BB0008091E80085FD02C09093E8004150442385

-:107BC00069F70895982FFB01282F20728770809302

-:107BD000E90064E63AE317C08091E80085FFFCCF36

-:107BE00097FF02C0849101C080813196211180E00D

-:107BF0005D9860938C018093F1008091E80085FD91

-:107C000002C03093E800415050408FEF4F3F58077B

-:107C100019F796FF03C08AE38093E80008958091E6

-:107C20009301813299F45D9884E680938C0120E081

-:107C300030E003C080818093F100F901E050FF4FF4

-:107C40002F5F3F4F28303105A9F714C0803261F40F

-:107C50008091E80082FFFCCF80E091E067E072DF76

-:107C60008BEF8093E80006C0823221F4809194016A

-:107C70008093070181E0089520919501223261F1FE

-:107C8000213081F48091980190919901089711F425

-:107C900020939A0180919A01882309F04AC0EFEA63

-:107CA000F8E749C0223021F484E6E1ECF8E717C098

-:107CB000233009F03CC080919401882319F4E9E451

-:107CC000F8E739C0823019F4EDE4F8E734C08130C8

-:107CD00071F5E5E8F8E72FC081E0EBE2F8E7909175

-:107CE0009801382F981708F4392F90918C0120E0D3

-:107CF0004EEF8091E8008570E1F38091E80082FD0D

-:107D000012C02F5F84915D988093F100822F8F7352

-:107D100011F44093E800319694E6231750F39093C2

-:107D20008C0181E0089590938C0180E0089580E0BB

-:107D30000895EDE9F8E78491D2CF1092E90080919F

-:107D4000E80083FF61C082E991E068E0FBDE82EF3A

-:107D50008093E8008091920187FF05C08091E80040

-:107D600080FFFCCF03C08EEF8093E80080919301E9

-:107D7000853051F48091E80080FFFCCF8091940120

-:107D800080688093E30039C08930E1F480919401E8

-:107D900080938E01E7E2F8E791E031E026E39093EB

-:107DA000E9003093EB0084918093EC002093ED0088

-:107DB0009F5F3196953099F78EE78093EA00109295

-:107DC000EA001BC0883049F490918E015D9884E6EA

-:107DD00080938C019093F10010C0882339F45D9852

-:107DE00084E680938C011092F10007C0863011F474

-:107DF00043DF01C014DF882321F08EEF8093E80079

-:107E0000089581E28093EB0008958091E100109243

-:107E1000E100282F83FF0CC01092E90081E08093DD

-:107E2000EB001092EC0082E38093ED0010928E0143

-:107E300022FF1CC080918C01882331F081508093F7

-:107E40008C01882309F45D9A80918D01882331F09B

-:107E5000815080938D01882309F4289A80918F01A5

-:107E6000882321F4109291011092900108951F939C

-:107E7000CF93DF9312E0C0E9D1E05FDFC6DF10935C

-:107E8000E9008091E80085FF13C0289884E680937C

-:107E90008D019091F1008091E80085FD03C08BE693

-:107EA0008093E800892F90E0DF91CF911F91089592

-:107EB000809190019091910101979093910180930D

-:107EC00090018091900190919101892B09F446DDF8

-:0A7ED000CE010197F1F727DDD0CFB6

-:087EDA0000E1000000000000BF

-:040000030000780081

+:10700000BDC00000E0C00000DEC00000DCC0000029

+:10701000DAC00000D8C00000D6C00000D4C0000014

+:10702000D2C00000D0C000008AC30000FCC3000032

+:10703000CAC00000C8C00000C6C00000C4C0000034

+:10704000C2C00000C0C00000BEC00000BCC0000044

+:10705000BAC00000B8C00000B6C00000B4C0000054

+:10706000B2C00000B0C00000AEC00000ACC0000064

+:10707000AAC00000A8C00000A6C00000A4C0000074

+:10708000A2C00000A0C000009EC000009CC0000084

+:107090009AC0000098C0000096C0000094C0000094

+:1070A00092C0000090C000008EC0000011241FBEDE

+:1070B000CFEFDAE0DEBFCDBFF7C0080B000202025F

+:1070C0000100090400000102020000052400100173

+:1070D0000524010101042402060524060001070518

+:1070E000810310004009040100020A0000000705A6

+:1070F00002024000000705830240000041014214E3

+:107100004505560455026403740300001E9587026A

+:10711000011003000403090422034100720064000B

+:10712000750069006E006F0020004C0065006F0064

+:107130006E006100720064006F001803410072006D

+:107140006400750069006E006F0020004C004C0068

+:1071500043001201000200000040412334000001FE

+:10716000010200011201000202000040412334002C

+: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/diskloader/DiskLoader-Micro.hex b/bootloaders/diskloader/DiskLoader-Micro.hex
deleted file mode 100644
index fbbcc52..0000000
--- a/bootloaders/diskloader/DiskLoader-Micro.hex
+++ /dev/null
@@ -1,113 +0,0 @@
-:1078000011241FBECFEFDAE0DEBFCDBFF2C04101D1

-:1078100042144505560455026403740300001E9586

-:1078200087020110030000C18081C106C0FF0A0069

-:107830000CA10185037508150026FF00954009017C

-:107840008102954009029102C004030904380341F2

-:107850000072006400750069006E006F0020004D2A

-:10786000006900630072006F00200062006F006F0B

-:107870000074006C006F00610064006500720020FD

-:1078800000200020001803410072006400750069A8

-:10789000006E006F0020004C004C004300120100FD

-:1078A00002020000404123350000010102000112E4

-:1078B00001000200000040412335000001010200E8

-:1078C00001090264000301008032080B0002020279

-:1078D000010009040000010202000005240010015B

-:1078E0000524010101042402020524060001070504

-:1078F000810310004009040100020A00000007058E

-:107900000202400000070583024000000904020053

-:107910000103000000092101010001221E000705EA

-:1079200084034000400020918A0130918B012C5F3C

-:107930003F4F30938B0120938A01C901892F9927EA

-:107940008695982F803418F08FE7891B982F990F10

-:10795000921710F447980895479A08955D9A289AC7

-:1079600081E08093E0001092E200EE27FF27099467

-:1079700008950F931F93CF93DF93982FEB01042F5C

-:1079800010E088E76030780730F411E083E0FB0115

-:1079900080935700E895892F68E071E0402FF8D078

-:1079A000112311F107B600FCFDCF402F4695FE01D3

-:1079B000A8E0B1E020E031E009C08D919D910C017B

-:1079C00030935700E895112432962F5F2417A8F3BF

-:1079D00085E0FE0180935700E89507B600FCFDCFD7

-:1079E00081E180935700E895DF91CF911F910F912E

-:1079F000089588E10FB6F8948093600010926000BB

-:107A00000FBE5D9A289A47983F9A209A559A90E817

-:107A1000909361001092610081E885BF95BF9FD06F

-:107A200084E18093880180E180938901E0E0F0E0C7

-:107A3000859194918F5F9F4F19F081E080938F0122

-:107A4000EE24FF24BB24B39454EFC52E51E0D52E71

-:107A50000ED2082F8EE098E7FC0124913196029611

-:107A60004491201711F02223B9F71092910110923E

-:107A7000900182E068E071E08BD0013479F460918C

-:107A800008016058633028F0683111F064E001C0EB

-:107A900063E0C62FD0E0CF5DD7480EC0063571F445

-:107AA00080910801803311F011E022C080910A0119

-:107AB000C82FD0E0C25ED74811E022C0053721F4BC

-:107AC00013E0CEE1D8E71CC0053539F4E090080199

-:107AD000F0900901EE0CFF1C0AC0043631F482E07C

-:107AE000B7014091090145DF02C0043721F010E0E1

-:107AF000C5E2D8E705C010910901E701E10EF11CCC

-:107B0000B6D18097B1F483E068E871E041E050E0DD

-:107B100059D0112329F0412F50E083E8BE0152D003

-:107B200083E469E871E041E050E04CD0013509F0B0

-:107B30008FCFD0929101C0929001B0928F01EE242C

-:107B4000FF2486CFFC01289884E680938D0104C031

-:107B50008091F100819361506623D1F708951092CE

-:107B600091011092900110928E0110928F0181E08C

-:107B70008093D70080EA8093D80082E189BD09B460

-:107B800000FEFDCF80E98093D8001092E0000895B8

-:107B9000FB018093E90024E69BE611C08091E80098

-:107BA00085FFFCCF289820938D018091F10081936F

-:107BB0008091E80085FD02C09093E8004150442385

-:107BC00069F70895982FFB01282F20728770809302

-:107BD000E90064E63AE317C08091E80085FFFCCF36

-:107BE00097FF02C0849101C080813196211180E00D

-:107BF0005D9860938C018093F1008091E80085FD91

-:107C000002C03093E800415050408FEF4F3F58077B

-:107C100019F796FF03C08AE38093E80008958091E6

-:107C20009301813299F45D9884E680938C0120E081

-:107C300030E003C080818093F100F901E050FF4FF4

-:107C40002F5F3F4F28303105A9F714C0803261F40F

-:107C50008091E80082FFFCCF80E091E067E072DF76

-:107C60008BEF8093E80006C0823221F4809194016A

-:107C70008093070181E0089520919501223261F1FE

-:107C8000213081F48091980190919901089711F425

-:107C900020939A0180919A01882309F04AC0EFEA63

-:107CA000F8E749C0223021F484E6E1ECF8E717C098

-:107CB000233009F03CC080919401882319F4E9E451

-:107CC000F8E739C0823019F4EDE4F8E734C08130C8

-:107CD00071F5E5E8F8E72FC081E0EBE2F8E7909175

-:107CE0009801382F981708F4392F90918C0120E0D3

-:107CF0004EEF8091E8008570E1F38091E80082FD0D

-:107D000012C02F5F84915D988093F100822F8F7352

-:107D100011F44093E800319694E6231750F39093C2

-:107D20008C0181E0089590938C0180E0089580E0BB

-:107D30000895EDE9F8E78491D2CF1092E90080919F

-:107D4000E80083FF61C082E991E068E0FBDE82EF3A

-:107D50008093E8008091920187FF05C08091E80040

-:107D600080FFFCCF03C08EEF8093E80080919301E9

-:107D7000853051F48091E80080FFFCCF8091940120

-:107D800080688093E30039C08930E1F480919401E8

-:107D900080938E01E7E2F8E791E031E026E39093EB

-:107DA000E9003093EB0084918093EC002093ED0088

-:107DB0009F5F3196953099F78EE78093EA00109295

-:107DC000EA001BC0883049F490918E015D9884E6EA

-:107DD00080938C019093F10010C0882339F45D9852

-:107DE00084E680938C011092F10007C0863011F474

-:107DF00043DF01C014DF882321F08EEF8093E80079

-:107E0000089581E28093EB0008958091E100109243

-:107E1000E100282F83FF0CC01092E90081E08093DD

-:107E2000EB001092EC0082E38093ED0010928E0143

-:107E300022FF1CC080918C01882331F081508093F7

-:107E40008C01882309F45D9A80918D01882331F09B

-:107E5000815080938D01882309F4289A80918F01A5

-:107E6000882321F4109291011092900108951F939C

-:107E7000CF93DF9312E0C0E9D1E05FDFC6DF10935C

-:107E8000E9008091E80085FF13C0289884E680937C

-:107E90008D019091F1008091E80085FD03C08BE693

-:107EA0008093E800892F90E0DF91CF911F91089592

-:107EB000809190019091910101979093910180930D

-:107EC00090018091900190919101892B09F446DDF8

-:0A7ED000CE010197F1F727DDD0CFB6

-:087EDA0000E1000000000000BF

-:040000030000780081

-:00000001FF

diff --git a/bootloaders/diskloader/Makefile b/bootloaders/diskloader/Makefile
index 6ac3db3..0ae99e8 100644
--- a/bootloaders/diskloader/Makefile
+++ b/bootloaders/diskloader/Makefile
@@ -1,105 +1,103 @@
-###############################################################################
-# Makefile for DiskLoader
-###############################################################################
-
-## General Flags
-PROJECT = DiskLoader
-TARGET = DiskLoader.elf
-CC = avr-gcc
-
-# BOARD2
-MCU = atmega32u4
-AVR_FREQ   = 16000000L
-
+###############################################################################

+# 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 = 0x0034

 # 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,--section-start=.text=0x7800,--relax
-LDFLAGS += -nodefaultlibs -nostartfiles
-
-
-## 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 5 -u -U flash:w:$(TARGET).hex
\ No newline at end of file
+#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,--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/diskloader/src/CDC.cpp b/bootloaders/diskloader/src/CDC.cpp
new file mode 100644
index 0000000..cc798b4
--- /dev/null
+++ b/bootloaders/diskloader/src/CDC.cpp
@@ -0,0 +1,173 @@
+
+
+/* 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/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp
index 6580618..216ddc6 100644
--- a/bootloaders/diskloader/src/DiskLoader.cpp
+++ b/bootloaders/diskloader/src/DiskLoader.cpp
@@ -1,65 +1,56 @@
-
+/*
+ *  DiskLoader.cpp
+ */
 
 #include "Platform.h"
+//#include "USBCore.h"
 
-//	This bootloader creates a composite Serial device
-//
-//	The serial interface supports a STK500v1 protocol that is very similar to optiboot
-//
-//	The bootloader will timeout and start the firmware after a few hundred milliseconds
-//	if a usb connection is not detected.
-//	
-//	The tweakier code is to keep the bootloader below 2k (no interrupt table, for example)
 
 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"
-		"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
-		::);
+				  "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;
-extern volatile u8 _ejected;
-extern volatile u16 _timeout;
+u16 do_reset = 0;
+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 bootloader please
 	if (write)
 		boot_page_erase(page);
-
-	Recv(ep,_flashbuf,count);		// Read while page is erasing
-
+	
+	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 ();
 }
 
-
-int USBGetChar();
-#define getch USBGetChar
-
 #define HW_VER	 0x02
 #define SW_MAJOR 0x01
 #define SW_MINOR 0x10
@@ -104,136 +95,186 @@ const u8 _consts[] =
 	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"
+				  ::);
+}
 
-void USBInit(void);
 int main(void) __attribute__ ((naked));
-
-//	STK500v1 main loop, very similar to optiboot in protocol and implementation
-int main()
-{
+int main() 
+{		
 	wdt_disable();
-	TXLED0;
-	RXLED0;
-	LED0;
 	BOARD_INIT();
-	USBInit();
-
+	/* 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;
-
-	if (pgm_read_word(0) != -1)
-		_ejected = 1;
-
-	for(;;)
+	
+	for (;;) 
 	{
 		u8* packet = _flashbuf;
 		u16 address = 0;
 		for (;;)
 		{
-			u8 cmd = getch();
-
-			//	Read packet contents
-			u8 len;
-			const u8* rs = _readSize;
-			for(;;)
+//			while (!USB_Available(CDC_RX))
+//				;
+			if (USB_Available(CDC_RX)) 
 			{
-				u8 c = pgm_read_byte(rs++);
-				len = pgm_read_byte(rs++);
-				if (c == cmd || c == 0)
+				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;
+				}
 			}
-			_timeout = 0;
-			//	Read params
-			Recv(CDC_RX,packet,len);
-
-			//	Send a response
-			u8 send = 0;
-			const u8* pgm = _consts+7;			// 0
-			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];	// read signature
-				send = 1;
-			}
-			
-			//	Read signature bytes
-			else if (STK_READ_SIGN == cmd)
-			{
-				pgm = _consts;
-				send = 3;
-			}
-
-			else if (STK_LOAD_ADDRESS == cmd)
-			{
-				address = *((u16*)packet);		// word addresses
-				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; // not sure of this is required
-			}
-
-			// Check sync
-			if (getch() != ' ')
-				break;
-			Transfer(CDC_TX,&_inSync,1);
-
-			// Send result
-			if (send)
-				Transfer(CDC_TX|TRANSFER_PGM,pgm,send);	// All from pgm memory
-
-			//	Send ok
-			Transfer(CDC_TX|TRANSFER_RELEASE,&_ok,1);
-
-			if (cmd == 'Q')
-				break;
 		}
-		_timeout = 500;		// wait a moment before exiting the bootloader - may need to finish responding to 'Q' for example
-		_ejected = 1;
 	}
 }
-
-//	Nice breathing LED indicates we are in the firmware
-u16 _pulse;
-void LEDPulse()
-{
-	_pulse += 4;
-	u8 p = _pulse >> 9;
-	if (p > 63)
-		p = 127-p;
-	p += p;
-	if (((u8)_pulse) > p)
-		LED0;
-	else
-		LED1;
-}
-
-void Reboot()
-{
-	TXLED0;		// switch off the RX and TX LEDs before starting the user sketch
-	RXLED0;
-	UDCON = 1;		// Detatch USB
-	UDIEN = 0;
-	asm volatile (	// Reset vector to run firmware
-		"clr r30\n"
-		"clr r31\n"
-		"ijmp\n"
-	::);
-}
diff --git a/bootloaders/diskloader/src/Platform.h b/bootloaders/diskloader/src/Platform.h
index 6acbf39..4b58f9f 100644
--- a/bootloaders/diskloader/src/Platform.h
+++ b/bootloaders/diskloader/src/Platform.h
@@ -1,3 +1,9 @@
+/*
+ *  Platform.h
+ */
+
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
 
 #include <inttypes.h>
 #include <avr/io.h>
@@ -11,39 +17,56 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned long u32;
 
-
-#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 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
 
-#define OEM_NAME		'l','e','o','n','a','r','d','o'					// 8 chars
-#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5); CPU_PRESCALE(0); DISABLE_JTAG();
-#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)
+//#include "USBDesc.h"
+//#include "../../../cores/arduino/USBCore.h"
 
-#define TRANSFER_PGM		0x80
-#define TRANSFER_RELEASE	0x40
-#define TRANSFER_ZERO		0x20
 
-void Transfer(u8 ep, const u8* data, int len);
-void Recv(u8 ep, u8* dst, u8 len);
-void Program(u8 ep, u16 page, u8 count);
+#define min(a,b) ((a)<(b)?(a):(b))
 
-#define CDC_ENABLED
+#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)
 
-#include "USBCore.h"
-#include "USBDesc.h"
+#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/diskloader/src/USBAPI.h b/bootloaders/diskloader/src/USBAPI.h
new file mode 100644
index 0000000..1724ce1
--- /dev/null
+++ b/bootloaders/diskloader/src/USBAPI.h
@@ -0,0 +1,83 @@
+
+
+#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/diskloader/src/USBCore.cpp b/bootloaders/diskloader/src/USBCore.cpp
index ca74721..56944e5 100644
--- a/bootloaders/diskloader/src/USBCore.cpp
+++ b/bootloaders/diskloader/src/USBCore.cpp
@@ -17,9 +17,10 @@
 */
 
 #include "Platform.h"
+#include "USBAPI.h"
+#include "USBDesc.h"
 
-#define CDC_TX CDC_ENDPOINT_IN
-#define CDC_RX CDC_ENDPOINT_OUT
+#if defined(USBCON)
 
 #define EP_TYPE_CONTROL				0x00
 #define EP_TYPE_BULK_IN				0x81
@@ -31,32 +32,54 @@
 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 #define TX_RX_LED_PULSE_MS 100
-u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
-u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
-
-void Reboot();
+volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
 
 //==================================================================
 //==================================================================
 
-typedef struct
-{
-	u32	dwDTERate;
-	u8	bCharFormat;
-	u8 	bParityType;
-	u8 	bDataBits;
-	u8	lineState;
-} LineInfo;
+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
+};
 
-static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
+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);
 
 //==================================================================
 //==================================================================
 
-//	4 bytes of RAM
-volatile u8 _usbConfiguration;
-volatile u8 _ejected;
-volatile u16 _timeout;
+volatile u8 _usbConfiguration = 0;
 
 static inline void WaitIN(void)
 {
@@ -86,34 +109,25 @@ static inline void ClearOUT(void)
 	UEINTX = ~(1<<RXOUTI);
 }
 
-static
-void Send(volatile const u8* data, u8 count)
-{
-	TXLED1;					// light the TX LED
-	TxLEDPulse = TX_RX_LED_PULSE_MS;
-	while (count--)
-		UEDATX = *data++;
-}
-
 void Recv(volatile u8* data, u8 count)
 {
-	RXLED1;					// light the RX LED
-	RxLEDPulse = TX_RX_LED_PULSE_MS;
 	while (count--)
 		*data++ = UEDATX;
+	
+	RX_LED_ON();
+	RxLEDPulse = TX_RX_LED_PULSE_MS;	
 }
 
 static inline u8 Recv8()
 {
-	RXLED1;					// light the RX LED
+	RX_LED_ON();
 	RxLEDPulse = TX_RX_LED_PULSE_MS;
-	return UEDATX;
+
+	return UEDATX;	
 }
 
 static inline void Send8(u8 d)
 {
-	TXLED1;					// light the TX LED
-	TxLEDPulse = TX_RX_LED_PULSE_MS;
 	UEDATX = d;
 }
 
@@ -175,48 +189,38 @@ static inline u8 FrameNumber()
 //==================================================================
 //==================================================================
 
-#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;
-}
-
-//	API
-void USBInit(void)
-{
-	_timeout = 0;
-	_usbConfiguration = 0;
-	_ejected = 0;
-	
-	UHWCON = 0x01;						// power internal reg (don't need this?)
-	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
-	UDCON = 0;							// enable attach resistor
-}
-
 u8 USBGetConfiguration(void)
 {
 	return _usbConfiguration;
 }
 
-u8 HasData(u8 ep)
+#define USB_RECV_TIMEOUT
+class LockEP
 {
-	SetEP(ep);
-	return ReadWriteAllowed();	// count in fifo
+	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();
 }
 
-int USBGetChar();
-void Recv(u8 ep, u8* dst, u8 len)
+void USB_Recv_block(u8 ep, u8* dst, int len)
 {
-	SetEP(ep);
+//	SetEP(ep & 7);
+	LockEP lock(ep);
 	while (len--)
 	{
 		while (!ReadWriteAllowed())
@@ -224,47 +228,131 @@ void Recv(u8 ep, u8* dst, u8 len)
 		*dst++ = Recv8();
 		if (!ReadWriteAllowed())	// release empty buffer
 			ReleaseRX();
-	}
+	}	
 }
 
-//	Transmit a packet to endpoint
-void Transfer(u8 ep, const u8* data, int len)
+//	Non Blocking receive
+//	Return number of bytes read
+int USB_Recv(u8 ep, void* d, int len)
 {
-	u8 zero = ep & TRANSFER_ZERO;
-	SetEP(ep & 7);
-	while (len--)
-	{
-		while (!ReadWriteAllowed())
-			;	// TODO Check for STALL etc
+	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;
+}
 
-		u8 d = (ep & TRANSFER_PGM) ? pgm_read_byte(data) : data[0];
-		data++;
-		if (zero)
-			d = 0;
-		Send8(d);
+//	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();
+}
 
-		if (!ReadWriteAllowed())
-			ReleaseTX();
+//	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
 
-	EP_TYPE_INTERRUPT_IN,		// HID_ENDPOINT_INT
+#ifdef HID_ENABLED
+	EP_TYPE_INTERRUPT_IN		// HID_ENDPOINT_INT
+#endif
 };
 
-static void InitEndpoints()
+#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++)
 	{
@@ -277,99 +365,123 @@ static void InitEndpoints()
 	UERST = 0;
 }
 
-typedef struct
+//	Handle CLASS_INTERFACE requests
+static
+bool ClassInterfaceRequest(Setup& setup)
 {
-	u8 bmRequestType;
-	u8 bRequest;
-	u8 wValueL;
-	u8 wValueH;
-	u16 wIndex;
-	u16 wLength;
-} Setup;
-Setup _setup;
+	u8 i = setup.wIndex;
 
-//bool USBHook(Setup& setup)
-bool USBHook()
-{
-	Setup& setup = _setup;
-	u8 r = setup.bRequest;
+#ifdef CDC_ENABLED
+	if (CDC_ACM_INTERFACE == i)
+		return CDC_Setup(setup);
+#endif
 
-	//	CDC Requests
-	if (CDC_GET_LINE_CODING == r)
-	{
-		Send((const volatile u8*)&_usbLineInfo,7);
-	}
+	return false;
+}
 
-	else if (CDC_SET_LINE_CODING ==  r)
+int _cmark;
+int _cend;
+void InitControl(int end)
+{
+	SetEP(0);
+	_cmark = 0;
+	_cend = end;
+}
+
+static
+bool SendControl(u8 d)
+{
+	if (_cmark < _cend)
 	{
-		WaitOUT();
-		Recv((volatile u8*)&_usbLineInfo,7);
-		ClearOUT();
+		if (!WaitForINOrOUT())
+			return false;
+		Send8(d);
+		if (!((_cmark + 1) & 0x3F))
+			ClearIN();	// Fifo is full, release this packet
 	}
+	_cmark++;
+	return true;
+};
 
-	else if (CDC_SET_CONTROL_LINE_STATE == r)
+//	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--)
 	{
-		_usbLineInfo.lineState = setup.wValueL;
+		u8 c = pgm ? pgm_read_byte(data++) : *data++;
+		if (!SendControl(c))
+			return -1;
 	}
-
-	return true;
+	return sent;
 }
 
-extern const u8 _rawHID[] PROGMEM;
-#define LSB(_x) ((_x) & 0xFF)
-#define MSB(_x) ((_x) >> 8)
-
-#define RAWHID_USAGE_PAGE	0xFFC0
-#define RAWHID_USAGE		0x0C00
-#define RAWHID_TX_SIZE 64
-#define RAWHID_RX_SIZE 64
+//	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;
+}
 
-const u8 _rawHID[] =
+int SendInterfaces()
 {
-	//	RAW HID
-	0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE),	// 30
-	0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
+	int total = 0;
+	u8 interfaces = 0;
 
-	0xA1, 0x01,				// Collection 0x01
-    0x85, 0x03,             // REPORT_ID (3)
-	0x75, 0x08,				// report size = 8 bits
-	0x15, 0x00,				// logical minimum = 0
-	0x26, 0xFF, 0x00,		// logical maximum = 255
+#ifdef CDC_ENABLED
+	total = CDC_GetInterface(&interfaces);
+#endif
 
-	0x95, 64,				// report count TX
-	0x09, 0x01,				// usage
-	0x81, 0x02,				// Input (array)
+	return interfaces;
+}
 
-	0x95, 64,				// report count RX
-	0x09, 0x02,				// usage
-	0x91, 0x02,				// Output (array)
-	0xC0					// end collection
-};
+//	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;
 
-bool SendDescriptor()
+static
+bool SendDescriptor(Setup& setup)
 {
-	Setup& 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;
-
-	u8 t = setup.wValueH;
-	if (0x22 == t)
-	{
-		desc_addr = _rawHID;
-		desc_length = sizeof(desc_length);
-	} else if (USB_DEVICE_DESCRIPTOR_TYPE == t)
+	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_CONFIGURATION_DESCRIPTOR_TYPE == t)
-	{
-		desc_addr = (const u8*)&USB_ConfigDescriptor;
-		desc_length = sizeof(USB_ConfigDescriptor);
-	}
 	else if (USB_STRING_DESCRIPTOR_TYPE == t)
 	{
 		if (setup.wValueL == 0)
@@ -380,81 +492,106 @@ bool SendDescriptor()
 			desc_addr = (const u8*)&STRING_IMANUFACTURER;
 		else
 			return false;
-	} else 
-		return false;
+	}
 
+	if (desc_addr == 0)
+		return false;
 	if (desc_length == 0)
 		desc_length = pgm_read_byte(desc_addr);
-	if ((u8)setup.wLength < desc_length)		// bit of a cheat limiting to 255 bytes TODO (saved 8 bytes)
-		desc_length = (u8)setup.wLength;
-
-	//	Send descriptor
-	//	EP0 is 64 bytes long
-	//	RWAL and FIFOCON don't work on EP0
-	u8 n = 0;
-	do
-	{
-		if (!WaitForINOrOUT())
-			return false;
-		Send8(pgm_read_byte(&desc_addr[n++]));
-		u8 clr = n & 0x3F;
-		if (!clr)
-			ClearIN();	// Fifo is full, release this packet
-	} while (n < desc_length);
+
+	USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
 	return true;
 }
 
-void USBSetupInterrupt()
+//	Endpoint 0 interrupt
+ISR(USB_COM_vect)
 {
     SetEP(0);
 	if (!ReceivedSetupInt())
 		return;
 
-	Setup& setup = _setup;	// global saves ~30 bytes
+	Setup setup;
 	Recv((u8*)&setup,8);
 	ClearSetupInt();
 
-	if (setup.bmRequestType & DEVICETOHOST)
+	u8 requestType = setup.bmRequestType;
+	if (requestType & REQUEST_DEVICETOHOST)
 		WaitIN();
 	else
 		ClearIN();
 
     bool ok = true;
-	u8 r = setup.bRequest;
-	if (SET_ADDRESS == r)
-	{
-		WaitIN();
-		UDADDR = setup.wValueL | (1<<ADDEN);
-	}
-	else if (SET_CONFIGURATION == r)
-	{
-		_usbConfiguration = setup.wValueL;
-		InitEndpoints();
-	}
-	else if (GET_CONFIGURATION == r)
-	{
-		Send8(_usbConfiguration);
-	}
-	else if (GET_STATUS == r)
-	{
-		Send8(0);		// All good as far as I know
-	}
-	else if (GET_DESCRIPTOR == r)
+	if (REQUEST_STANDARD == (requestType & REQUEST_TYPE))
 	{
-		ok = SendDescriptor();
+		//	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
 	{
-		ok = USBHook();
+		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();
 }
 
-void USBGeneralInterrupt()
+//	General interrupt
+ISR(USB_GEN_vect)
 {
 	u8 udint = UDINT;
 	UDINT = 0;
@@ -464,45 +601,69 @@ void USBGeneralInterrupt()
 	{
 		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))
-			TXLED0;
+			TX_LED_OFF();
 		if (RxLEDPulse && !(--RxLEDPulse))
-			RXLED0;
-		
-		if (!_ejected)
-			_timeout = 0;
+			RX_LED_OFF();
 	}
 }
 
-void LEDPulse();
-int USBGetChar()
+//	VBUS or counting frames
+//	Any frame counting?
+u8 USBConnected()
 {
-	for(;;)
-	{
-		USBSetupInterrupt();
-		USBGeneralInterrupt();
+	u8 f = UDFNUML;
+//	delay(3);
+	_delay_ms(3);
+	return f != UDFNUML;
+}
 
-		//	Read a char
-		if (HasData(CDC_RX))
-		{
-			u8 c = Recv8();
-			if (!ReadWriteAllowed())
-				ReleaseRX();
-			return c;
-		} 
-
-		if (!--_timeout) {
-			Reboot();	// USB not connected, run firmware
-		}
-		
-		_delay_us(100);	// stretch out the bootloader period to about 5 seconds after enumeration
-		LEDPulse();
-	}
-	return -1;
+//=======================================================================
+//=======================================================================
+
+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/diskloader/src/USBCore.h b/bootloaders/diskloader/src/USBCore.h
index 537c0ec..8d13806 100644
--- a/bootloaders/diskloader/src/USBCore.h
+++ b/bootloaders/diskloader/src/USBCore.h
@@ -18,31 +18,54 @@
 #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 HOSTTODEVICE	0x00
-#define DEVICETOHOST	0x80
-#define STANDARD		0x00
-#define CLASS			0x20
-#define VENDOR			0x40
-#define DEVICE			0x00
-#define INTERFACE		0x01
-#define ENDPOINT		0x02
-#define OTHER			0x03
-
-#define CDC_SET_LINE_CODING		0x20
-#define CDC_GET_LINE_CODING		0x21
+#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
@@ -94,6 +117,13 @@
 #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 {
@@ -186,14 +216,32 @@ typedef struct
 
 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;
-	CDCCSInterfaceDescriptor	callManagement;
-	CDCCSInterfaceDescriptor4	controlManagement;
-	CDCCSInterfaceDescriptor	functionalDescriptor;
+	CMFunctionalDescriptor		callManagement;			// Call Management
+	ACMFunctionalDescriptor		controlManagement;		// ACM
+	CDCCSInterfaceDescriptor	functionalDescriptor;	// CDC_UNION
 	EndpointDescriptor			cifin;
 
 	//	Data
@@ -202,6 +250,13 @@ typedef struct
 	EndpointDescriptor			out;
 } CDCDescriptor;
 
+typedef struct 
+{
+	InterfaceDescriptor			msc;
+	EndpointDescriptor			in;
+	EndpointDescriptor			out;
+} MSCDescriptor;
+
 typedef struct
 {
 	u8 len;			// 9
@@ -222,11 +277,12 @@ typedef struct
 	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(100) }
+	{ 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 }
@@ -243,4 +299,5 @@ typedef struct
 #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/diskloader/src/USBDesc.cpp b/bootloaders/diskloader/src/USBDesc.cpp
deleted file mode 100644
index c8ea9c6..0000000
--- a/bootloaders/diskloader/src/USBDesc.cpp
+++ /dev/null
@@ -1,82 +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"
-
-//====================================================================================================
-//====================================================================================================
-//	Actual device descriptors
-
-const u16 STRING_LANGUAGE[2] = {
-	(3<<8) | (2+2),
-	0x0409	// English
-};
-
-
-const u16 STRING_IPRODUCT[28] = {
-	(3<<8) | (2+2*27),
-#if USB_PID == USB_PID_LEONARDO	
-	'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o',' ','b','o','o','t','l','o','a','d','e','r'
-#elif USB_PID == USB_PID_MICRO
-	'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ','b','o','o','t','l','o','a','d','e','r',' ',' ',' '
-#endif
-};
-
-const u16 STRING_IMANUFACTURER[12] = {
-	(3<<8) | (2+2*11),
-	'A','r','d','u','i','n','o',' ','L','L','C'
-};
-
-
-//#ifdef CDC_ENABLED
-DeviceDescriptor USB_DeviceDescriptorA = D_DEVICE(0X02,0X00,0X00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
-//#else
-DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
-//#endif
-
-Config USB_ConfigDescriptor =
-{
-	D_CONFIG(sizeof(Config),INTERFACE_COUNT),
-
-#ifdef CDC_ENABLED
-	//	CDC
-	{
-		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
-		D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,2),				// 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)
-	},
-#endif
-	// HID
-	{
-		D_INTERFACE(HID_INTERFACE,1,3,0,0),
-		D_HIDREPORT(30),
-		D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x40)
-	}
-};
-
diff --git a/bootloaders/diskloader/src/USBDesc.h b/bootloaders/diskloader/src/USBDesc.h
index 094dba5..a3f1b0f 100644
--- a/bootloaders/diskloader/src/USBDesc.h
+++ b/bootloaders/diskloader/src/USBDesc.h
@@ -16,48 +16,50 @@
 ** 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_ENDPOINT_ACM	1
-#define CDC_ENDPOINT_OUT	2
-#define CDC_ENDPOINT_IN		3
-
-#define HID_INTERFACE		2	// HID Interface
-#define HID_ENDPOINT_INT	4
-
-#define INTERFACE_COUNT		3	// 2 for cdc + 1 for hid
-
-#else 
+#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		2	// HID Interface
-#define HID_ENDPOINT_INT	4
+#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		1	// 1 for hid
+#define INTERFACE_COUNT		(MSC_INTERFACE + MSC_INTERFACE_COUNT)
 
-#endif
-
-typedef struct
-{
-	ConfigDescriptor	config;
 #ifdef CDC_ENABLED
-	CDCDescriptor		cdc;
+#define CDC_RX CDC_ENDPOINT_OUT
+#define CDC_TX CDC_ENDPOINT_IN
 #endif
-	HIDDescriptor		hid;
-} Config;
 
-extern Config USB_ConfigDescriptor PROGMEM;
-extern DeviceDescriptor USB_DeviceDescriptor PROGMEM;
-extern DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
-
-extern const u16 STRING_LANGUAGE[2] PROGMEM;
-extern const u16 STRING_IPRODUCT[28] PROGMEM;
-extern const u16 STRING_IMANUFACTURER[12] PROGMEM;
+#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	
 
-#define CDC_TX CDC_ENDPOINT_IN
-#define CDC_RX CDC_ENDPOINT_OUT
\ No newline at end of file