rewrite of cmd_cpu/do_cpu_freq

[z180-stamp.git] / avr / cmd_misc.c

diff --git a/avr/cmd_misc.c b/avr/cmd_misc.c
index 9061b5ad0d95cd7520093bf769352bd594142bb0..63a510cb9d8553eb43439f9966ac57cb7554196a 100644 (file)
--- a/avr/cmd_misc.c
+++ b/avr/cmd_misc.c
@@ -7,25 +7,21 @@
  * SPDX-License-Identifier:    GPL-2.0
  */
 
-#include "common.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[])
 {
        bool put_newline = true;
 
        (void) cmdtp; (void) flag;
 
-       /* reset getopt() */
-       optind = 0;
-
        int opt;
        while ((opt = getopt(argc, argv, PSTR("n"))) != -1) {
                switch (opt) {
@@ -52,7 +48,7 @@ command_ret_t do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 
 
-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;
@@ -87,3 +83,28 @@ 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;
+}