Changeset 566 for trunk/tools/lpc21isp

Timestamp:

11/23/09 01:30:28 (4 months ago)

Author:

goodea

Message:

Update lpc21isp

Location:

trunk/tools/lpc21isp

Files:

• Makefile (modified) (1 diff)
• Makefile.vc (added)
• README (added)
• StdAfx.h (added)
• adprog.c (added)
• adprog.h (added)
• gpl.txt (added)
• lgpl-3.0.txt (added)
• lpc21isp.c (modified) (45 diffs)
• lpc21isp.h (modified) (1 diff)
• lpcprog.c (added)
• lpcprog.dsp (added)
• lpcprog.dsw (added)
• lpcprog.h (added)
• lpcterm.c (added)
• lpcterm.h (added)

trunk/tools/lpc21isp/Makefile

@@ -1 @@
-CC=gcc
-OBJS=lpc21isp.o
-CFLAGS=-O2 -Wall -g
-INSTALLDIR=/usr/local/bin/
+all:      lpc21isp
 
-all: lpc21isp
+GLOBAL_DEP  = adprog.h lpc21isp.h lpcprog.h lpcterm.h
+CC = gcc
 
-.c.o:
-        $(CC) $(CFLAGS) -c $< -o $@
+ifneq ($(findstring(freebsd, $(OSTYPE))),)
+CFLAGS+=-D__FREEBSD__
+endif
 
-lpc21isp: $(OBJS)
-        $(CC) -o $@ $(OBJS)
+adprog.o: adprog.c $(GLOBAL_DEP)
+        $(CC) $(CDEBUG) $(CFLAGS) -c -o adprog.o adprog.c
+
+lpcprog.o: lpcprog.c $(GLOBAL_DEP)
+        $(CC) $(CDEBUG) $(CFLAGS) -c -o lpcprog.o lpcprog.c
+
+lpcterm.o: lpcterm.c $(GLOBAL_DEP)
+        $(CC) $(CDEBUG) $(CFLAGS) -c -o lpcterm.o lpcterm.c
+
+lpc21isp: lpc21isp.c adprog.o lpcprog.o lpcterm.o $(GLOBAL_DEP)
+        $(CC) $(CDEBUG) $(CFLAGS) -o lpc21isp lpc21isp.c adprog.o lpcprog.o lpcterm.o
 
 clean:
-        rm -f $(OBJS) lpc21isp
-
-install:
-        install -m 755 lpc21isp /usr/local/bin/lpc21isp
-
-.PHONY: clean
+        $(RM) adprog.o lpcprog.o lpcterm.o lpc21isp

trunk/tools/lpc21isp/lpc21isp.c

@@ -6 +6 @@
 Filename:          lpc21isp.c
 
-Compiler:          Microsoft VC 6/7, GCC Cygwin, GCC Linux
-
-Autor:             Martin Maurer (Martin.Maurer@clibb.de)
-
-Copyright:         (c) Martin Maurer 2003-2007, All rights reserved
+Compiler:          Microsoft VC 6/7, GCC Cygwin, GCC Linux, GCC ARM ELF
+
+Author:            Martin Maurer (Martin.Maurer@clibb.de)
+
+Copyright:         (c) Martin Maurer 2003-2008, All rights reserved
 Portions Copyright (c) by Aeolus Development 2004 http://www.aeolusdevelopment.com
 
-Version:           1.39
-
+    This file is part of lpc21isp.
+
+    lpc21isp is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    any later version.
+
+    lpc21isp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    and GNU General Public License along with lpc21isp.
+    If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#if defined(_WIN32)
+#if !defined __BORLANDC__
+#include "StdAfx.h"        // Precompiled Header for WIN32
+#endif
+#endif // defined(_WIN32)
+#include "lpc21isp.h"   // if using propriatory serial port communication (customize attached lpc21isp.h)
+#include "adprog.h"
+#include "lpcprog.h"
+#include "lpcterm.h"
+
+/*
 Change-History:
 
- 1.00  2004-01-08  Initial Version, tested for MSVC6/7 and GCC under Cygwin
- 1.01  2004-01-10  Porting to Linux (at least compiling must work)
- 1.02  2004-01-10  Implemented conversion intel hex format -> binary
- 1.03  2004-01-25  Preparation to upload to public website
- 1.04  2004-02-12  Merged in bugfixes by Soeren Gust
- 1.05  2004-03-14  Implement printing of error codes as text / strings
- 1.06  2004-03-09  Merged in bugfixes by Charles Manning:
-                   The '?' sychronisation does not reliably respond to the first '?'.
-                   I added some retries.
-                   The LPC2106 sometimes responds to the '?' by echoing them back.
-                   This sometimes causes an attempt to match "?Synchonized".
-                   Added code to strip off any leading '?'s.
-                   Timeouts were too long.
-                   Change from RTS/CTS to no flow control.
-                   Done because many/most people will use only 3-wire comms.
-                   Added some progress tracing.
- 1.07  2004-03-14  Implement handling of control lines for easier booting
- 1.08  2004-04-01  Bugfix for upload problem
- 1.09  2004-04-03  Redesign of upload routine
-                   Now always 180 byte blocks are uploaded, to prevent
-                   small junks in uuencoding
- 1.10  2004-04-03  Clear buffers before sending commands to LPC21xx,
-                   this prevents synchronizing errors when previously loaded
-                   program does a lot of output, so FIFO of PC runs full
- 1.11  2004-04-03  Small optimization for controlling reset line
-                   otherwise termonly starts LPC twice, free PC buffers
- 1.12  2004-04-04  Add switch to enable logging terminal output to lpc21isp.log
- 1.13  2004-05-19  Merged in improvement by Charles Manning:
-                   Instead of exiting the wrong hex file size is corrected
- 1.14  2004-07-07  Merged in improvement by Alex Holden:
-                   Remove little/big endian dependancy
- 1.15  2004-09-27  Temporary improvement by Cyril Holweck:
-                   Removed test (data echoed = data transmited) on the main
-                   data transfert, since this was the biggest failure
-                   reason and is covered by checksome anyway.
-                   Added COMPILE_FOR_LPC21, to have target dump it's own
-                   memory to stdout.
- 1.16  2004-10-09  Merged in bugfix / improvement by Sinelnikov Evgeny
-                   I found out that Linux and Windows serial port initialization
-                   are different with pinouts states. My board don't get
-                   reset signal at first cycle of DTR pinout moving.
-                   And I add this moving to initalization cycle.
- 1.17  2004-10-21  Changes by Cyril Holweck
-                   Divide main, take out the real programming function, that can
-                   also be used by a target to copy its own code to another.
- 1.18  2004-10-26  Changes by Cyril Holweck
-                   Added a "G 0 A\r\n" at end of programming to run code.
- 1.19  2004-11-03  Changes by Robert Adsett
-                   Add support for Analog Devices.
-                   Separate file load from programming.
-                   Change from a debug on/off flag to debug level
-                   Remove if(debug) tests and replace with DebugPrintf
-                   statements.
-                   Change serial I/O and timing so that the system
-                   dependancies are isolated to a few portability functions.
-                   Add support for binary serial I/O.
-                   Add doxygen support.
- 1.20  2004-11-07  Preparation for multiport booting (factory support)
- 1.21  2004-11-08  Bugfix from Robert Adsett
-                   BinaryLength was not initialized
- 1.22  2004-11-08  Changes from Cyril Holweck / Evgeny Sinelnikov
-                   Forgotten IspEnvironment-> and bugfixes if COMPILE_FOR_LINUX
-                   If COMPILE_FOR_LPC21, PhilipsDownload() 'acts as' main():
-                   - it should not be static and should return int.
-                   - no sub-function can use exit() but only return()
-                   Use 'char' instead of 'byte' ;)
- 1.23  2005-01-16  Build in automatic detection of LPC chiptype
-                   (needed for 256 KByte support)
- 1.24B 2005-06-02  Changes by Thiadmer Riemersma: completed support for other
-                   chip types (LPC213x series and others).
- 1.24C 2005-06-11  Changes by Thiadmer Riemersma: added the device ID codes for
-                   chip types LPC2131 and LPC2132.
- 1.25  2005-06-19  Martin Maurer: Setup more parameters in DCB,
-                   otherwise wrong code is downloaded (only Windows and Cygwin)
-                   when a previous program has changed these parameters
-                   Check exact string of "G 0 A\r\n0\r\n" instead of whole received buffer,
-                   to prevent checking of already received by program start
-                   (error on running program, but reports CMD_SUCCESS)
-                   Add ifdefs for all baudrates (needed only for high baudrate,
-                   which seem to be not available on Macs...)
- 1.26  2005-06-26  Martin Maurer:
-                   Correct check again: "G 0 A\r\n0\r\n" is cutted, because of reboot
-                   (error on running program, but reports CMD_SUCCESS)
- 1.27  2005-06-29  Martin Maurer:
-                   Add LPC chip ID's (thanks to Robert from Philips) for
-                   missing LPC213x and upcoming new LPC214x chips
-                   (currently untested, because i don't have access to these chips,
-                    please give me feedback !)
- 1.28  2005-07-27  Anders Rosvall / Embedded Artists AB:
-                   Changed the reset timeout to 500 ms when entering the bootloader.
-                   Some external reset controllers have quite long timeout periods,
-                   so extening the timeout delay would be a good thing.
- 1.29  2005-09-14  Rob Jansen:
-                   Added functionality to download to RAM and run from there.
-                   In LoadFile() added record types 04 (Extended Linear Address Record)
-                   and 05 (Start Linear Address Record), added address offset
-                   (IspEnvironment->BinaryOffset) and start address (...->StartAddress).
-                   Changed PhilipsDownload to skip all Flash prepare/erase/copy commands.
-                                   Note: Tested with VC7 only
-1.30   2005-10-04  Rob Jansen:
-                   - forgot to change the version string in 1.29
-                                   - Wrong text in LoadFile corrected (printed text mentions record type 05,
-                                     this should be 04
-                                   - Changed LoadFile to accept multiple record types 04
-                                   - Changed LoadFile to check on memory size, will not load more than x MB
-                                     if linear extended address records are used
-1.31   2005-11-13  Martin Maurer: Thanks to Frank Gutmann
-                   Updated number of sectors in device table
-                                   for LPC2194, LPC2292 and LPC2294
-1.32   2005-12-02  Martin Maurer: Corrected missing control of RTS/DTR
-                   in case user selected -termonly and -control
-                   Small correction (typo in debug)
-1.33   2006-10-01  Jean-Marc Koller:
-                   Added support for MacOS X (difference on how to set termios baudrate).
+1.00  2004-01-08  Initial Version, tested for MSVC6/7 and GCC under Cygwin
+1.01  2004-01-10  Porting to Linux (at least compiling must work)
+1.02  2004-01-10  Implemented conversion intel hex format -> binary
+1.03  2004-01-25  Preparation to upload to public website
+1.04  2004-02-12  Merged in bugfixes by Soeren Gust
+1.05  2004-03-14  Implement printing of error codes as text / strings
+1.06  2004-03-09  Merged in bugfixes by Charles Manning:
+                  The '?' sychronisation does not reliably respond to the first '?'.
+                  I added some retries.
+                  The LPC2106 sometimes responds to the '?' by echoing them back.
+                  This sometimes causes an attempt to match "?Synchonized".
+                  Added code to strip off any leading '?'s.
+                  Timeouts were too long.
+                  Change from RTS/CTS to no flow control.
+                  Done because many/most people will use only 3-wire comms.
+                  Added some progress tracing.
+1.07  2004-03-14  Implement handling of control lines for easier booting
+1.08  2004-04-01  Bugfix for upload problem
+1.09  2004-04-03  Redesign of upload routine
+                  Now always 180 byte blocks are uploaded, to prevent
+                  small junks in uuencoding
+1.10  2004-04-03  Clear buffers before sending commands to LPC21xx,
+                  this prevents synchronizing errors when previously loaded
+                  program does a lot of output, so FIFO of PC runs full
+1.11  2004-04-03  Small optimization for controlling reset line
+                  otherwise termonly starts LPC twice, free PC buffers
+1.12  2004-04-04  Add switch to enable logging terminal output to lpc21isp.log
+1.13  2004-05-19  Merged in improvement by Charles Manning:
+                  Instead of exiting the wrong hex file size is corrected
+1.14  2004-07-07  Merged in improvement by Alex Holden:
+                  Remove little/big endian dependancy
+1.15  2004-09-27  Temporary improvement by Cyril Holweck:
+                  Removed test (data echoed = data transmited) on the main
+                  data transfert, since this was the biggest failure
+                  reason and is covered by checksome anyway.
+                  Added COMPILE_FOR_LPC21, to have target dump it's own
+                  memory to stdout.
+1.16  2004-10-09  Merged in bugfix / improvement by Sinelnikov Evgeny
+                  I found out that Linux and Windows serial port initialization
+                  are different with pinouts states. My board don't get
+                  reset signal at first cycle of DTR pinout moving.
+                  And I add this moving to initalization cycle.
+1.17  2004-10-21  Changes by Cyril Holweck
+                  Divide main, take out the real programming function, that can
+                  also be used by a target to copy its own code to another.
+1.18  2004-10-26  Changes by Cyril Holweck
+                  Added a "G 0 A\r\n" at end of programming to run code.
+1.19  2004-11-03  Changes by Robert Adsett
+                  Add support for Analog Devices.
+                  Separate file load from programming.
+                  Change from a debug on/off flag to debug level
+                  Remove if (debug) tests and replace with DebugPrintf
+                  statements.
+                  Change serial I/O and timing so that the system
+                  dependancies are isolated to a few portability functions.
+                  Add support for binary serial I/O.
+                  Add doxygen support.
+1.20  2004-11-07  Preparation for multiport booting (factory support)
+1.21  2004-11-08  Bugfix from Robert Adsett
+                  BinaryLength was not initialized
+1.22  2004-11-08  Changes from Cyril Holweck / Evgeny Sinelnikov
+                  Forgotten IspEnvironment-> and bugfixes if COMPILE_FOR_LINUX
+                  If COMPILE_FOR_LPC21, PhilipsDownload() 'acts as' main():
+                  - it should not be static and should return int.
+                  - no sub-function can use exit() but only return ()
+                  Use 'char' instead of 'byte' ;)
+1.23  2005-01-16  Build in automatic detection of LPC chiptype
+                  (needed for 256 KByte support)
+1.24B 2005-06-02  Changes by Thiadmer Riemersma: completed support for other
+                  chip types (LPC213x series and others).
+1.24C 2005-06-11  Changes by Thiadmer Riemersma: added the device ID codes for
+                  chip types LPC2131 and LPC2132.
+1.25  2005-06-19  Martin Maurer: Setup more parameters in DCB,
+                  otherwise wrong code is downloaded (only Windows and Cygwin)
+                  when a previous program has changed these parameters
+                  Check exact string of "G 0 A\r\n0\r\n" instead of whole received buffer,
+                  to prevent checking of already received by program start
+                  (error on running program, but reports CMD_SUCCESS)
+                  Add ifdefs for all baudrates (needed only for high baudrate,
+                  which seem to be not available on Macs...)
+1.26  2005-06-26  Martin Maurer:
+                  Correct check again: "G 0 A\r\n0\r\n" is cutted, because of reboot
+                  (error on running program, but reports CMD_SUCCESS)
+1.27  2005-06-29  Martin Maurer:
+                  Add LPC chip ID's (thanks to Robert from Philips) for
+                  missing LPC213x and upcoming new LPC214x chips
+                  (currently untested, because i don't have access to these chips,
+                  please give me feedback !)
+1.28  2005-07-27  Anders Rosvall / Embedded Artists AB:
+                  Changed the reset timeout to 500 ms when entering the bootloader.
+                  Some external reset controllers have quite long timeout periods,
+                  so extening the timeout delay would be a good thing.
+1.29  2005-09-14  Rob Jansen:
+                  Added functionality to download to RAM and run from there.
+                  In LoadFile() added record types 04 (Extended Linear Address Record)
+                  and 05 (Start Linear Address Record), added address offset
+                  (IspEnvironment->BinaryOffset) and start address (...->StartAddress).
+                  Changed PhilipsDownload to skip all Flash prepare/erase/copy commands.
+                  Note: Tested with VC7 only
+1.30   2005-10-04 Rob Jansen:
+                  - forgot to change the version string in 1.29
+                  - Wrong text in LoadFile corrected (printed text mentions record type 05,
+                    this should be 04
+                  - Changed LoadFile to accept multiple record types 04
+                  - Changed LoadFile to check on memory size, will not load more than x MB
+                    if linear extended address records are used
+1.31   2005-11-13 Martin Maurer: Thanks to Frank Gutmann
+                  Updated number of sectors in device table
+                  for LPC2194, LPC2292 and LPC2294
+1.32   2005-12-02 Martin Maurer: Corrected missing control of RTS/DTR
+                  in case user selected -termonly and -control
+                  Small correction (typo in debug)
+1.33   2006-10-01 Jean-Marc Koller:
+                  Added support for MacOS X (difference on how to set termios baudrate).
 1.34   2006-10-01  Cyril Holweck:
-                   Made it compile again for lpc21isp
-                   Added const keyword to constant variables to make it better
-                   code for embeded target. (decrease RAM usage)
-                   Replaced all regular call to printf() by DebugPrintf()
-                   Removed call to scanf() (not much usefull and cost a lot to my target)
-1.35   2006-22-01  Cyril Holweck
-                   Added feature for LPC21: will start downloading at Sector 1 and upward,
-                   to finish with Sector 0, the one containing the checksum controling BSL entry
-1.36   2006-25-01  Cyril Holweck
-                   PhilipsDownload() will now return a unique error code for each error
-1.37   2006-10-03  Jeroen Domburg
-                   Added LPC2103 (and only the 2103, I can't find the IDs for 2101/2102)
-                           Corrected a loop which occured if the program completely fits in sector 0
-1.38   2007-01-05  Ray Molenkamp
-                   Added feature for LPC21: Wipe entire device before programming to enable
-                   reflashing of chips with the lpc codeprotection feature enabled.
-1.39   2007-01-12  Martin Maurer
-                   Added initial support for new processors LPC23xx and LPC24xx
-
-******************************************************************************/
-
-#define VERSION_STR     "1.39"
-
-/* LPC_RAMSTART, LPC_RAMBASE
- *
- * Used in PhilipsDownload() to decide whether to Flash code or just place in in RAM
- * (works for .hex files only)
- *
- * LPC_RAMSTART - the Physical start address of the SRAM
- * LPC_RAMBASE  - the base address where downloading starts.
- *                Note that any code in the .hex file that resides in 0x4000,0000 ~ 0x4000,0200
- *                will _not_ be written to the LPCs SRAM.
- *                This is due to the fact that 0x4000,0040 - 0x4000,0200 is used by the bootrom.
- *                Any interrupt vectors must be copied to 0x4000,0000 and remapped to 0x0000,0000
- *                by the startup code.
- */
-#define LPC_RAMSTART    0x40000000L
-#define LPC_RAMBASE     0x40000200L
-
-/* LPC_FLASHMASK
- *
- * LPC_FLASHMASK - bitmask to define the maximum size of the Filesize to download.
- *                 LoadFile() will check any new segment address record (03) or extended linear
- *                 address record (04) to see if the addressed 64 kByte data block still falls
- *                 in the max. flash size.
- *                 LoadFile() will not load any files that are larger than this size.
- */
-#define LPC_FLASHMASK  0xFFC00000 /* 22 bits = 4 MB */
-
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-    #define COMPILE_FOR_WINDOWS
-    #define COMPILED_FOR ("Windows")
-#elif defined(__CYGWIN__)
-    #define COMPILE_FOR_CYGWIN
-    #define COMPILED_FOR ("Cygwin")
-#elif defined(__arm__) || defined(__thumb__)
-    #define COMPILE_FOR_LPC21
-    #define COMPILED_FOR ("ARM")
-    #define printf iprintf
-#elif defined(__APPLE__)
-    #define COMPILE_FOR_LINUX
-    #define COMPILED_FOR ("Apple MacOS X")
-#else
-    #define COMPILE_FOR_LINUX
-    #define COMPILED_FOR ("Linux")
+                  Made it compile again for lpc21isp
+                  Added const keyword to constant variables to make it better
+                  code for embeded target. (decrease RAM usage)
+                  Replaced all regular call to printf() by DebugPrintf()
+                  Removed call to scanf() (not much usefull and cost a lot to my target)
+1.35   2006-22-01 Cyril Holweck
+                  Added feature for LPC21: will start downloading at Sector 1 and upward,
+                  to finish with Sector 0, the one containing the checksum controling BSL entry
+1.36   2006-25-01 Cyril Holweck
+                  PhilipsDownload() will now return a unique error code for each error
+1.37   2006-10-03 Jeroen Domburg
+                  Added LPC2103 (and only the 2103, I can't find the IDs for 2101/2102)
+                  Corrected a loop which occured if the program completely fits in sector 0
+1.38   2007-01-05 Ray Molenkamp
+                  Added feature for LPC21: Wipe entire device before programming to enable
+                  reflashing of chips with the lpc codeprotection feature enabled.
+1.39   2007-01-12 Martin Maurer
+                  Added initial support for new processors LPC23xx and LPC24xx
+1.40   2007-01-22 Martin Maurer
+                  Correction of chip id of LPC2458
+1.41   2007-01-28 Jean-Marc Koller
+                  Modified Terminal() to disable ECHO with termios only once, instead of
+                  modifying and restoring termios in each getch and kbhit call (which caused
+                  a strange echo behaviour in MacOS X).
+1.42   2007-01-28 Rob Probin
+                  Added -localecho command to allow local echoing in terminal mode for use
+                  where target does not echo back keystrokes.
+1.43   2007-01-29 Martin Maurer
+                  Moved keyboard handling routines to own subroutines,
+                  so they can be used during aborting synchronisation.
+                  Newest cygwin made problems, StringOscillator always contained '\0x0d'
+                  at the end, when calling lpc21isp from batch file
+1.44   2007-02-23 Yang Yang
+                  Added feature for LPC21: Verify the data in Flash after every writes
+                  to sector. To detect errors in writing to Flash ROM.
+1.45   2007-02-25 Martin Maurer
+                  Replace printf syntax of DumpString by a simple pointer to a string
+                  printf syntax is a nice thing, but it is not working :-(
+                  and therefore makes debugging much more difficult...
+                  Moved VERSION_STR to top of file to avoid possible cosmetical errors
+1.46   2007-02-25 Martin Maurer
+                  Again corrected debug output: should solve output of
+                  (FFFFFFB5) instead of (B5)
+1.47   2007-02-27 Robert Adsett
+                  Raised timeout on AD send packet function.
+1.48   2007-04-20 Martin Maurer
+                  Thanks to Josef Wolf for preventing to overwrite over end of array
+1.49   2007-10-16 New Option -halfduplex allow single wire using.
+                  Implemented and tested only for Windows. Data Resend implemented.
+1.50   2007-10-31 Changes by Simon Ellwood
+                  Formated the code for readablity
+                  Fixed some c++ compiler issues
+1.51   2007-11-20 Changes by Simon Ellwood
+                  Split into seperate files
+                  Made more modular so when used in an embedded mode only the required code is built
+1.52   2008-01-22 Changes by Manuel Koeppen
+                  Made compileable again for linux and windows
+                  Fixed bug in ClearSerialPortBuffers (linux)
+1.53   2008-02-25 Changes by Michael Roth
+                  Get priority of debug messages wih -control right
+1.54   2008-03-03 Martin Maurer
+                  Try to bring lpc21isp back to a useable state in Windows, Cygwin, Linux and Mac OS.
+                  Merged in changes by Erika Stefanini, which were done only for old version 1.49:
+                  Added device ids for revision B chips
+1.55   2008-03-03 Martin Maurer
+                  Thanks to Fausto Marzoli, bugfix for compiling latest version under Linux
+1.56   2008-04-01 Steve Franks
+                  Integrate FreeBSD patch.
+                  Add support for swapping and/or inverting RTS & DTR
+1.57   2008-04-06 Mauricio Scaff
+                  Changed OpenSerialPort to work with MacOS
+                  Corrected the number of sectors in some 512K devices (28 instead of 27)
+                  Added support for LPC2387 and LPC2388
+                  Defined BL error 19 (Code Protected)
+1.58   2008-05-10 Herbert Demmel dh2@demmel.com
+                  I had the special requirement to integrate the program into my own Windows
+                  software compiled with Borland C++ Builder 5. I had to do some minor changes
+                  for Borland (see defined __BORLANDC__) and modified to code slightly to have
+                  some simple callbacks for screen i/o (see define INTEGRATED_IN_WIN_APP).
+                  Please notet that I don *not* check / modify the part for AnalogDevices !!
+                  Besides that I fixed some minor issues:
+                  added dcb.fOutxCtsFlow = FALSE and dcb.fOutxDsrFlow = FALSE (sometimes required)
+                  Now comparing one character less of answer to "Now launching ... code" command
+1.59   2008-07-07 Peter Hayward
+                  Fixed freeze under Windows XP SP2 by removing redundant call to SetCommMask.
+1.60   2008-07-21 Martin Maurer
+                  Added uptodate part ids for LPC2458, LPC2468 and LPC2478
+                  Add comment "obsolete" for older part ids for LPC2458 and LPC2468
+                  Add ", " between compile date and time
+1.61   2008-10-21 Fausto Marzoli (thanks to Geoffrey Wossum for the patches)
+                  Fix for compiling latest version under Linux and "ControlLinesSwapped" issue
+1.62   2008-11-19 Martin Maurer
+                  Added (untested) support for LPC2109
+                  Added (untested) support for LPC2361 / LPC2362
+                  Heavy update of part identification number of LPC23xx and LPC24xx
+                  Correct bug, that hex file must exist, when "-detectonly" is used
+                  Correct Makefile.vc: use /Fe instead of -o
+1.63   2008-11-23 Martin Maurer
+                  Changed to GNU Lesser General Public License
+1.64   2009-01-19 Steve Franks
+                __FREEBSD__ changed to __FreeBSD__ at some point, plus other com port fixes
+*/
+
+// Don't forget to update the version string that is on the next line
+#define VERSION_STR "1.64"
+
+#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
+static char RxTmpBuf[256];        // save received data to this buffer for half-duplex
+char * pRxTmpBuf = RxTmpBuf;
 #endif
 
-#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
-#include <windows.h>
-#include <io.h>
-#endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
-
-#if defined COMPILE_FOR_WINDOWS
-#include <conio.h>
-#endif // defined COMPILE_FOR_WINDOWS
-
-#if defined COMPILE_FOR_LINUX
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/ioctl.h>
-#endif // defined COMPILE_FOR_LINUX
-
-#if defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
-#include <termios.h>
-#include <unistd.h>     // for read and return value of lseek
-#include <sys/time.h>   // for select_time
-#endif // defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
-
-#include <ctype.h>      // isdigit()
-#include <stdio.h>      // stdout
-#include <stdarg.h>
-#include <time.h>
-
-#if defined COMPILE_FOR_LPC21
-#include <stdlib.h>
-#include <string.h>
-//#include <lpc_ioctl.h>  // if using libc serial port communication
-#include "lpc21isp.h"   // if using propriatory serial port communication (customize attached lpc21isp.h)
+#if !defined COMPILE_FOR_LPC21
+int debug_level = 2;
 #endif
-
-#if !defined COMPILE_FOR_LPC21
-#include <fcntl.h>
-#endif
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif // O_BINARY
-
-#ifndef DWORD
-#define DWORD unsigned long
-#endif // DWORD
-
-#if defined COMPILE_FOR_LINUX
-#define stricmp strcasecmp
-#endif // defined COMPILE_FOR_LINUX
-
-
-/* Return values used by PhilipsDownload(): reserving all values from 0x1000 to 0x1FFF */
-
-#define NO_ANSWER_WDT       0x1000
-#define NO_ANSWER_QM        0x1001
-#define NO_ANSWER_SYNC      0x1002
-#define NO_ANSWER_OSC       0x1003
-#define NO_ANSWER_RBV       0x1004
-#define NO_ANSWER_RPID      0x1005
-#define ERROR_WRITE_DATA    0x1006
-#define ERROR_WRITE_CRC     0x1007
-#define ERROR_WRITE_CRC2    0x1008
-#define PROGRAM_TOO_LARGE   0x1009
-
-#define UNLOCK_ERROR        0x1100   /* return value is 0x1100 + philips ISP returned value (0 to 255) */
-#define WRONG_ANSWER_PREP   0x1200   /* return value is 0x1200 + philips ISP returned value (0 to 255) */
-#define WRONG_ANSWER_ERAS   0x1300   /* return value is 0x1300 + philips ISP returned value (0 to 255) */
-#define WRONG_ANSWER_WRIT   0x1400   /* return value is 0x1400 + philips ISP returned value (0 to 255) */
-#define WRONG_ANSWER_PREP2  0x1500   /* return value is 0x1500 + philips ISP returned value (0 to 255) */
-#define WRONG_ANSWER_COPY   0x1600   /* return value is 0x1600 + philips ISP returned value (0 to 255) */
-#define FAILED_RUN          0x1700   /* return value is 0x1700 + philips ISP returned value (0 to 255) */
-
-
-
-
-
-typedef unsigned char BINARY;   /**< data type used for microcontroller
-                                *  memory image.                        */
-
-/*
-debug levels
-0 - very quiet          - Nothing gets printed at this level
-1 - quiet               - Only error messages should be printed
-2 - indicate progress   - Add progress messages
-3 - first level debug   - Major level tracing
-4 - second level debug  - Add detailed debugging
-5 - log comm's          - log serial I/O
-*/
-
-typedef enum
-{
-    PHILIPS_ARM,
-    ANALOG_DEVICES_ARM
-} TARGET;
-
-typedef struct
-{
-    unsigned long id;
-    unsigned Product;
-    unsigned FlashSize;     /* in kiB, for informational purposes only */
-    unsigned RAMSize;       /* in kiB, for informational purposes only */
-    unsigned FlashSectors;  /* total number of sectors */
-    unsigned MaxCopySize;   /* maximum size that can be copied to Flash in a single command */
-    const int *SectorTable; /* pointer to a sector table with constant the sector sizes */
-} LPC_DEVICE_TYPE;
-
-typedef struct
-{
-
-#if !defined COMPILE_FOR_LPC21
-    TARGET micro;                      /**< The type of micro that will be
-                                         * programmed.                           */
-    int debug_level;
-    unsigned char TerminalAfterUpload;
-    unsigned char FormatHex;
-    unsigned char ControlLines;
-    unsigned char LogFile;
-    char *input_file;                   /**< Name of the file to get input from. */
-    char *serial_port;                  /**< Name of the serial port to use to
-                                         * communicate with the microcontroller.
-                                         * Read from the command line.          */
-
-#endif // !defined COMPILE_FOR_LPC21
-    unsigned char TerminalOnly;
-    unsigned char DetectOnly;
-    unsigned char WipeDevice;
-    int           DetectedDevice;       /* index in LPCtypes[] array */
-    char *baud_rate;                    /**< Baud rate to use on the serial
-                                         * port communicating with the
-                                         * microcontroller. Read from the
-                                         * command line.                        */
-
-    char *StringOscillator;             /**< Holds representation of oscillator
-                                          * speed from the command line.         */
-    BINARY *BinaryContent;              /**< Binary image of the                 */
-                                        /* microcontroller's memory.             */
-    unsigned long BinaryLength;
-        unsigned long BinaryOffset;
-        unsigned long StartAddress;
-
-#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
-    HANDLE hCom;
-#endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
-
-#if defined COMPILE_FOR_LINUX || defined COMPILE_FOR_LPC21
-    int fdCom;
-#endif // defined COMPILE_FOR_LINUX || defined COMPILE_FOR_LPC21
-
-#if defined COMPILE_FOR_LINUX
-    struct termios oldtio, newtio;
-#endif // defined COMPILE_FOR_LINUX
-
-    unsigned serial_timeout_count;   /**< Local used to track
-                                      * timeouts on serial port read. */
-
-} ISP_ENVIRONMENT;
-
-
-static void DumpString(int level, const void *s, size_t size, const char *fmt, ...);
-static void SendComPort(ISP_ENVIRONMENT *IspEnvironment, const char *s);
-static void ReceiveComPort(ISP_ENVIRONMENT *IspEnvironment, void *Answer, unsigned long MaxSize, unsigned long *RealSize, unsigned long WantedNr0x0A,unsigned timeOutMilliseconds);
-static void PhilipsOutputErrorMessage(unsigned char ErrorNumber);
-static unsigned char GetErrorNumber(const char *Answer);
-static void SerialTimeoutSet(ISP_ENVIRONMENT *IspEnvironment, unsigned timeout_milliseconds);
-static void SerialTimeoutTick(ISP_ENVIRONMENT *IspEnvironment);
-static int SerialTimeoutCheck(ISP_ENVIRONMENT *IspEnvironment);
-
-#if !defined COMPILE_FOR_LPC21
-
-static int debug_level = 2;
-
-static void DebugPrintf( int level, const char *fmt, ...);
-static void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment);
-static void ControlModemLines(ISP_ENVIRONMENT *IspEnvironment, unsigned char DTR, unsigned char RTS);
-static unsigned char Ascii2Hex(unsigned char c);
-#endif
-
-static const int SectorTable_210x[] = { 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-                                        8192, 8192, 8192, 8192, 8192, 8192, 8192 };
-static const int SectorTable_2103[] = { 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096 };
-static const int SectorTable_211x[] = { 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-                                        8192, 8192, 8192, 8192, 8192, 8192, 8192, };
-static const int SectorTable_212x[] = { 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-                                        65536, 65536, 8192, 8192, 8192, 8192, 8192, 8192,
-                                        8192 };
-static const int SectorTable_213x[] = { 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
-                                        32768, 32768, 32768, 32768, 32768, 32768, 32768, 32768,
-                                        32768, 32768, 32768, 32768, 32768, 32768, 4096, 4096,
-                                        4096, 4096, 4096 };
-static int SectorTable_RAM[]  = { 65000 };
-
-static LPC_DEVICE_TYPE LPCtypes[] =
-{
-  { 0, 0, 0 },  /* unknown */
-  { 0x0004FF11, 2103,  32,  8,  8, 4096, SectorTable_2103 },
-  { 0xFFF0FF12, 2104, 128, 16, 15, 8192, SectorTable_210x },
-  { 0xFFF0FF22, 2105, 128, 32, 15, 8192, SectorTable_210x },
-  { 0xFFF0FF32, 2106, 128, 64, 15, 8192, SectorTable_210x },
-  { 0x0101FF12, 2114, 128, 16, 15, 8192, SectorTable_211x },
-  { 0x0201FF12, 2119, 128, 16, 15, 8192, SectorTable_211x },
-  { 0x0101FF13, 2124, 256, 16, 17, 8192, SectorTable_212x },
-  { 0x0201FF13, 2129, 256, 16, 17, 8192, SectorTable_212x },
-  { 0x0002FF01, 2131,  32,  8,  8, 4096, SectorTable_213x },
-  { 0x0002FF11, 2132,  64, 16,  9, 4096, SectorTable_213x },
-  { 0x0002FF12, 2134, 128, 16, 11, 4096, SectorTable_213x },
-  { 0x0002FF23, 2136, 256, 32, 15, 4096, SectorTable_213x },
-  { 0x0002FF25, 2138, 512, 32, 27, 4096, SectorTable_213x },
-  { 0x0402FF01, 2141,  32,  8,  8, 4096, SectorTable_213x },
-  { 0x0402FF11, 2142,  64, 16,  9, 4096, SectorTable_213x },
-  { 0x0402FF12, 2144, 128, 16, 11, 4096, SectorTable_213x },
-  { 0x0402FF23, 2146, 256, 40, 15, 4096, SectorTable_213x },
-  { 0x0402FF25, 2148, 512, 40, 27, 4096, SectorTable_213x },
-  { 0x0301FF13, 2194, 256, 16, 17, 8192, SectorTable_212x },
-  { 0x0301FF12, 2210,   0, 16,  0, 8192, SectorTable_211x }, /* table is a "don't care" */
-  { 0x0401FF12, 2212, 128, 16, 15, 8192, SectorTable_211x },
-  { 0x0601FF13, 2214, 256, 16, 17, 8192, SectorTable_212x },
-  /*            2290; same id as the LPC2210 */
-  { 0x0401FF13, 2292, 256, 16, 17, 8192, SectorTable_212x },
-  { 0x0501FF13, 2294, 256, 16, 17, 8192, SectorTable_212x },
-  { 0x0603FB02, 2364, 128, 34, 11, 4096, SectorTable_213x },
-  { 0x0603FB23, 2366, 256, 58, 15, 4096, SectorTable_213x },
-  { 0x0603FB25, 2368, 512, 58, 27, 4096, SectorTable_213x },
-  { 0x0703FF25, 2378, 512, 58, 27, 4096, SectorTable_213x },
-  /* { 0x0603FF35, 2458, 512, 98, 27, 4096, SectorTable_213x }, same id as 2468 ? */
-  { 0x0603FF35, 2468, 512, 98, 27, 4096, SectorTable_213x }
-};
 
 /************* Portability layer. Serial and console I/O differences    */
 /* are taken care of here.                                              */
 
-#if defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
-static int kbhit( void);
-static int getch( void);
-#endif // defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
-
-#if defined COMPILE_FOR_LINUX
-static void Sleep(unsigned long MilliSeconds);
-#endif // defined COMPILE_FOR_LINUX
-
-
-
-#if !defined COMPILE_FOR_LPC21
+#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 static void OpenSerialPort(ISP_ENVIRONMENT *IspEnvironment)
 {
-    // Open COM-Port (different between Windows and Linux)
-
-#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
     DCB    dcb;
     COMMTIMEOUTS commtimeouts;
@@ -454 +284 @@
     IspEnvironment->hCom = CreateFile(IspEnvironment->serial_port, GENERIC_READ | GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
 
-    if(IspEnvironment->hCom == INVALID_HANDLE_VALUE)
-    {
-        DebugPrintf( 1, "Can't open COM-Port %s ! - Error: %ld\n", IspEnvironment->serial_port, GetLastError());
+    if (IspEnvironment->hCom == INVALID_HANDLE_VALUE)
+    {
+        DebugPrintf(1, "Can't open COM-Port %s ! - Error: %ld\n", IspEnvironment->serial_port, GetLastError());
         exit(2);
     }
 
-    DebugPrintf( 3, "COM-Port %s opened...\n", IspEnvironment->serial_port);
+    DebugPrintf(3, "COM-Port %s opened...\n", IspEnvironment->serial_port);
 
     GetCommState(IspEnvironment->hCom, &dcb);
@@ -472 +302 @@
     dcb.fNull       = FALSE;
     dcb.fRtsControl = RTS_CONTROL_DISABLE;
-    if(SetCommState(IspEnvironment->hCom, &dcb) == 0)
-    {
-        DebugPrintf( 1, "Can't set baudrate %s ! - Error: %ld", IspEnvironment->baud_rate, GetLastError());
+
+    // added by Herbert Demmel - iF CTS line has the wrong state, we would never send anything!
+    dcb.fOutxCtsFlow = FALSE;
+    dcb.fOutxDsrFlow = FALSE;
+
+    if (SetCommState(IspEnvironment->hCom, &dcb) == 0)
+    {
+        DebugPrintf(1, "Can't set baudrate %s ! - Error: %ld", IspEnvironment->baud_rate, GetLastError());
         exit(3);
     }
 
-    SetCommMask(IspEnvironment->hCom,EV_RXCHAR | EV_TXEMPTY);
+   /*
+    *  Peter Hayward 02 July 2008
+    *
+    *  The following call is only needed if the WaitCommEvent
+    *  or possibly the GetCommMask functions are used.  They are
+    *  *not* in this implimentation.  However, under Windows XP SP2
+    *  on my laptop the use of this call causes XP to freeze (crash) while
+    *  this program is running, e.g. in section 5/6/7 ... of a largish
+    *  download.  Removing this *unnecessary* call fixed the problem.
+    *  At the same time I've added a call to SetupComm to request
+    *  (not necessarity honoured) the operating system to provide
+    *  large I/O buffers for high speed I/O without handshaking.
+    *
+    *   SetCommMask(IspEnvironment->hCom,EV_RXCHAR | EV_TXEMPTY);
+    */
+    SetupComm(IspEnvironment->hCom, 32000, 32000);
+
+    SetCommMask(IspEnvironment->hCom, EV_RXCHAR | EV_TXEMPTY);
 
     commtimeouts.ReadIntervalTimeout         = MAXDWORD;
@@ -486 +338 @@
     commtimeouts.WriteTotalTimeoutConstant   =    0;
     SetCommTimeouts(IspEnvironment->hCom, &commtimeouts);
-
+}
 #endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
 #if defined COMPILE_FOR_LINUX
-
-    IspEnvironment->fdCom = open(IspEnvironment->serial_port, O_RDWR | O_NOCTTY | O_NONBLOCK );
-
-    if(IspEnvironment->fdCom < 0)
-    {
-        DebugPrintf( 1, "Can't open COM-Port %s !\n", IspEnvironment->serial_port);
+static void OpenSerialPort(ISP_ENVIRONMENT *IspEnvironment)
+{
+    IspEnvironment->fdCom = open(IspEnvironment->serial_port, O_RDWR | O_NOCTTY | O_NONBLOCK);
+
+    if (IspEnvironment->fdCom < 0)
+    {
+        int err = errno;
+        DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, err, err);
         exit(2);
     }
 
-    DebugPrintf( 3, "COM-Port %s opened...\n", IspEnvironment->serial_port);
-
-        /* clear input & output buffers, then switch to "blocking mode" */
-        tcflush(IspEnvironment->fdCom, TCOFLUSH);
-        tcflush(IspEnvironment->fdCom, TCIFLUSH);
-        fcntl(IspEnvironment->fdCom, F_SETFL, fcntl(IspEnvironment->fdCom, F_GETFL) & ~O_NONBLOCK);
+    DebugPrintf(3, "COM-Port %s opened...\n", IspEnvironment->serial_port);
+
+    /* clear input & output buffers, then switch to "blocking mode" */
+    tcflush(IspEnvironment->fdCom, TCOFLUSH);
+    tcflush(IspEnvironment->fdCom, TCIFLUSH);
+    fcntl(IspEnvironment->fdCom, F_SETFL, fcntl(IspEnvironment->fdCom, F_GETFL) & ~O_NONBLOCK);
 
     tcgetattr(IspEnvironment->fdCom, &IspEnvironment->oldtio); /* save current port settings */
@@ -512 +366 @@
 
 #ifdef __APPLE__
-#define NEWTERMIOS_SETBAUDARTE(bps)     IspEnvironment->newtio.c_ispeed = IspEnvironment->newtio.c_ospeed = bps;
+#define NEWTERMIOS_SETBAUDARTE(bps) IspEnvironment->newtio.c_ispeed = IspEnvironment->newtio.c_ospeed = bps;
+
+#elif __FreeBSD__
+
+        if(cfsetspeed(&IspEnvironment->newtio,(speed_t) strtol(IspEnvironment->baud_rate,NULL,10))) {
+                  DebugPrintf(1, "baudrate %s not supported\n", IspEnvironment->baud_rate);
+                  exit(3);
+              };
 #else
-#define NEWTERMIOS_SETBAUDARTE(bps)     IspEnvironment->newtio.c_cflag |= bps;
-#endif
-
-    switch(atol(IspEnvironment->baud_rate))
+#define NEWTERMIOS_SETBAUDARTE(bps) IspEnvironment->newtio.c_cflag |= bps;
+
+    switch (atol(IspEnvironment->baud_rate))
     {
 #ifdef B1152000
-        case 1152000: NEWTERMIOS_SETBAUDARTE( B1152000 ); break;
+          case 1152000: NEWTERMIOS_SETBAUDARTE(B1152000); break;
 #endif // B1152000
 #ifdef B576000
-        case  576000: NEWTERMIOS_SETBAUDARTE( B576000 ); break;
+          case  576000: NEWTERMIOS_SETBAUDARTE(B576000); break;
 #endif // B576000
 #ifdef B230400
-        case  230400: NEWTERMIOS_SETBAUDARTE( B230400 ); break;
+          case  230400: NEWTERMIOS_SETBAUDARTE(B230400); break;
 #endif // B230400
 #ifdef B115200
-        case  115200: NEWTERMIOS_SETBAUDARTE( B115200 ); break;
+          case  115200: NEWTERMIOS_SETBAUDARTE(B115200); break;
 #endif // B115200
 #ifdef B57600
-        case   57600: NEWTERMIOS_SETBAUDARTE( B57600 ); break;
+          case   57600: NEWTERMIOS_SETBAUDARTE(B57600); break;
 #endif // B57600
 #ifdef B38400
-        case   38400: NEWTERMIOS_SETBAUDARTE( B38400 ); break;
+          case   38400: NEWTERMIOS_SETBAUDARTE(B38400); break;
 #endif // B38400
 #ifdef B19200
-        case   19200: NEWTERMIOS_SETBAUDARTE( B19200 ); break;
+          case   19200: NEWTERMIOS_SETBAUDARTE(B19200); break;
 #endif // B19200
 #ifdef B9600
-        case    9600: NEWTERMIOS_SETBAUDARTE( B9600 ); break;
+          case    9600: NEWTERMIOS_SETBAUDARTE(B9600); break;
 #endif // B9600
-        default:
-        {
-            DebugPrintf( 1, "unknown baudrate %s\n", IspEnvironment->baud_rate);
-            exit(3);
-        }
-    }
+          default:
+              {
+                  DebugPrintf(1, "unknown baudrate %s\n", IspEnvironment->baud_rate);
+                  exit(3);
+              }
+    }
+
+#endif
 
     IspEnvironment->newtio.c_iflag = IGNPAR | IGNBRK | IXON | IXOFF;
@@ -561 +423 @@
 
     tcflush(IspEnvironment->fdCom, TCIFLUSH);
-    tcsetattr(IspEnvironment->fdCom, TCSANOW, &IspEnvironment->newtio);
-
+    if(tcsetattr(IspEnvironment->fdCom, TCSANOW, &IspEnvironment->newtio))
+    {
+       DebugPrintf(1, "Could not change serial port behaviour (wrong baudrate?)\n");
+       exit(3);
+    }
+
+}
 #endif // defined COMPILE_FOR_LINUX
-}
-
+
+#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 static void CloseSerialPort(ISP_ENVIRONMENT *IspEnvironment)
 {
-#if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
-
     CloseHandle(IspEnvironment->hCom);
+}
 
 #endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
 #if defined COMPILE_FOR_LINUX
-
-        tcflush(IspEnvironment->fdCom, TCOFLUSH);
-        tcflush(IspEnvironment->fdCom, TCIFLUSH);
+static void CloseSerialPort(ISP_ENVIRONMENT *IspEnvironment)
+{
+    tcflush(IspEnvironment->fdCom, TCOFLUSH);
+    tcflush(IspEnvironment->fdCom, TCIFLUSH);
     tcsetattr(IspEnvironment->fdCom, TCSANOW, &IspEnvironment->oldtio);
 
     close(IspEnvironment->fdCom);
-
+}
 #endif // defined COMPILE_FOR_LINUX
-}
-
-#endif // !defined COMPILE_FOR_LPC21
+
 
 /***************************** SendComPortBlock *************************/
@@ -592 +457 @@
 \param [in] n size of the block.
 */
-static void SendComPortBlock(ISP_ENVIRONMENT *IspEnvironment, const void *s, size_t n)
+void SendComPortBlock(ISP_ENVIRONMENT *IspEnvironment, const void *s, size_t n)
 {
 #if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
     unsigned long realsize;
-
+    size_t m;
+    unsigned long rxsize;
+    char * pch;
+    char * rxpch;
 #endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
-    DumpString( 4, s, n, "Sending ");
+    DumpString(4, s, n, "Sending ");
 
 #if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
-    WriteFile(IspEnvironment->hCom, s, n, &realsize, NULL);
-
+    if (IspEnvironment->HalfDuplex == 0)
+        WriteFile(IspEnvironment->hCom, s, n, &realsize, NULL);
+    else
+    {
+        pch = (char *)s;
+        rxpch = RxTmpBuf;
+        pRxTmpBuf = RxTmpBuf;
+
+        // avoid buffer otherflow
+        if (n > sizeof (RxTmpBuf))
+            n = sizeof (RxTmpBuf);
+
+        for (m = 0; m < n; m++)
+        {
+            WriteFile(IspEnvironment->hCom, pch, 1, &realsize, NULL);
+
+            if ((*pch != '?') || (n != 1))
+            {
+                do
+                {
+                    ReadFile(IspEnvironment->hCom, rxpch, 1, &rxsize, NULL);
+                }while (rxsize == 0);
+            }
+            pch++;
+            rxpch++;
+        }
+        *rxpch = 0;        // terminate echo string
+    }
 #endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
@@ -619 +513 @@
 \param [in] s string to send.
 */
-static void SendComPort(ISP_ENVIRONMENT *IspEnvironment, const char *s)
-{
-    SendComPortBlock( IspEnvironment, s, strlen(s));
+void SendComPort(ISP_ENVIRONMENT *IspEnvironment, const char *s)
+{
+    SendComPortBlock(IspEnvironment, s, strlen(s));
+}
+
+/***************************** SerialTimeoutTick ************************/
+/**  Performs a timer tick.  In this simple case all we do is count down
+with protection against underflow and wrapping at the low end.
+*/
+static void SerialTimeoutTick(ISP_ENVIRONMENT *IspEnvironment)
+{
+    if (IspEnvironment->serial_timeout_count <= 1)
+    {
+        IspEnvironment->serial_timeout_count = 0;
+    }
+    else
+    {
+        IspEnvironment->serial_timeout_count--;
+    }
 }
 
@@ -635 +545 @@
 buffer that is actually used.
 */
-static void ReceiveComPortBlock( ISP_ENVIRONMENT *IspEnvironment,
-                                 void *answer, unsigned long max_size,
-                                 unsigned long *real_size)
-{
+static void ReceiveComPortBlock(ISP_ENVIRONMENT *IspEnvironment,
+                                          void *answer, unsigned long max_size,
+                                          unsigned long *real_size)
+{
+    char tmp_string[32];
 
 #if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
-    ReadFile(IspEnvironment->hCom, answer, max_size, real_size, NULL);
+    if (IspEnvironment->HalfDuplex == 0)
+        ReadFile(IspEnvironment->hCom, answer, max_size, real_size, NULL);
+    else
+    {
+        *real_size = strlen (pRxTmpBuf);
+        if (*real_size)
+        {
+            if (max_size >= *real_size)
+            {
+                strncpy((char*) answer, pRxTmpBuf, *real_size);
+                RxTmpBuf[0] = 0;
+                pRxTmpBuf = RxTmpBuf;
+            }
+            else
+            {
+                strncpy((char*) answer, pRxTmpBuf, max_size);
+                *real_size = max_size;
+                pRxTmpBuf += max_size;
+            }
+        }
+        else
+            ReadFile(IspEnvironment->hCom, answer, max_size, real_size, NULL);
+    }
 
 #endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
@@ -652 +585 @@
 #endif // defined COMPILE_FOR_LINUX
 
-
-    DumpString( 5, answer, (*real_size), "Read(Length=%ld): ", (*real_size));
-
-    if( *real_size == 0)
-    {
-        SerialTimeoutTick( IspEnvironment );
+    sprintf(tmp_string, "Read(Length=%ld): ", (*real_size));
+    DumpString(5, answer, (*real_size), tmp_string);
+
+    if (*real_size == 0)
+    {
+        SerialTimeoutTick(IspEnvironment);
     }
 }
@@ -676 +609 @@
 static void SerialTimeoutSet(ISP_ENVIRONMENT *IspEnvironment, unsigned timeout_milliseconds)
 {
-
 #if defined COMPILE_FOR_LINUX
-    IspEnvironment->serial_timeout_count = timeout_milliseconds/100;
+    IspEnvironment->serial_timeout_count = timeout_milliseconds / 100;
 #elif defined COMPILE_FOR_LPC21
-    IspEnvironment->serial_timeout_count = timeout_milliseconds*200;
+    IspEnvironment->serial_timeout_count = timeout_milliseconds * 200;
 #else
     IspEnvironment->serial_timeout_count = timeout_milliseconds;
@@ -686 +618 @@
 }
 
-/***************************** SerialTimeoutTick ************************/
-/**  Performs a timer tick.  In this simple case all we do is count down
-with protection against underflow and wrapping at the low end.
-*/
-static void SerialTimeoutTick(ISP_ENVIRONMENT *IspEnvironment)
-{
-    if( IspEnvironment->serial_timeout_count <= 1)
-    {
-        IspEnvironment->serial_timeout_count = 0;
-    }
-    else
-    {
-        IspEnvironment->serial_timeout_count--;
-    }
-}
+
 
 /***************************** SerialTimeoutCheck ***********************/
@@ -709 +627 @@
 static int SerialTimeoutCheck(ISP_ENVIRONMENT *IspEnvironment)
 {
-    if( IspEnvironment->serial_timeout_count == 0)
+    if (IspEnvironment->serial_timeout_count == 0)
     {
         return 1;
@@ -723 +641 @@
 \return The character read from the keyboard.
 */
-static int getch(void)
+int getch(void)
 {
     char ch;
-    struct termios origtty, tty;
-
-    /* store the current tty settings */
-    tcgetattr(0, &origtty);
-
-    /* start with the current settings */
-    tty = origtty;
-    /* make modifications to put it in raw mode, turn off echo */
-    tty.c_lflag &= ~ICANON;
-    tty.c_lflag &= ~ECHO;
-    tty.c_lflag &= ~ISIG;
-    tty.c_cc[VMIN] = 1;
-    tty.c_cc[VTIME] = 0;
-
-    /* put the settings into effect */
-    tcsetattr(0, TCSADRAIN, &tty);
 
     /* Read in one character */
     read(0,&ch,1);
-
-    /* reset the tty to its original settings */
-    tcsetattr(0, TCSADRAIN, &origtty);
 
     return ch;
@@ -760 +659 @@
 \retval 1 Characters from the console ready to be read.
 */
-static int kbhit(void)
+int kbhit(void)
 {
     /* return 0 for no key pressed, 1 for key pressed */
     int return_value = 0;
 
-    /* variables to store the current tty state, create a new one */
-    struct termios origtty, tty;
     /* time struct for the select() function, to only wait a little while */
     struct timeval select_time;
@@ -776 +673 @@
     FD_SET(STDIN_FILENO, &readset);
 
-    /* store the current tty settings */
-    tcgetattr(0, &origtty);
-
-    /* start with the current settings */
-    tty = origtty;
-    /* make modifications to put it in raw mode, turn off echo */
-    tty.c_lflag &= ~ICANON;
-    tty.c_lflag &= ~ECHO;
-    tty.c_lflag &= ~ISIG;
-    tty.c_cc[VMIN] = 1;
-    tty.c_cc[VTIME] = 0;
-
-    /* put the settings into effect */
-    tcsetattr(0, TCSADRAIN, &tty);
-
     /* how long to block for - this must be > 0.0, but could be changed
-       to some other setting. 10-18msec seems to work well and only
-       minimally load the system (0% CPU loading) */
+    to some other setting. 10-18msec seems to work well and only
+    minimally load the system (0% CPU loading) */
     select_time.tv_sec = 0;
     select_time.tv_usec = 10;
@@ -804 +686 @@
     }
 
-    /* reset the tty to its original settings */
-    tcsetattr(0, TCSADRAIN, &origtty);
 
     /* return with what we found out */
     return return_value;
 }
+struct termios keyboard_origtty;
 #endif // defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
+
+
+/***************************** PrepareKeyboardTtySettings ***************/
+/** Set the keyboard tty to be able to check for new characters via kbhit
+getting them via getch
+*/
+
+void PrepareKeyboardTtySettings(void)
+{
+#if defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
+    /* store the current tty settings */
+    if (!tcgetattr(0, &keyboard_origtty))
+    {
+        struct termios tty;
+        /* start with the current settings */
+        tty = keyboard_origtty;
+        /* make modifications to put it in raw mode, turn off echo */
+        tty.c_lflag &= ~ICANON;
+        tty.c_lflag &= ~ECHO;
+        tty.c_lflag &= ~ISIG;
+        tty.c_cc[VMIN] = 1;
+        tty.c_cc[VTIME] = 0;
+
+        /* put the settings into effect */
+        tcsetattr(0, TCSADRAIN, &tty);
+    }
+#endif
+}
+
+
+/***************************** ResetKeyboardTtySettings *****************/
+/** Reset the keyboard tty to original settings
+*/
+void ResetKeyboardTtySettings(void)
+{
+#if defined COMPILE_FOR_LINUX || defined COMPILE_FOR_CYGWIN
+    /* reset the tty to its original settings */
+    tcsetattr(0, TCSADRAIN, &keyboard_origtty);
+#endif
+}
 
 
@@ -823 +744 @@
 static void ControlModemLines(ISP_ENVIRONMENT *IspEnvironment, unsigned char DTR, unsigned char RTS)
 {
+    //handle wether to invert the control lines:
+    DTR ^= IspEnvironment->ControlLinesInverted;
+    RTS ^= IspEnvironment->ControlLinesInverted;
+
+    //handle wether to swap the control lines
+    if (IspEnvironment->ControlLinesSwapped)
+    {
+        unsigned char tempRTS;
+        tempRTS = RTS;
+        RTS = DTR;
+        DTR = tempRTS;
+    }
+
 #if defined COMPILE_FOR_LINUX
     int status;
 
-    if(ioctl(IspEnvironment->fdCom, TIOCMGET, &status) == 0)
-    {
-        DebugPrintf( 1, "ioctl get ok, status = %X\n",status);
+    if (ioctl(IspEnvironment->fdCom, TIOCMGET, &status) == 0)
+    {
+        DebugPrintf(3, "ioctl get ok, status = %X\n",status);
     }
     else
     {
-        DebugPrintf( 1, "ioctl get failed\n");
-    }
-
-    if(DTR) status |=  TIOCM_DTR;
+        DebugPrintf(1, "ioctl get failed\n");
+    }
+
+    if (DTR) status |=  TIOCM_DTR;
     else    status &= ~TIOCM_DTR;
 
-    if(RTS) status |=  TIOCM_RTS;
+    if (RTS) status |=  TIOCM_RTS;
     else    status &= ~TIOCM_RTS;
 
-    if(ioctl(IspEnvironment->fdCom, TIOCMSET, &status) == 0)
-    {
-        DebugPrintf( 1, "ioctl set ok, status = %X\n",status);
+    if (ioctl(IspEnvironment->fdCom, TIOCMSET, &status) == 0)
+    {
+        DebugPrintf(3, "ioctl set ok, status = %X\n",status);
     }
     else
     {
-        DebugPrintf( 1, "ioctl set failed\n");
-    }
-
-    if(ioctl(IspEnvironment->fdCom, TIOCMGET, &status) == 0)
-    {
-        DebugPrintf( 1, "ioctl get ok, status = %X\n",status);
+        DebugPrintf(1, "ioctl set failed\n");
+    }
+
+    if (ioctl(IspEnvironment->fdCom, TIOCMGET, &status) == 0)
+    {
+        DebugPrintf(3, "ioctl get ok, status = %X\n",status);
     }
     else
     {
-        DebugPrintf( 1, "ioctl get failed\n");
+        DebugPrintf(1, "ioctl get failed\n");
     }
 
@@ -862 +796 @@
 #if defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
-    if(DTR) EscapeCommFunction(IspEnvironment->hCom, SETDTR);
+    if (DTR) EscapeCommFunction(IspEnvironment->hCom, SETDTR);
     else    EscapeCommFunction(IspEnvironment->hCom, CLRDTR);
 
-    if(RTS) EscapeCommFunction(IspEnvironment->hCom, SETRTS);
+    if (RTS) EscapeCommFunction(IspEnvironment->hCom, SETRTS);
     else    EscapeCommFunction(IspEnvironment->hCom, CLRRTS);
 
 #endif // defined COMPILE_FOR_WINDOWS || defined COMPILE_FOR_CYGWIN
 
-    DebugPrintf( 3, "DTR (%d), RTS (%d)\n", DTR, RTS);
+#if defined COMPILE_FOR_LPC21
+    LPC_RESET(DTR);
+    LPC_BSL(RTS);
+#endif
+
+    DebugPrintf(3, "DTR (%d), RTS (%d)\n", DTR, RTS);
 }
 
@@ -877 +816 @@
 /**  Empty the serial port buffers.  Cleans things to a known state.
 */
-static void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment)
+void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment)
 {
 #if defined COMPILE_FOR_LINUX
@@ -887 +826 @@
 
     // Flush input and output buffers
+    tty=origtty;
     tcsetattr(IspEnvironment->fdCom, TCSAFLUSH, &tty);
 
@@ -904 +844 @@
 \param [in] Milliseconds the time to wait for in milliseconds.
 */
-static void Sleep(unsigned long MilliSeconds)
+void Sleep(unsigned long MilliSeconds)
 {
     usleep(MilliSeconds*1000); //convert to microseconds
@@ -934 +874 @@
 debugging information being sent.
 \param [in] level the debug level of the print statement, if the level
- is less than or equal to the current debug level it will be printed.
+is less than or equal to the current debug level it will be printed.
 \param [in] fmt a standard printf style format string.
 \param [in] ... the usual printf parameters.
 */
-static void DebugPrintf( int level, const char *fmt, ...)
+#if !defined INTEGRATED_IN_WIN_APP
+void DebugPrintf(int level, const char *fmt, ...)
 {
     va_list ap;
 
-    if( level <= debug_level)
-    {
-        va_start( ap, fmt);
-        vprintf( fmt, ap);
-        va_end( ap);
-        fflush( stdout);
-    }
-}
+    if (level <= debug_level)
+    {
+        char pTemp[2000];
+        va_start(ap, fmt);
+        //vprintf(fmt, ap);
+        vsprintf(pTemp, fmt, ap);
+        TRACE(pTemp);
+        va_end(ap);
+        fflush(stdout);
+    }
+}
+#endif
 #endif // !defined COMPILE_FOR_LPC21
 
@@ -967 +912 @@
 reading with an incomplete buffer.
 */
-static void ReceiveComPort( ISP_ENVIRONMENT *IspEnvironment,
-                            void *Ans, unsigned long MaxSize,
-                            unsigned long *RealSize, unsigned long WantedNr0x0A,
-                            unsigned timeOutMilliseconds)
+void ReceiveComPort(ISP_ENVIRONMENT *IspEnvironment,
+                                    const char *Ans, unsigned long MaxSize,
+                                    unsigned long *RealSize, unsigned long WantedNr0x0A,
+                                    unsigned timeOutMilliseconds)
 {
     unsigned long tmp_realsize;
@@ -976 +921 @@
     int eof = 0;
     unsigned long p;
-    signed char *Answer;
-
-    Answer = Ans;
-
-    SerialTimeoutSet( IspEnvironment, timeOutMilliseconds);
+    unsigned char *Answer;
+    char tmp_string[32];
+
+    Answer = (unsigned char*) Ans;
+
+    SerialTimeoutSet(IspEnvironment, timeOutMilliseconds);
 
     (*RealSize) = 0;
@@ -986 +932 @@
     do
     {
-        ReceiveComPortBlock( IspEnvironment, Answer + (*RealSize), MaxSize - 1 - (*RealSize), &tmp_realsize);
-
-        if(tmp_realsize != 0)
+        ReceiveComPortBlock(IspEnvironment, Answer + (*RealSize), MaxSize - 1 - (*RealSize), &tmp_realsize);
+
+        if (tmp_realsize != 0)
         {
-            for(p = (*RealSize); p < (*RealSize) + tmp_realsize; p++)
-            {
-                if(Answer[p] == 0x0a)
+            for (p = (*RealSize); p < (*RealSize) + tmp_realsize; p++)
+            {
+                if (Answer[p] == 0x0a)
                 {
                     nr_of_0x0A++;
                 }
-                else if( Answer[p] < 0 )
+                else if (((signed char) Answer[p]) < 0)
                 {
                     eof = 1;
@@ -1005 +951 @@
         (*RealSize) += tmp_realsize;
 
-    } while(((*RealSize) < MaxSize) && (SerialTimeoutCheck(IspEnvironment) == 0) && (nr_of_0x0A < WantedNr0x0A) && !eof);
+    } while (((*RealSize) < MaxSize) && (SerialTimeoutCheck(IspEnvironment) == 0) && (nr_of_0x0A < WantedNr0x0A) && !eof);
 
     Answer[(*RealSize)] = 0;
 
-    DumpString( 3, Answer, (*RealSize), "Answer(Length=%ld): ", (*RealSize));
+    sprintf(tmp_string, "Answer(Length=%ld): ", (*RealSize));
+    DumpString(3, Answer, (*RealSize), tmp_string);
 }
 
@@ -1024 +971 @@
 \return 0 if successful, non-zero otherwise.
 */
-static int ReceiveComPortBlockComplete( ISP_ENVIRONMENT *IspEnvironment,
-                                        void *block, size_t size, unsigned timeout)
+int ReceiveComPortBlockComplete(ISP_ENVIRONMENT *IspEnvironment,
+                                                    void *block, size_t size, unsigned timeout)
 {
     unsigned long realsize = 0, read;
     char *result;
-
-    result = block;
-
-    SerialTimeoutSet( IspEnvironment, timeout);
+    char tmp_string[32];
+
+    result = (char*) block;
+
+    SerialTimeoutSet(IspEnvironment, timeout);
 
     do
     {
-        ReceiveComPortBlock( IspEnvironment, result + realsize, size - realsize, &read);
+        ReceiveComPortBlock(IspEnvironment, result + realsize, size - realsize, &read);
 
         realsize += read;
 
-    } while((realsize < size) && (SerialTimeoutCheck(IspEnvironment) == 0));
-
-    DumpString( 3, result, realsize, "Answer(Length=%ld): ", realsize);
-
-    if( realsize != size)
+    } while ((realsize < size) && (SerialTimeoutCheck(IspEnvironment) == 0));
+
+    sprintf(tmp_string, "Answer(Length=%ld): ", realsize);
+    DumpString(3, result, realsize, tmp_string);
+
+    if (realsize != size)
     {
         return 1;
@@ -1059 +1008 @@
 \param [in] argv an array of pointers to the arguments.
 */
-static void ReadArguments(ISP_ENVIRONMENT *IspEnvironment, int argc, char *argv[])
-{
-    int i;
-
-    if(argc >= 5)
-    {
-        for(i = 1; i < argc - 4; i++)
+static void ReadArguments(ISP_ENVIRONMENT *IspEnvironment, unsigned int argc, char *argv[])
+{
+    unsigned int i;
+
+    if (argc >= 5)
+    {
+        for (i = 1; i < argc - 4; i++)
         {
-            if(stricmp(argv[i], "-wipe") == 0)
-            {
-                 IspEnvironment->WipeDevice = 1;
-                 DebugPrintf( 3, "Wipe entire device before writing.\n");
-            }
-            if(stricmp(argv[i], "-bin") == 0)
-            {
-                 IspEnvironment->FormatHex = 0;
-                 DebugPrintf( 3, "Binary format file input.\n");
-            }
-            else if(stricmp(argv[i], "-hex") == 0)
-            {
-                 IspEnvironment->FormatHex = 1;
-                 DebugPrintf( 3, "Hex format file input.\n");
-            }
-            else if(stricmp(argv[i], "-term") == 0)
-            {
-                 IspEnvironment->TerminalAfterUpload = 1;
-                 DebugPrintf( 3, "Invoke terminal after upload.\n");
-            }
-            else if(stricmp(argv[i], "-termonly") == 0)
-            {
-                 IspEnvironment->TerminalOnly = 1;
-                 DebugPrintf( 3, "Only provide terminal.\n");
-            }
-            else if(stricmp(argv[i], "-detectonly") == 0)
-            {
-                 IspEnvironment->DetectOnly = 1;
-                 DebugPrintf( 3, "Only detect LPC chip part id.\n");
-            }
-            else if(stricmp(argv[i], "-debug") == 0)
-            {
-                 debug_level = 4;
-                 DebugPrintf( 3, "Turn on debug.\n");
-            }
-            else if(stricmp(argv[i], "-control") == 0)
-            {
-                 IspEnvironment->ControlLines = 1;
-                 DebugPrintf( 3, "Use RTS/DTR to control target state.\n");
-            }
-            else if(stricmp(argv[i], "-logfile") == 0)
-            {
-                 IspEnvironment->LogFile = 1;
-                 DebugPrintf( 3, "Log terminal output.\n");
-            }
-            else if( stricmp( argv[i], "-ADARM") == 0)
+            if (stricmp(argv[i], "-wipe") == 0)
+            {
+                IspEnvironment->WipeDevice = 1;
+                DebugPrintf(3, "Wipe entire device before writing.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-bin") == 0)
+            {
+                IspEnvironment->FileFormat = FORMAT_BINARY;
+                DebugPrintf(3, "Binary format file input.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-hex") == 0)
+            {
+                IspEnvironment->FileFormat = FORMAT_HEX;
+                DebugPrintf(3, "Hex format file input.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-logfile") == 0)
+            {
+                IspEnvironment->LogFile = 1;
+                DebugPrintf(3, "Log terminal output.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-detectonly") == 0)
+            {
+                IspEnvironment->DetectOnly  = 1;
+                IspEnvironment->ProgramChip = 0;
+                DebugPrintf(3, "Only detect LPC chip part id.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-debug") == 0)
+            {
+                debug_level = 4;
+                DebugPrintf(3, "Turn on debug.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-control") == 0)
+            {
+                IspEnvironment->ControlLines = 1;
+                DebugPrintf(3, "Use RTS/DTR to control target state.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-controlswap") == 0)
+            {
+                IspEnvironment->ControlLinesSwapped = 1;
+                DebugPrintf(3, "Use RTS to control reset, and DTR to control P0.14(ISP).\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-controlinv") == 0)
+            {
+                IspEnvironment->ControlLinesInverted = 1;
+                DebugPrintf(3, "Invert state of RTS & DTR (0=true/assert/set, 1=false/deassert/clear).\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-halfduplex") == 0)
+            {
+                IspEnvironment->HalfDuplex = 1;
+                DebugPrintf(3, "halfduplex serial communication.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-ADARM") == 0)
             {
                 IspEnvironment->micro = ANALOG_DEVICES_ARM;
-                DebugPrintf( 2, "Target: Analog Devices.\n");
-            }
-            else if( stricmp( argv[i], "-PHILIPSARM") == 0)
+                DebugPrintf(2, "Target: Analog Devices.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-PHILIPSARM") == 0)
             {
                 IspEnvironment->micro = PHILIPS_ARM;
-                DebugPrintf( 2, "Target: Philips.\n");
-            }
-            else
-            {
-                DebugPrintf( 2, "Unknown command line option: \"%s\"\n", argv[i]);
-            }
+                DebugPrintf(2, "Target: Philips.\n");
+                continue;
+            }
+
+            if (stricmp(argv[i], "-Verify") == 0)
+            {
+                IspEnvironment->Verify = 1;
+                DebugPrintf(2, "Verify after copy RAM to Flash.\n");
+                continue;
+            }
+
+#ifdef INTEGRATED_IN_WIN_APP
+            if (stricmp(argv[i], "-nosync") == 0)
+            {
+                IspEnvironment->NoSync = 1;
+                DebugPrintf(2, "Performing no syncing, already done.\n");
+                continue;
+            }
+#endif
+
+#ifdef TERMINAL_SUPPORT
+            if (CheckTerminalParameters(IspEnvironment, argv[i]))
+            {
+                continue;
+            }
+#endif
+
+            DebugPrintf(2, "Unknown command line option: \"%s\"\n", argv[i]);
         }
 
         IspEnvironment->input_file = argv[argc - 4];
-        IspEnvironment->StringOscillator = argv[argc - 1];
+
+        // Newest cygwin delivers a '\x0d' at the end of argument
+        // when calling lpc21isp from batch file
+        for (i = 0; i < strlen(argv[argc - 1]) && i < (sizeof(IspEnvironment->StringOscillator) - 1) &&
+            argv[argc - 1][i] >= '0' && argv[argc - 1][i] <= '9'; i++)
+        {
+            IspEnvironment->StringOscillator[i] = argv[argc - 1][i];
+        }
+        IspEnvironment->StringOscillator[i] = 0;
+
         IspEnvironment->serial_port = argv[argc - 3];
         IspEnvironment->baud_rate = argv[argc - 2];
     }
 
-    if(argc < 5)
+    if (argc < 5)
     {
         debug_level = (debug_level < 2) ? 2 : debug_level;
     }
 
-    if(argc < 5)
-    {
-        DebugPrintf( 2, "\n");
-        DebugPrintf( 2, "Portable command line ISP for Philips LPC2000 family and \n");
-        DebugPrintf( 2, "Version " VERSION_STR "                 Analog Devices ADUC 70xx\n");
-        DebugPrintf( 2, "Compiled for %s: %s %s\n", COMPILED_FOR, __DATE__, __TIME__);
-        DebugPrintf( 2, "Copyright (c) by Martin Maurer, 2003-2005  Email: Martin.Maurer@clibb.de\n");
-        DebugPrintf( 2, "Portions Copyright (c) by Aeolus Development 2004\n");
-        DebugPrintf( 2, "                 http://www.aeolusdevelopment.com\n");
-        DebugPrintf( 2, "\n");
-
-        DebugPrintf( 1, "Syntax:  lpc21isp [Options] file comport baudrate Oscillator_in_kHz\n\n");
-        DebugPrintf( 1, "Example: lpc21isp test.hex com1 115200 14746\n\n");
-        DebugPrintf( 1, "Options: -bin           for uploading binary file\n");
-        DebugPrintf( 1, "         -hex           for uploading file in intel hex format (default)\n");
-        DebugPrintf( 1, "         -term          for starting terminal after upload\n");
-        DebugPrintf( 1, "         -termonly      for starting terminal without an upload\n");
-        DebugPrintf( 1, "         -detectonly    detect only used LPC chiptype (PHILIPSARM only)\n");
-        DebugPrintf( 1, "         -debug         for creating a lot of debug infos\n");
-        DebugPrintf( 1, "         -wipe          Erase entire device before upload\n");
-        DebugPrintf( 1, "         -control       for controlling RS232 lines for easier booting\n");
-        DebugPrintf( 1, "                        (Reset = DTR, EnableBootLoader = RTS)\n");
-        DebugPrintf( 1, "         -logfile       for enabling logging of terminal output to lpc21isp.log\n");
-        DebugPrintf( 1, "         -ADARM         for downloading to an Analog Devices\n");
-        DebugPrintf( 1, "                        ARM microcontroller ADUC70xx\n");
-        DebugPrintf( 1, "         -PHILIPSARM    for downloading to a microcontroller from\n");
-        DebugPrintf( 1, "                        Philips LPC2000 family (default)\n");
+    if (argc < 5)
+    {
+        DebugPrintf(2, "\n"
+                       "Portable command line ISP for NXP LPC2000 family and Analog Devices ADUC 70xx\n"
+                       "Version " VERSION_STR " compiled for " COMPILED_FOR ": " __DATE__ ", " __TIME__ "\n"
+                       "Copyright (c) by Martin Maurer, 2003-2008, Email: Martin.Maurer@clibb.de\n"
+                       "Portions Copyright (c) by Aeolus Development 2004, www.aeolusdevelopment.com\n"
+                       "\n");
+
+        DebugPrintf(1, "Syntax:  lpc21isp [Options] file comport baudrate Oscillator_in_kHz\n\n"
+                       "Example: lpc21isp test.hex com1 115200 14746\n\n"
+                       "Options: -bin         for uploading binary file\n"
+                       "         -hex         for uploading file in intel hex format (default)\n"
+                       "         -term        for starting terminal after upload\n"
+                       "         -termonly    for starting terminal without an upload\n"
+                       "         -localecho   for local echo in terminal\n"
+                       "         -detectonly  detect only used LPC chiptype (PHILIPSARM only)\n"
+                       "         -debug       for creating a lot of debug infos\n"
+                       "         -wipe        Erase entire device before upload\n"
+                       "         -control     for controlling RS232 lines for easier booting\n"
+                       "                      (Reset = DTR, EnableBootLoader = RTS)\n"
+#ifdef INTEGRATED_IN_WIN_APP
+                       "         -nosync      Do not synchronize device via '?'\n"
+#endif
+                       "         -controlswap swap RS232 control lines\n"
+                       "                      (Reset = RTS, EnableBootLoader = DTR)\n"
+                       "         -controlinv  Invert state of RTS & DTR \n"
+                       "                      (0=true/assert/set, 1=false/deassert/clear).\n"
+                       "         -verify      Verify the data in Flash after every writes to\n"
+                       "                      sector. To detect errors in writing to Flash ROM\n"
+                       "         -logfile     for enabling logging of terminal output to lpc21isp.log\n"
+                       "         -halfduplex  use halfduplex serial communication (i.e. with K-Line)\n"
+                       "         -ADARM       for downloading to an Analog Devices\n"
+                       "                      ARM microcontroller ADUC70xx\n"
+                       "         -PHILIPSARM  for downloading to a microcontroller from\n"
+                       "                      Philips LPC2000 family (default)\n");
 
         exit(1);
     }
 
-    if(IspEnvironment->micro == PHILIPS_ARM)
-    {
+    if (IspEnvironment->micro == PHILIPS_ARM)
+    {
+        // If StringOscillator is bigger than 100 MHz, there seems to be something wrong
         if (strlen(IspEnvironment->StringOscillator) > 5)
         {
-            DebugPrintf( 1, "Invalid crystal frequency %s",argv[argc - 1]);
+            DebugPrintf(1, "Invalid crystal frequency %s\n", IspEnvironment->StringOscillator);
             exit(1);
         }
     }
 }
-
-typedef enum
-{
-    PROGRAM_MODE,
-    RUN_MODE
-} TARGET_MODE;
 
 /***************************** ResetTarget ******************************/
@@ -1191 +1203 @@
 \param [in] mode the mode to leave the target in.
 */
-static void ResetTarget( ISP_ENVIRONMENT *IspEnvironment, TARGET_MODE mode)
-{
-
-    if(IspEnvironment->ControlLines)
-    {
-
-        switch( mode)
+void ResetTarget(ISP_ENVIRONMENT *IspEnvironment, TARGET_MODE mode)
+{
+    if (IspEnvironment->ControlLines)
+    {
+        switch (mode)
         {
-                /* Reset and jump to boot loader.                       */
-            case PROGRAM_MODE:
-                ControlModemLines(IspEnvironment, 1, 1);
-                Sleep(100);
-                ClearSerialPortBuffers(IspEnvironment);
-                Sleep(100);
-                ControlModemLines(IspEnvironment, 0, 1);
-                //Longer delay is the Reset signal is conected to an external rest controller
-                Sleep(500);
-                // Clear the RTS line after having reset the micro
-                // Needed for the "GO <Address> <Mode>" ISP command to work */
-                ControlModemLines(IspEnvironment, 0, 0);
-                break;
-
-                /* Reset and start uploaded program                     */
-            case RUN_MODE:
-                ControlModemLines(IspEnvironment, 1, 0);
-                Sleep(100);
-                ClearSerialPortBuffers(IspEnvironment);
-                Sleep(100);
-                ControlModemLines(IspEnvironment, 0, 0);
-                Sleep(100);
-                break;
+        /* Reset and jump to boot loader.                       */
+        case PROGRAM_MODE:
+            ControlModemLines(IspEnvironment, 1, 1);
+            Sleep(100);
+            ClearSerialPortBuffers(IspEnvironment);
+            Sleep(100);
+            ControlModemLines(IspEnvironment, 0, 1);
+            //Longer delay is the Reset signal is conected to an external rest controller
+            Sleep(500);
+            // Clear the RTS line after having reset the micro
+            // Needed for the "GO <Address> <Mode>" ISP command to work */
+            ControlModemLines(IspEnvironment, 0, 0);
+            break;
+
+        /* Reset and start uploaded program                     */
+        case RUN_MODE:
+            ControlModemLines(IspEnvironment, 1, 0);
+            Sleep(100);
+            ClearSerialPortBuffers(IspEnvironment);
+            Sleep(100);
+            ControlModemLines(IspEnvironment, 0, 0);
+            Sleep(100);
+            break;
         }
     }
 }
 
-/***************************** LoadFile *********************************/
-/**  Loads the requested file to download into memory.
-\param [in] IspEnvironment  structure containing input filename
-*/
-static void LoadFile(ISP_ENVIRONMENT *IspEnvironment)
-{
-    int fd;
-    int i;
-    int BinaryOffsetDefined;
-    unsigned long  Pos;
-    unsigned long  FileLength;
-    BINARY        *FileContent;              /**< Used to store the content of a hex */
-                                             /* file before converting to binary.    */
-    unsigned long BinaryMemSize;
-
-    fd = open(IspEnvironment->input_file, O_RDONLY | O_BINARY);
-    if(fd == -1)
-    {
-        DebugPrintf( 1, "Can't open file %s\n", IspEnvironment->input_file);
-        exit(1);
-    }
-
-    FileLength = lseek(fd, 0L, 2);      // Get file size
-
-    if(FileLength == (size_t)-1)
-    {
-        DebugPrintf( 1, "\nFileLength = -1 !?!\n");
-        exit(1);
-    }
-
-    lseek(fd, 0L, 0);
-
-    FileContent = malloc(FileLength);
-
-    BinaryMemSize = FileLength * 2;
-
-    IspEnvironment->BinaryLength = 0;   /* Increase length as needed.       */
-        IspEnvironment->BinaryOffset = 0;
-        IspEnvironment->StartAddress = 0;
-        BinaryOffsetDefined = 0;
-
-    IspEnvironment->BinaryContent = malloc(BinaryMemSize);
-
-    read(fd, FileContent, FileLength);
-
-    close(fd);
-
-    DebugPrintf( 2, "File %s:\n\tloaded...\n", IspEnvironment->input_file);
-
-        // Intel-Hex -> Binary Conversion
-
-    if(IspEnvironment->FormatHex != 0)
-    {
+
+/***************************** Ascii2Hex ********************************/
+/**  Converts a hex character to its equivalent number value. In case of an
+error rather abruptly terminates the program.
+\param [in] c the hex digit to convert.
+\return the value of the hex digit.
+*/
+static unsigned char Ascii2Hex(unsigned char c)
+{
+    if (c >= '0' && c <= '9')
+    {
+        return (unsigned char)(c - '0');
+    }
+
+    if (c >= 'A' && c <= 'F')
+    {
+        return (unsigned char)(c - 'A' + 10);
+    }
+
+    if (c >= 'a' && c <= 'f')
+    {
+        return (unsigned char)(c - 'a' + 10);
+    }
+
+    DebugPrintf(1, "Wrong Hex-Nibble %c (%02X)\n", c, c);
+    exit(1);
+
+    return 0;  // this "return" will never be reached, but some compilers give a warning if it is not present
+}
+
+void ReadHexFile(ISP_ENVIRONMENT *IspEnvironment)
+{
+    LoadFile(IspEnvironment);
+
+    if (IspEnvironment->BinaryLength)
+    {
+        BINARY* FileContent = IspEnvironment->FileContent;
+
+        unsigned long  Pos;
         unsigned char  RecordLength;
         unsigned short RecordAddress;
@@ -1284 +1280 @@
         unsigned char  RecordType;
         unsigned char  Hexvalue;
-                unsigned long  StartAddress;
-
-        DebugPrintf( 3, "Converting file %s to binary format...\n", IspEnvironment->input_file);
+        unsigned long  StartAddress;
+        int            BinaryOffsetDefined = 0;
+        unsigned char  i;
+
+
+        DebugPrintf(3, "Converting file %s to binary format...\n", IspEnvironment->input_file);
 
         Pos = 0;
-        while(Pos < FileLength)
+        while (Pos < IspEnvironment->BinaryLength)
         {
-            if(FileContent[Pos] == '\r')
+            if (FileContent[Pos] == '\r')
             {
                 Pos++;
@@ -1297 +1296 @@
             }
 
-            if(FileContent[Pos] == '\n')
+            if (FileContent[Pos] == '\n')
             {
                 Pos++;
@@ -1303 +1302 @@
             }
 
-            if(FileContent[Pos] != ':')
-            {
-                DebugPrintf( 1, "Missing start of record (':') wrong byte %c / %02X\n", FileContent[Pos], FileContent[Pos]);
+            if (FileContent[Pos] != ':')
+            {
+                DebugPrintf(1, "Missing start of record (':') wrong byte %c / %02X\n", FileContent[Pos], FileContent[Pos]);
                 exit(1);
             }
@@ -1315 +1314 @@
             RecordLength  |= Ascii2Hex(FileContent[Pos++]);
 
-            DebugPrintf( 4, "RecordLength = %02X\n", RecordLength);
+            DebugPrintf(4, "RecordLength = %02X\n", RecordLength);
 
             RecordAddress   = Ascii2Hex(FileContent[Pos++]);
@@ -1325 +1324 @@
             RecordAddress  |= Ascii2Hex(FileContent[Pos++]);
 
-            DebugPrintf( 4, "RecordAddress = %04X\n", RecordAddress);
+            DebugPrintf(4, "RecordAddress = %04X\n", RecordAddress);
 
             RealAddress = RealAddress - (RealAddress & 0xffff) + RecordAddress;
 
-            DebugPrintf( 4, "RealAddress = %08lX\n", RealAddress);
+            DebugPrintf(4, "RealAddress = %08lX\n", RealAddress);
 
             RecordType      = Ascii2Hex(FileContent[Pos++]);
@@ -1335 +1334 @@
             RecordType     |= Ascii2Hex(FileContent[Pos++]);
 
-            DebugPrintf( 4, "RecordType = %02X\n", RecordType);
-
-            if(RecordType == 0x00)          // 00 - Data record
-            {
-                                /*
-                                 * Binary Offset is defined as soon as first data record read
-                                 */
-                                BinaryOffsetDefined = 1;
-                                     // Memory for binary file big enough ?
-                while(RealAddress + RecordLength - IspEnvironment->BinaryOffset > BinaryMemSize)
-                {
-                    BinaryMemSize <<= 1;
-                    IspEnvironment->BinaryContent = realloc(IspEnvironment->BinaryContent, BinaryMemSize);
-                }
-
-                    // We need to know, what the highest address is,
-                    // how many bytes / sectors we must flash
-                if(RealAddress + RecordLength - IspEnvironment->BinaryOffset > IspEnvironment->BinaryLength)
+            DebugPrintf(4, "RecordType = %02X\n", RecordType);
+
+            if (RecordType == 0x00)          // 00 - Data record
+            {
+                /*
+                * Binary Offset is defined as soon as first data record read
+                */
+
+                //BinaryOffsetDefined = 1;
+
+                // Memory for binary file big enough ?
+                while ((RealAddress + RecordLength - IspEnvironment->BinaryOffset) > IspEnvironment->BinaryMemSize)
+                {
+                    IspEnvironment->BinaryMemSize <<= 1;    // Double the size allocated !!!
+                    IspEnvironment->BinaryContent = (BINARY*) realloc(IspEnvironment->BinaryContent, IspEnvironment->BinaryMemSize);
+                }
+
+                // We need to know, what the highest address is,
+                // how many bytes / sectors we must flash
+                if (RealAddress + RecordLength - IspEnvironment->BinaryOffset > IspEnvironment->BinaryLength)
                 {
                     IspEnvironment->BinaryLength = RealAddress + RecordLength - IspEnvironment->BinaryOffset;
-                    DebugPrintf( 3, "Image size now: %ld\n", IspEnvironment->BinaryLength);
-                }
-
-                for(i = 0; i < RecordLength; i++)
+                    DebugPrintf(3, "Image size now: %ld\n", IspEnvironment->BinaryLength);
+                }
+
+                for (i = 0; i < RecordLength; i++)
                 {
                     Hexvalue        = Ascii2Hex(FileContent[Pos++]);
@@ -1366 +1367 @@
                 }
             }
-            else if(RecordType == 0x01)     // 01 - End of file record
+            else if (RecordType == 0x01)     // 01 - End of file record
             {
                 break;
             }
-            else if(RecordType == 0x02)     // 02 - Extended segment address record
-            {
-                for(i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+            else if (RecordType == 0x02)     // 02 - Extended segment address record
+            {
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
                 {
                     RealAddress <<= 4;
-                    if(i == 0)
+                    if (i == 0)
                     {
                         RealAddress  = Ascii2Hex(FileContent[Pos++]);
@@ -1386 +1387 @@
                 RealAddress <<= 4;
             }
-            else if(RecordType == 0x03)     // 03 - Start segment address record
-            {
-                for(i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+            else if (RecordType == 0x03)     // 03 - Start segment address record
+            {
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
                 {
                     RealAddress <<= 4;
-                    if(i == 0)
+                    if (i == 0)
                     {
                         RealAddress  = Ascii2Hex(FileContent[Pos++]);
@@ -1402 +1403 @@
                 RealAddress <<= 8;
             }
-            else if(RecordType == 0x04)     // 04 - Extended linear address record, used by IAR
-            {
-                for(i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+            else if (RecordType == 0x04)     // 04 - Extended linear address record, used by IAR
+            {
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
                 {
                     RealAddress <<= 4;
-                    if(i == 0)
+                    if (i == 0)
                     {
                         RealAddress  = Ascii2Hex(FileContent[Pos++]);
@@ -1417 +1418 @@
                 }
                 RealAddress <<= 16;
-                                if(!BinaryOffsetDefined)
-                                {
-                                        // set startaddress of BinaryContent
-                                        // use of LPC_FLASHMASK to allow a memory range, not taking the first
-                                        // [04] record as actual start-address.
-                                        IspEnvironment->BinaryOffset = RealAddress & LPC_FLASHMASK;
-                                }
-                                else
-                                {
-                                        if((RealAddress & LPC_FLASHMASK) != IspEnvironment->BinaryOffset)
-                                        {
-                                                DebugPrintf(1, "New Extended Linear Address Record [04] out of memory range\n");
-                                                DebugPrintf(1, "Current Memory starts at: 0x%08X, new Address is: 0x%08X",
-                                                                   IspEnvironment->BinaryOffset, RealAddress);
-                                                exit(1);
-                                        }
-                                }
-            }
-            else if(RecordType == 0x05)     // 05 - Start linear address record
-            {
-                           StartAddress = 0;
-               for(i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+                if (!BinaryOffsetDefined)
+                {
+                    // set startaddress of BinaryContent
+                    // use of LPC_FLASHMASK to allow a memory range, not taking the first
+                    // [04] record as actual start-address.
+                    IspEnvironment->BinaryOffset = RealAddress & LPC_FLASHMASK;
+                }
+                else
+                {
+                    if ((RealAddress & LPC_FLASHMASK) != IspEnvironment->BinaryOffset)
+                    {
+                        DebugPrintf(1, "New Extended Linear Address Record [04] out of memory range\n"
+                                       "Current Memory starts at: 0x%08X, new Address is: 0x%08X",
+                                       IspEnvironment->BinaryOffset, RealAddress);
+                        exit(1);
+                    }
+                }
+            }
+            else if (RecordType == 0x05)     // 05 - Start linear address record
+            {
+                StartAddress = 0;
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
                 {
                     StartAddress <<= 4;
-                    if(i == 0)
+                    if (i == 0)
                     {
                         StartAddress  = Ascii2Hex(FileContent[Pos++]);
@@ -1450 +1451 @@
                     }
                 }
-                DebugPrintf( 1,"Start Address = 0x%8X\n", StartAddress);
+                DebugPrintf(1,"Start Address = 0x%8X\n", StartAddress);
                 IspEnvironment->StartAddress = StartAddress;
-              }
-
-            while(FileContent[Pos++] != 0x0a)      // Search till line end
+            }
+
+            while (FileContent[Pos++] != 0x0a)      // Search till line end
             {
             }
         }
 
-        DebugPrintf( 2, "\tconverted to binary format...\n");
-
-            // When debugging is switched on, output result of conversion to file debugout.bin
-        if(debug_level >= 4)
+        DebugPrintf(2, "\tconverted to binary format...\n");
+
+        // When debugging is switched on, output result of conversion to file debugout.bin
+        if (debug_level >= 4)
         {
             int fdout;
@@ -1470 +1471 @@
         }
     }
+}
+
+
+/***************************** LoadFile *********************************/
+/**  Loads the requested file to download into memory.
+\param [in] IspEnvironment  structure containing input filename
+*/
+static void LoadFile(ISP_ENVIRONMENT *IspEnvironment)
+{
+    int            fd;
+    int            i;
+    int            BinaryOffsetDefined;
+    unsigned long  Pos;
+    unsigned long  FileLength;
+    BINARY        *FileContent;              /**< Used to store the content of a hex */
+                                             /*   file before converting to binary.  */
+    unsigned long  BinaryMemSize;
+
+    fd = open(IspEnvironment->input_file, O_RDONLY | O_BINARY);
+    if (fd == -1)
+    {
+        DebugPrintf(1, "Can't open file %s\n", IspEnvironment->input_file);
+        exit(1);
+    }
+
+    FileLength = lseek(fd, 0L, 2);      // Get file size
+
+    if (FileLength == (size_t)-1)
+    {
+        DebugPrintf(1, "\nFileLength = -1 !?!\n");
+        exit(1);
+    }
+
+    lseek(fd, 0L, 0);
+
+    FileContent = (BINARY*) malloc(FileLength);
+
+    BinaryMemSize = FileLength * 2;
+
+    IspEnvironment->BinaryLength = 0;   /* Increase length as needed.       */
+    IspEnvironment->BinaryOffset = 0;
+    IspEnvironment->StartAddress = 0;
+    BinaryOffsetDefined = 0;
+
+    IspEnvironment->BinaryContent = (BINARY*) malloc(BinaryMemSize);
+
+    read(fd, FileContent, FileLength);
+
+    close(fd);
+
+    DebugPrintf(2, "File %s:\n\tloaded...\n", IspEnvironment->input_file);
+
+    // Intel-Hex -> Binary Conversion
+
+    if (IspEnvironment->FileFormat == FORMAT_HEX)
+    {
+        unsigned char  RecordLength;
+        unsigned short RecordAddress;
+        unsigned long  RealAddress = 0;
+        unsigned char  RecordType;
+        unsigned char  Hexvalue;
+        unsigned long  StartAddress;
+
+        DebugPrintf(3, "Converting file %s to binary format...\n", IspEnvironment->input_file);
+
+        Pos = 0;
+        while (Pos < FileLength)
+        {
+            if (FileContent[Pos] == '\r')
+            {
+                Pos++;
+                continue;
+            }
+
+            if (FileContent[Pos] == '\n')
+            {
+                Pos++;
+                continue;
+            }
+
+            if (FileContent[Pos] != ':')
+            {
+                DebugPrintf(1, "Missing start of record (':') wrong byte %c / %02X\n", FileContent[Pos], FileContent[Pos]);
+                exit(1);
+            }
+
+            Pos++;
+
+            RecordLength   = Ascii2Hex(FileContent[Pos++]);
+            RecordLength <<= 4;
+            RecordLength  |= Ascii2Hex(FileContent[Pos++]);
+
+            DebugPrintf(4, "RecordLength = %02X\n", RecordLength);
+
+            RecordAddress   = Ascii2Hex(FileContent[Pos++]);
+            RecordAddress <<= 4;
+            RecordAddress  |= Ascii2Hex(FileContent[Pos++]);
+            RecordAddress <<= 4;
+            RecordAddress  |= Ascii2Hex(FileContent[Pos++]);
+            RecordAddress <<= 4;
+            RecordAddress  |= Ascii2Hex(FileContent[Pos++]);
+
+            DebugPrintf(4, "RecordAddress = %04X\n", RecordAddress);
+
+            RealAddress = RealAddress - (RealAddress & 0xffff) + RecordAddress;
+
+            DebugPrintf(4, "RealAddress = %08lX\n", RealAddress);
+
+            RecordType      = Ascii2Hex(FileContent[Pos++]);
+            RecordType    <<= 4;
+            RecordType     |= Ascii2Hex(FileContent[Pos++]);
+
+            DebugPrintf(4, "RecordType = %02X\n", RecordType);
+
+            if (RecordType == 0x00)          // 00 - Data record
+            {
+                /*
+                * Binary Offset is defined as soon as first data record read
+                */
+                BinaryOffsetDefined = 1;
+                // Memory for binary file big enough ?
+                while (RealAddress + RecordLength - IspEnvironment->BinaryOffset > BinaryMemSize)
+                {
+                    BinaryMemSize <<= 1;
+                    IspEnvironment->BinaryContent = (BINARY*) realloc(IspEnvironment->BinaryContent, BinaryMemSize);
+                }
+
+                // We need to know, what the highest address is,
+                // how many bytes / sectors we must flash
+                if (RealAddress + RecordLength - IspEnvironment->BinaryOffset > IspEnvironment->BinaryLength)
+                {
+                    IspEnvironment->BinaryLength = RealAddress + RecordLength - IspEnvironment->BinaryOffset;
+                    DebugPrintf(3, "Image size now: %ld\n", IspEnvironment->BinaryLength);
+                }
+
+                for (i = 0; i < RecordLength; i++)
+                {
+                    Hexvalue        = Ascii2Hex(FileContent[Pos++]);
+                    Hexvalue      <<= 4;
+                    Hexvalue       |= Ascii2Hex(FileContent[Pos++]);
+                    IspEnvironment->BinaryContent[RealAddress + i - IspEnvironment->BinaryOffset] = Hexvalue;
+                }
+            }
+            else if (RecordType == 0x01)     // 01 - End of file record
+            {
+                break;
+            }
+            else if (RecordType == 0x02)     // 02 - Extended segment address record
+            {
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+                {
+                    RealAddress <<= 4;
+                    if (i == 0)
+                    {
+                        RealAddress  = Ascii2Hex(FileContent[Pos++]);
+                    }
+                    else
+                    {
+                        RealAddress |= Ascii2Hex(FileContent[Pos++]);
+                    }
+                }
+                RealAddress <<= 4;
+            }
+            else if (RecordType == 0x03)     // 03 - Start segment address record
+            {
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+                {
+                    RealAddress <<= 4;
+                    if (i == 0)
+                    {
+                        RealAddress  = Ascii2Hex(FileContent[Pos++]);
+                    }
+                    else
+                    {
+                        RealAddress |= Ascii2Hex(FileContent[Pos++]);
+                    }
+                }
+                RealAddress <<= 8;
+            }
+            else if (RecordType == 0x04)     // 04 - Extended linear address record, used by IAR
+            {
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+                {
+                    RealAddress <<= 4;
+                    if (i == 0)
+                    {
+                        RealAddress  = Ascii2Hex(FileContent[Pos++]);
+                    }
+                    else
+                    {
+                        RealAddress |= Ascii2Hex(FileContent[Pos++]);
+                    }
+                }
+                RealAddress <<= 16;
+                if (!BinaryOffsetDefined)
+                {
+                    // set startaddress of BinaryContent
+                    // use of LPC_FLASHMASK to allow a memory range, not taking the first
+                    // [04] record as actual start-address.
+                    IspEnvironment->BinaryOffset = RealAddress & LPC_FLASHMASK;
+                }
+                else
+                {
+                    if ((RealAddress & LPC_FLASHMASK) != IspEnvironment->BinaryOffset)
+                    {
+                        DebugPrintf(1, "New Extended Linear Address Record [04] out of memory range\n");
+                        DebugPrintf(1, "Current Memory starts at: 0x%08X, new Address is: 0x%08X",
+                            IspEnvironment->BinaryOffset, RealAddress);
+                        exit(1);
+                    }
+                }
+            }
+            else if (RecordType == 0x05)     // 05 - Start linear address record
+            {
+                StartAddress = 0;
+                for (i = 0; i < RecordLength * 2; i++)   // double amount of nibbles
+                {
+                    StartAddress <<= 4;
+                    if (i == 0)
+                    {
+                        StartAddress  = Ascii2Hex(FileContent[Pos++]);
+                    }
+                    else
+                    {
+                        StartAddress |= Ascii2Hex(FileContent[Pos++]);
+                    }
+                }
+                DebugPrintf(1,"Start Address = 0x%8X\n", StartAddress);
+                IspEnvironment->StartAddress = StartAddress;
+            }
+
+            while (FileContent[Pos++] != 0x0a)      // Search till line end
+            {
+            }
+        }
+
+        DebugPrintf(2, "\tconverted to binary format...\n");
+
+        // When debugging is switched on, output result of conversion to file debugout.bin
+        if (debug_level >= 4)
+        {
+            int fdout;
+            fdout = open("debugout.bin", O_RDWR | O_BINARY | O_CREAT | O_TRUNC, 0777);
+            write(fdout, IspEnvironment->BinaryContent, IspEnvironment->BinaryLength);
+            close(fdout);
+        }
+    }
     else
     {
@@ -1477 +1725 @@
     }
 
-    DebugPrintf( 2, "\timage size : %ld\n", IspEnvironment->BinaryLength);
-
-        // check length to flash for correct alignment, can happen with broken ld-scripts
+    DebugPrintf(2, "\timage size : %ld\n", IspEnvironment->BinaryLength);
+
+    // check length to flash for correct alignment, can happen with broken ld-scripts
     if (IspEnvironment->BinaryLength % 4 != 0)
     {
         unsigned long NewBinaryLength = ((IspEnvironment->BinaryLength + 3)/4) * 4;
 
-        DebugPrintf( 2, "Warning:  data not aligned to 32 bits, padded (length was %lX, now %lX)\n", IspEnvironment->BinaryLength, NewBinaryLength);
+        DebugPrintf(2, "Warning:  data not aligned to 32 bits, padded (length was %lX, now %lX)\n", IspEnvironment->BinaryLength, NewBinaryLength);
 
         IspEnvironment->BinaryLength = NewBinaryLength;
     }
-
-}
-
-
-#define ANALOG_DEVICES_SYNC_CHAR        ((BINARY)0x08)
-#define ANALOG_DEVICES_SYNC_RESPONSE    ("ADuC")
-#define ANALOG_DEVICES_SYNC_SIZE        (strlen( ANALOG_DEVICES_SYNC_RESPONSE))
-
-typedef struct {
-    BINARY product_id[15];
-    BINARY version[3];
-    BINARY reserved[4];
-    BINARY terminator[2];
-    } AD_SYNC_RESPONSE;
-
-/***************************** AnalogDevicesSync ************************/
-/**  Attempt to synchronize with an Analog Device ARM micro.  Sends a
-backspace and reads back the microcontrollers response.  Performs
-multiple retries. Exits the program on error, returns to caller in the
-case of success.
-*/
-static void AnalogDevicesSync(ISP_ENVIRONMENT *IspEnvironment)
-{
-    BINARY sync;                        /* Holds sync command.          */
-    AD_SYNC_RESPONSE response;          /* Response from micro.         */
-    int sync_attempts;                  /* Number of retries.           */
-
-        /*  Make sure we don't read garbage later instead of the        */
-        /* response we expect from the micro.                           */
+}
+#endif // !defined COMPILE_FOR_LPC21
+
+#ifndef COMPILE_FOR_LPC21
+int PerformActions(ISP_ENVIRONMENT *IspEnvironment)
+{
+    int downloadResult = -1;
+
+    DebugPrintf(2, "lpc21isp version " VERSION_STR "\n");
+
+    /* Download requested, read in the input file.                  */
+    if (IspEnvironment->ProgramChip)
+    {
+        LoadFile(IspEnvironment);
+    }
+
+    OpenSerialPort(IspEnvironment);   /* Open the serial port to the microcontroller. */
+
+    ResetTarget(IspEnvironment, PROGRAM_MODE);
+
     ClearSerialPortBuffers(IspEnvironment);
 
-    DebugPrintf( 2, "Synchronizing\n"); /* Progress report.             */
-
-    sync = ANALOG_DEVICES_SYNC_CHAR;    /* Build up sync command.       */
-
-        /*  Perform the actual sync attempt.  First send the sync       */
-        /* character, the attempt to read back the response.  For the   */
-        /* AD ARM micro this is a fixed length block.  If response is   */
-        /* received attempt to validate it by comparing the first       */
-        /* characters to those expected.  If the received block does    */
-        /* not validate or is incomplete empty the serial buffer and    */
-        /* retry.                                                       */
-    for(sync_attempts = 0; sync_attempts < 5; sync_attempts++)
-    {
-        SendComPortBlock( IspEnvironment, &sync, 1);
-
-        if( ReceiveComPortBlockComplete( IspEnvironment, &response, sizeof( response),
-            500) == 0)
+    /* Perform the requested download.                              */
+    if (IspEnvironment->ProgramChip || IspEnvironment->DetectOnly)
+    {
+        switch (IspEnvironment->micro)
         {
-
-            if( memcmp( response.product_id, ANALOG_DEVICES_SYNC_RESPONSE,
-                ANALOG_DEVICES_SYNC_SIZE) == 0)
-            {
-                return;
-            }
-            else
-            {
-                DumpString( 3, &response, sizeof(response),
-                    "Unexpected response to sync attempt ");
-            }
+#ifdef LPC_SUPPORT
+        case PHILIPS_ARM:
+            downloadResult = PhilipsDownload(IspEnvironment);
+            break;
+#endif
+
+#ifdef AD_SUPPORT
+        case ANALOG_DEVICES_ARM:
+            downloadResult = AnalogDevicesDownload(IspEnvironment);
+            break;
+#endif
         }
-        else
+
+        if (downloadResult != 0)
         {
-            DebugPrintf( 3, "No (or incomplete) answer on sync attempt\n");
+            CloseSerialPort(IspEnvironment);
+            exit(downloadResult);
         }
-
-        ClearSerialPortBuffers(IspEnvironment);
-    }
-
-    DebugPrintf( 1, "No (or unacceptable) answer on sync attempt\n");
-    exit(4);
-}
-
-typedef struct {
-    char start1;
-    char start2;
-    BINARY bytes;
-    char cmd;
-    BINARY address_h;
-    BINARY address_u;
-    BINARY address_m;
-    BINARY address_l;
-    BINARY data[251];
-    } AD_PACKET;
-
-/***************************** AnalogDevicesFormPacket ******************/
-/**  Create an Analog Devices communication packet from the constituent
-elements.
-\param [in] cmd The command being sent, one of 'E' for erase, 'W' for
-write, 'V' for verify or 'R' for run..
-\param [in] no_bytes the number of data bytes to send with the command in
-the packet.
-\param [in] address the address to apply the command to.
-\param [in] data the data to send with the packet, may be null if no_bytes
-is zero.
-\param[out] packet that will be filled.
-*/
-static void AnalogDevicesFormPacket( ISP_ENVIRONMENT *IspEnvironment,
-                                     char cmd, int no_bytes, unsigned int address,
-                                     const void *data, AD_PACKET *packet)
-{
-    BINARY checksum;
-    const BINARY *data_in;
-    int i;
-
-    (void)IspEnvironment; /* never used in this function */
-
-        /*  Some sanity checking on the arguments.  These should only   */
-        /* fail if there is a bug in the caller.                        */
-        /*  Check 1) that the number of data bytes is in an acceptable  */
-        /* range, 2) that we have a non-null pointer if data is being   */
-        /* put in the packet and 3) that we have a non-null pointer to  */
-        /* the packet to be filled. We just exit with an error message  */
-        /* if any of these tests fail.                                  */
-    if( (no_bytes < 0) || (no_bytes > 250))
-    {
-        DebugPrintf( 1,
-            "The number of bytes (%d) passed to FormPacket is invalid.\n",
-            no_bytes);
-        exit( -1);
-    }
-    if( (data == 0) && (no_bytes != 0))
-    {
-        DebugPrintf( 1,
-            "A null pointer to data paased to FormPacket when data was expected.\n");
-        exit( -1);
-    }
-    if( packet == 0)
-    {
-        DebugPrintf( 1,
-            "A null packet pointer was passed to FormPacket.\n");
-        exit( -1);
-    }
-
-    checksum = 0;               /*  Checksum starts at zero.            */
-
-    data_in = data;             /*  Pointer pun so we can walk through  */
-                                /* the data.                            */
-
-    packet->start1 = 0x7;       /*  The start of the packet is constant.*/
-    packet->start2 = 0xE;
-
-        /*  Fill in the rest of the packet and calculate the checksum   */
-        /* as we go.                                                    */
-
-        /* The number of bytes is the number of data bytes + the        */
-        /* address bytes + the command byte.                            */
-    packet->bytes = (BINARY)(no_bytes + 5);
-
-    checksum += packet->bytes;
-
-        /*  The command for the packet being sent.  No error checking   */
-        /* done on this.                                                */
-    packet->cmd = cmd;
-
-    checksum += cmd;
-
-        /*  Now break up the address and place in the proper packet     */
-        /* locations.                                                   */
-    packet->address_l = (BINARY)(address & 0xFF);
-    packet->address_m = (BINARY)((address >> 8) & 0xFF);
-    packet->address_u = (BINARY)((address >> 16) & 0xFF);
-    packet->address_h = (BINARY)((address >> 24) & 0xFF);
-
-    checksum += packet->address_l;
-    checksum += packet->address_m;
-    checksum += packet->address_u;
-    checksum += packet->address_h;
-
-        /*  Copy the data bytes into the packet.  We could use memcpy   */
-        /* but we have to calculate the checksum anyway.                */
-    for( i = 0; i < no_bytes; i++)
-    {
-        packet->data[i] = data_in[i];
-        checksum += data_in[i];
-    }
-