From 8b12b2adf41a7fd79f839499b52e125336c176be Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Tue, 20 Sep 2005 15:20:17 +0000
Subject: [PATCH] Removed putch(0)'s from bootloader startup.

---
 bootloader/ATmegaBOOT.bin          | Bin 2018 -> 1844 bytes
 bootloader/ATmegaBOOT.c            |  62 ++------------
 bootloader/ATmegaBOOT.srec         | 129 -----------------------------
 bootloader/fixmybootloader.command |   7 +-
 4 files changed, 14 insertions(+), 184 deletions(-)
 delete mode 100755 bootloader/ATmegaBOOT.srec

diff --git a/bootloader/ATmegaBOOT.bin b/bootloader/ATmegaBOOT.bin
index 8cd79b8faf0d24c7e1b4a454bfb3a4530e24c2bd..702bdea3e67a576e164688e37789754a60ed3292 100755
GIT binary patch
delta 63
zcmaFFzlCpt1=FL)6Rng);%EOm-?MS1di&oAQ#q!_f_OV87L-kV<FeU|QHP1?(Z$Uv
T%q@(J;+tQx=rc{;#jXJW)K45?

delta 241
zcmdnO_lSRj1=E9f6Rng)VrTz5-?NirYCMSEI8(j-?}Vun3(D9);xaoXK68PxHfu5J
zFfkcl+8n{$!pNAh`7Vn-Q$4aK4Sk4F$YK^yF-0?-59*<YW+orZL)i}~7+?9U5d7o3
zficeqgJ7kp3iZnTP5Kb4Ii_krSq=3Q3Z_nNpNfpT401lq(4QIAq~BivWGjE@i~?CY
cXD5i{I50zhLM%jT&i97cPhfvd=3&<W09uuGD*ylh

diff --git a/bootloader/ATmegaBOOT.c b/bootloader/ATmegaBOOT.c
index 407abd8bd..7ff752503 100755
--- a/bootloader/ATmegaBOOT.c
+++ b/bootloader/ATmegaBOOT.c
@@ -3,20 +3,11 @@
 /*                                                        */
 /* ATmegaBOOT.c                                           */
 /*                                                        */
-/* build: 050123                                          */
+/* Copyright (c) 2003, Jason P. Kyle                      */
+/* All rights reserved.                                   */
 /*                                                        */
 /* Hacked by DojoCorp - ZGZ - MMX - IVR                   */
 /*                                                        */
-/* For the latest version see:                            */
-/* http://www.0j0.org and                                 */
-/* http://www.potemkin.org								  */
-/*                                                        */
-/* ------------------------------------------------------ */
-/*                                                        */
-/* Copyleft (c) 2005, DojoDave                            */
-/* Creative Commons   .                                   */
-/* see avr1.org for original file and information         */
-/*                                                        */
 /* This program is free software; you can redistribute it */
 /* and/or modify it under the terms of the GNU General    */
 /* Public License as published by the Free Software       */
@@ -123,8 +114,6 @@ char getch(void);
 void getNch(uint8_t);
 void byte_response(uint8_t);
 void nothing_response(void);
-char gethex(void);
-void puthex(char);
 
 union address_union {
   uint16_t word;
@@ -182,7 +171,10 @@ int main(void)
   //UCSRC = 0x86;
   //UCSRB = _BV(TXEN)|_BV(RXEN);
 
-  putch('\0');
+
+  /* this was giving uisp problems, so I removed it; without it, the boot
+     works on with uisp and avrdude on the mac (at least). */
+  //putch('\0');
 
   uint32_t l;
   uint32_t time_count;
@@ -198,7 +190,9 @@ int main(void)
     for(l=0; l<40000000; ++l);
     cbi(LED_PORT,LED);
   }
- putch('\0'); // this line is needed for the synchronization of the programmer
+
+ /* see comment at previous call to putch() */
+ //putch('\0'); // this line is needed for the synchronization of the programmer
 
   /* forever */
   for (;;) {
@@ -468,44 +462,6 @@ int main(void)
 
 }
 
-
-char gethex(void) {
-  char ah,al;
-
-  ah = getch(); putch(ah);
-  al = getch(); putch(al);
-  if(ah >= 'a') {
-    ah = ah - 'a' + 0x0a;
-  } else if(ah >= '0') {
-    ah -= '0';
-  }
-  if(al >= 'a') {
-    al = al - 'a' + 0x0a;
-  } else if(al >= '0') {
-    al -= '0';
-  }
-  return (ah << 4) + al;
-}
-
-void puthex(char ch) {
-  char ah,al;
-
-  ah = (ch & 0xf0) >> 4;
-  if(ah >= 0x0a) {
-    ah = ah - 0x0a + 'a';
-  } else {
-    ah += '0';
-  }
-  al = (ch & 0x0f);
-  if(al >= 0x0a) {
-    al = al - 0x0a + 'a';
-  } else {
-    al += '0';
-  }
-  putch(ah);
-  putch(al);
-}
-
 void putch(char ch)
 {
   /* m8 */
diff --git a/bootloader/ATmegaBOOT.srec b/bootloader/ATmegaBOOT.srec
deleted file mode 100755
index 987f03ebf..000000000
--- a/bootloader/ATmegaBOOT.srec
+++ /dev/null
@@ -1,129 +0,0 @@
-S012000041546D656761424F4F542E73726563AF
-S113180012C02BC02AC029C028C027C026C025C0AA
-S113181024C023C022C021C020C01FC01EC01DC0C0
-S11318201CC01BC01AC011241FBECFE5D4E0DEBF0C
-S1131830CDBF10E0A0E6B0E0E0EEFFE102C005900D
-S11318400D92A236B107D9F711E0A2E6B0E001C0CB
-S11318501D92AD36B107E1F738C0D2CF5D9BFECF04
-S11318608CB908955F9BFECF8CB1992787FD909525
-S113187008955F9BFECF8CB1803209F008955D9B83
-S1131880FECF24E12CB95D9BFECF30E13CB9089535
-S1131890982F5F9BFECF8CB1803209F008955D9B39
-S11318A0FECF24E12CB95D9BFECF9CB95D9BFECF9E
-S11318B030E13CB90895282F90E004C05F9BFECF2F
-S11318C08CB19F5F9217D0F30895CFE5D4E0DEBFCB
-S11318D0CDBF8E98969A000010BC13E319B908E1A5
-S11318E00AB986E880BD5D9BFECF1CB8CC24DD24FC
-S11318F07601BD9A10926A0120E08FEF99E5A2E685
-S1131900B2E0C297A109B109B7FFFBCFC59A8FEF27
-S113191099E5A2E6B2E0C297A109B109B7FFFBCFEE
-S1131920C598822F8F5F282F833038F380936A0104
-S11319305D9BFECF1CB85F9914C00894C11CD11CD8
-S1131940E11CF11CF0E8CF16FDE8DF06FBE5EF062D
-S1131950F0E0FF0680F3E0916200F09163000995E6
-S1131960EACF5F9BFECF2CB1922F2033F1F19C364E
-S113197009F4BFC2913309F493C2903409F437C215
-S1131980913409F417C2923409F400C2953409F46D
-S1131990E9C1903509F4CBC1913509F4BCC1923544
-S11319A009F426C1953509F40CC1963509F4F2C041
-S11319B0943609F495C0943709F43FC0953721F162
-S11319C0963709F0B8CF5F9BFECF2CB1203209F0D7
-S11319D0B2CF5D9BFECF34E13CB95D9BFECF1CB81A
-S11319E05D9BFECF50E15CB9A6CF5F9BFECF3CB1BF
-S11319F0303209F0BCCF5D9BFECF44E14CB95D9B16
-S1131A00FECF50E15CB9B3CF5F9BFECFECB1E032C7
-S1131A1009F091CF5D9BFECF04E10CB95D9BFECF35
-S1131A201EE11CB95D9BFECF43E94CB95D9BFECF23
-S1131A3067E06CB95D9BFECFD5CF5F9BFECF3CB119
-S1131A40309369015F9BFECF5CB1509368015F9B4B
-S1131A50FECF7CB1753409F43DC0B0916C01BE7FFA
-S1131A60B0936C01C0916600D0916700CC0FDD1F6C
-S1131A70D0936700C09366005F9BFECFFCB1F03249
-S1131A8009F059CF5D9BFECF84E18CB9C0E0D0E072
-S1131A90209168013091690112161306C0F48091F7
-S1131AA06C0180FD1DC1869580FD30C1E09166000A
-S1131AB0F091670084915D9BFECF8CB93196F093D1
-S1131AC06700E09366002196C217D30740F35D9B3D
-S1131AD0FECF88CF90916C01916090936C01CCCF34
-S1131AE05F9BFECF9CB1909369015F9BFECFACB12D
-S1131AF0A093680190916C019E7F5F9BFECFBCB167
-S1131B00B53409F4916090936C0140E050E0209169
-S1131B106801309169011216130658F4E8E6F0E002
-S1131B205F9BFECFCCB1C1934F5F5F4F421753070A
-S1131B30B8F35F9BFECFECB1E03209F0FCCEF0913C
-S1131B406C01F0FF62C0C0E0D0E012161306D8F4B6
-S1131B5008E610E0F80161918F0180916600909190
-S1131B60670033D2A0916600B09167001196B093DC
-S1131B706700A093660021968091680190916901A5
-S1131B80C817D90738F35D9BFECF24E12CB95D9BC0
-S1131B90FECF28CF90E05F9BFECF8CB19F5F943047
-S1131BA0D0F35F9BFECF6CB1603209F0C4CE5D9B75
-S1131BB0FECF74E17CB95D9BFECF1CB85D9BFECF6C
-S1131BC011CF5F9BFECF2CB1209366005F9BFECFAD
-S1131BD03CB1309367005F9BFECF4CB1403209F0BB
-S1131BE0AACE5D9BFECF54E15CB95D9BFECFFACEDD
-S1131BF05F9BFECF0CB1003209F09DCE5D9BFECF02
-S1131C0014E11CB95D9BFECFEDCE0091670007FD8A
-S1131C1063C010926B016091660070916700660F5B
-S1131C20771F70936700609366004091680140FFDE
-S1131C3006C02F5F3F4F3093690120936801F894E9
-S1131C40E199FECF1127E0916600F0916700C8E6A4
-S1131C50D0E08091680190916901103091F4009175
-S1131C60570001700130D9F303E000935700E89561
-S1131C700091570001700130D9F301E1009357003E
-S1131C80E895099019900091570001700130D9F33B
-S1131C9001E000935700E8951395103298F011274E
-S1131CA00091570001700130D9F305E0009357000B
-S1131CB0E8950091570001700130D9F301E10093D8
-S1131CC05700E8953296029709F0C7CF103011F00B
-S1131CD00296E5CF112457CF11E010936B019BCFEF
-S1131CE0809166009091670068D15D9BFECF8CB9AE
-S1131CF0A0916600B09167001196B0936700A0931D
-S1131D0066002091680130916901DDCEE0916600A2
-S1131D10F0916700D3CE5F9BFECFECB1E03281F04F
-S1131D20C12C5AE6D52E58E1E52EF12C04CE5F9B4A
-S1131D30FECFACB1A03269F0CC24DD247601FBCD1A
-S1131D405D9BFECFF4E1FCB95D9BFECF80E18CB9D5
-S1131D50E7CF5D9BFECFB4E1BCB95D9BFECFC0E194
-S1131D60CCB9EACF90E05F9BFECF8CB19F5F9530FA
-S1131D70D0F35F9BFECF7CB1703209F0DCCD5D9B6C
-S1131D80FECF94E19CB95D9BFECF2CCE90E05F9B8F
-S1131D90FECF8CB19F5F9431D0F35F9BFECF5CB1DB
-S1131DA0503209F0C8CD5D9BFECF64E16CB95D9BF8
-S1131DB0FECF18CE5F9BFECF8CB18038F1F1813815
-S1131DC059F1823809F45BC0883909F447C05F9B34
-S1131DD0FECF3CB1303209F0AECD5D9BFECF44E185
-S1131DE04CB95D9BFECF1CB85D9BFECFFBCD5F9BCA
-S1131DF0FECF3CB1363818F05F9BFECF8CB15F9BB1
-S1131E00FECF4CB1403209F096CD5D9BFECF54E13C
-S1131E105CB95D9BFECFE6CD5F9BFECFACB1A0323B
-S1131E2009F089CD5D9BFECFB4E1BCB95D9BFECFCB
-S1131E30C1E0CCB95D9BFECFD5CD5F9BFECF6CB12D
-S1131E40603209F078CD5D9BFECF74E17CB95D9B77
-S1131E50FECF92E09CB95D9BFECFC4CD5F9BFECFCD
-S1131E600CB1003209F067CD5D9BFECF14E11CB9C3
-S1131E705D9BFECF23E02CB95D9BFECFB3CD5F9B72
-S1131E80FECFECB1E03209F056CD5D9BFECFF4E11C
-S1131E90FCB95D9BFECF82E18CB95D9BFECFA2CDE8
-S1131EA05F9BFECFACB1A03209F045CD5D9BFECF68
-S1131EB0B4E1BCB95D9BFECFC1E4CCB95D9BFECF60
-S1131EC0E6E5ECB95D9BFECFF2E5FCB95D9BFECF88
-S1131ED080E28CB95D9BFECF09E40CB95D9BFECF1B
-S1131EE013E51CB95D9BFECF20E52CB95D9BFECFAD
-S1131EF079CD5F9BFECF6CB16F3609F01CCD5F9B33
-S1131F00FECF7CB17C3609F016CD5F9BFECF9CB131
-S1131F10913609F010CD1FCD5F9BFECF8CB1992770
-S1131F2087FD9095282F5D9BFECF8CB95F9BFECFDC
-S1131F308CB1992787FD9095382F5D9BFECF8CB986
-S1131F4021362CF02755313634F0375507C020336D
-S1131F50D4F32053F8CF30330CF030532295207F44
-S1131F60230F822F992787FD90950895282F99276D
-S1131F7087FD9095807F9070959587959595879529
-S1131F8095958795959587958A306CF0982F995AF1
-S1131F90822F8F708A306CF0895A5D9BFECF9CB97A
-S1131FA05D9BFECF08C0982F905D822F8F708A3082
-S1131FB09CF7805DF2CF8CB90895E199FECF9FBB69
-S1131FC08EBBE09A99278DB30895E199FECF9FBB0C
-S1131FD08EBB6DBB0FB6F894E29AE19A0FBE0895DA
-S1051FE080007B
-S9031800E4
diff --git a/bootloader/fixmybootloader.command b/bootloader/fixmybootloader.command
index 8f13da7df..622693806 100755
--- a/bootloader/fixmybootloader.command
+++ b/bootloader/fixmybootloader.command
@@ -10,15 +10,18 @@
 # very useful also when for some reasons the bootloader disappears
 # 
 # TODO: cleanup and make it more user friendly
+# TODO: move this (and related) scripts to platform dist/ dirs
 #
 # expects an STK500 compatible programmer on the specified serial port
 # if you use the parallel port programmer you need to change the dprog
 # parametre
 # 
 
-BINDIR=/usr/local/avr/bin
+#BINDIR=/usr/local/avr/bin
+BINDIR=../build/macosx/work/tools/avr/bin
 #PORT=/dev/tty.usbserial0
-PORT=/dev/tty.USA19QW3b1P1.1  
+#PORT=/dev/tty.USA19QW3b1P1.1  
+PORT=/dev/tty.USA19QW1b1P1.1
 
 $BINDIR/uisp -dpart=ATmega8 -dprog=stk500 -dserial=$PORT -dspeed=115200 --wr_lock=0xFF
 $BINDIR/uisp -dpart=ATmega8 -dprog=stk500 -dserial=$PORT -dspeed=115200 --wr_fuse_l=0xdf --wr_fuse_h=0xc8