shell: support for multiple GUI (non-batch) commands, move GUI refresh from…

shell: support for multiple GUI (non-batch) commands, move GUI refresh from wrc_main to the shell code

shell: support for multiple GUI (non-batch) commands, move GUI refresh from…
shell: support for multiple GUI (non-batch) commands, move GUI refresh from wrc_main to the shell code
248230af · Tomasz Wlostowski · Grzegorz Daniluk · a8e94519 · 248230af · 248230af
Commit 248230af authored Apr 22, 2020 by Tomasz Wlostowski Committed by Grzegorz Daniluk Apr 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 18 deletions

shell.h include/shell.h +1 -0

cmd_gui.c shell/cmd_gui.c +6 -2

shell.c shell/shell.c +25 -0

wrc_main.c wrc_main.c +1 -16

No files found.
--- a/include/shell.h
+++ b/include/shell.h
@@ -42,5 +42,6 @@ void shell_show_build_init(void);
 void shell_register_command( struct wrc_shell_cmd* cmd );
 void shell_list_cmds(void);
 void shell_register_commands();
+void shell_activate_ui_command( int (*callback)() );

 #endif
--- a/shell/cmd_gui.c
+++ b/shell/cmd_gui.c
@@ -3,15 +3,19 @@
 *
 * Released according to the GNU GPL, version 2 or any later version.
 */
+
+#include <wrc.h>
+
 #include "shell.h"

 static int cmd_gui(const char *args[])
 {
-	wrc_ui_mode = UI_GUI_MODE;
+	shell_activate_ui_command( wrc_mon_gui );
 	return 0;
 }

-DEFINE_WRC_COMMAND(gui) = {
+DEFINE_WRC_COMMAND(gui) = 
+{
 	.name = "gui",
 	.exec = cmd_gui,
 };
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -30,6 +30,7 @@
 #define SH_PROMPT 0
 #define SH_INPUT 1
 #define SH_EXEC 2
+#define SH_EXEC_UI 3

 #define ESCAPE_FLAG 0x10000

@@ -49,6 +50,7 @@ static struct wrc_shell_cmd *cmds[ SHELL_MAX_COMMANDS ];
 static int n_cmds = 0;

 int shell_is_interacting;
+int (*shell_ui_callback)();

 static int insert(char c)
 {
@@ -142,6 +144,7 @@ void shell_init()
 {
 	cmd_len = cmd_pos = 0;
 	state = SH_PROMPT;
+	shell_ui_callback = NULL;
 }

 int shell_interactive()
@@ -223,8 +226,22 @@ int shell_interactive()
 	case SH_EXEC:
 		cmd_buf[cmd_len] = 0;
 		_shell_exec();
+
+// fixme: ugly hack, we should manage the shell FSM state in a cleaner way.
+		if( state == SH_EXEC_UI )
+			return 1;
+
 		state = SH_PROMPT;
 		return 1;
+
+
+	case SH_EXEC_UI:
+		if( !shell_ui_callback || shell_ui_callback() < 0 || console_getc() == 27 )
+		{
+			cmd_buf[cmd_len] = 0;
+			state = SH_PROMPT;
+		}
+		return 1;
 	}
 	return 0;
 }
@@ -380,6 +397,14 @@ void shell_list_cmds()
 	}
 }

+void shell_activate_ui_command( int (*callback)() )
+{
+	shell_ui_callback = callback;
+	state = SH_EXEC_UI;
+	pp_printf("Activateui: %p\n", callback );
+	cmd_len = 0;
+}
+
 #define REGISTER_WRC_COMMAND(_name) \
 	{ extern struct wrc_shell_cmd __wrc_cmd_ ## _name; shell_register_command( &__wrc_cmd_ ## _name ); }


--- a/wrc_main.c
+++ b/wrc_main.c
@@ -56,9 +56,6 @@
 #include "lib/snmp.h"
 #endif

-int wrc_ui_mode = UI_SHELL_MODE;
-int wrc_ui_refperiod = TICS_PER_SECOND; /* 1 sec */
-int wrc_phase_tracking = 1;
 char wrc_hw_name[HW_NAME_LENGTH];

 uint32_t cal_phase_transition = 2389;
@@ -103,7 +100,6 @@ static void wrc_initialize(void)

 	wrc_board_init();

-	wrc_ui_mode = UI_SHELL_MODE;
 	_endram = ENDRAM_MAGIC;

 	wrc_ptp_set_mode(WRC_MODE_SLAVE);
@@ -154,18 +150,7 @@ static int wrc_check_link(void)

 static int ui_update(void)
 {
-	int ret;
-
-	if (wrc_ui_mode == UI_GUI_MODE) {
-		ret = wrc_mon_gui();
-		if ( console_getc() == 27 || wrc_ui_refperiod == 0) {
-			shell_init();
-			wrc_ui_mode = UI_SHELL_MODE;
-		}
-	} else {
-		ret = shell_interactive();
-	}
-	return ret;
+	return shell_interactive();
 }

 /* initialize functions to be called after reset in check_reset function */