sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore trainling whitespace in .patch and .diff files wehre required

Browse Source
This commit is contained in:
Gregory Nutt 2014-04-13 17:12:02 -06:00
parent ab5b37189b
commit 09177facdf
5 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
View File

@ -22,12 +22,12 @@ index ba7dbe7..b9f9991 100644
+ FAR const char *fmt, va_list ap);
+#endif
static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf
*
****************************************************************************/
+#if 0
static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
FAR const char *fmt, ...)
@ -35,7 +35,7 @@ index ba7dbe7..b9f9991 100644
@@ -263,6 +270,51 @@ static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
#endif
}
+#else
+static int nsh_consolevoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, va_list ap)
+{
@ -95,7 +95,7 @@ index ba7dbe7..b9f9991 100644
+#endif
pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer;
pstate->cn_vtbl.exit = nsh_consoleexit;
@@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void)
}
return pstate;
@ -122,12 +122,12 @@ index c78362f..59bd8d7 100644
#include <stdbool.h>
+#include <stdarg.h>
#include <errno.h>
/****************************************************************************
@@ -62,11 +63,13 @@
#define nsh_undirect(v,s) (v)->undirect(v,s)
#define nsh_exit(v,s) (v)->exit(v,s)
+#if 0
#ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt)
@ -135,9 +135,9 @@ index c78362f..59bd8d7 100644
# define nsh_output vtbl->output
#endif
+#endif
/* Size of info to be saved in call to nsh_redirect */
@@ -107,7 +110,11 @@ struct nsh_vtbl_s
void (*release)(FAR struct nsh_vtbl_s *vtbl);
#endif
@ -152,8 +152,8 @@ index c78362f..59bd8d7 100644
void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
@@ -159,5 +166,6 @@ struct console_stdio_s
/* Defined in nsh_console.c *************************************************/
FAR struct console_stdio_s *nsh_newconsole(void);
+int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...);
#endif /* __APPS_NSHLIB_NSH_CONSOLE_H */

134
configs/mcu123-lpc214x/lpc21isp-1.60.diff
View File

@ -2,82 +2,82 @@ diff -rub lpc21isp-1.60/lpc21isp.c lpc21isp-Linux//lpc21isp.c
--- lpc21isp-1.60/lpc21isp.c 2008-07-21 15:17:06.000000000 -0600
+++ lpc21isp-Linux//lpc21isp.c 2008-09-16 09:21:20.000000000 -0600
@@ -22,6 +22,7 @@
#include "adprog.h"
#include "lpcprog.h"
#include "lpcterm.h"
+#include "errno.h"
/*
Change-History:
#include "adprog.h"
#include "lpcprog.h"
#include "lpcterm.h"
+#include "errno.h"
/*
Change-History:
@@ -319,10 +320,7 @@
if (IspEnvironment->fdCom < 0)
{
- int* p_err = __error();
- int err;
- if (p_err) { err = *p_err; }
- DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, err, err);
+ DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, errno, errno);
exit(2);
}
if (IspEnvironment->fdCom < 0)
{
- int* p_err = __error();
- int err;
- if (p_err) { err = *p_err; }
- DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, err, err);
+ DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, errno, errno);
exit(2);
}
diff -rub lpc21isp-1.60/lpc21isp.h lpc21isp-Linux//lpc21isp.h
--- lpc21isp-1.60/lpc21isp.h 2008-05-10 17:35:00.000000000 -0600
+++ lpc21isp-Linux//lpc21isp.h 2008-09-16 09:18:42.000000000 -0600
@@ -165,6 +165,7 @@
#endif
unsigned serial_timeout_count; /**< Local used to track timeouts on serial port read. */
+ unsigned char DoNotStart; /* Do not start Code if this is set*/
} ISP_ENVIRONMENT;
#endif
unsigned serial_timeout_count; /**< Local used to track timeouts on serial port read. */
+ unsigned char DoNotStart; /* Do not start Code if this is set*/
} ISP_ENVIRONMENT;
@@ -173,7 +174,6 @@
#define DebugPrintf(in, ...)
#else
-extern int debug_level;
#if defined INTEGRATED_IN_WIN_APP
#define DebugPrintf(in, ...)
#else
-extern int debug_level;
#if defined INTEGRATED_IN_WIN_APP
@@ -191,7 +191,6 @@
#else
void DebugPrintf(int level, const char *fmt, ...);
-//#define DebugPrintf(level, ...) if (level <= debug_level) { TRACE( __VA_ARGS__ ); }
#endif
void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment);
#else
void DebugPrintf(int level, const char *fmt, ...);
-//#define DebugPrintf(level, ...) if (level <= debug_level) { TRACE( __VA_ARGS__ ); }
#endif
void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment);
diff -rub lpc21isp-1.60/lpcprog.c lpc21isp-Linux//lpcprog.c
--- lpc21isp-1.60/lpcprog.c 2008-07-21 14:39:50.000000000 -0600
+++ lpc21isp-Linux//lpcprog.c 2008-09-16 08:52:46.000000000 -0600
@@ -1062,15 +1062,16 @@
}
else
{
+ if (IspEnvironment->DoNotStart == 0)
+ {
DebugPrintf(2, "Now launching the brand new code\n");
fflush(stdout);
-
if (IspEnvironment->HalfDuplex == 0)
sprintf(tmpString, "G %ld A\r\n", IspEnvironment->StartAddress);
else
sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress);
-
SendComPort(IspEnvironment, tmpString); //goto 0 : run this fresh new downloaded code code
+
if (IspEnvironment->BinaryOffset < LPC_RAMSTART)
{ // Skip response on G command - show response on Terminal instead
ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 5000);
}
else
{
+ if (IspEnvironment->DoNotStart == 0)
+ {
DebugPrintf(2, "Now launching the brand new code\n");
fflush(stdout);
-
if (IspEnvironment->HalfDuplex == 0)
sprintf(tmpString, "G %ld A\r\n", IspEnvironment->StartAddress);
else
sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress);
-
SendComPort(IspEnvironment, tmpString); //goto 0 : run this fresh new downloaded code code
+
if (IspEnvironment->BinaryOffset < LPC_RAMSTART)
{ // Skip response on G command - show response on Terminal instead
ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 5000);
@@ -1099,6 +1100,7 @@
return (FAILED_RUN + GetAndReportErrorNumber(Answer));
}
}
+ }
fflush(stdout);
}
return (FAILED_RUN + GetAndReportErrorNumber(Answer));
}
}
+ }
fflush(stdout);
}
Only in lpc21isp-Linux/: lpcprog.c.orig
diff -rub lpc21isp-1.60/Makefile lpc21isp-Linux//Makefile
--- lpc21isp-1.60/Makefile 2008-04-07 00:23:00.000000000 -0600
@ -85,18 +85,18 @@ diff -rub lpc21isp-1.60/Makefile lpc21isp-Linux//Makefile
@@ -3,9 +3,9 @@
GLOBAL_DEP = adprog.h lpc21isp.h lpcprog.h lpcterm.h
CC = gcc
-ifneq ($findstring("freebsd", $(OSTYPE)),"")
-CFLAGS+=-D__FREEBSD__
-endif
+#ifneq ($findstring("freebsd", $(OSTYPE)),"")
+#CFLAGS+=-D__FREEBSD__
+#endif
adprog.o: adprog.c $(GLOBAL_DEP)
$(CC) $(CDEBUG) $(CFLAGS) -c -o adprog.o adprog.c
@@ -21,3 +21,4 @@
clean:
$(RM) adprog.o lpcprog.o lpcterm.o lpc21isp
+ $(RM) *~

38
configs/pcduino-a10/nsh/pcduino-140107.patch
View File

@ -5,58 +5,58 @@ index 3cc6323..ad42790 100644
@@ -312,12 +312,14 @@ void up_boot(void)
* for all IO regions (Including the vector region).
*/
+lowsyslog("Calling a1x_setupmappings\n"); // REMOVE ME
a1x_setupmappings();
/* Provide a special mapping for the IRAM interrupt vector positioned in
* high memory.
*/
+lowsyslog("Calling a1x_vectormapping\n"); // REMOVE ME
a1x_vectormapping();
#endif /* CONFIG_ARCH_ROMPGTABLE */
@@ -326,16 +328,19 @@ void up_boot(void)
* arm_vector.S
*/
+lowsyslog("Calling a1x_copyvectorblock\n"); // REMOVE ME
a1x_copyvectorblock();
/* Initialize the FPU */
#ifdef CONFIG_ARCH_FPU
+lowsyslog("Calling arm_fpuconfig\n"); // REMOVE ME
arm_fpuconfig();
#endif
/* Perform common, low-level chip initialization (might do nothing) */
+lowsyslog("Calling a1x_lowsetup\n"); // REMOVE ME
a1x_lowsetup();
/* Perform early serial initialization if we are going to use the serial
@@ -343,6 +348,7 @@ void up_boot(void)
*/
#ifdef USE_EARLYSERIALINIT
+lowsyslog("Calling up_earlyserialinit\n"); // REMOVE ME
up_earlyserialinit();
#endif
@@ -353,6 +359,7 @@ void up_boot(void)
*/
#ifdef CONFIG_NUTTX_KERNEL
+lowsyslog("Calling a1x_userspace\n"); // REMOVE ME
a1x_userspace();
#endif
@@ -362,5 +369,7 @@ void up_boot(void)
* - Configuration of board specific resources (PIOs, LEDs, etc).
*/
+lowsyslog("Calling a1x_boardinitialize\n"); // REMOVE ME
a1x_boardinitialize();
+lowsyslog("Returning\n"); // REMOVE ME
@ -68,7 +68,7 @@ index bce82d5..924bd24 100644
@@ -220,6 +220,12 @@ __start:
teq r0, r2
bne .Lpgtableclear
+ movw r1, #0x0416 // REMOVE ME
+ movt r1, #0x01c0
+ movw r2, #0x4070
@ -83,11 +83,11 @@ index f82490c..5c16e48 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_mmu.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_mmu.c
@@ -94,7 +94,7 @@ void mmu_l1_setentry(uint32_t paddr, uint32_t vaddr, uint32_t mmuflags)
/* Invalidate the TLB cache associated with virtual address range */
- mmu_invalidate_region(vaddr, 1024*1024);
+// mmu_invalidate_region(vaddr, 1024*1024);
}
#endif

12
configs/pjrc-8051/sdcc-2.6.0.patch
View File

@ -9,20 +9,20 @@ diff -u sdcc/device/lib/Makefile.orig sdcc/device/lib/Makefile
+ $(MAKE) MODELFLAGS="--model-$$model --stack-auto --int-long-reent --float-reent" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
done \
fi
diff -u sdcc/device/include/stdarg.h.orig sdcc/device/include/stdarg.h
diff -u sdcc/device/include/stdarg.h.orig sdcc/device/include/stdarg.h
--- sdcc/device/include/stdarg.h.orig 2007-03-11 13:21:15.000000000 -0600
+++ sdcc/device/include/stdarg.h 2007-03-11 13:26:59.000000000 -0600
@@ -25,9 +25,9 @@
#else
-typedef unsigned char __data * va_list ;
-#define va_arg(marker,type) *((type __data * )(marker -= sizeof(type)))
-#define va_start(marker,first) { marker = (va_list) ((char __data * )&first); }
+typedef unsigned char * va_list ;
+#define va_arg(marker,type) *((type * )(marker -= sizeof(type)))
+#define va_start(marker,first) { marker = (va_list) ((char * )&first); }
#endif

20
configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
View File

@ -22,12 +22,12 @@ index ba7dbe7..b9f9991 100644
+ FAR const char *fmt, va_list ap);
+#endif
static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
#if CONFIG_NFILE_DESCRIPTORS > 0
@@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf
*
****************************************************************************/
+#if 0
static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
FAR const char *fmt, ...)
@ -35,7 +35,7 @@ index ba7dbe7..b9f9991 100644
@@ -263,6 +270,51 @@ static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
#endif
}
+#else
+static int nsh_consolevoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, va_list ap)
+{
@ -95,7 +95,7 @@ index ba7dbe7..b9f9991 100644
+#endif
pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer;
pstate->cn_vtbl.exit = nsh_consoleexit;
@@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void)
}
return pstate;
@ -122,12 +122,12 @@ index c78362f..59bd8d7 100644
#include <stdbool.h>
+#include <stdarg.h>
#include <errno.h>
/****************************************************************************
@@ -62,11 +63,13 @@
#define nsh_undirect(v,s) (v)->undirect(v,s)
#define nsh_exit(v,s) (v)->exit(v,s)
+#if 0
#ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt)
@ -135,9 +135,9 @@ index c78362f..59bd8d7 100644
# define nsh_output vtbl->output
#endif
+#endif
/* Size of info to be saved in call to nsh_redirect */
@@ -107,7 +110,11 @@ struct nsh_vtbl_s
void (*release)(FAR struct nsh_vtbl_s *vtbl);
#endif
@ -152,8 +152,8 @@ index c78362f..59bd8d7 100644
void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
@@ -159,5 +166,6 @@ struct console_stdio_s
/* Defined in nsh_console.c *************************************************/
FAR struct console_stdio_s *nsh_newconsole(void);
+int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...);
#endif /* __APPS_NSHLIB_NSH_CONSOLE_H */