X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/889202c46ced1be4fc0db3faf63564722eba2865..1f12ca6c89dbd3e4414b9d3b997736da4df69549:/avr/cmd_misc.c

diff --git a/avr/cmd_misc.c b/avr/cmd_misc.c
index 7ab8fef..63a510c 100644
--- a/avr/cmd_misc.c
+++ b/avr/cmd_misc.c
@@ -1,58 +1,110 @@
 /*
+ * (C) Copyright 2014,2016 Leo C. <erbl259-lmu@yahoo.de>
+ *
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * SPDX-License-Identifier:	GPL-2.0+
+ * SPDX-License-Identifier:	GPL-2.0
  */
 
-#include "common.h"
-#include "command.h"
+#include "cmd_misc.h"
+#include "eval_arg.h"
+#include <stdbool.h>
+
+#include "timer.h"
+#include "con-utils.h"
+#include "getopt-min.h"
 
 
-command_ret_t do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_echo(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
-	uint_fast8_t putnl = 1;
-	
+	bool put_newline = true;
+
 	(void) cmdtp; (void) flag;
 
-	for (uint_fast8_t i = 1; i < argc; i++) {
+	int opt;
+	while ((opt = getopt(argc, argv, PSTR("n"))) != -1) {
+		switch (opt) {
+		case 'n':
+			put_newline = false;
+			break;
+		default: /* '?' */
+			return CMD_RET_USAGE;
+		}
+	}
+
+	for (uint_fast8_t i = optind; i < argc; i++) {
 
-		uint_fast8_t backslash = 0;
-		char *p = argv[i];
-		char c;
-		
-		if (i != 1)
+		if (i != optind)
 			putchar(' ');
-		while ((c = *p++) != '\0') {
-		
-			if(backslash) {
-				backslash = 0;
-				if (c == 'c') {
-					putnl = 0;
-					continue;
-				} else
-					putchar('\\');
-			} else {
-				if (c == '\\') {
-					backslash = 1;
-					continue;
-				}
-			}
-			putchar(c);
-		}
-	}			
-					
-	if (putnl)
+
+		my_puts(argv[i]);
+	}
+
+	if (put_newline)
 		putchar('\n');
 
 	return CMD_RET_SUCCESS;
 }
 
-#if 0
-U_BOOT_CMD(
-	echo,	CONFIG_SYS_MAXARGS,	1,	do_echo,
-	"echo args to console",
-	"[args..]\n"
-	"    - echo args to console; \\c suppresses newline"
-);
-#endif
+
+command_ret_t do_sleep(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+{
+	unsigned long start = get_timer(0);
+	unsigned long delay;
+	char *sp;
+	uint_fast8_t millisec = 0;
+
+	(void) cmdtp; (void) flag;
+
+	if (argc != 2)
+		return CMD_RET_USAGE;
+
+	delay = eval_arg(argv[1], &sp);
+
+	if (*sp == 'm') {
+		millisec = 1;
+		sp++;
+	}
+	if (*sp == 's')
+		sp++;
+	if (*sp != '\0')
+		return CMD_RET_USAGE;
+
+	if (!millisec)
+		delay *= 1000;
+
+	while (get_timer(start) < delay) {
+		if (ctrlc())
+			return CMD_RET_FAILURE;
+
+		udelay(100);
+	}
+
+	return CMD_RET_SUCCESS;
+}
+
+command_ret_t do_time(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+	uint32_t elapsed_ms = 0;
+	command_ret_t retval;
+	uint_fast8_t repeatable;
+
+	if (argc == 1)
+		return CMD_RET_USAGE;
+
+	elapsed_ms = get_timer(0);
+	retval = cmd_process(0, argc - 1, argv + 1, &repeatable);
+	elapsed_ms = get_timer(elapsed_ms);
+
+	uint32_t min;
+	uint16_t sec, ms;
+
+	min = elapsed_ms / 1000 / 60;
+	sec = (elapsed_ms / 1000) % 60;
+	ms = elapsed_ms % 1000;
+
+	printf_P(PSTR("\ntime: %lum %u.%03us\n"), min, sec, ms);
+
+	return retval;
+}