rebuilt Diskloader, added LED control macros for Leonardo, removed Microtouch defines

hardware/arduino/bootloaders/diskloader/DiskLoader.hex

@@ -1,4 +1,4 @@
-:1078000011241FBECFEFDAE0DEBFCDBFC4C04101FF
+:1078000011241FBECFEFDAE0DEBFCDBFD0C04101F3
 :1078100042144505560455026403740300001E9586
 :1078200087020110030000C18081C106C0FF0A0069
 :107830000CA10185037508150026FF00954009017C
@@ -13,83 +13,87 @@
 :1078C000040100020A000000070502024000000750
 :1078D00005830240000009040200010300000009C2
 :1078E0002101010001221E00070584034000400021
-:1078F00080918A0190918B01019690938B018093E6
-:107900008A01089581E08093E0001092E200EE2762
-:10791000FF27099408950F931F93CF93DF93982F18
-:10792000EB01042F10E088E76030780730F411E0B5
-:1079300083E0FB0180935700E895892F68E071E0B0
-:10794000402FCED0112311F107B600FCFDCF402F00
-:107950004695FE01A8E0B1E020E031E009C08D913C
-:107960009D910C0130935700E895112432962F5FBA
-:107970002417A8F385E0FE0180935700E89507B629
-:1079800000FCFDCF81E180935700E895DF91CF9116
-:107990001F910F9108958BD084E18093880180E13D
-:1079A00080938901E0E0F0E0859194918F5F9F4F93
-:1079B00019F081E080938D01EE24FF24DD24D3941F
-:1079C000D6D1082F8EE098E7FC01249131960296DB
-:1079D0004491201711F02223B9F710928F011092D1
-:1079E0008E0182E068E071E07BD0013479F460912F
-:1079F00008016058633028F0683111F064E001C07C
-:107A000063E0C62FD0E0CF5DD74808C0063579F4D3
-:107A100080910801803321F0C5E2D8E711E029C048
-:107A200080910A01C82FD0E0C25ED748F7CF053752
-:107A300021F4CEE1D8E713E01CC0053539F4E0901D
-:107A40000801F0900901EE0CFF1C0AC0043631F465
-:107A500082E0B701409109015EDF02C0043721F0E6
-:107A6000C5E2D8E710E005C010910901E701E10E79
-:107A7000F11C7DD18097B1F483E068E871E041E0CA
-:107A800050E044D0112329F0412F50E083E8BE019B
-:107A90003DD083E469E871E041E050E037D0013542
-:107AA00009F08ECFD0928D01EE24FF2489CF109261
-:107AB0008F0110928E0110928C0110928D0181E045
-:107AC0008093D70080EA8093D80082E189BD09B411
-:107AD00000FEFDCF80E98093D8001092E000089569
-:107AE000FB018093E9009BE60EC08091E80085FFD2
-:107AF000FCCF8091F10081938091E80085FD02C068
-:107B00009093E8004150442381F70895982FFB019A
-:107B1000282F207287708093E9003AE314C0809187
-:107B2000E80085FFFCCF97FF02C0849101C08081EF
-:107B30003196211180E08093F1008091E80085FD6D
-:107B400002C03093E800415050408FEF4F3F58073C
-:107B500031F796FF03C08AE38093E800089580918F
-:107B60009101813279F420E030E003C0808180937C
-:107B7000F100F901E050FF4F2F5F3F4F28303105F2
-:107B8000A9F71EC08032B1F48091E80082FFFCCFDB
-:107B900020E030E003C08091F1008083F901E050E3
-:107BA000FF4F2F5F3F4F28303105A9F78BEF8093B0
-:107BB000E80006C0823221F480919201809307018F
-:107BC00081E0089520919301223231F1213081F436
-:107BD0008091960190919701089711F42093980154
-:107BE00080919801882309F03AC0E9E7F8E739C0A5
-:107BF000223021F484E6EBE8F8E711C0233069F580
-:107C000080919201882319F4E9E4F8E72AC08130D1
-:107C100021F5EDE4F8E725C081E0EBE2F8E790918B
-:107C20009601282F981708F4292F90E03EEF8091B5
-:107C3000E8008570E1F38091E80082FD0EC09F5F4F
-:107C400084918093F100892F8F7311F43093E800B1
-:107C50003196921760F381E0089580E00895E7E699
-:107C6000F8E78491DCCF1092E9008091E80083FF6F
-:107C70005FC0E0E9F1E003C08091F100819381E011
-:107C8000E839F807C9F782EF8093E8008091900106
-:107C900087FF05C08091E80080FFFCCF03C08EEF16
-:107CA0008093E80080919101853051F48091E80043
-:107CB00080FFFCCF8091920180688093E30031C007
-:107CC0008930E1F48091920180938C01E7E2F8E73A
-:107CD00091E031E026E39093E9003093EB0084914A
-:107CE0008093EC002093ED009F5F3196953099F7DB
-:107CF0008EE78093EA001092EA0013C0883029F4DE
-:107D000080918C018093F1000CC0882319F41092AB
-:107D1000F10007C0863011F455DF01C020DF882351
-:107D200021F08EEF8093E800089581E28093EB00CC
-:107D300008958091E1001092E100282F83FF0CC08C
-:107D40001092E90081E08093EB001092EC0082E356
-:107D50008093ED0010928C0122FF08C080918D016C
-:107D6000882321F410928F0110928E0108951F93A1
-:107D700012E079DFDEDF1093E9008091E80085FFF3
-:107D80000DC09091F1008091E80085FD03C08BE665
-:107D90008093E800892F90E01F91089580918E01D3
-:107DA00090918F01019790938F0180938E01809124
-:107DB0008E0190918F01892B09F4A4DD99DDD9CF33
-:087DC00000E1000000000000DA
+:1078F00020918A0130918B012F5F3F4F30938B0194
+:1079000020938A01832F9927982F87FD9095990FAF
+:10791000921710F447980895479A089581E080934C
+:10792000E0001092E200EE27FF27099408950F93DC
+:107930001F93CF93DF93982FEB01042F10E088E77C
+:107940006030780730F411E083E0FB01809357004A
+:10795000E895892F68E071E0402FD8D0112311F10C
+:1079600007B600FCFDCF402F4695FE01A8E0B1E030
+:1079700020E031E009C08D919D910C0130935700BA
+:10798000E895112432962F5F2417A8F385E0FE01B5
+:1079900080935700E89507B600FCFDCF81E1809306
+:1079A0005700E895DF91CF911F910F9108953F9A6D
+:1079B000209A6E9A90E8909361001092610081E89D
+:1079C00085BF95BF8AD084E18093880180E1809350
+:1079D0008901E0E0F0E0859194918F5F9F4F19F06D
+:1079E00081E080938D01EE24FF24DD24D394D5D152
+:1079F000082F8EE098E7FC0124913196029644917D
+:107A0000201711F02223B9F710928F0110928E01E6
+:107A100082E068E071E07AD0013479F46091080185
+:107A20006058633028F0683111F064E001C063E011
+:107A3000C62FD0E0CF5DD7480EC0063571F48091D7
+:107A40000801803311F011E022C080910A01C82F93
+:107A5000D0E0C25ED74811E022C0053721F413E020
+:107A6000CEE1D8E71CC0053539F4E0900801F0906C
+:107A70000901EE0CFF1C0AC0043631F482E0B701A4
+:107A80004091090154DF02C0043721F010E0C5E243
+:107A9000D8E705C010910901E701E10EF11C7DD185
+:107AA0008097B1F483E068E871E041E050E044D0B1
+:107AB000112329F0412F50E083E8BE013DD083E43B
+:107AC00069E871E041E050E037D0013509F08FCF2F
+:107AD000D0928D01EE24FF248ACF10928F01109254
+:107AE0008E0110928C0110928D0181E08093D7005D
+:107AF00080EA8093D80082E189BD09B400FEFDCF01
+:107B000080E98093D8001092E0000895FB018093F3
+:107B1000E9009BE60EC08091E80085FFFCCF8091D4
+:107B2000F10081938091E80085FD02C09093E80008
+:107B30004150442381F70895982FFB01282F20728C
+:107B400087708093E9003AE314C08091E80085FFD4
+:107B5000FCCF97FF02C0849101C080813196211132
+:107B600080E08093F1008091E80085FD02C03093B1
+:107B7000E800415050408FEF4F3F580731F796FFD4
+:107B800003C08AE38093E8000895809191018132D7
+:107B900079F420E030E003C080818093F100F901A6
+:107BA000E050FF4F2F5F3F4F28303105A9F71EC02F
+:107BB0008032B1F48091E80082FFFCCF20E030E019
+:107BC00003C08091F1008083F901E050FF4F2F5FE7
+:107BD0003F4F28303105A9F78BEF8093E80006C0AE
+:107BE000823221F4809192018093070181E008950F
+:107BF00020919301223231F1213081F4809196015C
+:107C000090919701089711F4209398018091980121
+:107C1000882309F03AC0E9E7F8E739C0223021F4B7
+:107C200084E6EBE8F8E711C0233069F58091920112
+:107C3000882319F4E9E4F8E72AC0813021F5EDE45E
+:107C4000F8E725C081E0EBE2F8E790919601282F54
+:107C5000981708F4292F90E03EEF8091E800857096
+:107C6000E1F38091E80082FD0EC09F5F84918093D4
+:107C7000F100892F8F7311F43093E8003196921739
+:107C800060F381E0089580E00895E7E6F8E78491E5
+:107C9000DCCF1092E9008091E80083FF5FC0E0E94B
+:107CA000F1E003C08091F100819381E0E839F807A9
+:107CB000C9F782EF8093E8008091900187FF05C0AB
+:107CC0008091E80080FFFCCF03C08EEF8093E80036
+:107CD00080919101853051F48091E80080FFFCCFC4
+:107CE0008091920180688093E30031C08930E1F493
+:107CF0008091920180938C01E7E2F8E791E031E016
+:107D000026E39093E9003093EB0084918093EC009C
+:107D10002093ED009F5F3196953099F78EE7809321
+:107D2000EA001092EA0013C0883029F480918C0197
+:107D30008093F1000CC0882319F41092F10007C061
+:107D4000863011F455DF01C020DF882321F08EEF4B
+:107D50008093E800089581E28093EB00089580917C
+:107D6000E1001092E100282F83FF0CC01092E9007F
+:107D700081E08093EB001092EC0082E38093ED00B1
+:107D800010928C0122FF08C080918D01882321F47C
+:107D900010928F0110928E0108951F9312E079DFE7
+:107DA000DEDF1093E9008091E80085FF0DC090911F
+:107DB000F1008091E80085FD03C08BE68093E80028
+:107DC000892F90E01F91089584E6000000000000D4
+:107DD00000008150D1F780918E0190918F01019721
+:107DE00090938F0180938E0180918E0190918F01ED
+:0A7DF000892B09F493DD7CDDD2CF6E
+:087DFA0000E1000000000000A0
 :040000030000780081
 :00000001FF

hardware/arduino/bootloaders/diskloader/src/Platform.h

@@ -26,30 +26,17 @@ 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);
 
-
-#ifdef MICROTOUCH
-
-#define USB_VID 0x239A	// Adafruit vid
-#define USB_PID 0x2001	// sorry dave sprach zarathustra
-
-#define FAT_OEM_NAME	'r','o','s','s','u','m','u','r'					// 8 chars
-#define BOARD_INIT() DDRC = 0xFF; CPU_PRESCALE(0); DISABLE_JTAG();
-#define LED0 PORTC &= ~(1<<7) 
-#define LED1 PORTC |= (1<<7)
-#define BACKLIGHT0 PORTC &= ~(1<<6)
-#define BACKLIGHT1 PORTC |= (1<<6)
-
-#else
-
 #define USB_VID 0x2341	// arduino LLC vid
 #define USB_PID 0x0020	// educated guess
 
 #define FAT_OEM_NAME	'l','e','o','n','a','r','d','o'					// 8 chars
-#define BOARD_INIT()	// etc
-#define LED0 
-#define LED1
-
-#endif
+#define BOARD_INIT()	DDRC |= (1<<7); DDRB |= (1<<0); DDRE |= (1<<6); CPU_PRESCALE(0); DISABLE_JTAG();
+#define LED0			PORTC &= ~(1<<7)
+#define LED1			PORTC |= (1<<7)
+#define TXLED0			PORTE &= ~(1<<6)
+#define TXLED1			PORTE |= (1<<6)
+#define RXLED0			PORTB &= ~(1<<0)
+#define RXLED1			PORTB |= (1<<0)
 
 #define TRANSFER_PGM		0x80
 #define TRANSFER_RELEASE	0x40