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

Indent the define statement by two spaces

Browse Source 
follow the code style convention

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-05-21 16:37:31 +08:00 committed by Alin Jerpelea
parent 7032c72f2f
commit e81227f99d
12 changed files with 157 additions and 157 deletions

6
examples/nx/nx_internal.h

@ -60,7 +60,7 @@
# define CONFIG_EXAMPLES_NX_BGCOLOR 0x7b5d # define CONFIG_EXAMPLES_NX_BGCOLOR 0x7b5d
# else # else
# define CONFIG_EXAMPLES_NX_BGCOLOR ' ' # define CONFIG_EXAMPLES_NX_BGCOLOR ' '
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_NX_COLOR1 #ifndef CONFIG_EXAMPLES_NX_COLOR1
@ -70,7 +70,7 @@
# define CONFIG_EXAMPLES_NX_COLOR1 0xe73f # define CONFIG_EXAMPLES_NX_COLOR1 0xe73f
# else # else
# define CONFIG_EXAMPLES_NX_COLOR1 '1' # define CONFIG_EXAMPLES_NX_COLOR1 '1'
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_NX_COLOR2 #ifndef CONFIG_EXAMPLES_NX_COLOR2
@ -80,7 +80,7 @@
# define CONFIG_EXAMPLES_NX_COLOR2 0xdefb # define CONFIG_EXAMPLES_NX_COLOR2 0xdefb
# else # else
# define CONFIG_EXAMPLES_NX_COLOR2 '2' # define CONFIG_EXAMPLES_NX_COLOR2 '2'
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_NX_TBCOLOR #ifndef CONFIG_EXAMPLES_NX_TBCOLOR

2
examples/nxdemo/nxdemo.h

@ -61,7 +61,7 @@
# define CONFIG_EXAMPLES_NXDEMO_BGCOLOR 0x00 # define CONFIG_EXAMPLES_NXDEMO_BGCOLOR 0x00
# else # else
# define CONFIG_EXAMPLES_NXDEMO_BGCOLOR ' ' # define CONFIG_EXAMPLES_NXDEMO_BGCOLOR ' '
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_NXDEMO_DRAWCOLOR #ifndef CONFIG_EXAMPLES_NXDEMO_DRAWCOLOR

2
examples/nxhello/nxhello.h

@ -60,7 +60,7 @@
# define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x00 # define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x00
# else # else
# define CONFIG_EXAMPLES_NXHELLO_BGCOLOR ' ' # define CONFIG_EXAMPLES_NXHELLO_BGCOLOR ' '
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_NXHELLO_FONTID #ifndef CONFIG_EXAMPLES_NXHELLO_FONTID

4
examples/nxterm/nxterm_internal.h

@ -110,7 +110,7 @@
# define CONFIG_EXAMPLES_NXTERM_BGCOLOR RGBTO16(39, 64, 139) # define CONFIG_EXAMPLES_NXTERM_BGCOLOR RGBTO16(39, 64, 139)
# else # else
# define CONFIG_EXAMPLES_NXTERM_BGCOLOR RGBTO8(39, 64, 139) # define CONFIG_EXAMPLES_NXTERM_BGCOLOR RGBTO8(39, 64, 139)
# endif # endif
#endif #endif
/* Window color (lighter steel blue) */ /* Window color (lighter steel blue) */
@ -122,7 +122,7 @@
# define CONFIG_EXAMPLES_NXTERM_WCOLOR RGBTO16(202, 225, 255) # define CONFIG_EXAMPLES_NXTERM_WCOLOR RGBTO16(202, 225, 255)
# else # else
# define CONFIG_EXAMPLES_NXTERM_WCOLOR RGBTO8(202, 225, 255) # define CONFIG_EXAMPLES_NXTERM_WCOLOR RGBTO8(202, 225, 255)
# endif # endif
#endif #endif
/* Toolbar color (medium grey) */ /* Toolbar color (medium grey) */

4
examples/nxtext/nxtext_internal.h

@ -87,7 +87,7 @@
# define CONFIG_EXAMPLES_NXTEXT_BGCOLOR 0x7b5d # define CONFIG_EXAMPLES_NXTEXT_BGCOLOR 0x7b5d
# else # else
# define CONFIG_EXAMPLES_NXTEXT_BGCOLOR ' ' # define CONFIG_EXAMPLES_NXTEXT_BGCOLOR ' '
# endif # endif
#endif #endif
/* Pop-up font ID */ /* Pop-up font ID */
@ -105,7 +105,7 @@
# define CONFIG_EXAMPLES_NXTEXT_PUCOLOR 0xdefb # define CONFIG_EXAMPLES_NXTEXT_PUCOLOR 0xdefb
# else # else
# define CONFIG_EXAMPLES_NXTEXT_PUCOLOR '2' # define CONFIG_EXAMPLES_NXTEXT_PUCOLOR '2'
# endif # endif
#endif #endif
/* Background font ID */ /* Background font ID */

8
examples/pwfb/pwfb_internal.h

@ -89,7 +89,7 @@
# define CONFIG_EXAMPLES_PWFB_BGCOLOR 0x7b5d # define CONFIG_EXAMPLES_PWFB_BGCOLOR 0x7b5d
# else # else
# define CONFIG_EXAMPLES_PWFB_BGCOLOR ' ' # define CONFIG_EXAMPLES_PWFB_BGCOLOR ' '
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWFB_COLOR1 #ifndef CONFIG_EXAMPLES_PWFB_COLOR1
@ -99,7 +99,7 @@
# define CONFIG_EXAMPLES_PWFB_COLOR1 0xe73f # define CONFIG_EXAMPLES_PWFB_COLOR1 0xe73f
# else # else
# define CONFIG_EXAMPLES_PWFB_COLOR1 '1' # define CONFIG_EXAMPLES_PWFB_COLOR1 '1'
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWFB_COLOR2 #ifndef CONFIG_EXAMPLES_PWFB_COLOR2
@ -109,7 +109,7 @@
# define CONFIG_EXAMPLES_PWFB_COLOR2 0xdefb # define CONFIG_EXAMPLES_PWFB_COLOR2 0xdefb
# else # else
# define CONFIG_EXAMPLES_PWFB_COLOR2 '2' # define CONFIG_EXAMPLES_PWFB_COLOR2 '2'
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWFB_COLOR3 #ifndef CONFIG_EXAMPLES_PWFB_COLOR3
@ -119,7 +119,7 @@
# define CONFIG_EXAMPLES_PWFB_COLOR2 0xff76 # define CONFIG_EXAMPLES_PWFB_COLOR2 0xff76
# else # else
# define CONFIG_EXAMPLES_PWFB_COLOR2 '3' # define CONFIG_EXAMPLES_PWFB_COLOR2 '3'
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWFB_TBCOLOR #ifndef CONFIG_EXAMPLES_PWFB_TBCOLOR

8
examples/pwlines/pwlines_internal.h

@ -81,7 +81,7 @@
# define CONFIG_EXAMPLES_PWLINES_BGCOLOR 0x7b5d # define CONFIG_EXAMPLES_PWLINES_BGCOLOR 0x7b5d
# else # else
# define CONFIG_EXAMPLES_PWLINES_BGCOLOR ' ' # define CONFIG_EXAMPLES_PWLINES_BGCOLOR ' '
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWLINES_COLOR1 #ifndef CONFIG_EXAMPLES_PWLINES_COLOR1
@ -91,7 +91,7 @@
# define CONFIG_EXAMPLES_PWLINES_COLOR1 RGB16_DARKGREEN # define CONFIG_EXAMPLES_PWLINES_COLOR1 RGB16_DARKGREEN
# else # else
# define CONFIG_EXAMPLES_PWLINES_COLOR1 RGB8_DARKGREEN # define CONFIG_EXAMPLES_PWLINES_COLOR1 RGB8_DARKGREEN
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWLINES_COLOR2 #ifndef CONFIG_EXAMPLES_PWLINES_COLOR2
@ -101,7 +101,7 @@
# define CONFIG_EXAMPLES_PWLINES_COLOR2 RGB16_GREEN # define CONFIG_EXAMPLES_PWLINES_COLOR2 RGB16_GREEN
# else # else
# define CONFIG_EXAMPLES_PWLINES_COLOR2 RGB8_GREEN # define CONFIG_EXAMPLES_PWLINES_COLOR2 RGB8_GREEN
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWLINES_COLOR3 #ifndef CONFIG_EXAMPLES_PWLINES_COLOR3
@ -111,7 +111,7 @@
# define CONFIG_EXAMPLES_PWLINES_COLOR3 RGB16_LIGHTGREEN # define CONFIG_EXAMPLES_PWLINES_COLOR3 RGB16_LIGHTGREEN
# else # else
# define CONFIG_EXAMPLES_PWLINES_COLOR3 RGB8_LIGHTGREEN # define CONFIG_EXAMPLES_PWLINES_COLOR3 RGB8_LIGHTGREEN
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWLINES_BORDERWIDTH #ifndef CONFIG_EXAMPLES_PWLINES_BORDERWIDTH

118
fsutils/mkfatfs/fat32.h

@ -266,39 +266,39 @@
/* Sizes and limits */ /* Sizes and limits */
# ifndef CONFIG_FAT_MAXFNAME /* The maximum support filename can be limited */ # ifndef CONFIG_FAT_MAXFNAME /* The maximum support filename can be limited */
# define LDIR_MAXFNAME 255 /* Max unicode characters in file name */ # define LDIR_MAXFNAME 255 /* Max unicode characters in file name */
# elif CONFIG_FAT_MAXFNAME <= 255 # elif CONFIG_FAT_MAXFNAME <= 255
# define LDIR_MAXFNAME CONFIG_FAT_MAXFNAME # define LDIR_MAXFNAME CONFIG_FAT_MAXFNAME
# else # else
# error "Illegal value for CONFIG_FAT_MAXFNAME" # error "Illegal value for CONFIG_FAT_MAXFNAME"
# endif # endif
# define LDIR_MAXLFNCHARS 13 /* Max unicode characters in one LFN entry */ # define LDIR_MAXLFNCHARS 13 /* Max unicode characters in one LFN entry */
# define LDIR_MAXLFNS 20 /* Max number of LFN entries */ # define LDIR_MAXLFNS 20 /* Max number of LFN entries */
/* LFN directory entry offsets */ /* LFN directory entry offsets */
# define LDIR_SEQ 0 /* 1@ 0: Sequence number */ # define LDIR_SEQ 0 /* 1@ 0: Sequence number */
# define LDIR_WCHAR1_5 1 /* 10@ 1: File name characters 1-5 (5 Unicode characters) */ # define LDIR_WCHAR1_5 1 /* 10@ 1: File name characters 1-5 (5 Unicode characters) */
# define LDIR_ATTRIBUTES 11 /* 1@11: File attributes (always 0x0f) */ # define LDIR_ATTRIBUTES 11 /* 1@11: File attributes (always 0x0f) */
# define LDIR_NTRES 12 /* 1@12: Reserved for use by NT (always 0x00) */ # define LDIR_NTRES 12 /* 1@12: Reserved for use by NT (always 0x00) */
# define LDIR_CHECKSUM 13 /* 1@13: Checksum of the DOS filename */ # define LDIR_CHECKSUM 13 /* 1@13: Checksum of the DOS filename */
# define LDIR_WCHAR6_11 14 /* 12@14: File name characters 6-11 (6 Unicode characters) */ # define LDIR_WCHAR6_11 14 /* 12@14: File name characters 6-11 (6 Unicode characters) */
# define LDIR_FSTCLUSTLO 26 /* 2@26: First cluster (always 0x0000) */ # define LDIR_FSTCLUSTLO 26 /* 2@26: First cluster (always 0x0000) */
# define LDIR_WCHAR12_13 28 /* 4@28: File name characters 12-13 (2 Unicode characters) */ # define LDIR_WCHAR12_13 28 /* 4@28: File name characters 12-13 (2 Unicode characters) */
/* LFN sequence number and allocation status */ /* LFN sequence number and allocation status */
# define LDIR0_EMPTY DIR0_EMPTY /* The directory entry is empty */ # define LDIR0_EMPTY DIR0_EMPTY /* The directory entry is empty */
# define LDIR0_ALLEMPTY DIR0_ALLEMPTY /* This entry and all following are empty */ # define LDIR0_ALLEMPTY DIR0_ALLEMPTY /* This entry and all following are empty */
# define LDIR0_E5 DIR0_E5 /* The actual value is 0xe5 */ # define LDIR0_E5 DIR0_E5 /* The actual value is 0xe5 */
# define LDIR0_LAST 0x40 /* Last LFN in file name (appears first) */ # define LDIR0_LAST 0x40 /* Last LFN in file name (appears first) */
# define LDIR0_SEQ_MASK 0x1f /* Mask for sequence number (1-20) */ # define LDIR0_SEQ_MASK 0x1f /* Mask for sequence number (1-20) */
/* The LFN entry attribute */ /* The LFN entry attribute */
# define LDDIR_LFNATTR 0x0f # define LDDIR_LFNATTR 0x0f
#endif #endif
/* File system types */ /* File system types */
@ -453,10 +453,10 @@
#define DIR_PUTCRTTIMETENTH(p,v) UBYTE_PUT(p,DIR_CRTTIMETENTH,v) #define DIR_PUTCRTTIMETENTH(p,v) UBYTE_PUT(p,DIR_CRTTIMETENTH,v)
#ifdef CONFIG_FAT_LFN #ifdef CONFIG_FAT_LFN
# define LDIR_PUTSEQ(p,v) UBYTE_PUT(p,LDIR_SEQ,v) # define LDIR_PUTSEQ(p,v) UBYTE_PUT(p,LDIR_SEQ,v)
# define LDIR_PUTATTRIBUTES(p,v) UBYTE_PUT(p,LDIR_ATTRIBUTES,v) # define LDIR_PUTATTRIBUTES(p,v) UBYTE_PUT(p,LDIR_ATTRIBUTES,v)
# define LDIR_PUTNTRES(p,v) UBYTE_PUT(p,LDIR_NTRES,v) # define LDIR_PUTNTRES(p,v) UBYTE_PUT(p,LDIR_NTRES,v)
# define LDIR_PUTCHECKSUM(p,v) UBYTE_PUT(p,LDIR_CHECKSUM,v) # define LDIR_PUTCHECKSUM(p,v) UBYTE_PUT(p,LDIR_CHECKSUM,v)
#endif #endif
/* For the all targets, unaligned values need to be accessed byte-by-byte. /* For the all targets, unaligned values need to be accessed byte-by-byte.
@ -490,9 +490,9 @@
#define PART4_PUTSIZE(p,v) FAT_PUTUINT32(UBYTE_PTR(p,PART_ENTRY4+PART_SIZE),v) #define PART4_PUTSIZE(p,v) FAT_PUTUINT32(UBYTE_PTR(p,PART_ENTRY4+PART_SIZE),v)
#ifdef CONFIG_FAT_LFN #ifdef CONFIG_FAT_LFN
# define LDIR_PTRWCHAR1_5(p) UBYTE_PTR(p,LDIR_WCHAR1_5) # define LDIR_PTRWCHAR1_5(p) UBYTE_PTR(p,LDIR_WCHAR1_5)
# define LDIR_PTRWCHAR6_11(p) UBYTE_PTR(p,LDIR_WCHAR6_11) # define LDIR_PTRWCHAR6_11(p) UBYTE_PTR(p,LDIR_WCHAR6_11)
# define LDIR_PTRWCHAR12_13(p) UBYTE_PTR(p,LDIR_WCHAR12_13) # define LDIR_PTRWCHAR12_13(p) UBYTE_PTR(p,LDIR_WCHAR12_13)
#endif #endif
/* But for multi-byte values, the endian-ness of the target vs. the little /* But for multi-byte values, the endian-ness of the target vs. the little
@ -549,21 +549,21 @@
# define DIR_PUTFSTCLUSTLO(p,v) FAT_PUTUINT16(UBYTE_PTR(p,DIR_FSTCLUSTLO),v) # define DIR_PUTFSTCLUSTLO(p,v) FAT_PUTUINT16(UBYTE_PTR(p,DIR_FSTCLUSTLO),v)
# define DIR_PUTFILESIZE(p,v) FAT_PUTUINT32(UBYTE_PTR(p,DIR_FILESIZE),v) # define DIR_PUTFILESIZE(p,v) FAT_PUTUINT32(UBYTE_PTR(p,DIR_FILESIZE),v)
# ifdef CONFIG_FAT_LFN # ifdef CONFIG_FAT_LFN
# define LDIR_PUTWCHAR1(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5),v) # define LDIR_PUTWCHAR1(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5),v)
# define LDIR_PUTWCHAR2(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+2),v) # define LDIR_PUTWCHAR2(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+2),v)
# define LDIR_PUTWCHAR3(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+4),v) # define LDIR_PUTWCHAR3(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+4),v)
# define LDIR_PUTWCHAR4(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+6),v) # define LDIR_PUTWCHAR4(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+6),v)
# define LDIR_PUTWCHAR5(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+8),v) # define LDIR_PUTWCHAR5(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR1_5+8),v)
# define LDIR_PUTWCHAR6(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11),v) # define LDIR_PUTWCHAR6(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11),v)
# define LDIR_PUTWCHAR7(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+2),v) # define LDIR_PUTWCHAR7(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+2),v)
# define LDIR_PUTWCHAR8(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+4),v) # define LDIR_PUTWCHAR8(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+4),v)
# define LDIR_PUTWCHAR9(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+6),v) # define LDIR_PUTWCHAR9(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+6),v)
# define LDIR_PUTWCHAR10(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+8),v) # define LDIR_PUTWCHAR10(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+8),v)
# define LDIR_PUTWCHAR11(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+10),v) # define LDIR_PUTWCHAR11(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR6_11+10),v)
# define LDIR_PUTWCHAR12(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR12_13),v) # define LDIR_PUTWCHAR12(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR12_13),v)
# define LDIR_PUTWCHAR13(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR12_13+2),v) # define LDIR_PUTWCHAR13(p) FAT_PUTUINT16(UBYTE_PTR(p,LDIR_WCHAR12_13+2),v)
# endif # endif
# define FSI_PUTLEADSIG(p,v) FAT_PUTUINT32(UBYTE_PTR(p,FSI_LEADSIG),v) # define FSI_PUTLEADSIG(p,v) FAT_PUTUINT32(UBYTE_PTR(p,FSI_LEADSIG),v)
# define FSI_PUTSTRUCTSIG(p,v) FAT_PUTUINT32(UBYTE_PTR(p,FSI_STRUCTSIG),v) # define FSI_PUTSTRUCTSIG(p,v) FAT_PUTUINT32(UBYTE_PTR(p,FSI_STRUCTSIG),v)
@ -624,20 +624,20 @@
# define DIR_PUTFILESIZE(p,v) UINT32_PUT(p,DIR_FILESIZE,v) # define DIR_PUTFILESIZE(p,v) UINT32_PUT(p,DIR_FILESIZE,v)
# ifdef CONFIG_FAT_LFN # ifdef CONFIG_FAT_LFN
# define LDIR_PUTWCHAR1(p,v) UINT16_PUT(p,LDIR_WCHAR1_5,v) # define LDIR_PUTWCHAR1(p,v) UINT16_PUT(p,LDIR_WCHAR1_5,v)
# define LDIR_PUTWCHAR2(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+2,v) # define LDIR_PUTWCHAR2(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+2,v)
# define LDIR_PUTWCHAR3(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+4,v) # define LDIR_PUTWCHAR3(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+4,v)
# define LDIR_PUTWCHAR4(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+6,v) # define LDIR_PUTWCHAR4(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+6,v)
# define LDIR_PUTWCHAR5(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+8,v) # define LDIR_PUTWCHAR5(p,v) UINT16_PUT(p,LDIR_WCHAR1_5+8,v)
# define LDIR_PUTWCHAR6(p,v) UINT16_PUT(p,LDIR_WCHAR6_11,v) # define LDIR_PUTWCHAR6(p,v) UINT16_PUT(p,LDIR_WCHAR6_11,v)
# define LDIR_PUTWCHAR7(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+2,v) # define LDIR_PUTWCHAR7(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+2,v)
# define LDIR_PUTWCHAR8(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+4,v) # define LDIR_PUTWCHAR8(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+4,v)
# define LDIR_PUTWCHAR9(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+6,v) # define LDIR_PUTWCHAR9(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+6,v)
# define LDIR_PUTWCHAR10(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+8,v) # define LDIR_PUTWCHAR10(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+8,v)
# define LDIR_PUTWCHAR11(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+10,v) # define LDIR_PUTWCHAR11(p,v) UINT16_PUT(p,LDIR_WCHAR6_11+10,v)
# define LDIR_PUTWCHAR12(p,v) UINT16_PUT(p,LDIR_WCHAR12_13,v) # define LDIR_PUTWCHAR12(p,v) UINT16_PUT(p,LDIR_WCHAR12_13,v)
# define LDIR_PUTWCHAR13(p,v) UINT16_PUT(p,LDIR_WCHAR12_13+2,v) # define LDIR_PUTWCHAR13(p,v) UINT16_PUT(p,LDIR_WCHAR12_13+2,v)
# endif # endif
# define FSI_PUTLEADSIG(p,v) UINT32_PUT(p,FSI_LEADSIG,v) # define FSI_PUTLEADSIG(p,v) UINT32_PUT(p,FSI_LEADSIG,v)
# define FSI_PUTSTRUCTSIG(p,v) UINT32_PUT(p,FSI_STRUCTSIG,v) # define FSI_PUTSTRUCTSIG(p,v) UINT32_PUT(p,FSI_STRUCTSIG,v)

2
nshlib/nsh.h

@ -1025,7 +1025,7 @@ int cmd_irqinfo(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
# ifndef CONFIG_NSH_DISABLE_RMDIR # ifndef CONFIG_NSH_DISABLE_RMDIR
int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
# endif # endif
# endif /* NSH_HAVE_DIROPTS */ #endif /* NSH_HAVE_DIROPTS */
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP) # if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP)

120
nshlib/nsh_command.c

@ -143,9 +143,9 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifndef CONFIG_DISABLE_ENVIRON #ifndef CONFIG_DISABLE_ENVIRON
# ifndef CONFIG_NSH_DISABLE_CD # ifndef CONFIG_NSH_DISABLE_CD
{ "cd", cmd_cd, 1, 2, "[<dir-path>|-|~|..]" }, { "cd", cmd_cd, 1, 2, "[<dir-path>|-|~|..]" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_CP #ifndef CONFIG_NSH_DISABLE_CP
@ -168,7 +168,7 @@ static const struct cmdmap_s g_cmdmap[] =
{ "dd", cmd_dd, 3, 7, { "dd", cmd_dd, 3, 7,
"if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] " "if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] "
"[skip=<sectors>] [verify]" }, "[skip=<sectors>] [verify]" },
# endif #endif
#if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) && !defined(CONFIG_NSH_DISABLE_DELROUTE) #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) && !defined(CONFIG_NSH_DISABLE_DELROUTE)
{ "delroute", cmd_delroute, 2, 3, "<target> [<netmask>]" }, { "delroute", cmd_delroute, 2, 3, "<target> [<netmask>]" },
@ -189,13 +189,13 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifndef CONFIG_NSH_DISABLE_ECHO #ifndef CONFIG_NSH_DISABLE_ECHO
# ifndef CONFIG_DISABLE_ENVIRON # ifndef CONFIG_DISABLE_ENVIRON
{ "echo", cmd_echo, 1, CONFIG_NSH_MAXARGUMENTS, { "echo", cmd_echo, 1, CONFIG_NSH_MAXARGUMENTS,
"[-n] [<string|$name> [<string|$name>...]]" }, "[-n] [<string|$name> [<string|$name>...]]" },
# else # else
{ "echo", cmd_echo, 1, CONFIG_NSH_MAXARGUMENTS, { "echo", cmd_echo, 1, CONFIG_NSH_MAXARGUMENTS,
"[-n] [<string> [<string>...]]" }, "[-n] [<string> [<string>...]]" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_ENV #ifndef CONFIG_NSH_DISABLE_ENV
@ -223,25 +223,25 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifdef CONFIG_DEBUG_MM #ifdef CONFIG_DEBUG_MM
# ifndef CONFIG_NSH_DISABLE_MEMDUMP # ifndef CONFIG_NSH_DISABLE_MEMDUMP
{ "memdump", cmd_memdump, 1, 4, "[pid/used/free/on/off]" { "memdump", cmd_memdump, 1, 4, "[pid/used/free/on/off]"
" <minseq> <maxseq>"}, " <minseq> <maxseq>"},
# endif # endif
#endif #endif
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
# ifndef CONFIG_NSH_DISABLE_GET # ifndef CONFIG_NSH_DISABLE_GET
{ "get", cmd_get, 4, 7, { "get", cmd_get, 4, 7,
"[-b|-n] [-f <local-path>] -h <ip-address> <remote-path>" }, "[-b|-n] [-f <local-path>] -h <ip-address> <remote-path>" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_HELP #ifndef CONFIG_NSH_DISABLE_HELP
# ifdef CONFIG_NSH_HELP_TERSE # ifdef CONFIG_NSH_HELP_TERSE
{ "help", cmd_help, 1, 2, "[<cmd>]" }, { "help", cmd_help, 1, 2, "[<cmd>]" },
#else # else
{ "help", cmd_help, 1, 3, "[-v] [<cmd>]" }, { "help", cmd_help, 1, 3, "[-v] [<cmd>]" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_HEXDUMP #ifndef CONFIG_NSH_DISABLE_HEXDUMP
@ -254,16 +254,16 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifdef CONFIG_NET #ifdef CONFIG_NET
# ifndef CONFIG_NSH_DISABLE_IFCONFIG # ifndef CONFIG_NSH_DISABLE_IFCONFIG
{ "ifconfig", cmd_ifconfig, 1, 12, { "ifconfig", cmd_ifconfig, 1, 12,
"[interface [address_family] [mtu <len>] | [<ip-address>|dhcp]]" "[interface [address_family] [mtu <len>] | [<ip-address>|dhcp]]"
"[dr|gw|gateway <dr-address>] [netmask <net-mask>|prefixlen <len>] " "[dr|gw|gateway <dr-address>] [netmask <net-mask>|prefixlen <len>] "
"[dns <dns-address>] [hw <hw-mac>]" }, "[dns <dns-address>] [hw <hw-mac>]" },
# endif # endif
# ifndef CONFIG_NSH_DISABLE_IFUPDOWN # ifndef CONFIG_NSH_DISABLE_IFUPDOWN
{ "ifdown", cmd_ifdown, 2, 2, "<interface>" }, { "ifdown", cmd_ifdown, 2, 2, "<interface>" },
{ "ifup", cmd_ifup, 2, 2, "<interface>" }, { "ifup", cmd_ifup, 2, 2, "<interface>" },
# endif # endif
#endif #endif
#if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS) #if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS)
@ -279,27 +279,27 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP) # if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP)
{ "losetup", cmd_losetup, 3, 6, { "losetup", cmd_losetup, 3, 6,
"[-d <dev-path>] | [[-o <offset>] [-r] [-s <sect-size>] " "[-d <dev-path>] | [[-o <offset>] [-r] [-s <sect-size>] "
"<dev-path> <file-path>]" }, "<dev-path> <file-path>]" },
# endif # endif
#endif #endif
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_SMART_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSMART) # if defined(CONFIG_SMART_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSMART)
{ "losmart", cmd_losmart, 2, 11, { "losmart", cmd_losmart, 2, 11,
"[-d <dev-path>] | [[-m <minor>] [-o <offset>] [-e <erase-size>] " "[-d <dev-path>] | [[-m <minor>] [-o <offset>] [-e <erase-size>] "
"[-s <sect-size>] [-r] <file-path>]" }, "[-s <sect-size>] [-r] <file-path>]" },
# endif # endif
#endif #endif
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_MTD_LOOP) && !defined(CONFIG_NSH_DISABLE_LOMTD) # if defined(CONFIG_MTD_LOOP) && !defined(CONFIG_NSH_DISABLE_LOMTD)
{ "lomtd", cmd_lomtd, 3, 9, { "lomtd", cmd_lomtd, 3, 9,
"[-d <dev-path>] | [[-o <offset>] [-e <erase-size>] " "[-d <dev-path>] | [[-o <offset>] [-e <erase-size>] "
"[-s <sect-size>] <dev-path> <file-path>]]" }, "[-s <sect-size>] <dev-path> <file-path>]]" },
# endif # endif
#endif #endif
#if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_PSEUDOFS_SOFTLINKS) #if !defined(CONFIG_NSH_DISABLE_LN) && defined(CONFIG_PSEUDOFS_SOFTLINKS)
@ -311,9 +311,9 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS) #if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS)
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE) # if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MODULE)
{ "lsmod", cmd_lsmod, 1, 1, NULL }, { "lsmod", cmd_lsmod, 1, 1, NULL },
#endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_MB #ifndef CONFIG_NSH_DISABLE_MB
@ -328,23 +328,23 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifdef NSH_HAVE_DIROPTS #ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_MKDIR # ifndef CONFIG_NSH_DISABLE_MKDIR
{ "mkdir", cmd_mkdir, 2, 3, "[-p] <path>" }, { "mkdir", cmd_mkdir, 2, 3, "[-p] <path>" },
# endif # endif
#endif #endif
#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FSUTILS_MKFATFS) #if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FSUTILS_MKFATFS)
# ifndef CONFIG_NSH_DISABLE_MKFATFS # ifndef CONFIG_NSH_DISABLE_MKFATFS
{ "mkfatfs", cmd_mkfatfs, 2, 6, { "mkfatfs", cmd_mkfatfs, 2, 6,
"[-F <fatsize>] [-r <rootdirentries>] <block-driver>" }, "[-F <fatsize>] [-r <rootdirentries>] <block-driver>" },
# endif # endif
#endif #endif
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_PIPES) && CONFIG_DEV_FIFO_SIZE > 0 && \ # if defined(CONFIG_PIPES) && CONFIG_DEV_FIFO_SIZE > 0 && \
!defined(CONFIG_NSH_DISABLE_MKFIFO) !defined(CONFIG_NSH_DISABLE_MKFIFO)
{ "mkfifo", cmd_mkfifo, 2, 2, "<path>" }, { "mkfifo", cmd_mkfifo, 2, 2, "<path>" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_MKRD #ifndef CONFIG_NSH_DISABLE_MKRD
@ -354,14 +354,14 @@ static const struct cmdmap_s g_cmdmap[] =
#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_SMARTFS) && \ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_SMARTFS) && \
defined(CONFIG_FSUTILS_MKSMARTFS) defined(CONFIG_FSUTILS_MKSMARTFS)
# ifndef CONFIG_NSH_DISABLE_MKSMARTFS # ifndef CONFIG_NSH_DISABLE_MKSMARTFS
# ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS # ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
{ "mksmartfs", cmd_mksmartfs, 2, 6, { "mksmartfs", cmd_mksmartfs, 2, 6,
"[-s <sector-size>] [-f] <path> [<num-root-directories>]" }, "[-s <sector-size>] [-f] <path> [<num-root-directories>]" },
# else # else
{ "mksmartfs", cmd_mksmartfs, 2, 5, "[-s <sector-size>] [-f] <path>" }, { "mksmartfs", cmd_mksmartfs, 2, 5, "[-s <sector-size>] [-f] <path>" },
# endif
# endif # endif
# endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_MH #ifndef CONFIG_NSH_DISABLE_MH
@ -370,15 +370,15 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#if !defined(CONFIG_DISABLE_MOUNTPOINT) #if !defined(CONFIG_DISABLE_MOUNTPOINT)
#ifndef CONFIG_NSH_DISABLE_MOUNT # ifndef CONFIG_NSH_DISABLE_MOUNT
#if defined(NSH_HAVE_CATFILE) && defined(HAVE_MOUNT_LIST) # if defined(NSH_HAVE_CATFILE) && defined(HAVE_MOUNT_LIST)
{ "mount", cmd_mount, 1, 7, { "mount", cmd_mount, 1, 7,
"[-t <fstype> [-o <options>] [<block-device>] <mount-point>]" }, "[-t <fstype> [-o <options>] [<block-device>] <mount-point>]" },
#else # else
{ "mount", cmd_mount, 4, 7, { "mount", cmd_mount, 4, 7,
"-t <fstype> [-o <options>] [<block-device>] <mount-point>" }, "-t <fstype> [-o <options>] [<block-device>] <mount-point>" },
#endif # endif
#endif # endif
#endif #endif
#ifdef NSH_HAVE_DIROPTS #ifdef NSH_HAVE_DIROPTS
@ -422,13 +422,13 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifndef CONFIG_NSH_DISABLE_PRINTF #ifndef CONFIG_NSH_DISABLE_PRINTF
# ifndef CONFIG_DISABLE_ENVIRON # ifndef CONFIG_DISABLE_ENVIRON
{ "printf", cmd_printf, 1, CONFIG_NSH_MAXARGUMENTS, { "printf", cmd_printf, 1, CONFIG_NSH_MAXARGUMENTS,
"[\\xNN] [\\n\\r\\t] [<string|$name> [<string|$name>...]]" }, "[\\xNN] [\\n\\r\\t] [<string|$name> [<string|$name>...]]" },
# else # else
{ "printf", cmd_printf, 1, CONFIG_NSH_MAXARGUMENTS, { "printf", cmd_printf, 1, CONFIG_NSH_MAXARGUMENTS,
"[\\xNN] [\\n\\r\\t] [<string> [<string>...]]" }, "[\\xNN] [\\n\\r\\t] [<string> [<string>...]]" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_PS #ifndef CONFIG_NSH_DISABLE_PS
@ -436,16 +436,16 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifdef CONFIG_NET_UDP #ifdef CONFIG_NET_UDP
# ifndef CONFIG_NSH_DISABLE_PUT # ifndef CONFIG_NSH_DISABLE_PUT
{ "put", cmd_put, 4, 7, { "put", cmd_put, 4, 7,
"[-b|-n] [-f <remote-path>] -h <ip-address> <local-path>" }, "[-b|-n] [-f <remote-path>] -h <ip-address> <local-path>" },
# endif # endif
#endif #endif
#ifndef CONFIG_DISABLE_ENVIRON #ifndef CONFIG_DISABLE_ENVIRON
# ifndef CONFIG_NSH_DISABLE_PWD # ifndef CONFIG_NSH_DISABLE_PWD
{ "pwd", cmd_pwd, 1, 1, NULL }, { "pwd", cmd_pwd, 1, 1, NULL },
# endif # endif
#endif #endif
#if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_PSEUDOFS_SOFTLINKS) #if !defined(CONFIG_NSH_DISABLE_READLINK) && defined(CONFIG_PSEUDOFS_SOFTLINKS)
@ -461,15 +461,15 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifdef NSH_HAVE_DIROPTS #ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_RM # ifndef CONFIG_NSH_DISABLE_RM
{ "rm", cmd_rm, 2, 3, "[-r] <file-path>" }, { "rm", cmd_rm, 2, 3, "[-r] <file-path>" },
# endif # endif
#endif #endif
#ifdef NSH_HAVE_DIROPTS #ifdef NSH_HAVE_DIROPTS
# ifndef CONFIG_NSH_DISABLE_RMDIR # ifndef CONFIG_NSH_DISABLE_RMDIR
{ "rmdir", cmd_rmdir, 2, 2, "<dir-path>" }, { "rmdir", cmd_rmdir, 2, 2, "<dir-path>" },
# endif # endif
#endif #endif
#if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS) #if defined(CONFIG_MODULE) && !defined(CONFIG_NSH_DISABLE_MODCMDS)
@ -551,23 +551,23 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifndef CONFIG_DISABLE_MOUNTPOINT #ifndef CONFIG_DISABLE_MOUNTPOINT
# ifndef CONFIG_NSH_DISABLE_TRUNCATE # ifndef CONFIG_NSH_DISABLE_TRUNCATE
{ "truncate", cmd_truncate, 4, 4, "-s <length> <file-path>" }, { "truncate", cmd_truncate, 4, 4, "-s <length> <file-path>" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_UNAME #ifndef CONFIG_NSH_DISABLE_UNAME
#ifdef CONFIG_NET # ifdef CONFIG_NET
{ "uname", cmd_uname, 1, 7, "[-a | -imnoprsv]" }, { "uname", cmd_uname, 1, 7, "[-a | -imnoprsv]" },
#else # else
{ "uname", cmd_uname, 1, 7, "[-a | -imoprsv]" }, { "uname", cmd_uname, 1, 7, "[-a | -imoprsv]" },
#endif # endif
#endif #endif
#if !defined(CONFIG_DISABLE_MOUNTPOINT) #if !defined(CONFIG_DISABLE_MOUNTPOINT)
# ifndef CONFIG_NSH_DISABLE_UMOUNT # ifndef CONFIG_NSH_DISABLE_UMOUNT
{ "umount", cmd_umount, 2, 2, "<dir-path>" }, { "umount", cmd_umount, 2, 2, "<dir-path>" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_UNSET #ifndef CONFIG_NSH_DISABLE_UNSET
@ -603,9 +603,9 @@ static const struct cmdmap_s g_cmdmap[] =
#endif #endif
#ifdef CONFIG_NET_TCP #ifdef CONFIG_NET_TCP
# ifndef CONFIG_NSH_DISABLE_WGET # ifndef CONFIG_NSH_DISABLE_WGET
{ "wget", cmd_wget, 2, 4, "[-o <local-path>] <url>" }, { "wget", cmd_wget, 2, 4, "[-o <local-path>] <url>" },
# endif # endif
#endif #endif
#ifndef CONFIG_NSH_DISABLE_XD #ifndef CONFIG_NSH_DISABLE_XD

6
nshlib/nsh_session.c

@ -108,16 +108,16 @@ int nsh_session(FAR struct console_stdio_s *pstate,
write(OUTFD(pstate), g_nshgreeting, strlen(g_nshgreeting)); write(OUTFD(pstate), g_nshgreeting, strlen(g_nshgreeting));
#ifdef CONFIG_NSH_MOTD #ifdef CONFIG_NSH_MOTD
# ifdef CONFIG_NSH_PLATFORM_MOTD # ifdef CONFIG_NSH_PLATFORM_MOTD
/* Output the platform message of the day */ /* Output the platform message of the day */
platform_motd(vtbl->iobuffer, IOBUFFERSIZE); platform_motd(vtbl->iobuffer, IOBUFFERSIZE);
dprintf(OUTFD(pstate), "%s\n", vtbl->iobuffer); dprintf(OUTFD(pstate), "%s\n", vtbl->iobuffer);
# else # else
/* Output the fixed message of the day */ /* Output the fixed message of the day */
dprintf(OUTFD(pstate), "%s\n", g_nshmotd); dprintf(OUTFD(pstate), "%s\n", g_nshmotd);
# endif # endif
#endif #endif
/* Execute the login script */ /* Execute the login script */

34
system/zmodem/host/nuttx/compiler.h

@ -53,18 +53,18 @@
* unnecessary "weak" functions can be excluded from the link. * unnecessary "weak" functions can be excluded from the link.
*/ */
# ifndef __CYGWIN__ #ifndef __CYGWIN__
# define CONFIG_HAVE_WEAKFUNCTIONS 1 # define CONFIG_HAVE_WEAKFUNCTIONS 1
# define weak_alias(name, aliasname) \ # define weak_alias(name, aliasname) \
extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))); extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
# define weak_function __attribute__ ((weak)) # define weak_function __attribute__ ((weak))
# define weak_const_function __attribute__ ((weak, __const__)) # define weak_const_function __attribute__ ((weak, __const__))
# else #else
# undef CONFIG_HAVE_WEAKFUNCTIONS # undef CONFIG_HAVE_WEAKFUNCTIONS
# define weak_alias(name, aliasname) # define weak_alias(name, aliasname)
# define weak_function # define weak_function
# define weak_const_function # define weak_const_function
# endif #endif
/* The noreturn attribute informs GCC that the function will not return. */ /* The noreturn attribute informs GCC that the function will not return. */
@ -131,18 +131,18 @@
# undef CONFIG_PTR_IS_NOT_INT # undef CONFIG_PTR_IS_NOT_INT
#elif defined(__AVR__) #elif defined(__AVR__)
# if defined(CONFIG_AVR_HAS_MEMX_PTR) # if defined(CONFIG_AVR_HAS_MEMX_PTR)
/* I-space access qualifiers needed by Harvard architecture */ /* I-space access qualifiers needed by Harvard architecture */
# define IOBJ __flash # define IOBJ __flash
# define IPTR __memx # define IPTR __memx
# else # else
/* No I-space access qualifiers */ /* No I-space access qualifiers */
# define IOBJ # define IOBJ
# define IPTR # define IPTR
# endif # endif
/* Select the small, 16-bit addressing model (for D-Space) */ /* Select the small, 16-bit addressing model (for D-Space) */
@ -177,23 +177,23 @@
* then an integer is 32-bits. GCC will defined __INT__ accordingly: * then an integer is 32-bits. GCC will defined __INT__ accordingly:
*/ */
# if __INT__ == 16 # if __INT__ == 16
/* int is 16-bits, long is 32-bits */ /* int is 16-bits, long is 32-bits */
# define CONFIG_LONG_IS_NOT_INT 1 # define CONFIG_LONG_IS_NOT_INT 1
/* Pointers and int are the same size (16-bits) */ /* Pointers and int are the same size (16-bits) */
# undef CONFIG_PTR_IS_NOT_INT # undef CONFIG_PTR_IS_NOT_INT
# else # else
/* int and long are both 32-bits */ /* int and long are both 32-bits */
# undef CONFIG_LONG_IS_NOT_INT # undef CONFIG_LONG_IS_NOT_INT
/* Pointers and int are NOT the same size */ /* Pointers and int are NOT the same size */
# define CONFIG_PTR_IS_NOT_INT 1 # define CONFIG_PTR_IS_NOT_INT 1
# endif # endif
#else #else