Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files
configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+10 -10
View File
@@ -22,12 +22,12 @@ index ba7dbe7..b9f9991 100644
+ FAR const char *fmt, va_list ap); + FAR const char *fmt, va_list ap);
+#endif +#endif
static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl); static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
#if CONFIG_NFILE_DESCRIPTORS > 0 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf @@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf
* *
****************************************************************************/ ****************************************************************************/
+#if 0 +#if 0
static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
FAR const char *fmt, ...) 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, @@ -263,6 +270,51 @@ static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
#endif #endif
} }
+#else +#else
+static int nsh_consolevoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, va_list ap) +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 +#endif
pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer; pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer;
pstate->cn_vtbl.exit = nsh_consoleexit; pstate->cn_vtbl.exit = nsh_consoleexit;
@@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void) @@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void)
} }
return pstate; return pstate;
@@ -122,12 +122,12 @@ index c78362f..59bd8d7 100644
#include <stdbool.h> #include <stdbool.h>
+#include <stdarg.h> +#include <stdarg.h>
#include <errno.h> #include <errno.h>
/**************************************************************************** /****************************************************************************
@@ -62,11 +63,13 @@ @@ -62,11 +63,13 @@
#define nsh_undirect(v,s) (v)->undirect(v,s) #define nsh_undirect(v,s) (v)->undirect(v,s)
#define nsh_exit(v,s) (v)->exit(v,s) #define nsh_exit(v,s) (v)->exit(v,s)
+#if 0 +#if 0
#ifdef CONFIG_CPP_HAVE_VARARGS #ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt) # define nsh_output(v, fmt...) (v)->output(v, ##fmt)
@@ -135,9 +135,9 @@ index c78362f..59bd8d7 100644
# define nsh_output vtbl->output # define nsh_output vtbl->output
#endif #endif
+#endif +#endif
/* Size of info to be saved in call to nsh_redirect */ /* Size of info to be saved in call to nsh_redirect */
@@ -107,7 +110,11 @@ struct nsh_vtbl_s @@ -107,7 +110,11 @@ struct nsh_vtbl_s
void (*release)(FAR struct nsh_vtbl_s *vtbl); void (*release)(FAR struct nsh_vtbl_s *vtbl);
#endif #endif
@@ -152,8 +152,8 @@ index c78362f..59bd8d7 100644
void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
@@ -159,5 +166,6 @@ struct console_stdio_s @@ -159,5 +166,6 @@ struct console_stdio_s
/* Defined in nsh_console.c *************************************************/ /* Defined in nsh_console.c *************************************************/
FAR struct console_stdio_s *nsh_newconsole(void); FAR struct console_stdio_s *nsh_newconsole(void);
+int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...); +int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...);
#endif /* __APPS_NSHLIB_NSH_CONSOLE_H */ #endif /* __APPS_NSHLIB_NSH_CONSOLE_H */
configs/mcu123-lpc214x/lpc21isp-1.60.diff
+67 -67
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-1.60/lpc21isp.c 2008-07-21 15:17:06.000000000 -0600
+++ lpc21isp-Linux//lpc21isp.c 2008-09-16 09:21:20.000000000 -0600 +++ lpc21isp-Linux//lpc21isp.c 2008-09-16 09:21:20.000000000 -0600
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include "adprog.h" #include "adprog.h"
#include "lpcprog.h" #include "lpcprog.h"
#include "lpcterm.h" #include "lpcterm.h"
+#include "errno.h" +#include "errno.h"
/* /*
Change-History: Change-History:
@@ -319,10 +320,7 @@ @@ -319,10 +320,7 @@
if (IspEnvironment->fdCom < 0) if (IspEnvironment->fdCom < 0)
{ {
- int* p_err = __error(); - int* p_err = __error();
- int err; - int err;
- if (p_err) { err = *p_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, err, err);
+ DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, errno, errno); + DebugPrintf(1, "Can't open COM-Port %s ! (Error: %dd (0x%X))\n", IspEnvironment->serial_port, errno, errno);
exit(2); exit(2);
} }
diff -rub lpc21isp-1.60/lpc21isp.h lpc21isp-Linux//lpc21isp.h 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-1.60/lpc21isp.h 2008-05-10 17:35:00.000000000 -0600
+++ lpc21isp-Linux//lpc21isp.h 2008-09-16 09:18:42.000000000 -0600 +++ lpc21isp-Linux//lpc21isp.h 2008-09-16 09:18:42.000000000 -0600
@@ -165,6 +165,7 @@ @@ -165,6 +165,7 @@
#endif #endif
unsigned serial_timeout_count; /**< Local used to track timeouts on serial port read. */ unsigned serial_timeout_count; /**< Local used to track timeouts on serial port read. */
+ unsigned char DoNotStart; /* Do not start Code if this is set*/ + unsigned char DoNotStart; /* Do not start Code if this is set*/
} ISP_ENVIRONMENT; } ISP_ENVIRONMENT;
@@ -173,7 +174,6 @@ @@ -173,7 +174,6 @@
#define DebugPrintf(in, ...) #define DebugPrintf(in, ...)
#else #else
-extern int debug_level; -extern int debug_level;
#if defined INTEGRATED_IN_WIN_APP #if defined INTEGRATED_IN_WIN_APP
@@ -191,7 +191,6 @@ @@ -191,7 +191,6 @@
#else #else
void DebugPrintf(int level, const char *fmt, ...); void DebugPrintf(int level, const char *fmt, ...);
-//#define DebugPrintf(level, ...) if (level <= debug_level) { TRACE( __VA_ARGS__ ); } -//#define DebugPrintf(level, ...) if (level <= debug_level) { TRACE( __VA_ARGS__ ); }
#endif #endif
void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment); void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment);
diff -rub lpc21isp-1.60/lpcprog.c lpc21isp-Linux//lpcprog.c 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-1.60/lpcprog.c 2008-07-21 14:39:50.000000000 -0600
+++ lpc21isp-Linux//lpcprog.c 2008-09-16 08:52:46.000000000 -0600 +++ lpc21isp-Linux//lpcprog.c 2008-09-16 08:52:46.000000000 -0600
@@ -1062,15 +1062,16 @@ @@ -1062,15 +1062,16 @@
} }
else else
{ {
+ if (IspEnvironment->DoNotStart == 0) + if (IspEnvironment->DoNotStart == 0)
+ { + {
DebugPrintf(2, "Now launching the brand new code\n"); DebugPrintf(2, "Now launching the brand new code\n");
fflush(stdout); fflush(stdout);
- -
if (IspEnvironment->HalfDuplex == 0) if (IspEnvironment->HalfDuplex == 0)
sprintf(tmpString, "G %ld A\r\n", IspEnvironment->StartAddress); sprintf(tmpString, "G %ld A\r\n", IspEnvironment->StartAddress);
else else
sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress); sprintf(tmpString, "G %ld A\n", IspEnvironment->StartAddress);
- -
SendComPort(IspEnvironment, tmpString); //goto 0 : run this fresh new downloaded code code SendComPort(IspEnvironment, tmpString); //goto 0 : run this fresh new downloaded code code
+ +
if (IspEnvironment->BinaryOffset < LPC_RAMSTART) if (IspEnvironment->BinaryOffset < LPC_RAMSTART)
{ // Skip response on G command - show response on Terminal instead { // Skip response on G command - show response on Terminal instead
ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 5000); ReceiveComPort(IspEnvironment, Answer, sizeof(Answer)-1, &realsize, 2, 5000);
@@ -1099,6 +1100,7 @@ @@ -1099,6 +1100,7 @@
return (FAILED_RUN + GetAndReportErrorNumber(Answer)); return (FAILED_RUN + GetAndReportErrorNumber(Answer));
} }
} }
+ } + }
fflush(stdout); fflush(stdout);
} }
Only in lpc21isp-Linux/: lpcprog.c.orig Only in lpc21isp-Linux/: lpcprog.c.orig
diff -rub lpc21isp-1.60/Makefile lpc21isp-Linux//Makefile diff -rub lpc21isp-1.60/Makefile lpc21isp-Linux//Makefile
--- lpc21isp-1.60/Makefile 2008-04-07 00:23:00.000000000 -0600 --- 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 @@ @@ -3,9 +3,9 @@
GLOBAL_DEP = adprog.h lpc21isp.h lpcprog.h lpcterm.h GLOBAL_DEP = adprog.h lpc21isp.h lpcprog.h lpcterm.h
CC = gcc CC = gcc
-ifneq ($findstring("freebsd", $(OSTYPE)),"") -ifneq ($findstring("freebsd", $(OSTYPE)),"")
-CFLAGS+=-D__FREEBSD__ -CFLAGS+=-D__FREEBSD__
-endif -endif
+#ifneq ($findstring("freebsd", $(OSTYPE)),"") +#ifneq ($findstring("freebsd", $(OSTYPE)),"")
+#CFLAGS+=-D__FREEBSD__ +#CFLAGS+=-D__FREEBSD__
+#endif +#endif
adprog.o: adprog.c $(GLOBAL_DEP) adprog.o: adprog.c $(GLOBAL_DEP)
$(CC) $(CDEBUG) $(CFLAGS) -c -o adprog.o adprog.c $(CC) $(CDEBUG) $(CFLAGS) -c -o adprog.o adprog.c
@@ -21,3 +21,4 @@ @@ -21,3 +21,4 @@
clean: clean:
$(RM) adprog.o lpcprog.o lpcterm.o lpc21isp $(RM) adprog.o lpcprog.o lpcterm.o lpc21isp
+ $(RM) *~ + $(RM) *~
configs/pcduino-a10/nsh/pcduino-140107.patch
+19 -19
View File
@@ -5,58 +5,58 @@ index 3cc6323..ad42790 100644
@@ -312,12 +312,14 @@ void up_boot(void) @@ -312,12 +312,14 @@ void up_boot(void)
* for all IO regions (Including the vector region). * for all IO regions (Including the vector region).
*/ */
+lowsyslog("Calling a1x_setupmappings\n"); // REMOVE ME +lowsyslog("Calling a1x_setupmappings\n"); // REMOVE ME
a1x_setupmappings(); a1x_setupmappings();
/* Provide a special mapping for the IRAM interrupt vector positioned in /* Provide a special mapping for the IRAM interrupt vector positioned in
* high memory. * high memory.
*/ */
+lowsyslog("Calling a1x_vectormapping\n"); // REMOVE ME +lowsyslog("Calling a1x_vectormapping\n"); // REMOVE ME
a1x_vectormapping(); a1x_vectormapping();
#endif /* CONFIG_ARCH_ROMPGTABLE */ #endif /* CONFIG_ARCH_ROMPGTABLE */
@@ -326,16 +328,19 @@ void up_boot(void) @@ -326,16 +328,19 @@ void up_boot(void)
* arm_vector.S * arm_vector.S
*/ */
+lowsyslog("Calling a1x_copyvectorblock\n"); // REMOVE ME +lowsyslog("Calling a1x_copyvectorblock\n"); // REMOVE ME
a1x_copyvectorblock(); a1x_copyvectorblock();
/* Initialize the FPU */ /* Initialize the FPU */
#ifdef CONFIG_ARCH_FPU #ifdef CONFIG_ARCH_FPU
+lowsyslog("Calling arm_fpuconfig\n"); // REMOVE ME +lowsyslog("Calling arm_fpuconfig\n"); // REMOVE ME
arm_fpuconfig(); arm_fpuconfig();
#endif #endif
/* Perform common, low-level chip initialization (might do nothing) */ /* Perform common, low-level chip initialization (might do nothing) */
+lowsyslog("Calling a1x_lowsetup\n"); // REMOVE ME +lowsyslog("Calling a1x_lowsetup\n"); // REMOVE ME
a1x_lowsetup(); a1x_lowsetup();
/* Perform early serial initialization if we are going to use the serial /* Perform early serial initialization if we are going to use the serial
@@ -343,6 +348,7 @@ void up_boot(void) @@ -343,6 +348,7 @@ void up_boot(void)
*/ */
#ifdef USE_EARLYSERIALINIT #ifdef USE_EARLYSERIALINIT
+lowsyslog("Calling up_earlyserialinit\n"); // REMOVE ME +lowsyslog("Calling up_earlyserialinit\n"); // REMOVE ME
up_earlyserialinit(); up_earlyserialinit();
#endif #endif
@@ -353,6 +359,7 @@ void up_boot(void) @@ -353,6 +359,7 @@ void up_boot(void)
*/ */
#ifdef CONFIG_NUTTX_KERNEL #ifdef CONFIG_NUTTX_KERNEL
+lowsyslog("Calling a1x_userspace\n"); // REMOVE ME +lowsyslog("Calling a1x_userspace\n"); // REMOVE ME
a1x_userspace(); a1x_userspace();
#endif #endif
@@ -362,5 +369,7 @@ void up_boot(void) @@ -362,5 +369,7 @@ void up_boot(void)
* - Configuration of board specific resources (PIOs, LEDs, etc). * - Configuration of board specific resources (PIOs, LEDs, etc).
*/ */
+lowsyslog("Calling a1x_boardinitialize\n"); // REMOVE ME +lowsyslog("Calling a1x_boardinitialize\n"); // REMOVE ME
a1x_boardinitialize(); a1x_boardinitialize();
+lowsyslog("Returning\n"); // REMOVE ME +lowsyslog("Returning\n"); // REMOVE ME
@@ -68,7 +68,7 @@ index bce82d5..924bd24 100644
@@ -220,6 +220,12 @@ __start: @@ -220,6 +220,12 @@ __start:
teq r0, r2 teq r0, r2
bne .Lpgtableclear bne .Lpgtableclear
+ movw r1, #0x0416 // REMOVE ME + movw r1, #0x0416 // REMOVE ME
+ movt r1, #0x01c0 + movt r1, #0x01c0
+ movw r2, #0x4070 + movw r2, #0x4070
@@ -83,11 +83,11 @@ index f82490c..5c16e48 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_mmu.c --- a/nuttx/arch/arm/src/armv7-a/arm_mmu.c
+++ b/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) @@ -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 */ /* Invalidate the TLB cache associated with virtual address range */
- mmu_invalidate_region(vaddr, 1024*1024); - mmu_invalidate_region(vaddr, 1024*1024);
+// mmu_invalidate_region(vaddr, 1024*1024); +// mmu_invalidate_region(vaddr, 1024*1024);
} }
#endif #endif
configs/pjrc-8051/sdcc-2.6.0.patch
+6 -6
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; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto --int-long-reent --float-reent" PORT=$$model PORTDIR=$(BUILDDIR)/$$model-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \
done \ done \
fi 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.orig 2007-03-11 13:21:15.000000000 -0600
+++ sdcc/device/include/stdarg.h 2007-03-11 13:26:59.000000000 -0600 +++ sdcc/device/include/stdarg.h 2007-03-11 13:26:59.000000000 -0600
@@ -25,9 +25,9 @@ @@ -25,9 +25,9 @@
#else #else
-typedef unsigned char __data * va_list ; -typedef unsigned char __data * va_list ;
-#define va_arg(marker,type) *((type __data * )(marker -= sizeof(type))) -#define va_arg(marker,type) *((type __data * )(marker -= sizeof(type)))
-#define va_start(marker,first) { marker = (va_list) ((char __data * )&first); } -#define va_start(marker,first) { marker = (va_list) ((char __data * )&first); }
+typedef unsigned char * va_list ; +typedef unsigned char * va_list ;
+#define va_arg(marker,type) *((type * )(marker -= sizeof(type))) +#define va_arg(marker,type) *((type * )(marker -= sizeof(type)))
+#define va_start(marker,first) { marker = (va_list) ((char * )&first); } +#define va_start(marker,first) { marker = (va_list) ((char * )&first); }
#endif #endif
configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+10 -10
View File
@@ -22,12 +22,12 @@ index ba7dbe7..b9f9991 100644
+ FAR const char *fmt, va_list ap); + FAR const char *fmt, va_list ap);
+#endif +#endif
static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl); static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
#if CONFIG_NFILE_DESCRIPTORS > 0 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf @@ -213,6 +219,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, FAR const void *buf
* *
****************************************************************************/ ****************************************************************************/
+#if 0 +#if 0
static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
FAR const char *fmt, ...) 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, @@ -263,6 +270,51 @@ static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
#endif #endif
} }
+#else +#else
+static int nsh_consolevoutput(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, va_list ap) +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 +#endif
pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer; pstate->cn_vtbl.linebuffer = nsh_consolelinebuffer;
pstate->cn_vtbl.exit = nsh_consoleexit; pstate->cn_vtbl.exit = nsh_consoleexit;
@@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void) @@ -489,3 +545,15 @@ FAR struct console_stdio_s *nsh_newconsole(void)
} }
return pstate; return pstate;
@@ -122,12 +122,12 @@ index c78362f..59bd8d7 100644
#include <stdbool.h> #include <stdbool.h>
+#include <stdarg.h> +#include <stdarg.h>
#include <errno.h> #include <errno.h>
/**************************************************************************** /****************************************************************************
@@ -62,11 +63,13 @@ @@ -62,11 +63,13 @@
#define nsh_undirect(v,s) (v)->undirect(v,s) #define nsh_undirect(v,s) (v)->undirect(v,s)
#define nsh_exit(v,s) (v)->exit(v,s) #define nsh_exit(v,s) (v)->exit(v,s)
+#if 0 +#if 0
#ifdef CONFIG_CPP_HAVE_VARARGS #ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt) # define nsh_output(v, fmt...) (v)->output(v, ##fmt)
@@ -135,9 +135,9 @@ index c78362f..59bd8d7 100644
# define nsh_output vtbl->output # define nsh_output vtbl->output
#endif #endif
+#endif +#endif
/* Size of info to be saved in call to nsh_redirect */ /* Size of info to be saved in call to nsh_redirect */
@@ -107,7 +110,11 @@ struct nsh_vtbl_s @@ -107,7 +110,11 @@ struct nsh_vtbl_s
void (*release)(FAR struct nsh_vtbl_s *vtbl); void (*release)(FAR struct nsh_vtbl_s *vtbl);
#endif #endif
@@ -152,8 +152,8 @@ index c78362f..59bd8d7 100644
void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);
@@ -159,5 +166,6 @@ struct console_stdio_s @@ -159,5 +166,6 @@ struct console_stdio_s
/* Defined in nsh_console.c *************************************************/ /* Defined in nsh_console.c *************************************************/
FAR struct console_stdio_s *nsh_newconsole(void); FAR struct console_stdio_s *nsh_newconsole(void);
+int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...); +int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...);
#endif /* __APPS_NSHLIB_NSH_CONSOLE_H */ #endif /* __APPS_NSHLIB_NSH_CONSOLE_H */