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

NSH uname command will now print the board directory for -i option

Browse Source
This commit is contained in:
Gregory Nutt 2015-07-05 06:47:29 -06:00
parent 5ff7234707
commit 243694308e
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nshlib/nsh_syscmds.c
View File

@ -51,19 +51,34 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_BOARD_CUSTOM
# ifndef CONFIG_ARCH_BOARD_CUSTOM_NAME
# define BOARD_NAME ""
# else
# define BOARD_NAME CONFIG_ARCH_BOARD_CUSTOM_NAME
# endif
#else
# ifndef CONFIG_ARCH_BOARD
# define BOARD_NAME ""
# else
# define BOARD_NAME CONFIG_ARCH_BOARD
# endif
#endif
#define UNAME_KERNEL (1 << 0) #define UNAME_KERNEL (1 << 0)
#define UNAME_NODE (1 << 1) #define UNAME_NODE (1 << 1)
#define UNAME_RELEASE (1 << 2) #define UNAME_RELEASE (1 << 2)
#define UNAME_VERISON (1 << 3) #define UNAME_VERISON (1 << 3)
#define UNAME_MACHINE (1 << 4) #define UNAME_MACHINE (1 << 4)
#define UNAME_UNKNOWN (1 << 5) #define UNAME_PLATFORM (1 << 5)
#define UNAME_UNKNOWN (1 << 6)
#ifdef CONFIG_NET #ifdef CONFIG_NET
# define UNAME_ALL (UNAME_KERNEL | UNAME_NODE | UNAME_RELEASE | \ # define UNAME_ALL (UNAME_KERNEL | UNAME_NODE | UNAME_RELEASE | \
UNAME_VERISON | UNAME_MACHINE) UNAME_VERISON | UNAME_MACHINE | UNAME_PLATFORM)
#else #else
# define UNAME_ALL (UNAME_KERNEL | UNAME_RELEASE | UNAME_VERISON | \ # define UNAME_ALL (UNAME_KERNEL | UNAME_RELEASE | UNAME_VERISON | \
UNAME_MACHINE) UNAME_MACHINE | UNAME_PLATFORM)
#endif #endif
/**************************************************************************** /****************************************************************************
@ -271,13 +286,16 @@ int cmd_uname(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
break; break;
case 'p': case 'p':
case 'i':
if (set != UNAME_ALL) if (set != UNAME_ALL)
{ {
set |= UNAME_UNKNOWN; set |= UNAME_UNKNOWN;
} }
break; break;
case 'i':
set |= UNAME_PLATFORM;
break;
case '?': case '?':
default: default:
nsh_output(vtbl, g_fmtarginvalid, argv[0]); nsh_output(vtbl, g_fmtarginvalid, argv[0]);
@ -324,32 +342,31 @@ int cmd_uname(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
{ {
case 0: /* print the kernel/operating system name */ case 0: /* print the kernel/operating system name */
str = info.sysname; str = info.sysname;
str[SYS_NAMELEN-1] = '\0';
break; break;
#if CONFIG_NET #if CONFIG_NET
case 1: /* Print noname */ case 1: /* Print noname */
str = info.nodename; str = info.nodename;
str[HOST_NAME_MAX-1] = '\0';
break; break;
#endif #endif
case 2: /* Print the kernel release */ case 2: /* Print the kernel release */
str = info.release; str = info.release;
str[SYS_NAMELEN-1] = '\0';
break; break;
case 3: /* Print the kernel version */ case 3: /* Print the kernel version */
str = info.version; str = info.version;
str[SYS_NAMELEN-1] = '\0';
break; break;
case 4: /* Print the machine hardware name */ case 4: /* Print the machine hardware name */
str = info.machine; str = info.machine;
str[SYS_NAMELEN-1] = '\0';
break; break;
case 5: /* Print invalid */ case 5: /* Print the machine platform name */
str = BOARD_NAME;
break;
case 6: /* Print "unknown" */
str = "unknown"; str = "unknown";
break; break;