diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-03-06 13:31:13 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-03-06 13:31:13 -0600 |
| commit | 66aa7b68fca4b870fb63ad3eb53f05be87368832 (patch) | |
| tree | dd51c5d72b734ab156e584dd915d98d3064877c3 | |
| parent | 77a632298aebc2287acf233f6dd998aa8d1f4db8 (diff) | |
| download | nuttx-66aa7b68fca4b870fb63ad3eb53f05be87368832.tar.gz nuttx-66aa7b68fca4b870fb63ad3eb53f05be87368832.tar.bz2 nuttx-66aa7b68fca4b870fb63ad3eb53f05be87368832.zip | |
Minor cleanup of some new configurations; warning removal with GCC 4.8.2
| -rw-r--r-- | apps/nshlib/nsh_mntcmds.c | 6 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/nsh/defconfig | 26 |
2 files changed, 29 insertions, 3 deletions
diff --git a/apps/nshlib/nsh_mntcmds.c b/apps/nshlib/nsh_mntcmds.c index 741327405..de40c8e6c 100644 --- a/apps/nshlib/nsh_mntcmds.c +++ b/apps/nshlib/nsh_mntcmds.c @@ -194,7 +194,7 @@ static int df_man_readable_handler(FAR const char *mountpoint, /* Find the label for size */ which = 0; - while (size >= 9999 || (size & 0x3ff) == 0 && size) + while (size >= 9999 || ((size & 0x3ff) == 0 && size != 0)) { which++; size >>= 10; @@ -205,7 +205,7 @@ static int df_man_readable_handler(FAR const char *mountpoint, /* Find the label for free */ which = 0; - while (free >= 9999 || (free & 0x3ff) == 0 && free) + while (free >= 9999 || ((free & 0x3ff) == 0 && free != 0)) { which++; free >>= 10; @@ -216,7 +216,7 @@ static int df_man_readable_handler(FAR const char *mountpoint, /* Find the label for used */ which = 0; - while (used >= 9999 || (used & 0x3ff) == 0 && used) + while (used >= 9999 || ((used & 0x3ff) == 0 && used != 0)) { which++; used >>= 10; diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 767be2400..233fb72db 100644 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -34,6 +34,7 @@ CONFIG_INTELHEX_BINARY=y # # Customize Header Files # +# CONFIG_ARCH_STDINT_H is not set # CONFIG_ARCH_STDBOOL_H is not set # CONFIG_ARCH_MATH_H is not set # CONFIG_ARCH_FLOAT_H is not set @@ -308,6 +309,7 @@ CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_STACKDUMP=y # CONFIG_ENDIAN_BIG is not set +# CONFIG_ARCH_IDLE_CUSTOM is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMVECTORS=y # CONFIG_ARCH_RAMVECTORS is not set @@ -367,6 +369,7 @@ CONFIG_NSH_MMCSDSLOTNO=0 # # STM3210E-EVAL LCD Hardware Configuration # +# CONFIG_STM3210E_LCD is not set # # RTOS Features @@ -457,6 +460,10 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_BCH is not set # CONFIG_INPUT is not set # CONFIG_LCD is not set +# CONFIG_LCD_LANDSCAPE is not set +# CONFIG_LCD_PORTRAIT is not set +# CONFIG_LCD_RPORTRAIT is not set +# CONFIG_LCD_RLANDSCAPE is not set CONFIG_MMCSD=y CONFIG_MMCSD_NSLOTS=1 # CONFIG_MMCSD_READONLY is not set @@ -501,8 +508,27 @@ CONFIG_MTD=y CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set +# CONFIG_ARCH_HAVE_UART is not set +# CONFIG_ARCH_HAVE_UART0 is not set +# CONFIG_ARCH_HAVE_UART1 is not set +# CONFIG_ARCH_HAVE_UART2 is not set +# CONFIG_ARCH_HAVE_UART3 is not set +# CONFIG_ARCH_HAVE_UART4 is not set +# CONFIG_ARCH_HAVE_UART5 is not set +# CONFIG_ARCH_HAVE_UART6 is not set +# CONFIG_ARCH_HAVE_UART7 is not set +# CONFIG_ARCH_HAVE_UART8 is not set +# CONFIG_ARCH_HAVE_SCI0 is not set +# CONFIG_ARCH_HAVE_SCI1 is not set +# CONFIG_ARCH_HAVE_USART0 is not set CONFIG_ARCH_HAVE_USART1=y CONFIG_ARCH_HAVE_USART2=y +# CONFIG_ARCH_HAVE_USART3 is not set +# CONFIG_ARCH_HAVE_USART4 is not set +# CONFIG_ARCH_HAVE_USART5 is not set +# CONFIG_ARCH_HAVE_USART6 is not set +# CONFIG_ARCH_HAVE_USART7 is not set +# CONFIG_ARCH_HAVE_USART8 is not set # # USART Configuration |