X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/8a7deceacd30529e5c32082b2c719eb055841d0d..8a500c7f3634212263ab1291c139d9c6a8967b8b:/avr/cmd_misc.c

diff --git a/avr/cmd_misc.c b/avr/cmd_misc.c
index 315b959..ad913e8 100644
--- a/avr/cmd_misc.c
+++ b/avr/cmd_misc.c
@@ -1,59 +1,54 @@
 /*
+ * (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 <stdlib.h>
+#include "cmd_misc.h"
+#include "eval_arg.h"
+#include <stdbool.h>
 
-#include "command.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;
+		}
+	}
 
-		uint_fast8_t backslash = 0;
-		char *p = argv[i];
-		char c;
+	for (uint_fast8_t i = optind; i < argc; i++) {
 
-		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);
-		}
+
+		my_puts(argv[i]);
 	}
 
-	if (putnl)
+	if (put_newline)
 		putchar('\n');
 
 	return CMD_RET_SUCCESS;
 }
 
 
-command_ret_t do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+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;
@@ -65,7 +60,7 @@ command_ret_t do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
 	if (argc != 2)
 		return CMD_RET_USAGE;
 
-	delay = strtoul(argv[1], &sp, 10);
+	delay = eval_arg(argv[1], &sp);
 
 	if (*sp == 'm') {
 		millisec = 1;
@@ -89,3 +84,27 @@ command_ret_t do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
 	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;
+}