From 008d4ba33f9bd5742dc8bbfe00988381f4f955b3 Mon Sep 17 00:00:00 2001 From: fros4943 Date: Thu, 15 Jan 2009 13:18:19 +0000 Subject: [PATCH] sky example running both webserver and serial shell (overrides default slip handler) --- examples/sky-shell-webserver/Makefile | 8 +++ .../sky-shell-webserver/sky-shell-webserver.c | 68 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 examples/sky-shell-webserver/Makefile create mode 100644 examples/sky-shell-webserver/sky-shell-webserver.c diff --git a/examples/sky-shell-webserver/Makefile b/examples/sky-shell-webserver/Makefile new file mode 100644 index 000000000..7992f619b --- /dev/null +++ b/examples/sky-shell-webserver/Makefile @@ -0,0 +1,8 @@ +CONTIKI_PROJECT = sky-shell-webserver +all: $(CONTIKI_PROJECT) + +CFLAGS = -DWITH_UIP=1 + +CONTIKI = ../.. +APPS = webserver serial-shell +include $(CONTIKI)/Makefile.include diff --git a/examples/sky-shell-webserver/sky-shell-webserver.c b/examples/sky-shell-webserver/sky-shell-webserver.c new file mode 100644 index 000000000..023e71b0b --- /dev/null +++ b/examples/sky-shell-webserver/sky-shell-webserver.c @@ -0,0 +1,68 @@ +/* + * 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: sky-shell-webserver.c,v 1.1 2009/01/15 13:18:19 fros4943 Exp $ + */ + +#include "contiki.h" +#include "shell.h" +#include "serial-shell.h" + +#include "dev/serial.h" +#include "dev/uart1.h" +#include "webserver-nogui.h" + +#include +#include +#include +#include + +/*---------------------------------------------------------------------------*/ +PROCESS(sky_shell_process, "Sky Contiki shell w. webserver"); +AUTOSTART_PROCESSES(&sky_shell_process, &webserver_nogui_process); +/*---------------------------------------------------------------------------*/ +PROCESS_THREAD(sky_shell_process, ev, data) +{ + PROCESS_BEGIN(); + + /* WITH_UIP=1 assumes incoming SLIP serial data. + * We override this assumption by restoring default serial input handler. */ + uart1_set_input(serial_input_byte); + serial_init(); + + serial_shell_init(); + + shell_file_init(); + shell_wget_init(); + shell_text_init(); + + PROCESS_END(); +} +/*---------------------------------------------------------------------------*/