From 5ff7234707c90f38ddd1d492d3314d2a075fd3f2 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 4 Jul 2015 15:17:36 -0600 Subject: [PATCH] Remove the system/sysinfo command --- ChangeLog.txt | 5 +- system/Kconfig | 1 - system/Make.defs | 4 - system/Makefile | 2 +- system/sysinfo/.gitignore | 11 --- system/sysinfo/Kconfig | 19 ----- system/sysinfo/Makefile | 150 -------------------------------------- system/sysinfo/sysinfo.c | 73 ------------------- 8 files changed, 4 insertions(+), 261 deletions(-) delete mode 100644 system/sysinfo/.gitignore delete mode 100644 system/sysinfo/Kconfig delete mode 100644 system/sysinfo/Makefile delete mode 100644 system/sysinfo/sysinfo.c diff --git a/ChangeLog.txt b/ChangeLog.txt index 6a7f02afe..202a6300f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1332,6 +1332,7 @@ also be used to reset the system if CONFIG_BOARDCTL_RESET=y. (2015-07-04). * apps/system/poweroff: Remove the system poweroff command. This is - replaced with the NSH shutdown commandi (2015-07-02). + replaced with the NSH shutdown command (2015-07-02). * apps/nshlib: Add support for a uname command (2015-07-04). - + * apps/system/sysinfo: Remove the system sysinfo command. This is + replaced with the NSH uname command (2015-07-04). diff --git a/system/Kconfig b/system/Kconfig index edb0d5c3c..adb8dc927 100644 --- a/system/Kconfig +++ b/system/Kconfig @@ -19,7 +19,6 @@ source "$APPSDIR/system/mdio/Kconfig" source "$APPSDIR/system/ramtron/Kconfig" source "$APPSDIR/system/sdcard/Kconfig" source "$APPSDIR/system/sudoku/Kconfig" -source "$APPSDIR/system/sysinfo/Kconfig" source "$APPSDIR/system/lm75/Kconfig" source "$APPSDIR/system/vi/Kconfig" source "$APPSDIR/system/stackmonitor/Kconfig" diff --git a/system/Make.defs b/system/Make.defs index 564e183dc..07d9bb0bc 100644 --- a/system/Make.defs +++ b/system/Make.defs @@ -102,10 +102,6 @@ ifeq ($(CONFIG_SYSTEM_SUDOKU),y) CONFIGURED_APPS += system/sudoku endif -ifeq ($(CONFIG_SYSTEM_SYSINFO),y) -CONFIGURED_APPS += system/sysinfo -endif - ifeq ($(CONFIG_SYSTEM_USBMONITOR),y) CONFIGURED_APPS += system/usbmonitor endif diff --git a/system/Makefile b/system/Makefile index 217b68ea5..4f8aef185 100644 --- a/system/Makefile +++ b/system/Makefile @@ -39,7 +39,7 @@ SUBDIRS = cdcacm cle composite cu flash_eraseall free i2c hex2bin inifile SUBDIRS += install lm75 mdio nxplayer ramtest ramtron readline sdcard -SUBDIRS += stackmonitor sudoku sysinfo usbmonitor usbmsc vi zmodem zoneinfo +SUBDIRS += stackmonitor sudoku usbmonitor usbmsc vi zmodem zoneinfo # Create the list of installed runtime modules (INSTALLED_DIRS) diff --git a/system/sysinfo/.gitignore b/system/sysinfo/.gitignore deleted file mode 100644 index 83bd7b811..000000000 --- a/system/sysinfo/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/Make.dep -/.depend -/.built -/*.asm -/*.rel -/*.lst -/*.sym -/*.adb -/*.lib -/*.src -/*.obj diff --git a/system/sysinfo/Kconfig b/system/sysinfo/Kconfig deleted file mode 100644 index d1e489ad7..000000000 --- a/system/sysinfo/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -menuconfig SYSTEM_SYSINFO - bool "Sysinfo" - default n - ---help--- - Enable support for the NSH sysinfo command. - -if SYSTEM_SYSINFO - -config SYSTEM_SYSINFO_STACKSIZE - int "NSH sysinfo stack size" - default 1024 - -endif - diff --git a/system/sysinfo/Makefile b/system/sysinfo/Makefile deleted file mode 100644 index 545049e0a..000000000 --- a/system/sysinfo/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -############################################################################ -# apps/system/sysinfo/Makefile -# -# Copyright (C) 2011 Uros Platise. All rights reserved. -# Copyright (C) 2012 Gregory Nutt. All rights reserved. -# Author: Uros Platise -# Gregory Nutt -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name NuttX nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -# TODO, this makefile should run make under the app dirs, instead of -# sourcing the Make.defs! - --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs - -ifeq ($(WINTOOL),y) -INCDIROPT = -w -endif - -# NSH sysinfo command - -CONFIG_SYSTEM_SYSINFO_STACKSIZE ?= 1024 - -APPNAME = sysinfo -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = $(CONFIG_SYSTEM_SYSINFO_STACKSIZE) - -ASRCS = -CSRCS = -MAINSRC = sysinfo.c - -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) -MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) - -SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) -OBJS = $(AOBJS) $(COBJS) - -ifneq ($(CONFIG_BUILD_KERNEL),y) - OBJS += $(MAINOBJ) -endif - -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\..\libapps$(LIBEXT) -else -ifeq ($(WINTOOL),y) - BIN = ..\\..\\libapps$(LIBEXT) -else - BIN = ../../libapps$(LIBEXT) -endif -endif - -ifeq ($(WINTOOL),y) - INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" -else - INSTALL_DIR = $(BIN_DIR) -endif - -CONFIG_XYZ_PROGNAME ?= sysinfo$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -ROOTDEPPATH = --dep-path . - -# Common build - -VPATH = - -all: .built -.PHONY: context depend clean distclean - -$(AOBJS): %$(OBJEXT): %.S - $(call ASSEMBLE, $<, $@) - -$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c - $(call COMPILE, $<, $@) - -.built: $(OBJS) - $(call ARCHIVE, $(BIN), $(OBJS)) - $(Q) touch .built - -ifeq ($(CONFIG_BUILD_KERNEL),y) -$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) - @echo "LD: $(PROGNAME)" - $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) - $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME) - -install: $(BIN_DIR)$(DELIM)$(PROGNAME) - -else -install: - -endif - -# Register application - -ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) - -context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat -else -context: -endif - -# Create dependencies - -.depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - $(Q) touch $@ - -depend: .depend - -clean: - $(call DELFILE, .built) - $(call CLEAN) - -distclean: clean - $(call DELFILE, Make.dep) - $(call DELFILE, .depend) - --include Make.dep diff --git a/system/sysinfo/sysinfo.c b/system/sysinfo/sysinfo.c deleted file mode 100644 index 7301950c8..000000000 --- a/system/sysinfo/sysinfo.c +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - * apps/system/sysinfo/sysinfo.c - * - * Copyright (C) 2011 Uros Platise. All rights reserved. - * Author: Uros Platise - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/* Collects and reports system information. - * - * TODO: Gather information also from low-level devices, kernel/sched, clock, - * and further reporting as: sysinfo rtc, or sysinfo sched, ... with - * sysinfo help to report all of the options. - */ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include -#include - -#include -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -#ifdef CONFIG_BUILD_KERNEL -int main(int argc, FAR char *argv[]) -#else -int sysinfo_main(int argc, char *argv[]) -#endif -{ - printf("System Information:\n"); - printf("\tNuttX Version:\t" CONFIG_VERSION_STRING - " Build: %s\n", CONFIG_VERSION_BUILD); - printf("\tSystem Time:\t%d [s] UTC " -#ifdef CONFIG_RTC - "Hardware RTC Support" -#endif - "\n", time(NULL) ); - return 0; -}