From 8cec98399f2c7d99be1a0e46afa390655bd32827 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 10 Sep 2013 18:11:28 +0000 Subject: [PATCH] - update to lpc2lisp-1.94 from Alexander Shiryaev (MAINTAINER) --- devel/lpc21isp/Makefile | 6 +- devel/lpc21isp/distinfo | 7 +- devel/lpc21isp/patches/patch-lpc21isp_c | 53 ------ devel/lpc21isp/patches/patch-lpcprog_c | 222 ------------------------ devel/lpc21isp/pkg/DESCR | 6 +- 5 files changed, 9 insertions(+), 285 deletions(-) delete mode 100644 devel/lpc21isp/patches/patch-lpc21isp_c delete mode 100644 devel/lpc21isp/patches/patch-lpcprog_c diff --git a/devel/lpc21isp/Makefile b/devel/lpc21isp/Makefile index 9ee44d7dafa..89ea68ceaa2 100644 --- a/devel/lpc21isp/Makefile +++ b/devel/lpc21isp/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2013/03/11 10:50:11 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2013/09/10 18:11:28 jasper Exp $ COMMENT = ISP tool for LPC2000 and ADUC70xx microcontrollers -DISTNAME = lpc21isp_183 -PKGNAME = lpc21isp-1.83 +DISTNAME = lpc21isp_194 +PKGNAME = lpc21isp-1.94 CATEGORIES = devel HOMEPAGE = http://sourceforge.net/projects/lpc21isp/ diff --git a/devel/lpc21isp/distinfo b/devel/lpc21isp/distinfo index 2b550a4f878..928494437bf 100644 --- a/devel/lpc21isp/distinfo +++ b/devel/lpc21isp/distinfo @@ -1,5 +1,2 @@ -MD5 (lpc21isp_183.tar.gz) = S0N6bW5xivptGC8MGPU2Pw== -RMD160 (lpc21isp_183.tar.gz) = JOUhb0tN2KX4dUpDd+4tahhVohc= -SHA1 (lpc21isp_183.tar.gz) = slEQXOx6CmXyccIzyU4P4/q0III= -SHA256 (lpc21isp_183.tar.gz) = Zlo41y8/vwtrOkEDCQlXGB+l0BPSukCi713ltxVCwSE= -SIZE (lpc21isp_183.tar.gz) = 54558 +SHA256 (lpc21isp_194.tar.gz) = CZ/I1iI9+5eIeGtjLtgJSzDN1mGRPqHrD4JtnTnJjPg= +SIZE (lpc21isp_194.tar.gz) = 60937 diff --git a/devel/lpc21isp/patches/patch-lpc21isp_c b/devel/lpc21isp/patches/patch-lpc21isp_c deleted file mode 100644 index 89024e1785c..00000000000 --- a/devel/lpc21isp/patches/patch-lpc21isp_c +++ /dev/null @@ -1,53 +0,0 @@ -$OpenBSD: patch-lpc21isp_c,v 1.2 2011/10/19 11:38:47 jasper Exp $ ---- lpc21isp.c.orig Tue Aug 2 16:55:18 2011 -+++ lpc21isp.c Wed Oct 19 13:22:52 2011 -@@ -1,3 +1,4 @@ -+#include - /****************************************************************************** - - Project: Portable command line ISP for NXP LPC1000 / LPC2000 family -@@ -696,7 +697,7 @@ static void ReceiveComPortBlock(ISP_ENVIRONMENT *IspEn - - #endif // defined COMPILE_FOR_LINUX - -- sprintf(tmp_string, "Read(Length=%ld): ", (*real_size)); -+ int rCheckSNPrintF1 = snprintf(tmp_string, sizeof(tmp_string), "Read(Length=%ld): ", (*real_size)); assert( rCheckSNPrintF1 < sizeof(tmp_string) ); - DumpString(5, answer, (*real_size), tmp_string); - - if (*real_size == 0) -@@ -999,7 +1000,7 @@ void DebugPrintf(int level, const char *fmt, ...) - char pTemp[2000]; - va_start(ap, fmt); - //vprintf(fmt, ap); -- vsprintf(pTemp, fmt, ap); -+ int rCheckSNPrintF0 = vsnprintf(pTemp, sizeof(pTemp), fmt, ap); assert( rCheckSNPrintF0 < sizeof(pTemp) ); - TRACE(pTemp); - va_end(ap); - fflush(stdout); -@@ -1071,7 +1072,7 @@ void ReceiveComPort(ISP_ENVIRONMENT *IspEnvironment, - - Answer[(*RealSize)] = 0; - -- sprintf(tmp_string, "Answer(Length=%ld): ", (*RealSize)); -+ int rCheckSNPrintF2 = snprintf(tmp_string, sizeof(tmp_string), "Answer(Length=%ld): ", (*RealSize)); assert( rCheckSNPrintF2 < sizeof(tmp_string) ); - DumpString(3, Answer, (*RealSize), tmp_string); - } - -@@ -1106,7 +1107,7 @@ int ReceiveComPortBlockComplete(ISP_ENVIRONMENT *IspEn - - } while ((realsize < size) && (SerialTimeoutCheck(IspEnvironment) == 0)); - -- sprintf(tmp_string, "Answer(Length=%ld): ", realsize); -+ int rCheckSNPrintF3 = snprintf(tmp_string, sizeof(tmp_string), "Answer(Length=%ld): ", realsize); assert( rCheckSNPrintF3 < sizeof(tmp_string) ); - DumpString(3, result, realsize, tmp_string); - - if (realsize != size) -@@ -2183,7 +2184,7 @@ int lpctest(char* FileName) - IspEnvironment.baud_rate = "19200"; - IspEnvironment.nQuestionMarks = 100; - IspEnvironment.DoNotStart = 0; -- strcpy(IspEnvironment.StringOscillator, "25000"); -+ int rCheckSNPrintF4 = snprintf(IspEnvironment.StringOscillator, sizeof(IspEnvironment.StringOscillator), "%s", "25000"); assert( rCheckSNPrintF4 < sizeof(IspEnvironment.StringOscillator) ); - - return PerformActions(&IspEnvironment); // Do as requested ! - } diff --git a/devel/lpc21isp/patches/patch-lpcprog_c b/devel/lpc21isp/patches/patch-lpcprog_c deleted file mode 100644 index e3cceeb013e..00000000000 --- a/devel/lpc21isp/patches/patch-lpcprog_c +++ /dev/null @@ -1,222 +0,0 @@ -$OpenBSD: patch-lpcprog_c,v 1.2 2011/10/19 11:38:47 jasper Exp $ ---- lpcprog.c.orig Tue Aug 2 16:45:04 2011 -+++ lpcprog.c Wed Oct 19 13:22:21 2011 -@@ -1,3 +1,4 @@ -+#include - /****************************************************************************** - - Project: Portable command line ISP for NXP LPC1000 / LPC2000 family -@@ -495,7 +496,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - strippedsize--; - } - -- sprintf(tmp_string, "StrippedAnswer(Length=%d): '", strippedsize); -+ int rCheckSNPrintF0 = snprintf(tmp_string, sizeof(tmp_string), "StrippedAnswer(Length=%d): '", strippedsize); assert( rCheckSNPrintF0 < sizeof(tmp_string) ); - DumpString(3, strippedAnswer, strippedsize, tmp_string); - - tStartUpload = time(NULL); -@@ -542,13 +543,13 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - - DebugPrintf(3, "Setting oscillator\n"); - -- sprintf(temp, "%s\n", IspEnvironment->StringOscillator); -+ int rCheckSNPrintF1 = snprintf(temp, sizeof(temp), "%s\n", IspEnvironment->StringOscillator); assert( rCheckSNPrintF1 < sizeof(temp) ); - - SendComPort(IspEnvironment, temp); - - ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 1000); - -- sprintf(temp, "%s\nOK\r\n", IspEnvironment->StringOscillator); -+ int rCheckSNPrintF2 = snprintf(temp, sizeof(temp), "%s\nOK\r\n", IspEnvironment->StringOscillator); assert( rCheckSNPrintF2 < sizeof(temp) ); - - if (strcmp(Answer, temp) != 0) - { -@@ -771,7 +772,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - { - DebugPrintf(2, "Wiping Device. "); - -- sprintf(tmpString, "P %d %d\n", 0, LPCtypes[IspEnvironment->DetectedDevice].FlashSectors-1); -+ int rCheckSNPrintF3 = snprintf(tmpString, sizeof(tmpString), "P %d %d\n", 0, LPCtypes[IspEnvironment->DetectedDevice].FlashSectors-1); assert( rCheckSNPrintF3 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -779,7 +780,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - return (WRONG_ANSWER_PREP + GetAndReportErrorNumber(Answer)); - } - -- sprintf(tmpString, "E %d %d\n", 0, LPCtypes[IspEnvironment->DetectedDevice].FlashSectors-1); -+ int rCheckSNPrintF4 = snprintf(tmpString, sizeof(tmpString), "E %d %d\n", 0, LPCtypes[IspEnvironment->DetectedDevice].FlashSectors-1); assert( rCheckSNPrintF4 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -792,7 +793,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - //no wiping requested: erasing sector 0 first - DebugPrintf(2, "Erasing sector 0 first, to invalidate checksum. "); - -- sprintf(tmpString, "P %d %d\n", 0, 0); -+ int rCheckSNPrintF5 = snprintf(tmpString, sizeof(tmpString), "P %d %d\n", 0, 0); assert( rCheckSNPrintF5 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -800,7 +801,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - return (WRONG_ANSWER_PREP + GetAndReportErrorNumber(Answer)); - } - -- sprintf(tmpString, "E %d %d\n", 0, 0); -+ int rCheckSNPrintF6 = snprintf(tmpString, sizeof(tmpString), "E %d %d\n", 0, 0); assert( rCheckSNPrintF6 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -822,7 +823,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - - if (IspEnvironment->BinaryOffset < ReturnValueLpcRamStart(IspEnvironment)) // Skip Erase when running from RAM - { -- sprintf(tmpString, "P %ld %ld\n", Sector, Sector); -+ int rCheckSNPrintF7 = snprintf(tmpString, sizeof(tmpString), "P %ld %ld\n", Sector, Sector); assert( rCheckSNPrintF7 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -834,7 +835,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - fflush(stdout); - if (IspEnvironment->WipeDevice == 0 && (Sector!=0)) //Sector 0 already erased - { -- sprintf(tmpString, "E %ld %ld\n", Sector, Sector); -+ int rCheckSNPrintF8 = snprintf(tmpString, sizeof(tmpString), "E %ld %ld\n", Sector, Sector); assert( rCheckSNPrintF8 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -882,7 +883,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - CopyLength += ((45 * 4) - (CopyLength % (45 * 4))); - } - -- sprintf(tmpString, "W %ld %ld\n", ReturnValueLpcRamBase(IspEnvironment), CopyLength); -+ int rCheckSNPrintF9 = snprintf(tmpString, sizeof(tmpString), "W %ld %ld\n", ReturnValueLpcRamBase(IspEnvironment), CopyLength); assert( rCheckSNPrintF9 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -982,13 +983,13 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - - // printf("block_CRC = %ld\n", block_CRC); - -- sprintf(tmpString, "%ld\n", block_CRC); -+ int rCheckSNPrintF10 = snprintf(tmpString, sizeof(tmpString), "%ld\n", block_CRC); assert( rCheckSNPrintF10 < sizeof(tmpString) ); - - SendComPort(IspEnvironment, tmpString); - - ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2,5000); - -- sprintf(tmpString, "%ld\nOK\r\n", block_CRC); -+ int rCheckSNPrintF11 = snprintf(tmpString, sizeof(tmpString), "%ld\nOK\r\n", block_CRC); assert( rCheckSNPrintF11 < sizeof(tmpString) ); - - if (strcmp(Answer, tmpString) != 0) - { -@@ -1009,12 +1010,12 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - } - #else - // printf("block_CRC = %ld\n", block_CRC); -- sprintf(tmpString, "%ld\r\n", block_CRC); -+ int rCheckSNPrintF12 = snprintf(tmpString, sizeof(tmpString), "%ld\r\n", block_CRC); assert( rCheckSNPrintF12 < sizeof(tmpString) ); - SendComPort(IspEnvironment, tmpString); - - ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2,5000); - -- sprintf(tmpString, "%ld\r\nOK\r\n", block_CRC); -+ int rCheckSNPrintF13 = snprintf(tmpString, sizeof(tmpString), "%ld\r\nOK\r\n", block_CRC); assert( rCheckSNPrintF13 < sizeof(tmpString) ); - if (strcmp(Answer, tmpString) != 0) - { - DebugPrintf(1, "Error on writing block_CRC (2)\n"); -@@ -1032,13 +1033,13 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - #if !defined COMPILE_FOR_LPC21 - for (repeat = 0; repeat < 3; repeat++) - { -- sprintf(tmpString, "%ld\n", block_CRC); -+ int rCheckSNPrintF10 = snprintf(tmpString, sizeof(tmpString), "%ld\n", block_CRC); assert( rCheckSNPrintF10 < sizeof(tmpString) ); - - SendComPort(IspEnvironment, tmpString); - - ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2,5000); - -- sprintf(tmpString, "%ld\nOK\r\n", block_CRC); -+ int rCheckSNPrintF11 = snprintf(tmpString, sizeof(tmpString), "%ld\nOK\r\n", block_CRC); assert( rCheckSNPrintF11 < sizeof(tmpString) ); - - if (strcmp(Answer, tmpString) != 0) - { -@@ -1058,12 +1059,12 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - return (ERROR_WRITE_CRC2); - } - #else -- sprintf(tmpString, "%ld\r\n", block_CRC); -+ int rCheckSNPrintF12 = snprintf(tmpString, sizeof(tmpString), "%ld\r\n", block_CRC); assert( rCheckSNPrintF12 < sizeof(tmpString) ); - SendComPort(IspEnvironment, tmpString); - - ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2,5000); - -- sprintf(tmpString, "%ld\r\nOK\r\n", block_CRC); -+ int rCheckSNPrintF13 = snprintf(tmpString, sizeof(tmpString), "%ld\r\nOK\r\n", block_CRC); assert( rCheckSNPrintF13 < sizeof(tmpString) ); - if (strcmp(Answer, tmpString) != 0) - { - DebugPrintf(1, "Error on writing block_CRC (4)\n"); -@@ -1075,7 +1076,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - if (IspEnvironment->BinaryOffset < ReturnValueLpcRamStart(IspEnvironment)) - { - // Prepare command must be repeated before every write -- sprintf(tmpString, "P %ld %ld\n", Sector, Sector); -+ int rCheckSNPrintF7 = snprintf(tmpString, sizeof(tmpString), "P %ld %ld\n", Sector, Sector); assert( rCheckSNPrintF7 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -1107,7 +1108,7 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - CopyLength = LPCtypes[IspEnvironment->DetectedDevice].MaxCopySize; - } - -- sprintf(tmpString, "C %ld %ld %ld\n", SectorStart + SectorOffset, ReturnValueLpcRamBase(IspEnvironment), CopyLength); -+ int rCheckSNPrintF14 = snprintf(tmpString, sizeof(tmpString), "C %ld %ld %ld\n", SectorStart + SectorOffset, ReturnValueLpcRamBase(IspEnvironment), CopyLength); assert( rCheckSNPrintF14 < sizeof(tmpString) ); - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) - { -@@ -1123,11 +1124,11 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - //and the compare result may not be correct. - if (SectorStart + SectorOffset<64) - { -- sprintf(tmpString, "M %d %ld %ld\n", 64, ReturnValueLpcRamBase(IspEnvironment) + (64 - SectorStart - SectorOffset), CopyLength-(64 - SectorStart - SectorOffset)); -+ int rCheckSNPrintF15 = snprintf(tmpString, sizeof(tmpString), "M %d %ld %ld\n", 64, ReturnValueLpcRamBase(IspEnvironment) + (64 - SectorStart - SectorOffset), CopyLength-(64 - SectorStart - SectorOffset)); assert( rCheckSNPrintF15 < sizeof(tmpString) ); - } - else - { -- sprintf(tmpString, "M %ld %ld %ld\n", SectorStart + SectorOffset, ReturnValueLpcRamBase(IspEnvironment), CopyLength); -+ int rCheckSNPrintF16 = snprintf(tmpString, sizeof(tmpString), "M %ld %ld %ld\n", SectorStart + SectorOffset, ReturnValueLpcRamBase(IspEnvironment), CopyLength); assert( rCheckSNPrintF16 < sizeof(tmpString) ); - } - - if (!SendAndVerify(IspEnvironment, tmpString, Answer, sizeof Answer)) -@@ -1169,13 +1170,13 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - - if(LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC2XXX) - { -- sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress); -+ int rCheckSNPrintF17 = snprintf(tmpString, sizeof(tmpString), "G %ld A\n", IspEnvironment->StartAddress); assert( rCheckSNPrintF17 < sizeof(tmpString) ); - } - else if(LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC17XX || - LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC13XX || - LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC11XX) - { -- sprintf(tmpString, "G %ld T\n", IspEnvironment->StartAddress & ~1); -+ int rCheckSNPrintF18 = snprintf(tmpString, sizeof(tmpString), "G %ld T\n", IspEnvironment->StartAddress & ~1); assert( rCheckSNPrintF18 < sizeof(tmpString) ); - } - else - { -@@ -1198,13 +1199,13 @@ int NxpDownload(ISP_ENVIRONMENT *IspEnvironment) - */ - if(LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC2XXX) - { -- sprintf(ExpectedAnswer, "G %ld A\n0", IspEnvironment->StartAddress); -+ int rCheckSNPrintF19 = snprintf(ExpectedAnswer, sizeof(ExpectedAnswer), "G %ld A\n0", IspEnvironment->StartAddress); assert( rCheckSNPrintF19 < sizeof(ExpectedAnswer) ); - } - else if(LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC17XX || - LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC13XX || - LPCtypes[IspEnvironment->DetectedDevice].ChipVariant == CHIP_VARIANT_LPC11XX) - { -- sprintf(ExpectedAnswer, "G %ld T\n0", IspEnvironment->StartAddress & ~1); -+ int rCheckSNPrintF20 = snprintf(ExpectedAnswer, sizeof(ExpectedAnswer), "G %ld T\n0", IspEnvironment->StartAddress & ~1); assert( rCheckSNPrintF20 < sizeof(ExpectedAnswer) ); - } - else - { diff --git a/devel/lpc21isp/pkg/DESCR b/devel/lpc21isp/pkg/DESCR index dfa51c18f15..bec943940a6 100644 --- a/devel/lpc21isp/pkg/DESCR +++ b/devel/lpc21isp/pkg/DESCR @@ -1,2 +1,4 @@ -In-circuit programming (ISP) tool for the NXP (Philips) LPC1300 / -LPC1700 / LPC2000 series ARM7 / M0 / M3 microcontrollers. +In-circuit programming (ISP) tool for the NXP (Philips) LPC800 / +LPC1100 / LPC1300 / LPC1700 / LPC1800 / LPC2000 / LPC4300 series +ARM7 / Cortex-M0 / Cortex-M0+ / Cortex-M3 / Cortex-M4 +microcontrollers.