From 38e39bbc1c8aaf8006d00f0497805e2f165a5ecc Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 3 Jul 2008 17:56:17 +0000 Subject: [PATCH] Added a separate file for CFS Coffee-specific commands --- apps/shell/Makefile.shell | 2 +- apps/shell/shell-coffee.c | 100 ++++++++++++++++++++++++++++++++++++++ apps/shell/shell-coffee.h | 48 ++++++++++++++++++ apps/shell/shell-sky.c | 33 +------------ apps/shell/shell.h | 5 +- 5 files changed, 153 insertions(+), 35 deletions(-) create mode 100644 apps/shell/shell-coffee.c create mode 100644 apps/shell/shell-coffee.h diff --git a/apps/shell/Makefile.shell b/apps/shell/Makefile.shell index 2671d5cdc..56190041b 100644 --- a/apps/shell/Makefile.shell +++ b/apps/shell/Makefile.shell @@ -7,5 +7,5 @@ shell_src = shell.c serial-shell.c shell-reboot.c \ shell_dsc = shell-dsc.c ifeq ($(TARGET),sky) - shell_src += shell-sky.c shell-exec.c + shell_src += shell-sky.c shell-exec.c shell-coffee.c endif diff --git a/apps/shell/shell-coffee.c b/apps/shell/shell-coffee.c new file mode 100644 index 000000000..5655bbb7b --- /dev/null +++ b/apps/shell/shell-coffee.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2008, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + * $Id: shell-coffee.c,v 1.1 2008/07/03 17:56:17 adamdunkels Exp $ + */ + +/** + * \file + * CFS Coffee-specific Contiki shell commands + * \author + * Adam Dunkels + */ + +#include "contiki.h" +#include "shell-coffee.h" + +#include "cfs/cfs-coffee.h" + +#include +#include + +/*---------------------------------------------------------------------------*/ +PROCESS(shell_format_process, "format"); +SHELL_COMMAND(format_command, + "format", + "format: format the flash-based Coffee file system", + &shell_format_process); +PROCESS(shell_rm_process, "rm"); +SHELL_COMMAND(rm_command, + "rm", + "rm : remove the file named filename", + &shell_rm_process); +/*---------------------------------------------------------------------------*/ +PROCESS_THREAD(shell_format_process, ev, data) +{ + struct shell_input *input; + PROCESS_BEGIN(); + + shell_output_str(&format_command, "format: this command will erase all files. Do you want to format? [y/n]", ""); + + PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input); + input = data; + + if(input->len1 > 0 && + (input->data1[0] == 'y' || input->data1[0] == 'Y')) { + + shell_output_str(&format_command, "format: formatting file system", ""); + if(cfs_coffee_format() == 0) { + shell_output_str(&format_command, "format: formatting complete", ""); + } else { + shell_output_str(&format_command, "format: formatting failed", ""); + } + } + PROCESS_END(); +} +/*---------------------------------------------------------------------------*/ +PROCESS_THREAD(shell_rm_process, ev, data) +{ + PROCESS_BEGIN(); + + if(data != NULL) { + cfs_coffee_remove(data); + } + PROCESS_END(); +} +/*---------------------------------------------------------------------------*/ +void +shell_coffee_init(void) +{ + shell_register_command(&format_command); + shell_register_command(&rm_command); +} +/*---------------------------------------------------------------------------*/ diff --git a/apps/shell/shell-coffee.h b/apps/shell/shell-coffee.h new file mode 100644 index 000000000..0bf8fef9c --- /dev/null +++ b/apps/shell/shell-coffee.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2008, Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * This file is part of the Contiki operating system. + * + * $Id: shell-coffee.h,v 1.1 2008/07/03 17:56:17 adamdunkels Exp $ + */ + +/** + * \file + * Header file for CFS Coffee-specific Contiki shell commands + * \author + * Adam Dunkels + */ + +#ifndef __SHELL_COFFEE_H__ +#define __SHELL_COFFEE_H__ + +#include "shell.h" + +void shell_coffee_init(void); + +#endif /* __SHELL_COFFEE_H__ */ diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c index ad91ccea2..3c6491e16 100644 --- a/apps/shell/shell-sky.c +++ b/apps/shell/shell-sky.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: shell-sky.c,v 1.8 2008/07/03 09:52:15 adamdunkels Exp $ + * $Id: shell-sky.c,v 1.9 2008/07/03 17:56:17 adamdunkels Exp $ */ /** @@ -49,8 +49,6 @@ #include "dev/light.h" #include "dev/sht11.h" -#include "cfs/cfs-coffee.h" - #include "net/rime/timesynch.h" #include @@ -65,11 +63,6 @@ struct power_msg { }; /*---------------------------------------------------------------------------*/ -PROCESS(shell_format_process, "format"); -SHELL_COMMAND(format_command, - "format", - "format: format the flash-based Coffee file system", - &shell_format_process); PROCESS(shell_sense_process, "sense"); SHELL_COMMAND(sense_command, "sense", @@ -111,29 +104,6 @@ SHELL_COMMAND(powergraph_command, "powergraph: convert power profile to a 'graphical' repressentation", &shell_powergraph_process); /*---------------------------------------------------------------------------*/ -PROCESS_THREAD(shell_format_process, ev, data) -{ - struct shell_input *input; - PROCESS_BEGIN(); - - shell_output_str(&format_command, "format: this command will erase all files. Do you want to format? [y/n]", ""); - - PROCESS_WAIT_EVENT_UNTIL(ev == shell_event_input); - input = data; - - if(input->len1 > 0 && - (input->data1[0] == 'y' || input->data1[0] == 'Y')) { - - shell_output_str(&format_command, "format: formatting file system", ""); - if(cfs_coffee_format() == 0) { - shell_output_str(&format_command, "format: formatting complete", ""); - } else { - shell_output_str(&format_command, "format: formatting failed", ""); - } - } - PROCESS_END(); -} -/*---------------------------------------------------------------------------*/ #define MAX(a, b) ((a) > (b)? (a): (b)) #define MIN(a, b) ((a) < (b)? (a): (b)) struct spectrum { @@ -455,6 +425,5 @@ shell_sky_init(void) shell_register_command(&rfchannel_command); shell_register_command(&sense_command); shell_register_command(&senseconv_command); - shell_register_command(&format_command); } /*---------------------------------------------------------------------------*/ diff --git a/apps/shell/shell.h b/apps/shell/shell.h index 2a5fb8052..5acb4f000 100644 --- a/apps/shell/shell.h +++ b/apps/shell/shell.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: shell.h,v 1.6 2008/02/28 23:29:07 adamdunkels Exp $ + * $Id: shell.h,v 1.7 2008/07/03 17:57:26 adamdunkels Exp $ */ /** @@ -100,15 +100,16 @@ struct shell_input { }; #include "shell-blink.h" +#include "shell-coffee.h" #include "shell-exec.h" #include "shell-file.h" #include "shell-netfile.h" #include "shell-ps.h" #include "shell-reboot.h" -#include "shell-rime.h" #include "shell-rime-netcmd.h" #include "shell-rime-ping.h" #include "shell-rime-sniff.h" +#include "shell-rime.h" #include "shell-rsh.h" #include "shell-run.h" #include "shell-sendtest.h"