deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made use of shell_quit().

Browse source
This commit is contained in:
oliverschmidt 2008-02-28 23:50:02 +00:00
parent 6479f001fa
commit 2ce444c175
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/shell/gui-shell.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki desktop OS. * This file is part of the Contiki desktop OS.
* *
* $Id: gui-shell.c,v 1.4 2008/02/10 12:24:43 oliverschmidt Exp $ * $Id: gui-shell.c,v 1.5 2008/02/28 23:50:02 oliverschmidt Exp $
* *
*/ */
@ -66,14 +66,6 @@ PROCESS(shell_gui_process, "Command shell");
AUTOSTART_PROCESSES(&shell_gui_process); AUTOSTART_PROCESSES(&shell_gui_process);
/*-----------------------------------------------------------------------------------*/
void
shell_quit(char *str)
{
ctk_window_close(&window);
process_exit(&shell_gui_process);
LOADER_UNLOAD();
}
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
void void
shell_default_output(const char *str1, int len1, const char *str2, int len2) shell_default_output(const char *str1, int len1, const char *str2, int len2)
@ -145,7 +137,10 @@ PROCESS_THREAD(shell_gui_process, ev, data)
} }
} else if(ev == ctk_signal_window_close || } else if(ev == ctk_signal_window_close ||
ev == PROCESS_EVENT_EXIT) { ev == PROCESS_EVENT_EXIT) {
shell_quit(NULL); shell_quit();
ctk_window_close(&window);
process_exit(&shell_gui_process);
LOADER_UNLOAD();
} }
} }
PROCESS_END(); PROCESS_END();

9
apps/telnetd/telnetd.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki desktop OS. * This file is part of the Contiki desktop OS.
* *
* $Id: telnetd.c,v 1.10 2008/02/24 20:43:28 adamdunkels Exp $ * $Id: telnetd.c,v 1.11 2008/02/28 23:50:38 oliverschmidt Exp $
* *
*/ */
@ -139,14 +139,9 @@ buf_len(struct telnetd_buf *buf)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
shell_quit(char *str)
{
s.state = STATE_CLOSE;
}
/*---------------------------------------------------------------------------*/
void
telnetd_quit(void) telnetd_quit(void)
{ {
shell_quit();
#if TELNETD_CONF_GUI #if TELNETD_CONF_GUI
telnetd_gui_quit(); telnetd_gui_quit();
#endif /* TELNETD_CONF_GUI */ #endif /* TELNETD_CONF_GUI */