summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-02-26 06:04:23 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-02-26 06:04:23 -0600
commitdc4cb98d12f962b72dd80afd7eacd88be01e3c7c (patch)
tree0197d4bed12c8ada9d1066e4e99bef05b9d9b4df
parent30ede997c3fc8764c5a84987028cc8b3b351bf48 (diff)
downloadnuttx-dc4cb98d12f962b72dd80afd7eacd88be01e3c7c.tar.gz
nuttx-dc4cb98d12f962b72dd80afd7eacd88be01e3c7c.tar.bz2
nuttx-dc4cb98d12f962b72dd80afd7eacd88be01e3c7c.zip
Costmetic updates comments and style; Add NFS dependency on IPv4
-rw-r--r--nuttx/arch/mips/src/pic32mx/pic32mx-config.h2
-rw-r--r--nuttx/fs/nfs/Kconfig2
-rw-r--r--nuttx/include/sys/types.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h
index a80e2bba5..a2cc140ae 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h
@@ -600,7 +600,7 @@
/* DEVCFG3 */
#ifndef CONFIG_PIC32MX_USERID /* User ID */
-# define CONFIG_PIC32MX_USERID 0x584e /* "NutX" */
+# define CONFIG_PIC32MX_USERID 0x584e /* "NX" */
#endif
#ifndef CONFIG_PIC32MX_PMDL1WAY /* Peripheral module disable configuration */
diff --git a/nuttx/fs/nfs/Kconfig b/nuttx/fs/nfs/Kconfig
index 6a06555f4..9d2aa288d 100644
--- a/nuttx/fs/nfs/Kconfig
+++ b/nuttx/fs/nfs/Kconfig
@@ -6,7 +6,7 @@
config NFS
bool "NFS client file system"
default n
- depends on NET_UDP && !DISABLE_MOUNTPOINT
+ depends on NET_UDP && NET_IPv4 && !DISABLE_MOUNTPOINT
select FS_READABLE
select FS_WRITABLE
---help---
diff --git a/nuttx/include/sys/types.h b/nuttx/include/sys/types.h
index cc8aee15d..14c04e9c7 100644
--- a/nuttx/include/sys/types.h
+++ b/nuttx/include/sys/types.h
@@ -254,7 +254,7 @@ typedef unsigned short ushort;
typedef unsigned int uint;
typedef unsigned long ulong;
typedef signed char s_char;
-typedef char *caddr_t;
+typedef FAR char *caddr_t;
/* Task entry point */