From 60075ec59ee69af03f10b55c63765df47c6c8ab5 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Sun, 18 Jun 2006 08:07:30 +0000 Subject: [PATCH] Temporary deletion of files due to problems with the CVS repository --- platform/esb/dev/battery-sensor.c | 99 +++ .../esb/{net/dtc.h => dev/battery-sensor.h} | 85 ++- platform/esb/dev/beep.c | 164 +++++ platform/esb/dev/beep.h | 166 +++++ platform/esb/dev/button-sensor.c | 108 ++++ .../rs232-slip-drv.h => dev/button-sensor.h} | 60 +- platform/esb/net/dtc-conf.h | 102 --- platform/esb/net/dtc-nullservice.c | 80 --- platform/esb/net/dtc-service.h | 45 -- platform/esb/net/dtc.c | 612 ------------------ platform/esb/net/rs232-slip-drv.c | 72 --- 11 files changed, 604 insertions(+), 989 deletions(-) create mode 100644 platform/esb/dev/battery-sensor.c rename platform/esb/{net/dtc.h => dev/battery-sensor.h} (59%) create mode 100644 platform/esb/dev/beep.c create mode 100644 platform/esb/dev/beep.h create mode 100644 platform/esb/dev/button-sensor.c rename platform/esb/{net/rs232-slip-drv.h => dev/button-sensor.h} (70%) delete mode 100644 platform/esb/net/dtc-conf.h delete mode 100644 platform/esb/net/dtc-nullservice.c delete mode 100644 platform/esb/net/dtc-service.h delete mode 100644 platform/esb/net/dtc.c delete mode 100644 platform/esb/net/rs232-slip-drv.c diff --git a/platform/esb/dev/battery-sensor.c b/platform/esb/dev/battery-sensor.c new file mode 100644 index 000000000..4a80d55a2 --- /dev/null +++ b/platform/esb/dev/battery-sensor.c @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2006, 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. + * + * $Id: battery-sensor.c,v 1.3 2006/06/18 08:07:30 adamdunkels Exp $ + * + * ----------------------------------------------------------------- + * + * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne + * Created : 2005-11-01 + * Updated : $Date: 2006/06/18 08:07:30 $ + * $Revision: 1.3 $ + */ + +#include "dev/battery-sensor.h" +#include +#include "dev/irq.h" + +const struct sensors_sensor battery_sensor; +static unsigned int battery_value; + +/*---------------------------------------------------------------------------*/ +static void +init(void) +{ + battery_value = 0; +} +/*---------------------------------------------------------------------------*/ +static int +irq(void) +{ + battery_value = ADC12MEM6; + return 0; +} +/*---------------------------------------------------------------------------*/ +static void +activate(void) +{ + irq_adc12_activate(&battery_sensor, 6, (INCH_4 + SREF_0)); +} +/*---------------------------------------------------------------------------*/ +static void +deactivate(void) +{ + irq_adc12_deactivate(&battery_sensor, 6); + battery_value = 0; +} +/*---------------------------------------------------------------------------*/ +static int +active(void) +{ + return irq_adc12_active(6); +} +/*---------------------------------------------------------------------------*/ +static unsigned int +value(int type) +{ + return battery_value; +} +/*---------------------------------------------------------------------------*/ +static int +configure(int type, void *c) +{ + return 0; +} +/*---------------------------------------------------------------------------*/ +static void * +status(int type) +{ + return NULL; +} +/*---------------------------------------------------------------------------*/ +SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR, + init, irq, activate, deactivate, active, + value, configure, status); diff --git a/platform/esb/net/dtc.h b/platform/esb/dev/battery-sensor.h similarity index 59% rename from platform/esb/net/dtc.h rename to platform/esb/dev/battery-sensor.h index 63003c10d..122c275ee 100644 --- a/platform/esb/net/dtc.h +++ b/platform/esb/dev/battery-sensor.h @@ -1,61 +1,48 @@ /* - * Copyright (c) 2005, Swedish Institute of Computer Science - * All rights reserved. + * Copyright (c) 2006, 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. + * 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 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: battery-sensor.h,v 1.3 2006/06/18 08:07:30 adamdunkels Exp $ * - * @(#)$Id: dtc.h,v 1.1 2006/06/18 07:49:34 adamdunkels Exp $ - */ -/** - * \addtogroup dtc + * ----------------------------------------------------------------- * - * @{ + * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne + * Created : 2005-11-01 + * Updated : $Date: 2006/06/18 08:07:30 $ + * $Revision: 1.3 $ */ -/** - * \file - * Header file for the distributed TCP caching implementation. - * \author Adam Dunkels - * - */ +#ifndef __BATTERY_SENSOR_H__ +#define __BATTERY_SENSOR_H__ +#include "lib/sensors.h" +extern const struct sensors_sensor battery_sensor; -#ifndef __DTC_H__ -#define __DTC_H__ +#define BATTERY_SENSOR "Battery" -#include "uip.h" -#include "uipopt.h" - -void dtc_init(void); -u8_t dtc_input(u8_t *packetptr, u16_t len); - -PROCESS_NAME(dtc_process); - -#endif /* __DTC_H__ */ - -/** @} */ +#endif /* __BATTERY_SENSOR_H__ */ diff --git a/platform/esb/dev/beep.c b/platform/esb/dev/beep.c new file mode 100644 index 000000000..0ea316aa1 --- /dev/null +++ b/platform/esb/dev/beep.c @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2005, 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: beep.c,v 1.3 2006/06/18 08:07:30 adamdunkels Exp $ + */ + +#include + +#include "contiki-esb.h" + +/* + * Flag to indicate if any of these functions should generate a sound + * or not The function is used beep_off() to to change this flag so + * none of the functions will generate sounds. + */ +static unsigned char beep_flag = BEEP_ON; + +/* + * BEEPER_BIT is the bit in the io-register that is connected to the actual + * beeper, setting the bit high vill generate a high pitch tone. + */ +#define BEEPER_BIT 0x08 + +/*-----------------------------------------------------------------------------------*/ +void +beep_alarm(int alarmmode, int len) +{ + len = len / 200; + + while(len > 0) { + /* + * Check here if we should beep or not since if we do it outside the + * while loop the call to this function would take muck less time, i.e. + * beep_flag would have side effects that might not be predictable. + */ + if(beep_flag & BEEP_ON) { + if((alarmmode == BEEP_ALARM1) && ((len & 7) > 4)) { + P2OUT |= BEEPER_BIT; + } else if((alarmmode == BEEP_ALARM2) && ((len & 15) > 12)) { + P2OUT |= BEEPER_BIT; + } else { + P2OUT &= ~BEEPER_BIT; + } + } + clock_delay(200); + len--; + } + P2OUT &= ~BEEPER_BIT; +} +/*-----------------------------------------------------------------------------------*/ +void +beep_beep(int i) +{ + if(beep_flag & BEEP_ON) { + + /* Beep. */ + P2OUT |= BEEPER_BIT; + clock_delay(i); + P2OUT &= ~BEEPER_BIT; + } +} +/*-----------------------------------------------------------------------------------*/ +void +beep(void) +{ + beep_beep(20); +} +/*-----------------------------------------------------------------------------------*/ +void +beep_down(int d) +{ + int i; + for(i = 8; i < d; i += i / 8) { + beep_beep(10); + clock_delay(i); + } +} +/*-----------------------------------------------------------------------------------*/ +void +beep_on(void) +{ + beep_flag |= BEEP_ON; +} +/*-----------------------------------------------------------------------------------*/ +void +beep_off(void) +{ + beep_flag &= ~BEEP_ON; +} +/*-----------------------------------------------------------------------------------*/ +void +beep_spinup(void) +{ + unsigned int i; + + for(i = 10000; i > 80; i -= i / 20) { + beep_beep(2); + clock_delay(i); + } + + for(i = 4980; i > 2000; i -= 20) { + leds_on(LEDS_ALL); + clock_delay(5000 - i); + leds_off(LEDS_ALL); + clock_delay(i); + } + +} +/*-----------------------------------------------------------------------------------*/ +void +beep_quick(int n) +{ + int i; + for(i = 0; i < n; ++i) { + beep_beep(2000); + clock_delay(20000); + } +} +/*-----------------------------------------------------------------------------------*/ +void beep_long(clock_time_t len) { + /* + * Check if the beeper is turned on or off, i.e. if a call should generate + * a noise or not. + */ + if(beep_flag & BEEP_ON) { + /* Turn on the beeper. */ + P2OUT |= BEEPER_BIT; + } + + clock_wait(len); + + if(beep_flag & BEEP_ON) { + /* Turn the beeper off. */ + P2OUT &= ~BEEPER_BIT; + } +} +/*-----------------------------------------------------------------------------------*/ diff --git a/platform/esb/dev/beep.h b/platform/esb/dev/beep.h new file mode 100644 index 000000000..a8db5903d --- /dev/null +++ b/platform/esb/dev/beep.h @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2005, 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: beep.h,v 1.3 2006/06/18 08:07:31 adamdunkels Exp $ + */ +/** + * \addtogroup esb + * @{ + */ + +/** + * \defgroup beeper Beeper interface + * @{ + */ + +/** + * \file + * Interface to the beeper. + * \author Adam Dunkels + * + */ + +#ifndef __BEEP_H__ +#define __BEEP_H__ + +#define BEEP_ON 1 +#define BEEP_OFF 0 + +#define BEEP_ALARM1 1 +#define BEEP_ALARM2 2 + +#include "sys/clock.h" + +/** + * Beep for a specified time. + * + * This function causes the beeper to beep for the specified time. The + * time is measured in the same units as for the clock_delay() + * function. + * + * \note This function will hang the CPU during the beep. + * + * \note This function will stop any beep that was on previously when this + * function ends. + * + * \note If the beeper is turned off with beep_off() this call will still + * take the same time, though it will be silent. + * + * \param len The length of the beep. + * + */ +void beep_beep(int len); + +/** + * Beep an alarm for a specified time. + * + * This function causes the beeper to beep for the specified time. The + * time is measured in the same units as for the clock_delay() + * function. + * + * \note This function will hang the CPU during the beep. + * + * \note This function will stop any beep that was on previously when this + * function ends. + * + * \note If the beeper is turned off with beep_off() this call will still + * take the same time, though it will be silent. + * + * \param alarmmode The alarm mode (BEEP_ALARM1,BEEP_ALARM2) + * \param len The length of the beep. + * + */ +void beep_alarm(int alarmmode, int len); + +/** + * Produces a quick click-like beep. + * + * This function produces a short beep that sounds like a click. + * + */ +void beep(void); + +/** + * A beep with a pitch-bend down. + * + * This function produces a pitch-bend sound with deecreasing + * frequency. + * + * \param len The length of the pitch-bend. + * + */ +void beep_down(int len); + +/** + * Turn the beeper on. + * + * This function turns on the beeper. The beeper is turned off with + * the beep_off() function. + */ +void beep_on(void); + +/** + * Turn the beeper off. + * + * This function turns the beeper off after it has been turned on with + * beep_on(). + */ +void beep_off(void); + +/** + * Produce a sound similar to a hard-drive spinup. + * + * This function produces a sound that is intended to be similar to + * the sound a hard-drive makes when it starts. + * + */ +void beep_spinup(void); + +/** + * Beep for a long time (seconds) + * + * This function produces a beep with the specified length and will + * not return until the beep is complete. The length of the beep is + * specified using CLOCK_SECOND: a two second beep is CLOCK_SECOND * + * 2, and a quarter second beep is CLOCK_SECOND / 4. + * + * \note If the beeper is turned off with beep_off() this call will still + * take the same time, though it will be silent. + * + * \param len The length of the beep, measured in units of CLOCK_SECOND + */ +void beep_long(clock_time_t len); + +void beep_quick(int num); + +/** @} */ +/** @} */ + +#endif /* __BEEP_H__ */ diff --git a/platform/esb/dev/button-sensor.c b/platform/esb/dev/button-sensor.c new file mode 100644 index 000000000..fb0c81b8d --- /dev/null +++ b/platform/esb/dev/button-sensor.c @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2005, 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: button-sensor.c,v 1.3 2006/06/18 08:07:31 adamdunkels Exp $ + */ + +#include "contiki-esb.h" + +const struct sensors_sensor button_sensor; + +static struct timer debouncetimer; + +HWCONF_PIN(BUTTON, 2, 7); +HWCONF_IRQ(BUTTON, 2, 7); + +/*---------------------------------------------------------------------------*/ +static void +init(void) +{ + timer_set(&debouncetimer, 0); + BUTTON_IRQ_EDGE_SELECTD(); + + BUTTON_SELECT(); + BUTTON_MAKE_INPUT(); +} +/*---------------------------------------------------------------------------*/ +static int +irq(void) +{ + if(BUTTON_CHECK_IRQ()) { + if(timer_expired(&debouncetimer)) { + timer_set(&debouncetimer, CLOCK_SECOND / 4); + sensors_changed(&button_sensor); + return 1; + } + } + + return 0; +} +/*---------------------------------------------------------------------------*/ +static void +activate(void) +{ + sensors_add_irq(&button_sensor, BUTTON_IRQ_PORT()); + BUTTON_ENABLE_IRQ(); +} +/*---------------------------------------------------------------------------*/ +static void +deactivate(void) +{ + BUTTON_DISABLE_IRQ(); + sensors_remove_irq(&button_sensor, BUTTON_IRQ_PORT()); +} +/*---------------------------------------------------------------------------*/ +static int +active(void) +{ + return BUTTON_IRQ_ENABLED(); +} +/*---------------------------------------------------------------------------*/ +static unsigned int +value(int type) +{ + return BUTTON_READ() || !timer_expired(&debouncetimer); +} +/*---------------------------------------------------------------------------*/ +static int +configure(int type, void *c) +{ + return 0; +} +/*---------------------------------------------------------------------------*/ +static void * +status(int type) +{ + return NULL; +} +/*---------------------------------------------------------------------------*/ +SENSORS_SENSOR(button_sensor, BUTTON_SENSOR, + init, irq, activate, deactivate, active, + value, configure, status); diff --git a/platform/esb/net/rs232-slip-drv.h b/platform/esb/dev/button-sensor.h similarity index 70% rename from platform/esb/net/rs232-slip-drv.h rename to platform/esb/dev/button-sensor.h index e99ee3820..ff1ae1887 100644 --- a/platform/esb/net/rs232-slip-drv.h +++ b/platform/esb/dev/button-sensor.h @@ -1,40 +1,42 @@ /* * Copyright (c) 2005, Swedish Institute of Computer Science - * All rights reserved. + * 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. + * 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 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: rs232-slip-drv.h,v 1.1 2006/06/18 07:49:34 adamdunkels Exp $ + * @(#)$Id: button-sensor.h,v 1.3 2006/06/18 08:07:31 adamdunkels Exp $ */ -#ifndef __RS232_SLIP_DRV_H__ -#define __RS232_SLIP_DRV_H__ +#ifndef __BUTTON_SENSOR_H__ +#define __BUTTON_SENSOR_H__ -void rs232_slip_drv_init(void *); +#include "lib/sensors.h" -void rs232_slip_drv_request_poll(void); +extern const struct sensors_sensor button_sensor; -#endif /* __RS232_SLIP_DRV_H__ */ +#define BUTTON_SENSOR "Button" + +#endif /* __BUTTON_SENSOR_H__ */ diff --git a/platform/esb/net/dtc-conf.h b/platform/esb/net/dtc-conf.h deleted file mode 100644 index 7d9cc6941..000000000 --- a/platform/esb/net/dtc-conf.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2005, 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: dtc-conf.h,v 1.1 2006/06/18 07:49:33 adamdunkels Exp $ - */ -/** - * \file - * Configuration options for the distributed TCP caching module. - * \author Adam Dunkels - */ - -#ifndef __DTC_CONF_H__ -#define __DTC_CONF_H__ - -#include "uipopt.h" - -/** - * The maximum size of a TCP segment (excluding headers) that can be - * cached by the distributed TCP caching module. - * - * The distributed TCP caching module statically allocates memory for - * holding cached TCP segments. This configuration parameter sets the - * size of those blocks. The DTC_CONF_NUM_SEGMENTS configuration - * parameter sets the number of packet caches that are allocated. - * - * \hideinitializer - */ -#define DTC_CONF_MAX_SEGSIZE UIP_TCP_MSS - -/** - * The number of TCP segments that the distributed TCP caching module can hold. - * - * This configuration parameter affects how much memory is allocated - * to the TCP segment cache. The size of each cache block is set with - * the DTC_CONF_MAX_SEGSIZE parameter. - * - * \hideinitializer - */ -#define DTC_CONF_NUM_SEGMENTS 1 - -/** - * The number of simulataneous TCP connections that the distributed TCP caching can handle simulataneously. - * - * This configuration parameter specifies the maximum amount of - * simultaneous TCP connections that can be handled by the distributed - * TCP caching module. Note that this parameter does not limit the - * amount of TCP connections that can go through the node, only how - * many connections that will benefit from the help of the distributed - * TCP caching mechanism. - * - * \hideinitializer - */ -#define DTC_CONF_NUM_CONNECTIONS 1 - -/** - * Type definition of the native unsigned 32-bit datatype. - * - * This configuration option defines the native 32-bit datatype for - * the platform on which the distributed TCP caching mechanism is to - * be run. Normally, the unsigned 32-bit datatype is "unsigned long", - * but check the manual for the C compiler to be sure. - */ -typedef unsigned long u32_t; - -/** - * Type definition of the native signed 32-bit datatype. - * - * This configuration option defines the native 32-bit datatype for - * the platform on which the distributed TCP caching mechanism is to - * be run. Normally, the signed 32-bit datatype is "signed long", but - * check the manual for the C compiler to be sure. - */ -typedef signed long s32_t; - -#endif /* __DTC_CONF_H__ */ diff --git a/platform/esb/net/dtc-nullservice.c b/platform/esb/net/dtc-nullservice.c deleted file mode 100644 index 6d443565c..000000000 --- a/platform/esb/net/dtc-nullservice.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2005, 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: dtc-nullservice.c,v 1.1 2006/06/18 07:49:34 adamdunkels Exp $ - */ -#include "contiki.h" -#include "dtc-service.h" -#include "uip-fw.h" - -static u8_t input(void) {return UIP_FW_OK;} -static u8_t output(void) {return UIP_FW_OK;} - -static const struct dtc_service_interface state = - { - DTC_SERVICE_VERSION, - input, - output - }; - -EK_EVENTHANDLER(eventhandler, ev, data); -/*EK_POLLHANDLER(pollhandler);*/ -EK_PROCESS(p, DTC_SERVICE_NAME ": null", EK_PRIO_NORMAL, - eventhandler, NULL/*pollhandler*/, (void *)&state); - -/*---------------------------------------------------------------------------*/ -EK_PROCESS_INIT(dtc_service_init, arg) -{ - ek_service_start(DTC_SERVICE_NAME, &p); -} -/*---------------------------------------------------------------------------*/ -EK_EVENTHANDLER(eventhandler, ev, data) -{ - switch(ev) { - case EK_EVENT_INIT: - case EK_EVENT_REPLACE: - break; - case EK_EVENT_REQUEST_REPLACE: - ek_replace((struct ek_proc *)data, NULL); - break; - case EK_EVENT_REQUEST_EXIT: - ek_exit(); - break; - default: - break; - } - -} -/*---------------------------------------------------------------------------*/ -/*EK_POLLHANDLER(pollhandler) -{ - -}*/ -/*---------------------------------------------------------------------------*/ diff --git a/platform/esb/net/dtc-service.h b/platform/esb/net/dtc-service.h deleted file mode 100644 index be9f51aa6..000000000 --- a/platform/esb/net/dtc-service.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2005, 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: dtc-service.h,v 1.1 2006/06/18 07:49:34 adamdunkels Exp $ - */ -#ifndef __DTC_SERVICE_H__ -#define __DTC_SERVICE_H__ - -#include "contiki.h" - -#define dtc_service_name "DTC" - -SERVICE_INTERFACE(dtc_service, { - u8_t (* input)(u8_t *p, u16_t len); /* Called when data arrives. */ - u8_t (* output)(void); /* Called to send data. */ -}); - -#endif /* __DTC_SERVICE_H__ */ diff --git a/platform/esb/net/dtc.c b/platform/esb/net/dtc.c deleted file mode 100644 index 33c3bf5dc..000000000 --- a/platform/esb/net/dtc.c +++ /dev/null @@ -1,612 +0,0 @@ -/* - * Copyright (c) 2005, 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: dtc.c,v 1.1 2006/06/18 07:49:34 adamdunkels Exp $ - */ -/** - * \defgroup dtc Distributed TCP caching - * - * Distributed TCP Caching (DTC) is a mechanism that helps to improve - * the energy efficiency of TCP in wireless sensor networks. - * - * @{ - */ - -/** - * \file - * Implementation of the distributed TCP caching mechanism for uIP. - * \author Adam Dunkels - * - */ - - -#include "contiki.h" -#include "dtc-service.h" -#include "uip-fw.h" - -#include "dtc.h" -#include "dtc-conf.h" -#include "uip.h" -#include "uip-fw.h" -#include "uip_arch.h" - -#include "list.h" -#include "contiki.h" - -/*------------------------------------------------------------------------------*/ -/** - * \internal - * The TCP and IP headers. - */ -struct tcpip_hdr { - /* IP header. */ - u8_t vhl, - tos; - u16_t len; - - u8_t ipid[2], - ipoffset[2], - ttl, - proto; - u16_t ipchksum; - u32_t srcipaddr, - destipaddr; - - /* TCP header. */ - u16_t srcport, - destport; - u32_t seqno, ackno; - u8_t tcpoffset, - flags; - u16_t wnd; - u16_t tcpchksum; - u8_t urgp[2]; - u8_t data[4]; -}; - -/** - * \internal - * Structure for keeping the state of one TCP end-point. - */ -struct dtc_tcpend { - u32_t ipaddr; /**< The IP address of the end-point. */ - u32_t seqno; /**< The next expected TCP sequence number from the - end-point. */ - u32_t rttseq; /**< The sequence number for which an RTT - measurement is currently being made, or 0 if no - measurement is being made. */ - u16_t port; /**< The TCP port number of the end-point. */ - u16_t window; /**< The receiver window for the end-point. */ - int sa; /**< The smoothed avergage for the RTT - estimations. */ - int sv; /**< The smoothed variance for the RTT - estimations. */ - u8_t rto; /**< The RTO generated from the RTT estimations. */ - u8_t tmr; /**< Timer. */ - u8_t nrtx; /**< Number of retransmissions performed by the - distributed TCP snoop module. */ -}; - -/** - * \internal - * The structure holding the state of a TCP connection. - */ -struct dtc_conn { - struct dtc_conn *next; - list_t segments; - struct dtc_tcpend e1; /**< First TCP end-point. */ - struct dtc_tcpend e2; /**< Second TCP end-point. */ - u8_t tmr; /**< Timer. */ -}; - -/** - * \internal - * The structure holding a cached TCP segment. - */ -struct dtc_segment { - struct dtc_segment *next; - struct tcpip_hdr hdr; /**< The TCP and IP headers of the - packet. */ - struct dtc_conn *conn; /**< Pointer to the connection that the - segment belongs to. */ - u16_t len; /**< The length of the segment, - measured in TCP bytes. */ - u8_t data[DTC_CONF_MAX_SEGSIZE]; - /**< The data contained in the - segment. */ - u8_t tmr; /**< Timer - starts at 0 and counts - upward every time - dtc_periodic() is invoked. */ -}; - -/** - * \internal - * The list of cached TCP segments. - */ -MEMB(segments, sizeof(struct dtc_segment), DTC_CONF_NUM_SEGMENTS); -/*static struct dtc_segment segments[DTC_CONF_NUM_SEGMENTS];*/ - -/** - * \internal - * The list of TCP connections for which the distributed TCP snoop - * mechanism is active. - */ -MEMB(conns, sizeof(struct dtc_conn), DTC_CONF_NUM_CONNECTIONS); -/*static struct dtc_conn conns[DTC_CONF_NUM_CONNECTIONS];*/ - -LIST(connlist); - -#define TCP_SEQ_LT(a,b) ((s32_t)((a)-(b)) < 0) -#define TCP_SEQ_LEQ(a,b) ((s32_t)((a)-(b)) <= 0) -#define TCP_SEQ_GT(a,b) ((s32_t)((a)-(b)) > 0) -#define TCP_SEQ_GEQ(a,b) ((s32_t)((a)-(b)) >= 0) -#define TCP_FIN 0x01 -#define TCP_SYN 0x02 -#define TCP_RST 0x04 -#define TCP_PSH 0x08 -#define TCP_ACK 0x10 -#define TCP_URG 0x20 -#define TCP_CTL 0x3f - -/** - * \internal - * The length of the standard IP header, without IP options. - */ -#define IP_HLEN 20 - -/** - * \internal - * The start value of the retransmission time-out. - */ -#define RTO 30 - -static u32_t htonl(u32_t n); - - -static u8_t input(u8_t *packetptr, u16_t len); -static u8_t output(void) {return UIP_FW_OK;} - -SERVICE(dtc_service, dtc_service, { input, output }); - -PROCESS(dtc_process, "Distributed TCP Caching"); - -/*------------------------------------------------------------------------------*/ -/** - * Initialize the distributed snoop module. - * - * This function initializes the distributed snoop module and must be - * called before any of the other functions are used. - */ -/*------------------------------------------------------------------------------*/ -static void -init_dtc(void) -{ - memb_init(&conns); - memb_init(&segments); - - list_init(connlist); - /* list_init(segmentlist);*/ -} -/*------------------------------------------------------------------------------*/ -/** - * \internal - * Save a segment in the segment cache. - * - * \param hdr Pointer to the header of the segment. - * \param len The length of the segment. - * - * \return A pointer to the cached segment, or NULL if the cache was full. - * - */ -/*------------------------------------------------------------------------------*/ -static struct dtc_segment * -cache_segment(struct dtc_conn *conn, - struct tcpip_hdr *hdr, u16_t len) -{ - struct dtc_segment *s; - - /* Check if there are any unused slots in the segment cache. */ - s = (struct dtc_segment *)memb_alloc(&segments); - - if(s == NULL) { - /* Here we might try to make room in the segment cache, but for - now we simply return. */ - return NULL; - } - - /* Do some sanity checks on the segment to be cached. */ - if(len < 40 || - len - 40 > DTC_CONF_MAX_SEGSIZE) { - return NULL; - } - - /* Calculate the length of the segment in TCP bytes. We do this by - taking the length of the IP packet, and subtract the size of the - IP and TCP headers. Since we only allow IP packets without - options, we know that the IP header is 20 bytes large, and we use - the header offset field of the TCP header to calculate the length - of the TCP header + options. - - Finally, if the segment has the SYN or FIN flags set, we add one - to the segment length. */ - - s->len = htons(hdr->len) - IP_HLEN - ((hdr->tcpoffset >> 4) << 2); - if((hdr->flags & (TCP_SYN | TCP_FIN)) != 0) { - ++s->len; - } - - - /* If there is no TCP data in the segment, there is no need to cache - it. */ - if(s->len == 0) { - return NULL; - } - - s->tmr = 0; - - /* Copy the TCP/IP headers. */ - memcpy(&s->hdr, hdr, 40); - - /* Copy the segment data. */ - memcpy(&s->data, &hdr->data[0], len - 40); - - /* Add segment to list of segments on the connection's list. */ - list_add(conn->segments, s); - - return s; -} -/*------------------------------------------------------------------------------*/ -/** - * \internal - * Process an incoming TCP segment for a connection. - */ -/*------------------------------------------------------------------------------*/ -static u8_t -process_segment(struct dtc_conn *conn, - struct dtc_tcpend *src, - struct dtc_tcpend *dst, - u8_t *packetptr, u16_t len) -{ - struct tcpip_hdr *hdr; - struct dtc_segment *s; - int m; - - hdr = (struct tcpip_hdr *)packetptr; - - /* Check if the incoming segment acknowledges one in the segment - list of the connection. */ - for(s = list_head(conn->segments); s != NULL; s = s->next) { - - printf("process_segment: for this conn, ack %d, ack %lu, seq %lu\n", - (hdr->flags & TCP_ACK), htonl(hdr->ackno), - htonl(s->hdr.seqno) + s->len); - - - /* Check if the incoming segment acknowledges this one. If so, - we should drop the cached segment and possibly do RTT - measurements. */ - - if((s->hdr.srcipaddr == hdr->destipaddr) && - (hdr->flags & TCP_ACK) != 0 && - TCP_SEQ_GEQ(htonl(hdr->ackno), htonl(s->hdr.seqno) + s->len)) { - - /* Do RTT estimation, unless we have done retransmissions. */ - if(src->rttseq != 0 && - TCP_SEQ_GEQ(htonl(hdr->ackno), src->rttseq) && - src->nrtx == 0) { - - printf("Performing RTT estimation for seqno %lu (timer %d)\n", - src->rttseq, src->tmr); - - m = src->tmr; - /* This is taken directly from VJs original code in his paper */ - m = m - (src->sa >> 3); - src->sa += m; - if(m < 0) { - m = -m; - } - m = m - (src->sv >> 2); - src->sv += m; - src->rto = (src->sa >> 3) + src->sv; - src->rttseq = 0; - printf("Performing RTO stuff, new rto %d\n", src->rto); - } - src->tmr = 0; - - printf("process_segment: bropping acked segment.\n"); - /* s->state = STATE_FREE;*/ - list_remove(conn->segments, s); - memb_free(&segments, s); - - /* Next, check if the incoming packet has the same sequence - number as one of the segments in the cache. If so, it is - either a retransmission or a duplicated packet. In any - case, the RTT estimation would be thwarted if we made - estimations, so we cancel any running RTT measurements. */ - } else if(s->hdr.seqno == hdr->seqno) { - if(s->hdr.srcipaddr == hdr->srcipaddr) { - src->rttseq = 0; - } else { - dst->rttseq = 0; - } - } - } - - s = cache_segment(conn, hdr, len); - - if(s != NULL) { - s->conn = conn; - if(dst->rttseq == 0) { - dst->rttseq = htonl(hdr->seqno); - dst->tmr = 0; - printf("Starting RTT est for %lu\n", dst->rttseq); - } - printf("Process_segment: segment cached\n"); - } else { - printf("Process_segment: segment not cached \n"); - } - - return uip_fw_forward(); -} -/*------------------------------------------------------------------------------*/ -/** - * Process an incoming packet by running it through the distributed - * TCP snooping mechanism, and possibly by forwarding it. - * - * This function processes an incoming packet, and should be called - * from the network device driver for every packet that arrives. The - * function might call uip_fw_output() to send out packets. - * - * \param packetptr A pointer to the first byte of the packet header - * of the incoming packet. The packet must follow contiguously the - * header in memory. - * - * \param len The length of the packet, including the packet header. - * - * \retval UIP_FW_OK If the packet should be further processed by the - * caller. - * - * \retval UIP_FW_FORWARDED If the packet was forwarded and therefor - * should not be further processed. - */ -/*------------------------------------------------------------------------------*/ -static u8_t -input(u8_t *packetptr, u16_t len) -{ - struct tcpip_hdr *hdr; - struct dtc_conn *c; - - hdr = (struct tcpip_hdr *)packetptr; - - /* XXX: when testing, only run dtc for connections on port 12347. */ - if(hdr->proto != UIP_PROTO_TCP || - (hdr->destport != HTONS(12347) && hdr->srcport != HTONS(12347))) { - return uip_fw_forward(); - } - - - printf("dtc_input (%d, %d): vhl 0x%x proto %d len %d ipchk 0x%x\n", - node_x(), node_y(), - hdr->vhl, hdr->proto, HTONS(hdr->len), - uip_ipchksum()); - - /* First, do some initial checking on the packet to make sure that - it is an undamaged TCP packet. Note that the checks are placed in - an order with the most computationally expensive at the end. */ - - if(hdr->vhl == 0x45 && /* IP version and header length must be normal. */ - - /* It must be a TCP packet. */ - hdr->proto == UIP_PROTO_TCP && - - /* We do not allow IP fragments. */ - hdr->ipoffset[1] == 0 && - (hdr->ipoffset[0] & 0x3f) == 0 && - - /* We do not process segments destined for ourselves. */ - hdr->destipaddr != *(u32_t *)uip_hostaddr && - - /* The packet length must not exceed the size of the segment - cache. */ - (DTC_CONF_MAX_SEGSIZE + 40) >= HTONS(hdr->len) && - - /* The IP checksum must be OK. */ - uip_ipchksum() == 0xffff && - - /* The TCP checksum must be OK. */ - uip_tcpchksum() == 0xffff) { - - /* Check if this segment belongs to a connection for which DTC - currently is active. Also keep track of the first unused - connection, in case we need to allocated it further down. */ - for(c = list_head(connlist); c != NULL; c = c->next) { - if(c->e1.ipaddr == hdr->destipaddr && - c->e1.port == htons(hdr->destport) && - c->e2.ipaddr == hdr->srcipaddr && - c->e2.port == htons(hdr->srcport)) { - printf("dtc_input %d, %d: process segment 1\n", - node_x(), node_y()); - return process_segment(c, &c->e2, &c->e1, - packetptr, len); - } else if(c->e2.ipaddr == hdr->destipaddr && - c->e2.port == htons(hdr->destport) && - c->e1.ipaddr == hdr->srcipaddr && - c->e1.port == htons(hdr->srcport)) { - printf("dtc_input %d, %d: process segment 2\n", node_x(), node_y()); - return process_segment(c, &c->e1, &c->e2, - packetptr, len); - - /* } else { - printf("dtc_input %d, %d: not processing segment\n", - node_x(), node_y()); - return UIP_FW_LOCAL;*/ - } - } - - - /* The incoming segment did not belong to any active connections, - so we allocate a new connection if there is a free one that we - can use. */ - printf("dtc_input %d, %d: creating new connection\n", node_x(), node_y()); - - c = (struct dtc_conn *)memb_alloc(&conns); - list_add(connlist, c); - /* Fill in the fields from the incoming header. */ - c->e1.ipaddr = hdr->srcipaddr; - c->e1.seqno = htonl(hdr->seqno); - c->e1.rttseq = 0; - c->e1.port = htons(hdr->srcport); - c->e1.window = htons(hdr->wnd); - c->e1.sa = 16; - c->e1.sv = 0; - c->e1.rto = RTO; - c->e1.tmr = 0; - c->e1.nrtx = 0; - - c->e2.ipaddr = hdr->destipaddr; - c->e2.seqno = htonl(hdr->ackno); - c->e2.rttseq = 0; - c->e2.port = htons(hdr->destport); - c->e2.window = 0; - c->e2.sa = 16; - c->e2.sv = 0; - c->e2.rto = RTO; - c->e2.tmr = 0; - c->e2.nrtx = 0; - - return process_segment(c, &c->e1, &c->e2, packetptr, len); - } - return uip_fw_forward(); -} -/*------------------------------------------------------------------------------*/ -/** - * \internal - * Perform periodic processing for a specific connection end-point. - * - * The periodic processing does two things: update timers and - * retransmit segments, where the timers drive the - * retransmissions. This must be done on a per-TCP-endpoint basis, - * rather than on a per-TCP-connection basis, because we maintain an - * RTT estimate for each endpoint. The reason for not having a single - * RTT for each TCP connection is that this node may be located on a - * path with a very long delay to one end and a very short delay to - * the other. - */ -/*------------------------------------------------------------------------------*/ -static void -periodic_endpoint(struct dtc_tcpend *c) -{ - ++c->tmr; - /* If the timer has reached its threshold value, we should - retransmit the segment with the lowest sequence number, if - cached. */ - if(c->tmr == c->rto) { - printf("periodic_endpoint: should do retransmission.\n"); - c->tmr = 0; - } -} -/*------------------------------------------------------------------------------*/ -/** - * Perform periodic processing. - * - * This function does the periodic processing in the distributed snoop - * module. It should be called as often as the uIP periodic function - * is called, typically twice a second. - * - */ -/*------------------------------------------------------------------------------*/ -static void -periodic(void) -{ - struct dtc_segment *s; - struct dtc_conn *c; - - /* for(i = 0; i < DTC_CONF_NUM_CONNECTIONS; ++i) { - c = &conns[i]; - if(c->state == STATE_USED) { - periodic_endpoint(&c->e1); - periodic_endpoint(&c->e2); - } - } - - for(i = 0; i < DTC_CONF_NUM_SEGMENTS; ++i) { - s = &segments[i]; - if(s->state == STATE_USED) { - ++s->tmr; - } - }*/ -} -/*------------------------------------------------------------------------------*/ -/** - * \internal - * Convert a 32-bit unsigned value from host to network byte order. - * - * \param n The 32-bit value to be converted. - * - * \return The converted 32-bit value. - * - */ -/*------------------------------------------------------------------------------*/ -static u32_t -htonl(u32_t n) -{ -#if BYTE_ORDER == BIG_ENDIAN - return n; -#else /* BYTE_ORDER == BIG_ENDIAN */ - return (((u32_t)n & 0xff) << 24) | - (((u32_t)n & 0xff00) << 8) | - (((u32_t)n & 0xff0000) >> 8) | - (((u32_t)n & 0xff000000) >> 24); -#endif /* BYTE_ORDER == BIG_ENDIAN */ - -} -/*------------------------------------------------------------------------------*/ -PROCESS_THREAD(dtc_process, ev, data) -{ - static struct etimer et; - - PROCESS_BEGIN(); - - init_dtc(); - - SERVICE_REGISTER(dtc_service); - - while(1) { - etimer_set(&et, CLOCK_SECOND / 2); - PROCESS_YIELD_UNTIL(etimer_expired(&et)); - - periodic(); - - } - - PROCESS_END(); -} -/*---------------------------------------------------------------------------*/ -/** @} */ diff --git a/platform/esb/net/rs232-slip-drv.c b/platform/esb/net/rs232-slip-drv.c deleted file mode 100644 index 70b2945ae..000000000 --- a/platform/esb/net/rs232-slip-drv.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2005, 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: rs232-slip-drv.c,v 1.1 2006/06/18 07:49:34 adamdunkels Exp $ - */ - -#include "contiki.h" -#include "uip.h" -#include "tcpip.h" -#include "rs232-slip.h" - -EK_POLLHANDLER(pollhandler); -EK_EVENTHANDLER(eventhandler, ev, data); -EK_PROCESS(p, "SLIP driver", EK_PRIO_HIGH, - eventhandler, pollhandler, NULL); -static ek_id_t id = EK_ID_NONE; - - -/*---------------------------------------------------------------------------*/ -EK_POLLHANDLER(pollhandler) -{ - uip_len = rs232_slip_poll(); - tcpip_input(); -} -/*---------------------------------------------------------------------------*/ -EK_PROCESS_INIT(rs232_slip_drv_init, arg) -{ - arg_free(arg); - - if(id == EK_ID_NONE) { - id = ek_start(&p); - } -} -/*---------------------------------------------------------------------------*/ -EK_EVENTHANDLER(eventhandler, ev, data) -{ - EK_EVENTHANDLER_ARGS(ev, data); -} -/*---------------------------------------------------------------------------*/ -void -rs232_slip_drv_request_poll(void) -{ - ek_request_poll(id); -} -/*---------------------------------------------------------------------------*/