giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a separate file for CFS Coffee-specific commands

Browse Source
This commit is contained in:
adamdunkels 2008-07-03 17:56:17 +00:00
parent 7ed816840e
commit 38e39bbc1c
5 changed files with 153 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shell/Makefile.shell
View File

@ -7,5 +7,5 @@ shell_src = shell.c serial-shell.c shell-reboot.c \
shell_dsc = shell-dsc.c shell_dsc = shell-dsc.c
ifeq ($(TARGET),sky) ifeq ($(TARGET),sky)
shell_src += shell-sky.c shell-exec.c shell_src += shell-sky.c shell-exec.c shell-coffee.c
endif endif

100
apps/shell/shell-coffee.c Normal file
View File

@ -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 <adam@sics.se>
*/
#include "contiki.h"
#include "shell-coffee.h"
#include "cfs/cfs-coffee.h"
#include <stdio.h>
#include <string.h>
/*---------------------------------------------------------------------------*/
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 <filename>: 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);
}
/*---------------------------------------------------------------------------*/

48
apps/shell/shell-coffee.h Normal file
View File

@ -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 <adam@sics.se>
*/
#ifndef __SHELL_COFFEE_H__
#define __SHELL_COFFEE_H__
#include "shell.h"
void shell_coffee_init(void);
#endif /* __SHELL_COFFEE_H__ */

33
apps/shell/shell-sky.c
View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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/light.h"
#include "dev/sht11.h" #include "dev/sht11.h"
#include "cfs/cfs-coffee.h"
#include "net/rime/timesynch.h" #include "net/rime/timesynch.h"
#include <stdio.h> #include <stdio.h>
@ -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"); PROCESS(shell_sense_process, "sense");
SHELL_COMMAND(sense_command, SHELL_COMMAND(sense_command,
"sense", "sense",
@ -111,29 +104,6 @@ SHELL_COMMAND(powergraph_command,
"powergraph: convert power profile to a 'graphical' repressentation", "powergraph: convert power profile to a 'graphical' repressentation",
&shell_powergraph_process); &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 MAX(a, b) ((a) > (b)? (a): (b))
#define MIN(a, b) ((a) < (b)? (a): (b)) #define MIN(a, b) ((a) < (b)? (a): (b))
struct spectrum { struct spectrum {
@ -455,6 +425,5 @@ shell_sky_init(void)
shell_register_command(&rfchannel_command); shell_register_command(&rfchannel_command);
shell_register_command(&sense_command); shell_register_command(&sense_command);
shell_register_command(&senseconv_command); shell_register_command(&senseconv_command);
shell_register_command(&format_command);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

5
apps/shell/shell.h
View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * 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-blink.h"
#include "shell-coffee.h"
#include "shell-exec.h" #include "shell-exec.h"
#include "shell-file.h" #include "shell-file.h"
#include "shell-netfile.h" #include "shell-netfile.h"
#include "shell-ps.h" #include "shell-ps.h"
#include "shell-reboot.h" #include "shell-reboot.h"
#include "shell-rime.h"
#include "shell-rime-netcmd.h" #include "shell-rime-netcmd.h"
#include "shell-rime-ping.h" #include "shell-rime-ping.h"
#include "shell-rime-sniff.h" #include "shell-rime-sniff.h"
#include "shell-rime.h"
#include "shell-rsh.h" #include "shell-rsh.h"
#include "shell-run.h" #include "shell-run.h"
#include "shell-sendtest.h" #include "shell-sendtest.h"