middleware: ntshell: optimize the ntshell cmds

* code format
* remove unused cmds: swape, boot
* bug fixes in cmds: load, go
* add the interface ntshell_register_cmds_app to let
application to register itself ntshell cmds

Signed-off-by: Wayne Ren <[email protected]>

Author: Wayne Ren

middleware/ntshell/cmds/cmd.h

@@ -28,17 +28,17 @@
  *
 --------------------------------------------- */
 
- /**
- * \file
- * \brief header file for cmd registeration
- */
+/**
+* \file
+* \brief header file for cmd registeration
+*/
 
 #ifndef _CMD_H_
 #define _CMD_H_
 
 #include "ntshell_usrcmd.h"
 #include "cmd_cfg.h"
 
-CMD_TABLE_T* ntshell_register_cmds(CMD_TABLE_T *prev);
+CMD_TABLE_T *ntshell_register_cmds(CMD_TABLE_T *prev);
 
 #endif /* _CMD_H_ */

middleware/ntshell/cmds/cmd_cfg.h

@@ -59,11 +59,9 @@
 #endif /* MID_FATFS */
 
 #ifndef NTSHELL_USE_CMDS_EXTEND
-#define NTSHELL_USE_CMDS_EXTEND		(1)		/*!< use commands defined in cmds_extend */
+#define NTSHELL_USE_CMDS_EXTEND		(0)		/*!< use commands defined in cmds_extend */
 #endif
 
-
-
 #endif /* MID_COMMON */
 
 #endif /** _NTSHELL_CMD_CFG_H_ */

middleware/ntshell/cmds/cmds.c

@@ -28,10 +28,10 @@
  *
 --------------------------------------------- */
 
- /**
- * \file
- * \brief register commands
- */
+/**
+* \file
+* \brief register commands
+*/
 
 #include "cmd.h"
 #include "embARC_toolchain.h"
@@ -43,10 +43,17 @@
 #include "cmds_fs.h"
 #include "ntshell_common.h"
 
+EMBARC_WEAK CMD_TABLE_T *ntshell_register_cmds_app(CMD_TABLE_T *prev)
+{
+	return prev;
+}
+
 /** indicate whether the commands were registered */
-CMD_TABLE_T* ntshell_register_cmds(CMD_TABLE_T *prev)
+CMD_TABLE_T *ntshell_register_cmds(CMD_TABLE_T *prev)
 {
-	if (prev == NULL) return NULL;
+	if (prev == NULL) {
+		return NULL;
+	}
 
 	/* help command was registered default,
 		so just register info command */
@@ -68,6 +75,7 @@ CMD_TABLE_T* ntshell_register_cmds(CMD_TABLE_T *prev)
 #if NTSHELL_USE_CMDS_FS
 	prev = ntshell_register_cmds_fs(prev);
 #endif
-
+	/* register user defined cmds */
+	prev = ntshell_register_cmds_app(prev);
 	return prev;
 }

middleware/ntshell/cmds/cmds_arc/cmd_aux.c

@@ -28,10 +28,10 @@
  *
 --------------------------------------------- */
 
- /**
- * \file
- * \brief the command to access auxiliary registers
- */
+/**
+* \file
+* \brief the command to access auxiliary registers
+*/
 
 
 #include "cmds_arc_cfg.h"
@@ -64,17 +64,22 @@ static void _auxiliary_register_dump(uint32_t start_addr, uint32_t end_addr, voi
 	VALID_EXTOBJ_NORTN(extobj);
 
 	p = start_addr;
+
 	while (p <= end_addr) {
 		CMD_DEBUG("0x%08x: ", p);
+
 		for (x = 0; x < MAXROWS; x++) {
 			val = _arc_aux_read(p);	/* read aux register */
 			CMD_DEBUG("0x%08x  ", val);
 			np = p + 1;
+
 			if (np < p) {
 				brk = 1;
 				break;
 			}
+
 			p = np;
+
 			if (p > end_addr) {
 				break;
 			}
@@ -95,10 +100,12 @@ static void _auxiliary_register_dump(uint32_t start_addr, uint32_t end_addr, voi
 static void cmd_lr_help(char *cmd_name, void *extobj)
 {
 	VALID_EXTOBJ_NORTN(extobj);
+
 	if (cmd_name == NULL) {
 		/* cmd_name not valid */
 		return;
 	}
+
 	CMD_DEBUG("Usage: %s [OPTION]... <ADD> <VAL> [NUM]\r\n"
 		"Read auxiliary register\r\n"
 		"  -h/H/?    Show the help information\r\n"
@@ -130,24 +137,28 @@ static int cmd_lr(int argc, char **argv, void *extobj)
 	NTSHELL_IO_GET(extobj);
 
 	/* show the help information, if the option is "-h" */
-	if(argc == 2 && ntlibc_strcmp(argv[1],"-h") == 0x00) {
+	if (argc == 2 && ntlibc_strcmp(argv[1],"-h") == 0x00) {
 		cmd_lr_help(argv[0], extobj);
 		goto error_exit;
 	}
+
 	/* the parameter checking */
 	if ((argc > 3) || (argc < 2)) {
 		ercd = E_SYS;
 		CMD_DEBUG("command error!\r\n");
 		CMD_DEBUG("Try '%s -h' for more information\r\n", argv[0]);
 		goto error_exit;
 	}
+
 	argv_tp = (char **)(&argv[1]);
+
 	/* parse 1th argument: start aux reg index */
 	if (xatoi(&argv_tp[0], &val)) {
 		start_addr = (uint32_t) val;
 	} else {
 		arg_err_flag = arg_err_flag | FIRST_ARG_ERR;
 	}
+
 	/* parse 2nd argument: aux reg size that you want to display */
 	if (argc == 3) {
 		if (xatoi(&argv_tp[1], &val)) {
@@ -167,6 +178,7 @@ static int cmd_lr(int argc, char **argv, void *extobj)
 
 	/* calc end address */
 	end_addr = start_addr + size - 1;
+
 	if ((end_addr < start_addr) && (size > 1)) { /* wrap? */
 		end_addr = 0xfffffffc;
 	}
@@ -188,10 +200,12 @@ static int cmd_lr(int argc, char **argv, void *extobj)
 static void cmd_sr_help(char *cmd_name, void *extobj)
 {
 	VALID_EXTOBJ_NORTN(extobj);
+
 	if (cmd_name == NULL) {
 		/* cmd_name not valid */
 		return;
 	}
+
 	CMD_DEBUG("Usage: %s [OPTION]... <ADD> <VAL> [NUM]\r\n"
 		"Write auxiliary register\r\n"
 		"  -h/H/?    Show the help information\r\n"
@@ -220,11 +234,13 @@ static int cmd_sr(int argc, char **argv, void *extobj)
 
 	VALID_EXTOBJ(extobj, -1);
 	NTSHELL_IO_GET(extobj);
+
 	/* show the help information, if the option is "-h" */
-	if(argc == 2 && ntlibc_strcmp(argv[1],"-h") == 0x00) {
+	if (argc == 2 && ntlibc_strcmp(argv[1],"-h") == 0x00) {
 		cmd_sr_help(argv[0], extobj);
 		goto error_exit;
 	}
+
 	/* the parameter checking */
 	if ((argc > 4) || (argc < 3)) {
 		ercd = E_SYS;
@@ -234,18 +250,21 @@ static int cmd_sr(int argc, char **argv, void *extobj)
 	}
 
 	argv_tp = (char **)(&argv[1]);
+
 	/* parse 1th argument: start aux reg index */
 	if (xatoi(&argv_tp[0], &val)) {
 		start_addr = (uint32_t) val;
 	} else {
 		arg_err_flag = arg_err_flag | FIRST_ARG_ERR;
 	}
+
 	/* parse 2nd argument: reg value */
 	if (xatoi(&argv_tp[1], &val)) {
 		reg_val = (uint32_t) val;
 	} else {
 		arg_err_flag = arg_err_flag | SECOND_ARG_ERR;
 	}
+
 	/* parse 3rd argument: reg amount to write */
 	if (argc == 4) {
 		if (xatoi(&argv_tp[2], &val)) {
@@ -265,6 +284,7 @@ static int cmd_sr(int argc, char **argv, void *extobj)
 
 	/* calc end address */
 	end_addr = start_addr + size - 1;
+
 	if (end_addr < start_addr) { /* wrap? */
 		end_addr = 0xfffffffc;
 	}
@@ -292,7 +312,7 @@ static CMD_TABLE_T sr_cmd = {"sr", "Write auxiliary register", cmd_sr, NULL};
 /**
  * register aux register write or read command
  */
-CMD_TABLE_T * register_ntshell_cmd_aux(CMD_TABLE_T *prev)
+CMD_TABLE_T *register_ntshell_cmd_aux(CMD_TABLE_T *prev)
 {
 	prev = ntshell_usrcmd_register(&lr_cmd, prev);
 	return ntshell_usrcmd_register(&sr_cmd, prev);

middleware/ntshell/cmds/cmds_arc/cmd_map.c

@@ -28,10 +28,10 @@
  *
 --------------------------------------------- */
 
- /**
- * \file
- * \brief show the memory map of bootloader
- */
+/**
+* \file
+* \brief show the memory map of bootloader
+*/
 
 #include "cmds_arc_cfg.h"
 #if NTSHELL_USE_CMDS_ARC_MAP
@@ -73,6 +73,7 @@ static void cmd_map_help(char *cmd_name, void *extobj)
 		/* cmd_name not valid */
 		return;
 	}
+
 	CMD_DEBUG("Usage: %s [OPTION]\r\n"
 		"Show the memory map of bootloader\r\n"
 		"  -h/H/?    Show the help information\r\n"
@@ -92,7 +93,7 @@ int cmd_map (int argc, char **argv, void *extobj)
 	VALID_EXTOBJ(extobj, -1);
 	NTSHELL_IO_GET(extobj);
 
-	if(argc == 2 && ntlibc_strcmp(argv[1],"-h") == 0x00) {
+	if (argc == 2 && ntlibc_strcmp(argv[1],"-h") == 0x00) {
 		cmd_map_help(argv[0], extobj);
 		goto error_exit;
 	}
@@ -124,46 +125,54 @@ int cmd_map (int argc, char **argv, void *extobj)
 
 	CMD_DEBUG("**********************************\r\n");
 	size = (int32_t)((int32_t)(&_e_data) - (int32_t)(&_f_data));
+
 	if (size >= (1024)) {
 		xsprintf(str,"%dKB",size/1024);
 	} else {
 		xsprintf(str,"%dbytes",size);
 	}
+
 	CMD_DEBUG("** DATA (%s)\r\n", str);
 	CMD_DEBUG("**********************************\r\n");
 	CMD_DEBUG(" _f_data   = 0x%08x\r\n",(int32_t)&_f_data);
 	CMD_DEBUG(" _e_data   = 0x%08x\r\n",(int32_t)&_e_data);
 
 	size = (int32_t)((int32_t)(&_e_bss) - (int32_t)(&_f_bss));
+
 	if (size >= (1024*1024)) {
 		xsprintf(str,"%dMB",size/1024/1024);
 	} else {
 		xsprintf(str,"%dKB",size/1024);
 	}
+
 	CMD_DEBUG("**********************************\r\n");
 	CMD_DEBUG("** BSS (%s)\r\n", str);
 	CMD_DEBUG("**********************************\r\n");
 	CMD_DEBUG(" _f_bss    = 0x%08x\r\n",(int32_t)&_f_bss);
 	CMD_DEBUG(" _e_bss    = 0x%08x\r\n",(int32_t)&_e_bss);
 
 	size = (int32_t)((int32_t)(&_e_stack) - (int32_t)(&_f_stack));
+
 	if (size >= (1024)) {
 		xsprintf(str,"%dKB",size/1024);
 	} else {
 		xsprintf(str,"%dbytes",size);
 	}
+
 	CMD_DEBUG("**********************************\r\n");
 	CMD_DEBUG("** STACK (%s)\r\n", str );
 	CMD_DEBUG("**********************************\r\n");
 	CMD_DEBUG(" _f_stack  = 0x%08x\r\n",(int32_t)&_f_stack);
 	CMD_DEBUG(" _e_stack  = 0x%08x\r\n",(int32_t)&_e_stack);
 
 	size = (int32_t)((int32_t)(&_e_heap) - (int32_t)(&_f_heap));
+
 	if (size >= (1024)) {
 		xsprintf(str,"%dKB",size/1024);
 	} else {
 		xsprintf(str,"%dbytes",size);
 	}
+
 	CMD_DEBUG("**********************************\r\n");
 	CMD_DEBUG("** HEAP (%s)\r\n", str);
 	CMD_DEBUG("**********************************\r\n");
@@ -179,9 +188,9 @@ static CMD_TABLE_T map_cmd = {"map", "Show the memory map of bootloader", cmd_ma
 /**
  * register map command
  */
-CMD_TABLE_T * register_ntshell_cmd_map(CMD_TABLE_T *prev)
+CMD_TABLE_T *register_ntshell_cmd_map(CMD_TABLE_T *prev)
 {
-    return ntshell_usrcmd_register(&map_cmd, prev);
+	return ntshell_usrcmd_register(&map_cmd, prev);
 }
 
 #endif /* NTSHELL_USE_CMDS_ARC_MAP */