From e7b03f1e5e4f410541744b9ebc686f1be1a8054b Mon Sep 17 00:00:00 2001
From: razvanm <razvanm>
Date: Tue, 22 May 2007 20:34:19 +0000
Subject: [PATCH] Initial commit of the Deluge T2. Some notes: - TOSBoot
 includes some code to allow the MicaZ version to compile but it's not support
 for it it's not done yet. - tools/tinyos/misc/Makefile.am is not updated yet
 so the new tools will not be installed by default.

---
 apps/tests/deluge/Blink/BlinkAppC.nc          |  53 ++
 apps/tests/deluge/Blink/BlinkC.nc             |  65 +++
 apps/tests/deluge/Blink/Makefile              |   7 +
 apps/tests/deluge/Blink/burn                  |  21 +
 apps/tests/deluge/Blink/volumes-stm25p.xml    |   4 +
 apps/tests/deluge/GoldenImage/GoldenImageC.nc |  33 ++
 apps/tests/deluge/GoldenImage/Makefile        |   7 +
 .../deluge/GoldenImage/volumes-stm25p.xml     |   4 +
 apps/tests/deluge/SerialBlink/BlinkAppC.nc    |  54 ++
 apps/tests/deluge/SerialBlink/BlinkC.nc       |  74 +++
 apps/tests/deluge/SerialBlink/Makefile        |   7 +
 .../deluge/SerialBlink/volumes-stm25p.xml     |   4 +
 doc/html/deluge-t2-manual.css                 | 193 +++++++
 doc/html/deluge-t2-manual.html                | 256 +++++++++
 doc/pdf/deluge-t2-manual.pdf                  | Bin 0 -> 43383 bytes
 support/make/Makedefaults                     |   2 +-
 support/make/bnp.extra                        |  24 +
 tools/tinyos/misc/tinyos.py                   | 285 ++++++++++
 tools/tinyos/misc/tos-build-deluge-image      | 188 +++++++
 tools/tinyos/misc/tos-deluge                  | 399 ++++++++++++++
 tos/lib/TOSBoot/Deluge.h                      | 142 +++++
 tos/lib/TOSBoot/Exec.nc                       |   4 +
 tos/lib/TOSBoot/ExtFlash.nc                   |  35 ++
 tos/lib/TOSBoot/Hardware.nc                   |  34 ++
 tos/lib/TOSBoot/Leds.nc                       |  35 ++
 tos/lib/TOSBoot/Makefile                      |  72 +++
 tos/lib/TOSBoot/ProgFlash.nc                  |  33 ++
 tos/lib/TOSBoot/TOSBoot.h                     |  39 ++
 tos/lib/TOSBoot/TOSBoot.nc                    |  61 +++
 tos/lib/TOSBoot/TOSBootM.nc                   | 259 +++++++++
 tos/lib/TOSBoot/Voltage.nc                    |  33 ++
 tos/lib/TOSBoot/at45db/ExtFlashC.nc           | 126 +++++
 tos/lib/TOSBoot/avr/HardwareC.nc              |  46 ++
 tos/lib/TOSBoot/avr/InternalFlashC.nc         |  65 +++
 tos/lib/TOSBoot/avr/ProgFlashM.nc             |  65 +++
 tos/lib/TOSBoot/avr/boot.h                    | 498 ++++++++++++++++++
 tos/lib/TOSBoot/crc.h                         |  56 ++
 tos/lib/TOSBoot/lib/ExecC.nc                  |  45 ++
 tos/lib/TOSBoot/lib/LedsC.nc                  |  80 +++
 tos/lib/TOSBoot/micaz/ExecC.nc                |  40 ++
 tos/lib/TOSBoot/micaz/InternalFlash.h         |  41 ++
 tos/lib/TOSBoot/micaz/PluginC.nc              |  13 +
 tos/lib/TOSBoot/micaz/TOSBoot_platform.h      |  47 ++
 tos/lib/TOSBoot/micaz/VoltageC.nc             |  58 ++
 tos/lib/TOSBoot/micaz/avrhardware.h           | 196 +++++++
 tos/lib/TOSBoot/micaz/hardware.h              | 143 +++++
 tos/lib/TOSBoot/msp430/HPLUSART0M.nc          | 128 +++++
 tos/lib/TOSBoot/msp430/HPLUSARTControl.nc     |  46 ++
 tos/lib/TOSBoot/msp430/HardwareC.nc           |  48 ++
 tos/lib/TOSBoot/msp430/InternalFlashC.nc      | 122 +++++
 tos/lib/TOSBoot/msp430/ProgFlashM.nc          |  70 +++
 tos/lib/TOSBoot/msp430/VoltageC.nc            |  72 +++
 tos/lib/TOSBoot/stm25p/ExtFlashC.nc           |  51 ++
 tos/lib/TOSBoot/stm25p/ExtFlashM.nc           | 114 ++++
 tos/lib/TOSBoot/telosb/InternalFlash.h        |  45 ++
 tos/lib/TOSBoot/telosb/InternalFlash.nc       |  37 ++
 tos/lib/TOSBoot/telosb/PluginC.nc             |  46 ++
 tos/lib/TOSBoot/telosb/PowerOffM.nc           |  85 +++
 tos/lib/TOSBoot/telosb/TOSBoot_platform.h     |  47 ++
 tos/lib/TOSBoot/telosb/hardware.h             |  88 ++++
 tos/lib/net/Deluge/AutoStarterC.nc            |  38 ++
 tos/lib/net/Deluge/AutoStarterP.nc            |  45 ++
 tos/lib/net/Deluge/BitVecUtils.h              |  39 ++
 tos/lib/net/Deluge/BitVecUtils.nc             |  62 +++
 tos/lib/net/Deluge/BitVecUtilsC.nc            |  80 +++
 tos/lib/net/Deluge/Crc.nc                     |  29 +
 tos/lib/net/Deluge/CrcP.nc                    |  48 ++
 tos/lib/net/Deluge/Deluge.h                   |  52 ++
 tos/lib/net/Deluge/DelugeC.nc                 |  71 +++
 tos/lib/net/Deluge/DelugeMetadata.h           |  46 ++
 tos/lib/net/Deluge/DelugeMetadata.nc          |  33 ++
 tos/lib/net/Deluge/DelugeMsgs.h               |  68 +++
 tos/lib/net/Deluge/DelugeP.nc                 | 140 +++++
 tos/lib/net/Deluge/DelugePageTransfer.h       |  96 ++++
 tos/lib/net/Deluge/DelugePageTransfer.nc      |  42 ++
 tos/lib/net/Deluge/DelugePageTransferC.nc     |  72 +++
 tos/lib/net/Deluge/DelugePageTransferP.nc     | 493 +++++++++++++++++
 tos/lib/net/Deluge/DelugeStorageC.nc          |  65 +++
 tos/lib/net/Deluge/DelugeStorageP.nc          | 188 +++++++
 tos/lib/net/Deluge/FakeBlockReaderC.nc        |  95 ++++
 tos/lib/net/Deluge/FakeBlockWriterC.nc        |  39 ++
 tos/lib/net/Deluge/FakeBlockWriterP.nc        | 102 ++++
 .../FlashVolumeManager/FlashVolumeManager.h   |  54 ++
 .../FlashVolumeManager/FlashVolumeManagerC.nc |  65 +++
 .../FlashVolumeManager/FlashVolumeManagerP.nc | 209 ++++++++
 tos/lib/net/Deluge/Globals.nc                 |  57 ++
 tos/lib/net/Deluge/GlobalsC.nc                |  72 +++
 tos/lib/net/Deluge/ObjectTransfer.nc          |  36 ++
 tos/lib/net/Deluge/ObjectTransferC.nc         |  80 +++
 tos/lib/net/Deluge/ObjectTransferP.nc         | 337 ++++++++++++
 tos/lib/net/Deluge/SerialStarterC.nc          |  34 ++
 tos/lib/net/Deluge/StatsCollector.nc          |  43 ++
 tos/lib/net/Deluge/StatsCollectorC.nc         |  60 +++
 tos/lib/net/Deluge/StatsCollectorP.nc         | 203 +++++++
 tos/lib/net/Deluge/extra/NetProg.h            |  48 ++
 tos/lib/net/Deluge/extra/NetProg.nc           |  57 ++
 tos/lib/net/Deluge/extra/NetProgC.nc          |  54 ++
 tos/lib/net/Deluge/extra/NetProgM.nc          | 127 +++++
 tos/lib/net/Deluge/extra/TOSBoot.h            |  39 ++
 .../net/Deluge/extra/msp430/InternalFlashC.nc | 122 +++++
 .../net/Deluge/extra/telos/NetProg_platform.h |  44 ++
 .../net/Deluge/extra/telosb/InternalFlash.h   |  45 ++
 .../net/Deluge/extra/telosb/InternalFlash.nc  |  37 ++
 .../Deluge/extra/telosb/TOSBoot_platform.h    |  47 ++
 104 files changed, 8757 insertions(+), 1 deletion(-)
 create mode 100644 apps/tests/deluge/Blink/BlinkAppC.nc
 create mode 100644 apps/tests/deluge/Blink/BlinkC.nc
 create mode 100644 apps/tests/deluge/Blink/Makefile
 create mode 100755 apps/tests/deluge/Blink/burn
 create mode 100644 apps/tests/deluge/Blink/volumes-stm25p.xml
 create mode 100644 apps/tests/deluge/GoldenImage/GoldenImageC.nc
 create mode 100644 apps/tests/deluge/GoldenImage/Makefile
 create mode 100644 apps/tests/deluge/GoldenImage/volumes-stm25p.xml
 create mode 100644 apps/tests/deluge/SerialBlink/BlinkAppC.nc
 create mode 100644 apps/tests/deluge/SerialBlink/BlinkC.nc
 create mode 100644 apps/tests/deluge/SerialBlink/Makefile
 create mode 100644 apps/tests/deluge/SerialBlink/volumes-stm25p.xml
 create mode 100644 doc/html/deluge-t2-manual.css
 create mode 100644 doc/html/deluge-t2-manual.html
 create mode 100644 doc/pdf/deluge-t2-manual.pdf
 create mode 100644 support/make/bnp.extra
 create mode 100644 tools/tinyos/misc/tinyos.py
 create mode 100755 tools/tinyos/misc/tos-build-deluge-image
 create mode 100755 tools/tinyos/misc/tos-deluge
 create mode 100644 tos/lib/TOSBoot/Deluge.h
 create mode 100644 tos/lib/TOSBoot/Exec.nc
 create mode 100644 tos/lib/TOSBoot/ExtFlash.nc
 create mode 100644 tos/lib/TOSBoot/Hardware.nc
 create mode 100644 tos/lib/TOSBoot/Leds.nc
 create mode 100644 tos/lib/TOSBoot/Makefile
 create mode 100644 tos/lib/TOSBoot/ProgFlash.nc
 create mode 100644 tos/lib/TOSBoot/TOSBoot.h
 create mode 100644 tos/lib/TOSBoot/TOSBoot.nc
 create mode 100644 tos/lib/TOSBoot/TOSBootM.nc
 create mode 100644 tos/lib/TOSBoot/Voltage.nc
 create mode 100644 tos/lib/TOSBoot/at45db/ExtFlashC.nc
 create mode 100644 tos/lib/TOSBoot/avr/HardwareC.nc
 create mode 100644 tos/lib/TOSBoot/avr/InternalFlashC.nc
 create mode 100644 tos/lib/TOSBoot/avr/ProgFlashM.nc
 create mode 100644 tos/lib/TOSBoot/avr/boot.h
 create mode 100644 tos/lib/TOSBoot/crc.h
 create mode 100644 tos/lib/TOSBoot/lib/ExecC.nc
 create mode 100644 tos/lib/TOSBoot/lib/LedsC.nc
 create mode 100644 tos/lib/TOSBoot/micaz/ExecC.nc
 create mode 100644 tos/lib/TOSBoot/micaz/InternalFlash.h
 create mode 100644 tos/lib/TOSBoot/micaz/PluginC.nc
 create mode 100644 tos/lib/TOSBoot/micaz/TOSBoot_platform.h
 create mode 100644 tos/lib/TOSBoot/micaz/VoltageC.nc
 create mode 100644 tos/lib/TOSBoot/micaz/avrhardware.h
 create mode 100644 tos/lib/TOSBoot/micaz/hardware.h
 create mode 100644 tos/lib/TOSBoot/msp430/HPLUSART0M.nc
 create mode 100644 tos/lib/TOSBoot/msp430/HPLUSARTControl.nc
 create mode 100644 tos/lib/TOSBoot/msp430/HardwareC.nc
 create mode 100644 tos/lib/TOSBoot/msp430/InternalFlashC.nc
 create mode 100644 tos/lib/TOSBoot/msp430/ProgFlashM.nc
 create mode 100644 tos/lib/TOSBoot/msp430/VoltageC.nc
 create mode 100644 tos/lib/TOSBoot/stm25p/ExtFlashC.nc
 create mode 100644 tos/lib/TOSBoot/stm25p/ExtFlashM.nc
 create mode 100644 tos/lib/TOSBoot/telosb/InternalFlash.h
 create mode 100644 tos/lib/TOSBoot/telosb/InternalFlash.nc
 create mode 100644 tos/lib/TOSBoot/telosb/PluginC.nc
 create mode 100644 tos/lib/TOSBoot/telosb/PowerOffM.nc
 create mode 100644 tos/lib/TOSBoot/telosb/TOSBoot_platform.h
 create mode 100644 tos/lib/TOSBoot/telosb/hardware.h
 create mode 100644 tos/lib/net/Deluge/AutoStarterC.nc
 create mode 100644 tos/lib/net/Deluge/AutoStarterP.nc
 create mode 100644 tos/lib/net/Deluge/BitVecUtils.h
 create mode 100644 tos/lib/net/Deluge/BitVecUtils.nc
 create mode 100644 tos/lib/net/Deluge/BitVecUtilsC.nc
 create mode 100644 tos/lib/net/Deluge/Crc.nc
 create mode 100644 tos/lib/net/Deluge/CrcP.nc
 create mode 100644 tos/lib/net/Deluge/Deluge.h
 create mode 100644 tos/lib/net/Deluge/DelugeC.nc
 create mode 100644 tos/lib/net/Deluge/DelugeMetadata.h
 create mode 100644 tos/lib/net/Deluge/DelugeMetadata.nc
 create mode 100644 tos/lib/net/Deluge/DelugeMsgs.h
 create mode 100644 tos/lib/net/Deluge/DelugeP.nc
 create mode 100644 tos/lib/net/Deluge/DelugePageTransfer.h
 create mode 100644 tos/lib/net/Deluge/DelugePageTransfer.nc
 create mode 100644 tos/lib/net/Deluge/DelugePageTransferC.nc
 create mode 100644 tos/lib/net/Deluge/DelugePageTransferP.nc
 create mode 100644 tos/lib/net/Deluge/DelugeStorageC.nc
 create mode 100644 tos/lib/net/Deluge/DelugeStorageP.nc
 create mode 100644 tos/lib/net/Deluge/FakeBlockReaderC.nc
 create mode 100644 tos/lib/net/Deluge/FakeBlockWriterC.nc
 create mode 100644 tos/lib/net/Deluge/FakeBlockWriterP.nc
 create mode 100644 tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManager.h
 create mode 100644 tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerC.nc
 create mode 100644 tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc
 create mode 100644 tos/lib/net/Deluge/Globals.nc
 create mode 100644 tos/lib/net/Deluge/GlobalsC.nc
 create mode 100644 tos/lib/net/Deluge/ObjectTransfer.nc
 create mode 100644 tos/lib/net/Deluge/ObjectTransferC.nc
 create mode 100644 tos/lib/net/Deluge/ObjectTransferP.nc
 create mode 100644 tos/lib/net/Deluge/SerialStarterC.nc
 create mode 100644 tos/lib/net/Deluge/StatsCollector.nc
 create mode 100644 tos/lib/net/Deluge/StatsCollectorC.nc
 create mode 100644 tos/lib/net/Deluge/StatsCollectorP.nc
 create mode 100644 tos/lib/net/Deluge/extra/NetProg.h
 create mode 100644 tos/lib/net/Deluge/extra/NetProg.nc
 create mode 100644 tos/lib/net/Deluge/extra/NetProgC.nc
 create mode 100644 tos/lib/net/Deluge/extra/NetProgM.nc
 create mode 100644 tos/lib/net/Deluge/extra/TOSBoot.h
 create mode 100644 tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc
 create mode 100644 tos/lib/net/Deluge/extra/telos/NetProg_platform.h
 create mode 100644 tos/lib/net/Deluge/extra/telosb/InternalFlash.h
 create mode 100644 tos/lib/net/Deluge/extra/telosb/InternalFlash.nc
 create mode 100644 tos/lib/net/Deluge/extra/telosb/TOSBoot_platform.h

diff --git a/apps/tests/deluge/Blink/BlinkAppC.nc b/apps/tests/deluge/Blink/BlinkAppC.nc
new file mode 100644
index 00000000..dae60f6a
--- /dev/null
+++ b/apps/tests/deluge/Blink/BlinkAppC.nc
@@ -0,0 +1,53 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2005 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+
+/**
+ * Blink is a basic application that toggles the a mote LED periodically.
+ * It does so by starting a Timer that fires every second. It uses the
+ * OSKI TimerMilli service to achieve this goal.
+ *
+ * @author tinyos-help@millennium.berkeley.edu
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ **/
+
+configuration BlinkAppC
+{
+}
+implementation
+{
+  components MainC, BlinkC, LedsC, DelugeC;
+  components new TimerMilliC() as Timer0;
+
+  BlinkC -> MainC.Boot;
+
+  BlinkC.Timer0 -> Timer0;
+  BlinkC.Leds -> LedsC;
+}
+
diff --git a/apps/tests/deluge/Blink/BlinkC.nc b/apps/tests/deluge/Blink/BlinkC.nc
new file mode 100644
index 00000000..d51432c8
--- /dev/null
+++ b/apps/tests/deluge/Blink/BlinkC.nc
@@ -0,0 +1,65 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+
+/**
+ * Implementation for Blink application.  Toggle the red LED when a
+ * Timer fires.
+ *
+ * @author tinyos-help@millennium.berkeley.edu
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ **/
+
+#include "Timer.h"
+
+module BlinkC
+{
+  uses interface Timer<TMilli> as Timer0;
+  uses interface Leds;
+  uses interface Boot;
+}
+
+implementation
+{
+  event void Boot.booted()
+  {
+    call Timer0.startPeriodic( 500 );
+  }
+
+  event void Timer0.fired()
+  {
+    dbg("BlinkC", "Timer 0 fired @ %s.\n", sim_time_string());
+#ifndef BLINK_REVERSE
+    call Leds.led1Toggle();
+#else
+    call Leds.led2Toggle();
+#endif
+  }
+}
+
diff --git a/apps/tests/deluge/Blink/Makefile b/apps/tests/deluge/Blink/Makefile
new file mode 100644
index 00000000..ee6423d3
--- /dev/null
+++ b/apps/tests/deluge/Blink/Makefile
@@ -0,0 +1,7 @@
+COMPONENT=BlinkAppC
+TINYOS_NP=BNP
+
+CFLAGS += -DTOSH_DATA_LENGTH=100
+CFLAGS += -DDELUGE_BASESTATION
+
+include $(MAKERULES)
diff --git a/apps/tests/deluge/Blink/burn b/apps/tests/deluge/Blink/burn
new file mode 100755
index 00000000..8bb82a30
--- /dev/null
+++ b/apps/tests/deluge/Blink/burn
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 /dev/ttyUSB0"
+  exit 2
+fi
+
+PORT=$1
+make clean
+
+echo ==================== Compile and load Blink ====================
+make telosb install bsl,$PORT
+
+echo ==================== Compile a new Blink ====================
+CFLAGS=-DBLINK_REVERSE make telosb 
+
+echo ==================== Upload the image ====================
+../../../../tools/tinyos/misc/tos-deluge $PORT -i 0 build/telosb/tos_image.xml
+
+echo ==================== Reboot ====================
+../../../../tools/tinyos/misc/tos-deluge $PORT -r 0 
diff --git a/apps/tests/deluge/Blink/volumes-stm25p.xml b/apps/tests/deluge/Blink/volumes-stm25p.xml
new file mode 100644
index 00000000..afc864a7
--- /dev/null
+++ b/apps/tests/deluge/Blink/volumes-stm25p.xml
@@ -0,0 +1,4 @@
+<volume_table>
+  <volume name="DELUGE0" size="65536"/>
+  <volume name="DELUGE1" size="65536"/>
+</volume_table>
\ No newline at end of file
diff --git a/apps/tests/deluge/GoldenImage/GoldenImageC.nc b/apps/tests/deluge/GoldenImage/GoldenImageC.nc
new file mode 100644
index 00000000..d99c2c9c
--- /dev/null
+++ b/apps/tests/deluge/GoldenImage/GoldenImageC.nc
@@ -0,0 +1,33 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+configuration GoldenImageC {}
+
+implementation
+{
+  components DelugeC;
+}
+
diff --git a/apps/tests/deluge/GoldenImage/Makefile b/apps/tests/deluge/GoldenImage/Makefile
new file mode 100644
index 00000000..35393d2b
--- /dev/null
+++ b/apps/tests/deluge/GoldenImage/Makefile
@@ -0,0 +1,7 @@
+COMPONENT=GoldenImageC
+TINYOS_NP=BNP
+
+CFLAGS += -DTOSH_DATA_LENGTH=100
+CFLAGS += -DDELUGE_BASESTATION
+
+include $(MAKERULES)
diff --git a/apps/tests/deluge/GoldenImage/volumes-stm25p.xml b/apps/tests/deluge/GoldenImage/volumes-stm25p.xml
new file mode 100644
index 00000000..afc864a7
--- /dev/null
+++ b/apps/tests/deluge/GoldenImage/volumes-stm25p.xml
@@ -0,0 +1,4 @@
+<volume_table>
+  <volume name="DELUGE0" size="65536"/>
+  <volume name="DELUGE1" size="65536"/>
+</volume_table>
\ No newline at end of file
diff --git a/apps/tests/deluge/SerialBlink/BlinkAppC.nc b/apps/tests/deluge/SerialBlink/BlinkAppC.nc
new file mode 100644
index 00000000..c3a97318
--- /dev/null
+++ b/apps/tests/deluge/SerialBlink/BlinkAppC.nc
@@ -0,0 +1,54 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2005 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+
+/**
+ * Blink is a basic application that toggles the a mote LED periodically.
+ * It does so by starting a Timer that fires every second. It uses the
+ * OSKI TimerMilli service to achieve this goal.
+ *
+ * @author tinyos-help@millennium.berkeley.edu
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ **/
+
+configuration BlinkAppC
+{
+}
+implementation
+{
+  components MainC, BlinkC, LedsC, DelugeC;
+  components new TimerMilliC() as Timer0;
+  components new SerialAMSenderC(0);
+
+  BlinkC -> MainC.Boot;
+
+  BlinkC.Timer0 -> Timer0;
+  BlinkC.Leds -> LedsC;
+  BlinkC.AMSend -> SerialAMSenderC;
+}
diff --git a/apps/tests/deluge/SerialBlink/BlinkC.nc b/apps/tests/deluge/SerialBlink/BlinkC.nc
new file mode 100644
index 00000000..ef32ef40
--- /dev/null
+++ b/apps/tests/deluge/SerialBlink/BlinkC.nc
@@ -0,0 +1,74 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+
+/**
+ * Implementation for Blink application.  Toggle the red LED when a
+ * Timer fires.
+ *
+ * @author tinyos-help@millennium.berkeley.edu
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ **/
+
+#include "Timer.h"
+
+module BlinkC
+{
+  uses interface Timer<TMilli> as Timer0;
+  uses interface Leds;
+  uses interface Boot;
+  uses interface AMSend;
+}
+
+implementation
+{
+  message_t byte_msg;
+  
+  event void Boot.booted()
+  {
+    call Timer0.startPeriodic( 1024 );
+  }
+
+  event void Timer0.fired()
+  {
+    char *payload = call AMSend.getPayload(&byte_msg);
+    dbg("BlinkC", "Timer 0 fired @ %s.\n", sim_time_string());
+#ifndef BLINK_REVERSE
+    call Leds.led1Toggle();
+    payload[0] = 1;
+#else
+    call Leds.led2Toggle();
+    payload[0] = 2;
+#endif
+    call AMSend.send(AM_BROADCAST_ADDR, &byte_msg, 1);
+  }
+
+  event void AMSend.sendDone(message_t* msg, error_t error) { };
+}
+
diff --git a/apps/tests/deluge/SerialBlink/Makefile b/apps/tests/deluge/SerialBlink/Makefile
new file mode 100644
index 00000000..ee6423d3
--- /dev/null
+++ b/apps/tests/deluge/SerialBlink/Makefile
@@ -0,0 +1,7 @@
+COMPONENT=BlinkAppC
+TINYOS_NP=BNP
+
+CFLAGS += -DTOSH_DATA_LENGTH=100
+CFLAGS += -DDELUGE_BASESTATION
+
+include $(MAKERULES)
diff --git a/apps/tests/deluge/SerialBlink/volumes-stm25p.xml b/apps/tests/deluge/SerialBlink/volumes-stm25p.xml
new file mode 100644
index 00000000..afc864a7
--- /dev/null
+++ b/apps/tests/deluge/SerialBlink/volumes-stm25p.xml
@@ -0,0 +1,4 @@
+<volume_table>
+  <volume name="DELUGE0" size="65536"/>
+  <volume name="DELUGE1" size="65536"/>
+</volume_table>
\ No newline at end of file
diff --git a/doc/html/deluge-t2-manual.css b/doc/html/deluge-t2-manual.css
new file mode 100644
index 00000000..02a6f88f
--- /dev/null
+++ b/doc/html/deluge-t2-manual.css
@@ -0,0 +1,193 @@
+
+               body {
+               color: black;
+               /*   background-color: #e5e5e5;*/
+               background-color: #ffffff;
+               /*background-color: beige;*/
+               margin-top: 2em;
+               margin-left: 8%;
+               margin-right: 8%;
+               }
+
+               h1,h2,h3,h4,h5,h6 {
+               margin-top: .5em;
+               }
+
+               .title {
+               font-size: 200%;
+               font-weight: normal;
+               }
+
+               .partheading {
+               font-size: 100%;
+               }
+
+               .chapterheading {
+               font-size: 100%;
+               }
+
+               .beginsection {
+               font-size: 110%;
+               }
+
+               .tiny {
+               font-size: 40%;
+               }
+
+               .scriptsize {
+               font-size: 60%;
+               }
+
+               .footnotesize {
+               font-size: 75%;
+               }
+
+               .small {
+               font-size: 90%;
+               }
+
+               .normalsize {
+               font-size: 100%;
+               }
+
+               .large {
+               font-size: 120%;
+               }
+
+               .largecap {
+               font-size: 150%;
+               }
+
+               .largeup {
+               font-size: 200%;
+               }
+
+               .huge {
+               font-size: 300%;
+               }
+
+               .hugecap {
+               font-size: 350%;
+               }
+
+               pre {
+               margin-left: 2em;
+               }
+
+               blockquote {
+               margin-left: 2em;
+               }
+
+               ol {
+               list-style-type: decimal;
+               }
+
+               ol ol {
+               list-style-type: lower-alpha;
+               }
+
+               ol ol ol {
+               list-style-type: lower-roman;
+               }
+
+               ol ol ol ol {
+               list-style-type: upper-alpha;
+               }
+
+               /*
+               .verbatim {
+               color: #4d0000;
+               }
+               */
+
+               tt i {
+               font-family: serif;
+               }
+
+               .verbatim em {
+               font-family: serif;
+               }
+
+               .scheme em {
+               font-family: serif;
+               color: black;
+               }
+
+               .scheme {
+               color: brown;
+               }
+
+               .scheme .keyword {
+               color: #990000;
+               font-weight: bold;
+               }
+
+               .scheme .builtin {
+               color: #990000;
+               }
+
+               .scheme .variable {
+               color: navy;
+               }
+
+               .scheme .global {
+               color: purple;
+               }
+
+               .scheme .selfeval {
+               color: green;
+               }
+
+               .scheme .comment {
+               color:  teal;
+               }
+
+               .schemeresponse {
+               color: green;
+               }
+
+               .navigation {
+               color: red;
+               text-align: right;
+               font-size: medium;
+               font-style: italic;
+               }
+
+               .disable {
+               /* color: #e5e5e5; */
+               color: gray;
+               }
+
+               .smallcaps {
+               font-size: 75%;
+               }
+
+               .smallprint {
+               color: gray;
+               font-size: 75%;
+               text-align: right;
+               }
+
+               /*
+               .smallprint hr {
+               text-align: left;
+               width: 40%;
+               }
+               */
+
+               .footnoterule {
+               text-align: left;
+               width: 40%;
+               }
+
+               .colophon {
+               color: gray;
+               font-size: 80%;
+               text-align: right;
+               }
+
+               .colophon a {
+               color: gray;
+               }
+
+               
\ No newline at end of file
diff --git a/doc/html/deluge-t2-manual.html b/doc/html/deluge-t2-manual.html
new file mode 100644
index 00000000..a807c8bf
--- /dev/null
+++ b/doc/html/deluge-t2-manual.html
@@ -0,0 +1,256 @@
+<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>
+Deluge T2 - Programming Manual
+</title>
+<link rel="stylesheet" type="text/css" href="deluge-t2-manual.css" title=default>
+<meta name=robots content="index,follow">
+</head>
+<body>
+<p>
+
+</p>
+<p>
+</p>
+<p>
+
+
+
+</p>
+<h1 class=title align=center><br><br>Deluge T2 - Programming Manual</h1>
+<p></p>
+<div align=center>
+Chieh-Jan Mike Liang<br>
+Razvan Musaloiu-E.<p>May 18, 2007</p>
+</div>
+<p></p>
+<p>
+</p>
+<a name="node_sec_1"></a>
+<h1>1&nbsp;&nbsp;Introduction</h1>
+<p></p>
+<p>
+Deluge is a reliable data dissemination protocol for large objects, such 
+as program binaries. Together with a bootloader, Deluge provides a way 
+to reprogram sensor motes in a network. Deluge is maintained by Jonathan 
+Hui, and Deluge 2.0 is the most recent version. Documentations on Deluge 
+2.0 are available at 
+<a href="http://www.cs.berkeley.edu/~jwhui/research/deluge/">http://www.cs.berkeley.edu/~jwhui/research/deluge/</a>.</p>
+<p>
+Deluge T2 is an effort to port Deluge 2.0 from TinyOS 1 to TinyOS 2. 
+Since the code from Deluge 2.0 is reused as much as possible, the 
+behavior and the usage of Deluge T2 should be similar to Deluge 2.0. 
+Having said that, it would be helpful to read the Deluge 2.0 manual and 
+related documentations.</p>
+<p>
+Deluge T2 is still in experimental phase. One current limitation is 
+platform support. Deluge T2 has been developed and tested on tmote sky 
+(<i>telosb</i>) only. In addition, Deluge T2 comes with 2 flash volumes by 
+default. However, more volumes can be added, if necessary. There are 
+also minor details that will be improved in future releases.</p>
+<p>
+</p>
+<a name="node_sec_2"></a>
+<h1>2&nbsp;&nbsp;Quick Start</h1>
+<p></p>
+<p>
+This section introduces the basics of reprogramming with an example. In 
+addition, it provides a quick test for software prerequisite. The latest 
+TinyOS 2 CVS tree and Python 2.4 with pySerial support are recommended 
+for running Deluge T2.</p>
+<p>
+To start the example, we run a <code class=verbatim>burn</code> script provided in 
+<code class=verbatim>tinyos-2.x/apps/tests/deluge/Blink</code>. For example,
+</p>
+<pre class=verbatim>   % ./burn /dev/ttyUSB0
+</pre><p>
+This <code class=verbatim>burn</code> script programs the directly-connected mote with one 
+version of blink. Then, it injects and reprograms the mote with another 
+version of blink. At this point, you can try to retrieve program image 
+versioning information. The script to interface with the mote is 
+provided in <code class=verbatim>tinyos-2.x/tools/</code>. For example,
+</p>
+<pre class=verbatim>   % tos-deluge.py /dev/ttyUSB0 -p 0
+</pre><p>
+You should see something similar to the output below.</p>
+<p>
+</p>
+<pre class=verbatim>   Pinging node ...
+   Connected to Deluge node.
+   --------------------------------------------------
+   Stored image 0
+     Prog Name:   BlinkAppC     
+     Compiled On: Thu May 17 00:36:33 2007
+     Platform:    telosb          
+     User ID:     mike          
+     Host Name:   sprite        
+     User Hash:   0xC50D8DA4L
+     Num Pages:   24/24
+   
+     Size:        26512
+     UID:         2302157803
+     Version:     6
+   --------------------------------------------------
+</pre><p></p>
+<p>
+The usage of <code class=verbatim>delugy.py</code> is available by running the script without 
+any arguments, and it will be discussed in section <a href="#node_sec_4">4</a>.</p>
+<p>
+</p>
+<a name="node_sec_3"></a>
+<h1>3&nbsp;&nbsp;Reprogramming a Network</h1>
+<p></p>
+<p>
+This section illustrates the procedure to reprogram a network. 
+Specifically, we will see how program images are injected and how 
+versioning information is retrieved.</p>
+<p>
+</p>
+<a name="node_sec_3.1"></a>
+<h2>3.1&nbsp;&nbsp;Setting Up the Motes</h2>
+<p>We first install both TOSBoot and a program that runs Deluge T2. For 
+simplicity, we use the golden image as the program. The golden image is 
+provided in <code class=verbatim>tinyos-2.x/apps/tests/deluge/GoldenImage</code>, and it does 
+nothing except initializing Deluge T2. This step can be done by 
+compiling and programming the mote normally. For example,
+</p>
+<pre class=verbatim>   % make telosb install,0 bsl,/dev/ttyUSB0
+</pre><p>
+Deluge T2 makes sure the mote ID remain persistent over image 
+reprogramming. You can test the installation by interacting with the 
+mote through <code class=verbatim>deluge.py</code>.</p>
+<p>
+</p>
+<a name="node_sec_3.2"></a>
+<h2>3.2&nbsp;&nbsp;Preparing Your Application</h2>
+<p>In most cases, the only two files you need to modify are the top-level
+wiring file and the Make file. You need to make sure <code class=verbatim>DelugeC</code>
+component is included. In addition, the Make file should have the
+following lines:
+</p>
+<pre class=verbatim>   TINYOS_NP=BNP
+   CFLAGS += -DTOSH_DATA_LENGTH=100
+</pre><p>
+Finally, compile your application without installing it on the mote. For 
+example,
+</p>
+<pre class=verbatim>   % make telosb
+</pre><p></p>
+<p>
+</p>
+<a name="node_sec_3.3"></a>
+<h2>3.3&nbsp;&nbsp;Injecting Your Application</h2>
+<p>Before a program image is disseminated in the network, we need to first 
+inject it to the base station. For example,
+</p>
+<pre class=verbatim>   % tos-deluge.py /dev/ttyUSB0 -i 1 apps/Blink/build/telosb/tos_image.xml
+</pre><p>
+You should see something similar to the output below.</p>
+<p>
+</p>
+<pre class=verbatim>   Pinging node ...
+   Connected to Deluge nodes.
+   --------------------------------------------------
+   Stored image 1
+     No proper Deluge image found!
+   --------------------------------------------------
+   Ihex read complete:
+     Total bytes = 25526
+     Sections = 2
+   --------------------------------------------------
+   Replace image with:
+     Prog Name:   BlinkAppC     
+     Compiled On: Mon May 07 00:01:43 2007
+     Platform:    telosb          
+     User ID:     mike          
+     Host Name:   sprite        
+     User Hash:   0xC50D8DA4L
+     Num Pages:   24/24
+   
+     Size:        26512
+     UID:         507153792
+     Version:     0
+   --------------------------------------------------
+</pre><p></p>
+<p>
+</p>
+<a name="node_sec_3.4"></a>
+<h2>3.4&nbsp;&nbsp;Reprogramming with New Image</h2>
+<p>After you decide which program image you want to reprogram, you can 
+first test on the base station by issuing the reboot command. For 
+example,
+</p>
+<pre class=verbatim>   % tos-deluge.py /dev/ttyUSB0 -r 1
+</pre><p>
+After a few moments, the mote will begin quickly flashing the LEDs to 
+signify the reprogramming process.</p>
+<p>
+Now, you can have the base station disseminate a program image to the rest of 
+the network. For example,
+</p>
+<pre class=verbatim>   % tos-deluge.py /dev/ttyUSB0 -d 1
+</pre><p>
+This command instructs the base station to notify the whole network of 
+the availablility of a new program image. This notification is currently 
+done via TinyOS dissemination service, and it triggers all motes in the 
+network to get the new program image. Upon receiving the complete image 
+over-the-air, each node automatically reboots and reprograms itself.</p>
+<p>
+</p>
+<a name="node_sec_4"></a>
+<h1>4&nbsp;&nbsp;Deluge T2 Python Toolchain</h1>
+<p></p>
+<p>
+Different from Deluge 2.0, Deluge T2 toolchain is written in Python. 
+However, as demonstrated in the previous section, the usage is very 
+similar.</p>
+<p>
+</p>
+<a name="node_sec_4.1"></a>
+<h2>4.1&nbsp;&nbsp;-p -ping</h2>
+<p>This command is useful for checking the status of program images on a 
+mote. It provides information such as program name, compile time, size 
+of the image, and so on.</p>
+<p>
+</p>
+<a name="node_sec_4.2"></a>
+<h2>4.2&nbsp;&nbsp;-i -inject</h2>
+<p>This command creates a program image from the supplied 
+<code class=verbatim>tos_image.xml</code> file, and it injects the image into specified 
+volume on the mote. All versioning information is kept on the mote, so 
+no state is stored on the PC.</p>
+<p>
+</p>
+<a name="node_sec_4.3"></a>
+<h2>4.3&nbsp;&nbsp;-r -reboot</h2>
+<p>This command sets up the mote to reprogram itself after reboot, and then 
+it reboots the mote. This command is applicable only to the directly 
+connected mote.</p>
+<p>
+</p>
+<a name="node_sec_4.4"></a>
+<h2>4.4&nbsp;&nbsp;-d -dissemination</h2>
+<p>This command instructs the directly connected mote to disseminate an 
+image to the network. This image is specified by the volume ID. Upon 
+successfully receiving an image, motes in the network automatically 
+reprogram themselves.</p>
+<p>
+</p>
+<a name="node_sec_4.5"></a>
+<h2>4.5&nbsp;&nbsp;-e -erase</h2>
+<p>This command erases a flash volume on the directly connected mote.</p>
+<p>
+</p>
+<a name="node_sec_4.6"></a>
+<h2>4.6&nbsp;&nbsp;-s -reset</h2>
+<p>This command resets versioning information of a specific image on the 
+directly connected mote.</p>
+<p>
+</p>
+<div align=right class=colophon>
+<i>Last modified: Friday, May 18th, 2007<br>
+HTML conversion by <a href="http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html">TeX2page 2004-09-11</a></i>
+</div>
+</body>
+</html>
diff --git a/doc/pdf/deluge-t2-manual.pdf b/doc/pdf/deluge-t2-manual.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d326295191835957f82a5e46c766e6ac3807e6f1
GIT binary patch
literal 43383
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
bv{h&tF@eyVFT|Vx2}TeqPF>y9-VFCYeU{~Q

literal 0
HcmV?d00001

diff --git a/support/make/Makedefaults b/support/make/Makedefaults
index de4f4d07..ebaf8308 100644
--- a/support/make/Makedefaults
+++ b/support/make/Makedefaults
@@ -4,7 +4,7 @@
 DEFAULT_LOCAL_GROUP ?= 0x7d
 OPTFLAGS ?= -Os
 NESC_FLAGS ?= -Wnesc-all
-GOALS += ident_flags tos_image
+GOALS += ident_flags tos_image bnp
 
 define DEFAULT_HELP
 
diff --git a/support/make/bnp.extra b/support/make/bnp.extra
new file mode 100644
index 00000000..bf0cdbb8
--- /dev/null
+++ b/support/make/bnp.extra
@@ -0,0 +1,24 @@
+#-*-Makefile-*- vim:syntax=make
+#$Id$
+
+DELUGE_DIR ?= $(TOSDIR)/lib/net/Deluge
+DELUGE_EXTRA ?= $(DELUGE_DIR)/extra
+TOSBOOT_DIR ?= $(TOSDIR)/lib/TOSBoot/build
+
+ifeq ($(TINYOS_NP),BNP)
+
+  CFLAGS += -DDELUGE
+  CFLAGS += -I$(TOSDIR)/lib/net -I$(DELUGE_DIR) -I$(DELUGE_DIR)/FlashVolumeManager
+
+  ifneq ($(filter telosb tmote,$(TARGETS)),)
+    CFLAGS += -I$(DELUGE_EXTRA) -I$(DELUGE_EXTRA)/msp430 -I$(DELUGE_EXTRA)/telos -I$(DELUGE_EXTRA)/telosb
+    ifeq ($(filter docs,$(GOALS)),)
+      CFLAGS += -Wl,--section-start=.text=0x4a00,--defsym=_reset_vector__=0x4000
+    endif
+    BOOTLOADER ?= $(TOSBOOT_DIR)/telosb/main.ihex
+    ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
+      BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
+    endif
+  endif
+
+endif
diff --git a/tools/tinyos/misc/tinyos.py b/tools/tinyos/misc/tinyos.py
new file mode 100644
index 00000000..22c9c94e
--- /dev/null
+++ b/tools/tinyos/misc/tinyos.py
@@ -0,0 +1,285 @@
+import struct, time, serial, socket
+
+# Copyright (c) 2007 Johns Hopkins University.
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose, without fee, and without written
+# agreement is hereby granted, provided that the above copyright
+# notice, the (updated) modification history and the author appear in
+# all copies of this source code.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+# OR PROFITS) 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.
+
+# @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+# @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+
+class Serial:
+    HDLC_FLAG_BYTE = 0x7e
+    HDLC_CTLESC_BYTE = 0x7d
+    
+    TOS_SERIAL_ACTIVE_MESSAGE_ID = 0
+    TOS_SERIAL_CC1000_ID = 1
+    TOS_SERIAL_802_15_4_ID = 2
+    TOS_SERIAL_UNKNOWN_ID = 255
+    
+    SERIAL_PROTO_ACK = 67
+    SERIAL_PROTO_PACKET_ACK = 68
+    SERIAL_PROTO_PACKET_NOACK = 69
+    SERIAL_PROTO_PACKET_UNKNOWN = 255
+  
+    __s = None       # An instance of serial.Serial object
+    __debug = False   # Debug mode
+    
+    def __init__(self, port, baudrate):
+       self.__s = serial.Serial(port, baudrate, rtscts=0, timeout=0.5)
+    
+    def __format_packet(self, packet):
+        return " ".join(["%02x" % p for p in packet]) + " | " + \
+               " ".join(["%d" % p for p in packet])
+    
+    def crc16(self, base_crc, frame_data):
+        crc = base_crc
+        for b in frame_data:
+            crc = crc ^ (b << 8)
+            for i in range(0, 8):
+                if crc & 0x8000 == 0x8000:
+                    crc = (crc << 1) ^ 0x1021
+                else:
+                    crc = crc << 1
+                crc = crc & 0xffff
+        return crc
+    
+    def __encode(self, val, dim):
+        output = []
+        for i in range(dim):
+            output.append(val & 0xFF)
+            val = val >> 8
+        return output
+    
+    def __decode(self, v):
+        r = long(0)
+        for i in v[::-1]:
+            r = (r << 8) + i
+        return r
+    
+    def __get_byte(self):
+        try:
+            r = struct.unpack("B", self.__s.read())[0]
+            return r
+        except struct.error:
+            # Serial port read timeout
+            raise socket.timeout
+    
+    def __put_bytes(self, data):
+        for b in data:
+            self.__s.write(struct.pack('B', b))
+    
+    def __unescape(self, packet):
+        r = []
+        esc = False
+        for b in packet:
+            if esc:
+                r.append(b ^ 0x20)
+                esc = False
+            elif b == self.HDLC_CTLESC_BYTE:
+                esc = True
+            else:
+                r.append(b)
+        return r
+    
+    def __escape(self, packet):
+        r = []
+        for b in packet:
+            if b == self.HDLC_FLAG_BYTE or b == self.HDLC_CTLESC_BYTE:
+                r.append(self.HDLC_CTLESC_BYTE)
+                r.append(b ^ 0x20)
+            else:
+                r.append(b)
+        return r
+    
+    # Returns the next incoming serial packet
+    def sniff_packet(self):
+        try:
+            d = self.__get_byte()
+            ts = time.time()
+            while d != self.HDLC_FLAG_BYTE:
+                d = self.__get_byte()
+                ts = time.time()
+            packet = [d]
+            d = self.__get_byte()
+            if d == self.HDLC_FLAG_BYTE:
+                d = self.__get_byte()
+                ts = time.time()
+            else:
+                packet.append(d)
+            while d != self.HDLC_FLAG_BYTE:
+                d = self.__get_byte()
+                packet.append(d)
+            un_packet = self.__unescape(packet)
+            
+            crc = self.crc16(0, un_packet[1:-3])
+            packet_crc = self.__decode(un_packet[-3:-1])
+            
+            if self.__debug == True:
+                if crc != packet_crc:
+                    print "Warning: wrong CRC!"
+                print "Recv:", self.__format_packet(un_packet)
+            return (ts, un_packet)
+        except socket.timeout:
+            return None
+    
+    # Filters and returns the next incoming serial packet with 
+    # specified AM group ID and AM ID
+    def read_packet(self, am_group, am_id):
+        packet = None
+        
+        while True:
+            packet = self.sniff_packet()
+            if not packet == None and len(packet[1]) >= 10:
+                if (packet[1])[8] == am_group and (packet[1])[9] == am_id:
+                    break
+            
+        return packet
+    
+    # Sends data with the specified AM group ID and AM ID. To have a "reliable"
+    # transfer, num_tries defines how many times to retry before giving up
+    def write_packet(self, am_group, am_id, data, num_tries=10):
+        for i in range(num_tries):
+            # The first byte after SERIAL_PROTO_PACKET_ACK is a sequence
+            # number that will be send back by the mote to ack the receive of
+            # the data.
+            packet = [self.SERIAL_PROTO_PACKET_ACK, 0, self.TOS_SERIAL_ACTIVE_MESSAGE_ID,
+                      0xff, 0xff,
+                      0, 0,
+                      len(data), am_group, am_id] + data
+            crc = self.crc16(0, packet)
+            packet.append(crc & 0xff)
+            packet.append((crc >> 8) & 0xff)
+            packet = [self.HDLC_FLAG_BYTE] + self.__escape(packet) + [self.HDLC_FLAG_BYTE]
+            
+            self.__put_bytes(packet)
+            if self.__debug == True:
+                print "Send:", self.__format_packet(packet)
+            
+            # Waits for ACK
+            for j in range(3):
+                while True:
+                    packet = self.sniff_packet()
+                    if packet == None:
+                        break
+                    elif (packet[1])[1] == self.SERIAL_PROTO_ACK:
+                        return True
+                        
+            # Debug messages
+            if self.__debug == True:
+                if i == (num_tries - 1):
+                    print "Failed to send the packet!" 
+                else:
+                    print "Timeout waiting for ACK... Retry"
+                        
+        return False
+    
+    def set_debug(self, debug):
+        self.__debug = debug
+
+class GenericPacket:
+    """ GenericPacket """
+
+    def __decode(self, v):
+        r = long(0)
+        for i in v:
+            r = (r << 8) + i
+        return r
+    
+    def __encode(self, val, dim):
+        output = []
+        for i in range(dim):
+            output.append(int(val & 0xFF))
+            val = val >> 8
+        output.reverse()
+        return output
+    
+    def __init__(self, desc, packet = None):
+        self.__dict__['_schema'] = [(t, s) for (n, t, s) in desc]
+        self.__dict__['_names'] = [n for (n, t, s) in desc]
+        self.__dict__['_values'] = []
+        offset = 10
+        if type(packet) == type([]):
+            for (t, s) in self._schema:
+                if t == 'int':
+                    self._values.append(self.__decode(packet[offset:offset + s]))
+                    offset += s
+                elif t == 'blob':
+                    if s:
+                        self._values.append(packet[offset:offset + s])
+                        offset += s
+                    else:
+                        self._values.append(packet[offset:-3])
+        elif type(packet) == type(()):
+            for i in packet:
+                self._values.append(i)
+        else:
+            for v in self._schema:
+                self._values.append(None)
+
+    def __repr__(self):
+        return self._values.__repr__()
+
+    def __str__(self):
+        return self._values.__str__()
+
+    # Implement the map behavior
+    def __getitem__(self, key):
+        return self.__getattr__(key)
+
+    def __setitem__(self, key, value):
+        self.__setattr__(key, value)
+
+    def __len__(self):
+        return len(self._values)
+
+    def keys(self):
+        return self._names
+
+    def values(self):
+        return self._names
+
+    # Implement the struct behavior
+    def __getattr__(self, name):
+        if type(name) == type(0):
+            return self._names[name]
+        else:
+            return self._values[self._names.index(name)]
+
+    def __setattr__(self, name, value):
+        if type(name) == type(0):
+            self._values[name] = value
+        else:
+            self._values[self._names.index(name)] = value
+
+    # Custom
+    def names(self):
+        return self._names
+
+    def sizes(self):
+        return self._schema
+
+    def payload(self):
+        r = []
+        for i in range(len(self._schema)):
+            (t, s) = self._schema[i]
+            if t == 'int':
+                r += self.__encode(self._values[i], s)
+            else:
+                r += self._values[i]
+        return r
diff --git a/tools/tinyos/misc/tos-build-deluge-image b/tools/tinyos/misc/tos-build-deluge-image
new file mode 100755
index 00000000..c6af4484
--- /dev/null
+++ b/tools/tinyos/misc/tos-build-deluge-image
@@ -0,0 +1,188 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2007 Johns Hopkins University.
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose, without fee, and without written
+# agreement is hereby granted, provided that the above copyright
+# notice, the (updated) modification history and the author appear in
+# all copies of this source code.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+# OR PROFITS) 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.
+
+# @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+# @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+
+import sys, struct, operator
+from xml.dom.minidom import parse
+
+DELUGE_PKTS_PER_PAGE = 48
+DELUGE_PKT_PAYLOAD_SIZE = 23
+DELUGE_BYTES_PER_PAGE = DELUGE_PKTS_PER_PAGE * DELUGE_PKT_PAYLOAD_SIZE
+DELUGE_MAX_PAGES = 128
+
+DELUGE_METADATA_SIZE = 16
+DELUGE_IDENT_SIZE = 128
+
+def sencode(s, dim):
+  s = [ord(c) for c in s]
+  if len(s) > dim:
+    return s[:dim]
+  return s + [0] * (dim - len(s))
+
+def encode(val, dim):
+  output = []
+  for i in range(dim):
+      output.append(val & 0xFF)
+      val = val >> 8
+  return output
+
+def decode(v):
+  r = long(0)
+  for i in v[::-1]:
+      r = (r << 8) + i
+  return r
+
+def int2byte(v):
+    return "".join([struct.pack("B", i) for i in v])
+
+def crc16(data):
+  crc = 0
+  for b in data:
+      crc = crc ^ (b << 8)
+      for i in range(0, 8):
+          if crc & 0x8000 == 0x8000:
+              crc = (crc << 1) ^ 0x1021
+          else:
+              crc = crc << 1
+          crc = crc & 0xffff
+  return crc
+
+def pages(data):
+    return (len(data) / DELUGE_BYTES_PER_PAGE) + \
+               (len(data) % DELUGE_BYTES_PER_PAGE != 0)
+
+def align(data):
+  mod = len(data) % DELUGE_BYTES_PER_PAGE
+  if mod == 0:
+    return data
+  return data + [0] * (DELUGE_BYTES_PER_PAGE - mod)
+
+def deluge_metadata(data, img_num):
+  uid = ident['uid_hash']
+  num_pages = pages(data)
+  image_number = img_num
+  crc = crc16([image_number] + [num_pages])
+  completed_pages = num_pages
+  return encode(uid, 4) + \
+         encode(version, 2) + \
+         [image_number] + \
+         [num_pages] + \
+         encode(crc, 2) + \
+         [completed_pages] + \
+         [0] + \
+         encode(len(data) + 16, 2) + \
+         ([0] * 2)
+
+def deluge_ident():
+  tmp = sencode(ident['program_name'], 16) + \
+        sencode(ident['user_id'], 16) + \
+        sencode(ident['hostname'], 16) + \
+        sencode(ident['platform'], 16) + \
+        encode(ident['size'], 4) + \
+        encode(ident['unix_time'], 4) + \
+        encode(ident['user_hash'], 4) + \
+        encode(ident['uid_hash'], 4)
+  return tmp + [0] * (DELUGE_IDENT_SIZE - len(tmp))
+
+def deluge_crc(data):
+  crc = [0] * DELUGE_MAX_PAGES
+  crc[0] = crc16(data[2*DELUGE_MAX_PAGES:DELUGE_BYTES_PER_PAGE])
+  #sys.stderr.write("crc[0] = 0x%x\n" % (crc[0]))
+  j = 1
+  for i in range(DELUGE_BYTES_PER_PAGE, len(data)-1, DELUGE_BYTES_PER_PAGE):
+    crc[j] = crc16(data[i:i+DELUGE_BYTES_PER_PAGE])
+    #sys.stderr.write("crc[%d] = 0x%x\n" % (j, crc[j]))
+    j += 1
+  return reduce(operator.add, [encode(i, 2) for i in crc]) + data[2*DELUGE_MAX_PAGES:]
+
+version = 0
+
+for i in range(len(sys.argv)):
+  if sys.argv[i] == '-v':
+    version = int(sys.argv[i+1])
+  elif sys.argv[i] == '-i':
+    img_num = int(sys.argv[i+1])
+    
+dom = parse(sys.argv[-1])
+ident = {}
+ident_list = [(n.localName, n.firstChild.nodeValue)
+              for n in dom.getElementsByTagName('ident')[0].childNodes if n.localName != None]
+for (k, v) in ident_list:
+  ident[k] = v
+for p in ['unix_time', 'user_hash', 'uid_hash']:
+  ident[p] = int(ident[p][:-1], 16)
+image = dom.getElementsByTagName('image')[0].firstChild.nodeValue
+
+all = []
+section = []
+end_addr = None
+for line in image.split():
+    #print "DEBUG:", line
+    length = int(line[1:3], 16)
+    addr = int(line[3:7], 16)
+    rectype = int(line[7:9], 16)
+    data = []
+    if len(line) > 11:
+        data = [int(line[i:i+2], 16) for i in range(9, len(line)-2, 2)]
+    crc = int(line[-2:], 16)
+    if rectype in [0x00, 0x03]:
+        if not end_addr:
+            end_addr = addr
+            start_addr = addr
+        if end_addr != addr:
+            all.append((start_addr, section))
+            if rectype == 0x03:
+                # This last record updates the first 4 bytes which
+                # holds some some low level configuration. They are
+                # the same all the time so I guess that's why they are
+                # skipped.
+                break
+            section = []
+            start_addr = addr
+        section += data
+        end_addr = addr + length
+    elif rectype == 0x01:
+        all.append((start_addr, section))
+        section = []
+        start_addr = addr
+
+sys.stderr.write('Ihex read complete:\n')
+sys.stderr.write('  Total bytes = %d\n' % reduce(operator.add, [len(l) for (_, l) in all]))
+sys.stderr.write('  Sections = %d\n' % len(all))
+
+# Usually, there are two sections: one for the code and one for the
+# interrupt vector.
+
+all_data = []
+for (addr, data) in all:
+  all_data += encode(addr, 4) + \
+              encode(len(data), 4) + \
+              data
+ident['size'] = len(all_data)
+all_data = deluge_ident() + all_data
+all_data = align([0] * 2 * DELUGE_MAX_PAGES + all_data)
+all_data = deluge_crc(all_data)
+sys.stdout.write(int2byte(deluge_metadata(all_data, img_num)) + \
+      int2byte(all_data))
+
diff --git a/tools/tinyos/misc/tos-deluge b/tools/tinyos/misc/tos-deluge
new file mode 100755
index 00000000..ec12aad2
--- /dev/null
+++ b/tools/tinyos/misc/tos-deluge
@@ -0,0 +1,399 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2007 Johns Hopkins University.
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose, without fee, and without written
+# agreement is hereby granted, provided that the above copyright
+# notice, the (updated) modification history and the author appear in
+# all copies of this source code.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+# OR PROFITS) 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.
+
+# @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+# @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+
+###############################################################################
+# Deluge Python Toolchain
+#
+# A command line utility to interact with nodes via a direct serial connection.
+# For the usage menu, please run this tool without any arguments. For example, 
+# "./tos-deluge.py"
+###############################################################################
+
+import sys, os, stat, struct, subprocess
+import tinyos
+from datetime import datetime
+import os.path 
+
+# Script-specific parameters
+HEX_OUTPUT_LINE_SIZE = 16
+# Path to the python script that builds Deluge image from XML
+PY_PATH_BUILD_IMAGE  = os.path.join(os.path.dirname(sys.argv[0]), 'tos-build-deluge-image')
+
+# TinyOS serial communication parameters
+SERIAL_AMGROUP           = 0
+SERIAL_AMID              = 0xAB
+SERIAL_DATA_PAYLOAD_SIZE = 80
+
+# Serial message types
+MSG_ERASE    = 0
+MSG_WRITE    = 1
+MSG_READ     = 2
+MSG_REPROG   = 5
+MSG_DISS     = 6
+
+ERROR_SUCCESS = 0
+ERROR_FAIL    = 1
+
+# Deluge-specific parameters
+DELUGE_PKTS_PER_PAGE    = 48
+DELUGE_PKT_PAYLOAD_SIZE = 23
+DELUGE_MAX_PAGES        = 128
+DELUGE_METADATA_SIZE    = 16 + 16 + 16 + 16 + 4 + 4 + 4 + 4   # Metadata size in binary 
+                                                              # image
+
+class SerialReqPacket(tinyos.GenericPacket):
+    def __init__(self, packet = None):
+        tinyos.GenericPacket.__init__(self,
+                                      [('msg_type', 'int',  1),
+                                       ('img_num',  'int',  1),
+                                       ('offset',   'int',  2),
+                                       ('len',      'int',  2),
+                                       ('data',     'blob', None)],
+                                      packet)
+
+class SerialReplyPacket(tinyos.GenericPacket):
+   def __init__(self, packet = None):
+       tinyos.GenericPacket.__init__(self,
+                                     [('error', 'int',  1),
+                                      ('data',  'blob', None)],
+                                     packet)
+
+# Displays an integer representation of byte stream to hex representation
+def print_hex(start_addr, byte_stream):
+    num_iterations = int( (len(byte_stream) - 1) / HEX_OUTPUT_LINE_SIZE ) + 1
+  
+    for i in range(num_iterations):
+        line = "%07x" % start_addr + " "   # Prints memory address
+        for j in range(HEX_OUTPUT_LINE_SIZE):
+            if (i * HEX_OUTPUT_LINE_SIZE + j) < len(byte_stream):
+                line += "%02x" % byte_stream[i * HEX_OUTPUT_LINE_SIZE + j] + " "
+    print line
+    
+    start_addr += HEX_OUTPUT_LINE_SIZE
+
+# Computes 16-bit CRC
+def crc16(data):
+    crc = 0
+    for b in data:
+        crc = crc ^ (b << 8)
+        for i in range(0, 8):
+            if crc & 0x8000 == 0x8000:
+                crc = (crc << 1) ^ 0x1021
+            else:
+                crc = crc << 1
+            crc = crc & 0xffff
+    
+    return crc
+
+# Converts a byte-stream array to int representation
+def toInt(byte_stream):
+    r = long(0)
+    for i in byte_stream[::-1]:
+        r = (r << 8) + i
+    
+    return r
+
+# Converts a byte-stream array to string representation
+def toString(byte_stream):
+    r = ""
+    for i in range(len(byte_stream)):
+        if byte_stream[i] == 0:
+            r += " "
+        else:
+            r += struct.pack("B", byte_stream[i])
+    
+    return r
+
+# Converts a byte-stream array to image status string representation
+def toStatusStr(num_space, binary_stream):
+    r = "%sProg Name:   %s\n" % (" " * num_space, 
+                                 toString(binary_stream[16:32]))
+    r += "%sCompiled On: %s\n" % (" " * num_space, 
+                                  datetime.fromtimestamp(toInt(binary_stream[84:88])).strftime('%a %h %d %T %Y'))
+    r += "%sPlatform:    %s\n" % (" " * num_space, 
+                                  toString(binary_stream[64:80]))
+    r += "%sUser ID:     %s\n" % (" " * num_space, 
+                                  toString(binary_stream[32:48]))
+    r += "%sHost Name:   %s\n" % (" " * num_space, 
+                                  toString(binary_stream[48:64]))
+    r += "%sUser Hash:   %s\n" % (" " * num_space, 
+                                  hex(toInt(binary_stream[88:92])))
+    r += "%sNum Pages:   %d/%d" % (" " * num_space, 
+                                   toInt(binary_stream[7:8]), 
+                                   toInt(binary_stream[10:11]))
+    
+    r += "\n\n"
+    r += "%sSize:        %d\n" % (" " * num_space, 
+                                   toInt(binary_stream[12:14]))
+    r += "%sUID:         %d\n" % (" " * num_space, 
+                                   toInt(binary_stream[0:4]))
+    r += "%sVersion:     %d" % (" " * num_space, 
+                                   toInt(binary_stream[4:6]))
+    
+    return r
+
+# Returns the metadata (first 16 bytes of the image) plus the "ident" 
+# (DELUGE_METADATA_SIZE bytes after CRC)
+def getMetaData(s, img_num):
+    r = []
+    # Gets the metadata (first 16 bytes of the image)
+    sreqpkt = SerialReqPacket((MSG_READ, img_num, 0, 16, []))
+  
+    if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()):
+        packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+        sreplypkt = SerialReplyPacket(packet[1])
+        if sreplypkt.error == ERROR_SUCCESS:
+            r.extend(sreplypkt.data)
+      
+            # Gets the "ident" portion of the image
+            sreqpkt["offset"] = 16 + (2 * DELUGE_MAX_PAGES)
+            sreqpkt["len"] = DELUGE_METADATA_SIZE
+            if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()):
+                packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+                sreplypkt = SerialReplyPacket(packet[1])
+                if sreplypkt.error == ERROR_SUCCESS:
+                    r.extend(sreplypkt.data)
+                    
+                    # Checks for valid CRC and timestamp
+                    if crc16(r[6:8]) == toInt(r[8:10]) and r[84:88] != [0xFF, 0xFF, 0xFF, 0xFF]:
+                        return r
+                else:
+                    print "ERROR: Unable to retrieve image information"
+        else:
+            print "ERROR: Unable to retrieve image information"
+
+    return None
+
+# Prints status of the image in the external flash
+def op_ping(s, img_num):
+    metadata = getMetaData(s, img_num)
+    if not metadata == None:
+        print "Connected to Deluge node."
+        # Prints out image status
+        print "--------------------------------------------------"
+        print "Stored image %d" % img_num
+        print toStatusStr(2, metadata)
+        print "--------------------------------------------------"
+        return True
+        
+    print "No proper Deluge image found!"
+    return False
+
+# Erases an image volume
+def op_erase(s, img_num):
+    sreqpkt = SerialReqPacket((MSG_ERASE, img_num, 0, 0, []))
+    success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload())
+    if success == True:
+        packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+        sreplypkt = SerialReplyPacket(packet[1])
+        if sreplypkt.error == ERROR_SUCCESS:
+            return True
+        else:
+            print "ERROR: Unable to erase the flash volume"
+            return False
+        
+    print "ERROR: Unable to send the command"
+    return False
+
+# Writes to an image volume
+def op_write(s, img_num, binary_stream):
+    sreqpkt = SerialReqPacket((MSG_WRITE, img_num, 0, 0, []))
+    local_crc = 0   # Running CRC
+    length = len(binary_stream)
+    
+    sreqpkt.offset = 0
+    while length > 0:
+        # Calculates the payload size for the current packet
+        if length >= SERIAL_DATA_PAYLOAD_SIZE:
+            sreqpkt.len = SERIAL_DATA_PAYLOAD_SIZE
+        else:
+            sreqpkt.len = length
+        sreqpkt.data = []
+        
+        # Reads in the file we want to transmit
+        for i in range(sreqpkt.len):
+            sreqpkt.data.append(struct.unpack("B", binary_stream[sreqpkt.offset + i])[0])
+        
+        # Sends over serial to the mote
+        if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) == False:
+            print "ERROR: Unable to send the last serial packet (file offset: %d)" % sreqpkt.offset
+            return False
+        
+        # Waiting for confirmation
+        packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+        sreplypkt = SerialReplyPacket(packet[1])
+        if sreplypkt.error != ERROR_SUCCESS:
+            print "ERROR: Unable to write to the flash volume (file offset: %d)" % sreqpkt.offset
+            return False
+            
+        local_crc = s.crc16(local_crc, sreqpkt.data)   # Computes running CRC
+        length -= sreqpkt.len
+        sreqpkt.offset += sreqpkt.len
+        
+    return True
+
+# Injects an image (specified by tos_image_xml) to an image volume
+def op_inject(s, img_num, tos_image_xml):
+    # Gets status information of stored image
+    metadata = getMetaData(s, img_num)
+    print "Connected to Deluge nodes."
+    print "--------------------------------------------------"
+    print "Stored image %d" % img_num
+    version = 0
+    if not metadata == None:
+        version = toInt(metadata[4:6]) + 1   # Increments the version
+        print toStatusStr(2, metadata)
+    else:
+        print "  No proper Deluge image found!"
+    print "--------------------------------------------------"
+    
+    # Creates binary image from the TOS image XML
+    try:
+        os.stat(tos_image_xml)         # Checks whether tos_image_xml is a valid file
+        os.stat(PY_PATH_BUILD_IMAGE)   # Checks whether PY_PATH_BUILD_IMAGE is a valid file
+    except:
+        print "ERROR: Unable to create a binary image from the TOS image XML, \"%s\"" % tos_image_xml
+        return False
+    p = subprocess.Popen([PY_PATH_BUILD_IMAGE, "-v", str(version), "-i", str(img_num), tos_image_xml], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    print p.stderr.read(),
+    print "--------------------------------------------------"
+    
+    # Writes the new binary image
+    if op_erase(s, img_num):
+        if op_write(s, img_num, p.stdout.read()):
+            metadata = getMetaData(s, img_num)
+            if not metadata == None:       
+                print "Replace image with:"
+                print toStatusStr(2, metadata)
+                print "--------------------------------------------------"
+        
+                return True
+    
+    return False
+
+# Requests the mote to reboot and reprogram itself
+def op_reprog(s, img_num):
+    if getMetaData(s, img_num) == None:
+        print "ERROR: No proper Deluge image found!"
+    else:
+        sreqpkt = SerialReqPacket((MSG_REPROG, img_num, 0, 0, []))
+        success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload())
+        if success == True:
+            packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+            sreplypkt = SerialReplyPacket(packet[1])
+            if sreplypkt.error == ERROR_SUCCESS:
+                return True
+            else:
+                print "ERROR: Unable to reboot the mote"
+                return False
+            
+        print "ERROR: Unable to send the command"
+    return False
+
+# Requests the mote to disseminate an image
+def op_diss(s, img_num):
+    if getMetaData(s, img_num) == None:
+        print "ERROR: No proper Deluge image found!"
+    else:
+        sreqpkt = SerialReqPacket((MSG_DISS, img_num, 0, 0, []))
+        success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload())
+        if success == True:
+            packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+            sreplypkt = SerialReplyPacket(packet[1])
+            if sreplypkt.error == ERROR_SUCCESS:
+                return True
+            else:
+                print "ERROR: Unable to start the command dissemination"
+                return False
+            
+        print "ERROR: Unable to send the command"
+    return False
+      
+# Resets image versioning information
+def op_reset(s, img_num):
+    sreqpkt = SerialReqPacket((MSG_WRITE, img_num, 4, 2, [0, 0]))
+    if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) == False:
+        print "ERROR: Unable to send the last serial packet (file offset: %d)" % sreqpkt.offset
+        return False
+        
+    # Waiting for confirmation
+    packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+    sreplypkt = SerialReplyPacket(packet[1])
+    if sreplypkt.error != ERROR_SUCCESS:
+        print "ERROR: Unable to write new versioning information"
+        return False
+            
+    return True
+      
+def print_usage():
+    print "Usage: %s <device> <-p|-i|-r|-d|-e|-s> image_number [options]" % sys.argv[0]
+    print "  -p --ping\n     Provide status of the image in the external flash"
+    print "  -i --inject\n     Inject a compiled TinyOS application"
+    print "      [options]: <tos_image.xml file path>"
+    print "  -r --reboot\n     Reboot and reprogram the directly-connected mote"
+    print "  -d --dissemination\n     Disseminate the image in the external flash to the network"
+    print "  -e --erase\n     Erase an image in the external flash"
+    print "  -s --reset\n     Reset the versioning information for a given image"
+
+# ======== MAIN ======== #
+num_req_arg = 4   # Minimum number of required arguments for this script
+if len(sys.argv) >= num_req_arg:
+    try:
+        sys.argv[3] = int(sys.argv[3])
+    except:
+        print "ERROR: Volume ID is not valid"
+        os._exit(-1)
+    
+    # Initializes serial port communication
+    try:
+        s = tinyos.Serial(sys.argv[1], 115200)
+        s.set_debug(False)   # Disables debug msg
+    except:
+        print "ERROR: Unable to initialize serial port connection"
+        os._exit(-1)
+    
+    if sys.argv[2] in ["-p", "--ping"]:
+        print "Pinging node ..."
+        op_ping(s, sys.argv[3]) 
+    elif sys.argv[2] in ["-i", "--inject"] and len(sys.argv) == (num_req_arg + 1):
+        print "Pinging node ..."
+        op_inject(s, sys.argv[3], sys.argv[4])
+    elif sys.argv[2] in ["-r", "--reboot"]:
+        if op_reprog(s, sys.argv[3]):
+            print "Command sent"
+    elif sys.argv[2] in ["-d", "--dissemination"]:
+        if op_diss(s, sys.argv[3]):
+            print "Command sent"
+    elif sys.argv[2] in ["-e", "--erase"]:
+        if op_erase(s, sys.argv[3]):
+            print "Image number %d erased" % sys.argv[3]
+    elif sys.argv[2] in ["-s", "--reset"]:
+        if op_reset(s, sys.argv[3]):
+            print "Successfully reset image versioning information"
+    else:
+        print_usage()
+
+else:
+    print_usage()
diff --git a/tos/lib/TOSBoot/Deluge.h b/tos/lib/TOSBoot/Deluge.h
new file mode 100644
index 00000000..b6aa2873
--- /dev/null
+++ b/tos/lib/TOSBoot/Deluge.h
@@ -0,0 +1,142 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __DELUGE_H__
+#define __DELUGE_H__
+
+#include "DelugeMetadata.h"
+#include "TOSBoot.h"
+
+#ifndef DELUGE_NUM_IMAGES
+#define DELUGE_NUM_IMAGES 3
+#endif
+
+enum {
+  DELUGE_VERSION                    = 2,
+  DELUGE_MAX_ADV_PERIOD_LOG2        = 22,
+  DELUGE_NUM_NEWDATA_ADVS_REQUIRED  = 2,
+  DELUGE_NUM_MIN_ADV_PERIODS        = 2,
+  DELUGE_MAX_NUM_REQ_TRIES          = 1,
+  DELUGE_REBOOT_DELAY               = 4,
+  DELUGE_FAILED_SEND_DELAY          = 16,
+  DELUGE_MIN_DELAY                  = 16,
+  DELUGE_PKTS_PER_PAGE              = 48,
+  DELUGE_PKT_PAYLOAD_SIZE           = 23,
+  DELUGE_DATA_OFFSET                = 128,
+  DELUGE_IDENT_SIZE                 = 128,
+  DELUGE_INVALID_ADDR               = (0x7fffffffL),
+  DELUGE_MAX_REQ_DELAY              = (0x1L << (DELUGE_MIN_ADV_PERIOD_LOG2-1)),
+  DELUGE_NACK_TIMEOUT               = (DELUGE_MAX_REQ_DELAY >> 0x1),
+  DELUGE_BYTES_PER_PAGE             = (DELUGE_PKTS_PER_PAGE*DELUGE_PKT_PAYLOAD_SIZE),
+  DELUGE_PKT_BITVEC_SIZE            = (((DELUGE_PKTS_PER_PAGE-1) / 8) + 1),
+  DELUGE_MAX_IMAGE_SIZE             = (128L*1024L),
+  DELUGE_MAX_PAGES                  = 128,
+  DELUGE_CRC_SIZE                   = sizeof(uint16_t),
+  DELUGE_CRC_BLOCK_SIZE             = DELUGE_MAX_PAGES*DELUGE_CRC_SIZE,
+  DELUGE_GOLDEN_IMAGE_NUM           = 0x0,
+  DELUGE_INVALID_VNUM               = -1,
+  DELUGE_INVALID_IMGNUM             = 0xff,
+  DELUGE_INVALID_PKTNUM             = 0xff,
+  DELUGE_INVALID_PGNUM              = 0xff,
+};
+
+#include "Storage.h"
+
+struct deluge_image_t {
+  imgnum_t imageNum;
+  volume_id_t volumeId;
+};
+
+typedef struct DelugeAdvTimer {
+  uint32_t timer      : 32;
+  uint8_t  periodLog2 : 8;
+  bool     overheard  : 1;
+  uint8_t  newAdvs    : 7;
+} DelugeAdvTimer;
+
+typedef struct DelugeNodeDesc {
+  imgvnum_t vNum;
+  uint32_t  uid;
+  imgnum_t  imgNum;
+  uint8_t   reserved;
+  uint16_t  crc;
+} DelugeNodeDesc;
+
+enum {
+  DELUGE_VOLUME_ID_0 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 2
+  DELUGE_VOLUME_ID_1 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 3
+  DELUGE_VOLUME_ID_2 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 4
+  DELUGE_VOLUME_ID_3 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 5
+  DELUGE_VOLUME_ID_4 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 6
+  DELUGE_VOLUME_ID_5 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 7
+  DELUGE_VOLUME_ID_6 = unique("StorageManager"),
+#if DELUGE_NUM_IMAGES >= 8
+  DELUGE_VOLUME_ID_7 = unique("StorageManager"),
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+};
+
+static const struct deluge_image_t DELUGE_IMAGES[DELUGE_NUM_IMAGES] = {
+  { DELUGE_VOLUME_ID_0, 0xDF },
+#if DELUGE_NUM_IMAGES >= 2
+  { DELUGE_VOLUME_ID_1, 0xD0 },
+#if DELUGE_NUM_IMAGES >= 3
+  { DELUGE_VOLUME_ID_2, 0xD1 },
+#if DELUGE_NUM_IMAGES >= 4
+  { DELUGE_VOLUME_ID_3, 0xD2 },
+#if DELUGE_NUM_IMAGES >= 5
+  { DELUGE_VOLUME_ID_4, 0xD3 },
+#if DELUGE_NUM_IMAGES >= 6
+  { DELUGE_VOLUME_ID_5, 0xD4 },
+#if DELUGE_NUM_IMAGES >= 7
+  { DELUGE_VOLUME_ID_6, 0xD5 },
+#if DELUGE_NUM_IMAGES >= 8
+  { DELUGE_VOLUME_ID_7, 0xD6 },
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+};
+
+#endif
diff --git a/tos/lib/TOSBoot/Exec.nc b/tos/lib/TOSBoot/Exec.nc
new file mode 100644
index 00000000..3d42c0d9
--- /dev/null
+++ b/tos/lib/TOSBoot/Exec.nc
@@ -0,0 +1,4 @@
+
+interface Exec {
+  command void exec();
+}
diff --git a/tos/lib/TOSBoot/ExtFlash.nc b/tos/lib/TOSBoot/ExtFlash.nc
new file mode 100644
index 00000000..a45e8e79
--- /dev/null
+++ b/tos/lib/TOSBoot/ExtFlash.nc
@@ -0,0 +1,35 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface ExtFlash {
+  command void startRead(uint32_t addr);
+  command uint8_t  readByte();
+  command void stopRead();
+}
diff --git a/tos/lib/TOSBoot/Hardware.nc b/tos/lib/TOSBoot/Hardware.nc
new file mode 100644
index 00000000..879c0447
--- /dev/null
+++ b/tos/lib/TOSBoot/Hardware.nc
@@ -0,0 +1,34 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface Hardware {
+  command void init();
+  command void reboot();
+}
diff --git a/tos/lib/TOSBoot/Leds.nc b/tos/lib/TOSBoot/Leds.nc
new file mode 100644
index 00000000..c672d1be
--- /dev/null
+++ b/tos/lib/TOSBoot/Leds.nc
@@ -0,0 +1,35 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface Leds {
+  command void set(uint8_t ledsOn);
+  command void flash(uint8_t a);
+  command void glow(uint8_t a, uint8_t b);
+}
diff --git a/tos/lib/TOSBoot/Makefile b/tos/lib/TOSBoot/Makefile
new file mode 100644
index 00000000..56924184
--- /dev/null
+++ b/tos/lib/TOSBoot/Makefile
@@ -0,0 +1,72 @@
+# $Id$
+
+#									tab:2
+#
+#
+# "Copyright (c) 2000-2005 The Regents of the University  of California.  
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose, without fee, and without written agreement is
+# hereby granted, provided that the above copyright notice, the following
+# two paragraphs and the author appear in all copies of this software.
+# 
+# IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+# OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+# CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+# ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+# PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+#
+#
+
+#
+# @author Jonathan Hui <jwhui@cs.berkeley.edu>
+#
+
+COMPONENT=TOSBoot
+TINYOS_NP=
+
+PFLAGS += -DNESC_BUILD_BINARY
+
+# ifeq ($(MAKECMDGOALS),mica2)
+#   CFLAGS += -DTOSBOOT_START=0x1f000 -DTOSBOOT_END=0x20000
+#   CFLAGS += -Wl,--section-start=.text=0x1f000
+#   CFLAGS += -Iat45db -Iavr -Imica2 -Ilib
+# endif
+
+# ifeq ($(MAKECMDGOALS),mica2dot)
+#   CFLAGS += -DTOSBOOT_START=0x1f000 -DTOSBOOT_END=0x20000
+#   CFLAGS += -Wl,--section-start=.text=0x1f000
+#   CFLAGS += -Iat45db -Iavr -Imica2dot -Ilib
+# endif
+
+ifeq ($(MAKECMDGOALS),micaz)
+  CFLAGS += -DTOSBOOT_START=0x1f000 -DTOSBOOT_END=0x20000
+  CFLAGS += -Wl,--section-start=.text=0x1f000
+  CFLAGS += -Iat45db -Iavr -Imicaz -Ilib
+  CFLAGS += -I../net/Deluge
+endif
+
+# ifeq ($(MAKECMDGOALS),telosa)
+#   CFLAGS += -DTOSBOOT_START=0x1100 -DTOSBOOT_END=0x1a00
+#   CFLAGS += -Iat45db -Imsp430 -Itelos -Ilib
+#   POST_BUILD_EXTRA_DEPS += strip_iv
+# endif
+
+ifeq ($(MAKECMDGOALS),telosb)
+  CFLAGS += -DTOSBOOT_START=0x4000 -DTOSBOOT_END=0x4a00
+  CFLAGS += -Imsp430 -Istm25p -Itelosb -Ilib
+  CFLAGS += -I../net/Deluge
+  POST_BUILD_EXTRA_DEPS += strip_iv
+endif
+
+strip_iv: FORCE
+	@echo "    removing interrupt vector from binary"
+	msp430-objcopy -j .text -j .data -O ihex $(BUILDDIR)/main.exe $(BUILDDIR)/main.ihex
+
+include $(MAKERULES)
diff --git a/tos/lib/TOSBoot/ProgFlash.nc b/tos/lib/TOSBoot/ProgFlash.nc
new file mode 100644
index 00000000..6b67bbb1
--- /dev/null
+++ b/tos/lib/TOSBoot/ProgFlash.nc
@@ -0,0 +1,33 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface ProgFlash {
+  command error_t write(in_flash_addr_t addr, uint8_t* buf, in_flash_addr_t len);
+}
diff --git a/tos/lib/TOSBoot/TOSBoot.h b/tos/lib/TOSBoot/TOSBoot.h
new file mode 100644
index 00000000..ab5524b5
--- /dev/null
+++ b/tos/lib/TOSBoot/TOSBoot.h
@@ -0,0 +1,39 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author  Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __TOSBOOT_H__
+#define __TOSBOOT_H__
+
+#include "TOSBoot_platform.h"
+
+typedef struct tosboot_args_t {
+  uint32_t imageAddr;
+  uint8_t  gestureCount;
+  bool     noReprogram;
+} tosboot_args_t;
+
+#endif
diff --git a/tos/lib/TOSBoot/TOSBoot.nc b/tos/lib/TOSBoot/TOSBoot.nc
new file mode 100644
index 00000000..d08429b7
--- /dev/null
+++ b/tos/lib/TOSBoot/TOSBoot.nc
@@ -0,0 +1,61 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+includes Deluge;
+includes TOSBoot;
+
+configuration TOSBoot {
+}
+implementation {
+
+  components
+    TOSBootM,
+    ExecC,
+    ExtFlashC,
+    HardwareC,
+    InternalFlashC as IntFlash,
+    LedsC,
+    PluginC,
+    ProgFlashM as ProgFlash,
+    VoltageC;
+
+  TOSBootM.SubInit -> ExtFlashC;
+  TOSBootM.SubControl -> ExtFlashC.StdControl;
+  TOSBootM.SubControl -> PluginC;
+
+  TOSBootM.Exec -> ExecC;
+  TOSBootM.ExtFlash -> ExtFlashC;
+  TOSBootM.Hardware -> HardwareC;
+  TOSBootM.IntFlash -> IntFlash;
+  TOSBootM.Leds -> LedsC;
+  TOSBootM.ProgFlash -> ProgFlash;
+  TOSBootM.Voltage -> VoltageC;
+
+}
diff --git a/tos/lib/TOSBoot/TOSBootM.nc b/tos/lib/TOSBoot/TOSBootM.nc
new file mode 100644
index 00000000..b5098a1a
--- /dev/null
+++ b/tos/lib/TOSBoot/TOSBootM.nc
@@ -0,0 +1,259 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+includes crc;
+includes hardware;
+
+module TOSBootM {
+  uses {
+    interface Exec;
+    interface ExtFlash;
+    interface Hardware;
+    interface InternalFlash as IntFlash;
+    interface Leds;
+    interface ProgFlash;
+    interface StdControl as SubControl;
+    interface Init as SubInit;
+    interface Voltage;
+  }
+}
+implementation {
+
+  enum {
+    LEDS_LOWBATT = 1,
+    LEDS_GESTURE = 7,
+  };
+
+  enum {
+    R_SUCCESS,
+    R_INVALID_IMAGE_ERROR,
+    R_PROGRAMMING_ERROR,
+  };
+
+  void startupLeds() {
+
+    uint8_t  output = 0x7;
+    uint8_t  i;
+
+    for (i = 3; i; i--, output >>= 1 )
+      call Leds.glow(output, output >> 1);
+
+  }
+
+  in_flash_addr_t extFlashReadAddr() {
+    in_flash_addr_t result = 0;
+    uint8_t  i;
+    for ( i = 0; i < 4; i++ )
+      result |= ((in_flash_addr_t)call ExtFlash.readByte() & 0xff) << (i*8);    
+    return result;
+  }
+
+  bool verifyImage(ex_flash_addr_t startAddr) {
+
+    uint16_t crcTarget = 0, crcTmp = 0;
+    uint16_t addr, len;
+    pgnum_t  numPgs;
+    uint8_t  i;
+
+    // read size of image
+    call ExtFlash.startRead(startAddr + offsetof(DelugeImgDesc,numPgs));
+    numPgs = call ExtFlash.readByte();
+    call ExtFlash.stopRead();
+
+    if (numPgs == 0 || numPgs == 0xff)
+      return FALSE;
+
+    startAddr += DELUGE_METADATA_SIZE;
+
+    addr = DELUGE_CRC_BLOCK_SIZE;
+    len = DELUGE_BYTES_PER_PAGE-DELUGE_CRC_BLOCK_SIZE;
+
+    for ( i = 0; i < numPgs && crcTarget == crcTmp; i++ ) {
+
+      // read crc
+      call ExtFlash.startRead(startAddr + i*sizeof(uint16_t));
+      crcTarget = (uint16_t)(call ExtFlash.readByte() & 0xff);
+      crcTarget |= (uint16_t)(call ExtFlash.readByte() & 0xff) << 8;
+      call ExtFlash.stopRead();
+
+      // compute crc
+      call ExtFlash.startRead(startAddr + addr);
+      for ( crcTmp = 0; len; len-- )
+	crcTmp = crcByte(crcTmp, call ExtFlash.readByte());
+      call ExtFlash.stopRead();
+
+      addr = (uint16_t)(i+1)*DELUGE_BYTES_PER_PAGE;
+      len = DELUGE_BYTES_PER_PAGE;
+    }
+
+    return (i == numPgs) && (crcTarget == crcTmp);
+  }
+
+  error_t programImage(ex_flash_addr_t startAddr) {
+
+    uint8_t  buf[TOSBOOT_INT_PAGE_SIZE];
+    uint16_t pageAddr, newPageAddr;
+    in_flash_addr_t intAddr;
+    in_flash_addr_t secLength;
+    ex_flash_addr_t curAddr;
+
+    if (!verifyImage(startAddr))
+      return R_INVALID_IMAGE_ERROR;
+
+    curAddr = startAddr + DELUGE_METADATA_SIZE + DELUGE_CRC_BLOCK_SIZE + DELUGE_IDENT_SIZE;
+
+    call ExtFlash.startRead(curAddr);
+
+    intAddr = extFlashReadAddr();
+    secLength = extFlashReadAddr();
+    curAddr = curAddr + 8;
+
+    // check that the image starts on the correct boundary
+    if (intAddr != TOSBOOT_END) {
+      call ExtFlash.stopRead();
+      return R_INVALID_IMAGE_ERROR;
+    }
+
+    while ( secLength ) {
+      
+      pageAddr = newPageAddr = intAddr / TOSBOOT_INT_PAGE_SIZE;
+
+      call ExtFlash.startRead(curAddr);
+      // fill in ram buffer for internal program flash sector
+      do {
+
+	// check if secLength is all ones
+	if ( secLength == 0xffffffff )
+	  return FAIL;
+
+	buf[(uint16_t)intAddr % TOSBOOT_INT_PAGE_SIZE] = call ExtFlash.readByte();
+	intAddr++; curAddr++;
+	
+	if ( --secLength == 0 ) {
+	  intAddr = extFlashReadAddr();
+	  secLength = extFlashReadAddr();
+	  curAddr = curAddr + 8;
+	}
+
+	newPageAddr = intAddr / TOSBOOT_INT_PAGE_SIZE;
+
+      } while ( pageAddr == newPageAddr && secLength );
+      call ExtFlash.stopRead();
+
+      call Leds.set(pageAddr);
+
+
+      // write out page
+      if (call ProgFlash.write(pageAddr*TOSBOOT_INT_PAGE_SIZE, buf,
+			       TOSBOOT_INT_PAGE_SIZE) == FAIL)
+	return R_PROGRAMMING_ERROR;
+
+    }
+
+    return R_SUCCESS;
+
+  }
+
+  void runApp() {
+    call SubControl.stop();
+    call Exec.exec();
+  }
+
+  void startupSequence() {
+
+    tosboot_args_t args;
+
+    // check voltage and make sure flash can be programmed
+    //   if not, just run the app, can't check for gestures
+    //   if we can't write to the internal flash anyway
+    if ( !call Voltage.okToProgram() ) {
+      // give user some time and count down LEDs
+      call Leds.flash(LEDS_LOWBATT);
+      startupLeds();
+      runApp();
+    }
+
+    // get current value of counter
+    call IntFlash.read((uint8_t*)TOSBOOT_ARGS_ADDR, &args, sizeof(args));
+
+    // increment gesture counter, see if it exceeds threshold
+    if ( ++args.gestureCount >= TOSBOOT_GESTURE_MAX_COUNT - 1 ) {
+      // gesture has been detected, display receipt of gesture on LEDs
+      call Leds.flash(LEDS_GESTURE);
+
+      // load golden image from flash
+      // if the golden image is invalid, forget about reprogramming
+      // if an error happened during reprogramming, reboot and try again
+      //   not much else we can do :-/
+      if (programImage(TOSBOOT_GOLDEN_IMG_ADDR) == R_PROGRAMMING_ERROR)
+	call Hardware.reboot();
+    }
+    else {
+      // update gesture counter
+      call IntFlash.write((uint8_t*)TOSBOOT_ARGS_ADDR, &args, sizeof(args));
+      if ( !args.noReprogram ) {
+	// if an error happened during reprogramming, reboot and try again
+	//   after two tries, try programming the golden image
+	if (programImage(args.imageAddr) == R_PROGRAMMING_ERROR) {
+	  call Hardware.reboot();
+	}
+      }
+    }
+
+    // give user some time and count down LEDs
+    startupLeds();
+
+    // reset counter and reprogramming flag
+    args.gestureCount = 0xff;
+    args.noReprogram = TRUE;
+    call IntFlash.write((uint8_t*)TOSBOOT_ARGS_ADDR, &args, sizeof(args));
+    
+    runApp();
+
+  }
+
+  int main() __attribute__ ((C, spontaneous)) {
+
+    __nesc_disable_interrupt();
+
+    TOSH_SET_PIN_DIRECTIONS();
+    call Hardware.init();
+
+    call SubInit.init();
+    call SubControl.start();
+
+    startupSequence();
+
+    return 0;
+
+  }
+
+}
diff --git a/tos/lib/TOSBoot/Voltage.nc b/tos/lib/TOSBoot/Voltage.nc
new file mode 100644
index 00000000..de4bbec1
--- /dev/null
+++ b/tos/lib/TOSBoot/Voltage.nc
@@ -0,0 +1,33 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface Voltage {
+  command bool okToProgram();
+}
diff --git a/tos/lib/TOSBoot/at45db/ExtFlashC.nc b/tos/lib/TOSBoot/at45db/ExtFlashC.nc
new file mode 100644
index 00000000..1d5d3c85
--- /dev/null
+++ b/tos/lib/TOSBoot/at45db/ExtFlashC.nc
@@ -0,0 +1,126 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module ExtFlashC {
+  provides {
+    interface Init;
+    interface StdControl;
+    interface ExtFlash;
+  }
+}
+
+implementation {
+
+  uint32_t addr;
+
+  command error_t Init.init() {
+    TOSH_MAKE_FLASH_CS_OUTPUT();
+    TOSH_SET_FLASH_CS_PIN();
+    TOSH_MAKE_FLASH_CLK_OUTPUT();
+    TOSH_CLR_FLASH_CLK_PIN();
+    TOSH_MAKE_FLASH_OUT_OUTPUT();      
+    TOSH_SET_FLASH_OUT_PIN();
+    TOSH_MAKE_FLASH_IN_INPUT();
+    TOSH_CLR_FLASH_IN_PIN();
+    return SUCCESS; 
+  }
+
+  command error_t StdControl.start() { return SUCCESS; }
+  command error_t StdControl.stop() { return SUCCESS; }
+
+  uint8_t SPIByte(uint8_t out) {
+
+    uint8_t in = 0;
+    uint8_t i;
+
+    for ( i = 0; i < 8; i++, out <<= 1 ) {
+
+      // write bit
+      if (out & 0x80)
+	TOSH_SET_FLASH_OUT_PIN();
+      else
+	TOSH_CLR_FLASH_OUT_PIN();
+
+      // clock
+      TOSH_SET_FLASH_CLK_PIN();
+
+      // read bit
+      in <<= 1;
+      if (TOSH_READ_FLASH_IN_PIN())
+	in |= 1;
+
+      // clock
+      TOSH_CLR_FLASH_CLK_PIN();
+
+    }
+
+    return in;
+
+  }
+
+  command void ExtFlash.startRead(uint32_t newAddr) {
+
+    uint8_t  cmdBuf[4];
+    uint8_t  i;
+
+    addr = newAddr;
+
+    cmdBuf[0] = 0x68;
+    cmdBuf[1] = (addr >> 15) & 0xff;
+    cmdBuf[2] = (addr >> 7) & 0xfe;
+    cmdBuf[3] = addr & 0xff;
+    
+    TOSH_CLR_FLASH_CLK_PIN();
+    TOSH_CLR_FLASH_CS_PIN();
+    
+    for(i = 0; i < 4; i++)
+      SPIByte(cmdBuf[i]);
+    for(i = 0; i < 4; i++)
+      SPIByte(0x0);
+    
+    TOSH_SET_FLASH_CLK_PIN();
+    TOSH_CLR_FLASH_CLK_PIN();
+
+  }
+
+  command uint8_t ExtFlash.readByte() {
+    if (!(addr & 0xff)) {
+      call ExtFlash.stopRead();
+      call ExtFlash.startRead(addr);
+    }
+    addr++;
+    return SPIByte(0);
+  }
+
+  command void ExtFlash.stopRead() {
+    TOSH_SET_FLASH_CS_PIN();
+  }
+
+}
diff --git a/tos/lib/TOSBoot/avr/HardwareC.nc b/tos/lib/TOSBoot/avr/HardwareC.nc
new file mode 100644
index 00000000..c48c89bc
--- /dev/null
+++ b/tos/lib/TOSBoot/avr/HardwareC.nc
@@ -0,0 +1,46 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module HardwareC {
+  provides {
+    interface Hardware;
+  }
+}
+
+implementation {
+
+  command void Hardware.init() {}
+  
+  command void Hardware.reboot() {
+    wdt_enable(1);
+    while(1);
+  }
+
+}
diff --git a/tos/lib/TOSBoot/avr/InternalFlashC.nc b/tos/lib/TOSBoot/avr/InternalFlashC.nc
new file mode 100644
index 00000000..1d6d8fb8
--- /dev/null
+++ b/tos/lib/TOSBoot/avr/InternalFlashC.nc
@@ -0,0 +1,65 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+includes InternalFlash;
+
+module InternalFlashC {
+  provides interface InternalFlash;
+}
+
+implementation {
+
+  command error_t InternalFlash.write(void* addr, void* buf, uint16_t size) {
+
+    uint8_t *addrPtr = (uint8_t*)addr;
+    uint8_t *bufPtr = (uint8_t*)buf;
+
+    for ( ; size; size-- )
+      eeprom_write_byte(addrPtr++, *bufPtr++);
+
+    while(!eeprom_is_ready());
+
+    return SUCCESS;
+
+  }
+
+  command error_t InternalFlash.read(void* addr, void* buf, uint16_t size) {
+
+    uint8_t *addrPtr = (uint8_t*)addr;
+    uint8_t *bufPtr = (uint8_t*)buf;
+
+    for ( ; size; size-- )
+      *bufPtr++ = eeprom_read_byte(addrPtr++);
+
+    return SUCCESS;
+
+  }
+
+}
diff --git a/tos/lib/TOSBoot/avr/ProgFlashM.nc b/tos/lib/TOSBoot/avr/ProgFlashM.nc
new file mode 100644
index 00000000..8bada2d6
--- /dev/null
+++ b/tos/lib/TOSBoot/avr/ProgFlashM.nc
@@ -0,0 +1,65 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module ProgFlashM {
+  provides {
+    interface ProgFlash;
+  }
+}
+
+implementation {
+
+#include <boot.h>
+
+  command error_t ProgFlash.write(in_flash_addr_t addr, uint8_t* buf, in_flash_addr_t len) {
+
+    uint16_t* wordBuf = (uint16_t*)buf;
+    uint32_t i;
+
+    if ( addr + len > TOSBOOT_START )
+      return FAIL;    
+
+    boot_page_erase( addr );
+    while( boot_rww_busy() )
+      boot_rww_enable();
+    
+    for ( i = 0; i < len; i += 2 )
+      boot_page_fill( addr + i, *wordBuf++ );
+
+    boot_page_write( addr );
+    
+    while ( boot_rww_busy() )
+      boot_rww_enable();
+    
+    return SUCCESS;
+    
+  }
+
+}
diff --git a/tos/lib/TOSBoot/avr/boot.h b/tos/lib/TOSBoot/avr/boot.h
new file mode 100644
index 00000000..08c89ce1
--- /dev/null
+++ b/tos/lib/TOSBoot/avr/boot.h
@@ -0,0 +1,498 @@
+/* Copyright (c) 2002, 2003, 2004  Eric B. Weddington
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * 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.
+   * Neither the name of the copyright holders nor the names of
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. */
+
+#ifndef _AVR_BOOT_H_
+#define _AVR_BOOT_H_    1
+
+/** \defgroup avr_boot Bootloader Support Utilities
+    \code
+    #include <avr/io.h>
+    #include <avr/boot.h>
+    \endcode
+
+    The macros in this module provide a C language interface to the
+    bootloader support functionality of certain AVR processors. These
+    macros are designed to work with all sizes of flash memory.
+
+    \note Not all AVR processors provide bootloader support. See your
+    processor datasheet to see if it provides bootloader support.
+
+    \todo From email with Marek: On smaller devices (all except ATmega64/128),
+    __SPM_REG is in the I/O space, accessible with the shorter "in" and "out"
+    instructions - since the boot loader has a limited size, this could be an
+    important optimization.
+
+    \par API Usage Example
+    The following code shows typical usage of the boot API.
+
+    \code
+    #include <avr/interrupt.h>
+    #include <avr/pgmspace.h>
+    
+    #define ADDRESS     0x1C000UL
+    
+    void boot_test(void)
+    {
+        unsigned char buffer[8];
+    
+        cli();
+    
+        // Erase page.
+        boot_page_erase((unsigned long)ADDRESS);
+        while(boot_rww_busy())
+        {
+            boot_rww_enable();
+        }
+    
+        // Write data to buffer a word at a time. Note incrementing address
+        // by 2. SPM_PAGESIZE is defined in the microprocessor IO header file.
+        for(unsigned long i = ADDRESS; i < ADDRESS + SPM_PAGESIZE; i += 2)
+        {
+            boot_page_fill(i, (i-ADDRESS) + ((i-ADDRESS+1) << 8));
+        }
+    
+        // Write page.
+        boot_page_write((unsigned long)ADDRESS);
+        while(boot_rww_busy())
+        {
+            boot_rww_enable();
+        }
+    
+        sei();
+    
+        // Read back the values and display.
+        // (The show() function is undefined and is used here as an example
+        // only.)
+        for(unsigned long i = ADDRESS; i < ADDRESS + 256; i++)
+        {
+            show(utoa(pgm_read_byte(i), buffer, 16));
+        }
+    
+        return;
+    }\endcode */
+
+#include <avr/eeprom.h>
+#include <avr/io.h>
+#include <inttypes.h>
+#include <limits.h>
+
+/* Check for SPM Control Register in processor. */
+#if defined (SPMCSR)
+#  define __SPM_REG    SPMCSR
+#elif defined (SPMCR)
+#  define __SPM_REG    SPMCR
+#else
+#  error AVR processor does not provide bootloader support!
+#endif
+
+/** \ingroup avr_boot
+    \def BOOTLOADER_SECTION
+
+    Used to declare a function or variable to be placed into a
+    new section called .bootloader. This section and its contents
+    can then be relocated to any address (such as the bootloader
+    NRWW area) at link-time. */
+
+#define BOOTLOADER_SECTION    __attribute__ ((section (".bootloader")))
+
+/* Create common bit definitions. */
+#ifdef ASB
+#define __COMMON_ASB    ASB
+#else
+#define __COMMON_ASB    RWWSB
+#endif
+
+#ifdef ASRE
+#define __COMMON_ASRE   ASRE
+#else
+#define __COMMON_ASRE   RWWSRE
+#endif
+
+/* Define the bit positions of the Boot Lock Bits. */
+
+#define BLB12           5
+#define BLB11           4
+#define BLB02           3
+#define BLB01           2
+
+/** \ingroup avr_boot
+    \def boot_spm_interrupt_enable()
+    Enable the SPM interrupt. */
+
+#define boot_spm_interrupt_enable()   (__SPM_REG |= (uint8_t)_BV(SPMIE))
+
+/** \ingroup avr_boot
+    \def boot_spm_interrupt_disable()
+    Disable the SPM interrupt. */
+
+#define boot_spm_interrupt_disable()  (__SPM_REG &= (uint8_t)~_BV(SPMIE))
+
+/** \ingroup avr_boot
+    \def boot_is_spm_interrupt()
+    Check if the SPM interrupt is enabled. */
+
+#define boot_is_spm_interrupt()       (__SPM_REG & (uint8_t)_BV(SPMIE))
+
+/** \ingroup avr_boot
+    \def boot_rww_busy()
+    Check if the RWW section is busy. */
+
+#define boot_rww_busy()          (__SPM_REG & (uint8_t)_BV(__COMMON_ASB))
+
+/** \ingroup avr_boot
+    \def boot_spm_busy()
+    Check if the SPM instruction is busy. */
+
+#define boot_spm_busy()               (__SPM_REG & (uint8_t)_BV(SPMEN))
+
+/** \ingroup avr_boot
+    \def boot_spm_busy_wait()
+    Wait while the SPM instruction is busy. */
+
+#define boot_spm_busy_wait()          do{}while(boot_spm_busy())
+
+#define __BOOT_PAGE_ERASE         (_BV(SPMEN) | _BV(PGERS))
+#define __BOOT_PAGE_WRITE         (_BV(SPMEN) | _BV(PGWRT))
+#define __BOOT_PAGE_FILL          _BV(SPMEN)
+#define __BOOT_RWW_ENABLE         (_BV(SPMEN) | _BV(__COMMON_ASRE))
+#define __BOOT_LOCK_BITS_SET      (_BV(SPMEN) | _BV(BLBSET))
+
+#define __BOOT_LOCK_BITS_MASK     (_BV(BLB01) | _BV(BLB02) \
+                                   | _BV(BLB11) | _BV(BLB12))
+
+#define eeprom_busy_wait() do {} while (!eeprom_is_ready())
+
+#define __boot_page_fill_normal(address, data)   \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw  r0, %3\n\t"                       \
+        "movw r30, %2\n\t"                       \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        "clr  r1\n\t"                            \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_PAGE_FILL),       \
+          "r" ((uint16_t)address),               \
+          "r" ((uint16_t)data)                   \
+        : "r0", "r30", "r31"                     \
+    );                                           \
+})
+
+#define __boot_page_fill_alternate(address, data)\
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw  r0, %3\n\t"                       \
+        "movw r30, %2\n\t"                       \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        ".word 0xffff\n\t"                       \
+        "nop\n\t"                                \
+        "clr  r1\n\t"                            \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_PAGE_FILL),       \
+          "r" ((uint16_t)address),               \
+          "r" ((uint16_t)data)                   \
+        : "r0", "r30", "r31"                     \
+    );                                           \
+})
+
+#define __boot_page_fill_extended(address, data) \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw  r0, %4\n\t"                       \
+        "movw r30, %A3\n\t"                      \
+        "sts %1, %C3\n\t"                        \
+        "sts %0, %2\n\t"                         \
+        "spm\n\t"                                \
+        "clr  r1\n\t"                            \
+        : "=m" (__SPM_REG),                      \
+          "=m" (RAMPZ)                           \
+        : "r" ((uint8_t)__BOOT_PAGE_FILL),       \
+          "r" ((uint32_t)address),               \
+          "r" ((uint16_t)data)                   \
+        : "r0", "r30", "r31"                     \
+    );                                           \
+})
+
+#define __boot_page_erase_normal(address)        \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw r30, %2\n\t"                       \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_PAGE_ERASE),      \
+          "r" ((uint16_t)address)                \
+        : "r30", "r31"                           \
+    );                                           \
+})
+
+#define __boot_page_erase_alternate(address)     \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw r30, %2\n\t"                       \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        ".word 0xffff\n\t"                       \
+        "nop\n\t"                                \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_PAGE_ERASE),      \
+          "r" ((uint16_t)address)                \
+        : "r30", "r31"                           \
+    );                                           \
+})
+
+#define __boot_page_erase_extended(address)      \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw r30, %A3\n\t"                      \
+        "sts  %1, %C3\n\t"                       \
+        "sts %0, %2\n\t"                         \
+        "spm\n\t"                                \
+        : "=m" (__SPM_REG),                      \
+          "=m" (RAMPZ)                           \
+        : "r" ((uint8_t)__BOOT_PAGE_ERASE),      \
+          "r" ((uint32_t)address)                \
+        : "r30", "r31"                           \
+    );                                           \
+})
+
+#define __boot_page_write_normal(address)        \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw r30, %2\n\t"                       \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_PAGE_WRITE),      \
+          "r" ((uint16_t)address)                \
+        : "r30", "r31"                           \
+    );                                           \
+})
+
+#define __boot_page_write_alternate(address)     \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw r30, %2\n\t"                       \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        ".word 0xffff\n\t"                       \
+        "nop\n\t"                                \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_PAGE_WRITE),      \
+          "r" ((uint16_t)address)                \
+        : "r30", "r31"                           \
+    );                                           \
+})
+
+#define __boot_page_write_extended(address)      \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "movw r30, %A3\n\t"                      \
+        "sts %1, %C3\n\t"                        \
+        "sts %0, %2\n\t"                         \
+        "spm\n\t"                                \
+        : "=m" (__SPM_REG),                      \
+          "=m" (RAMPZ)                           \
+        : "r" ((uint8_t)__BOOT_PAGE_WRITE),      \
+          "r" ((uint32_t)address)                \
+        : "r30", "r31"                           \
+    );                                           \
+})
+
+#define __boot_rww_enable()                      \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_RWW_ENABLE)       \
+    );                                           \
+})
+
+#define __boot_rww_enable_alternate()            \
+({                                               \
+    boot_spm_busy_wait();                        \
+    eeprom_busy_wait();                          \
+    __asm__ __volatile__                         \
+    (                                            \
+        "sts %0, %1\n\t"                         \
+        "spm\n\t"                                \
+        ".word 0xffff\n\t"                       \
+        "nop\n\t"                                \
+        : "=m" (__SPM_REG)                       \
+        : "r" ((uint8_t)__BOOT_RWW_ENABLE)       \
+    );                                           \
+})
+
+#define __boot_lock_bits_set(lock_bits)                    \
+({                                                         \
+    uint8_t value = (uint8_t)(lock_bits | __BOOT_LOCK_BITS_MASK); \
+    boot_spm_busy_wait();                                  \
+    eeprom_busy_wait();                                    \
+    __asm__ __volatile__                                   \
+    (                                                      \
+        "ldi r30, 1\n\t"                                   \
+        "ldi r31, 0\n\t"                                   \
+        "mov r0, %2\n\t"                                   \
+        "sts %0, %1\n\t"                                   \
+        "spm\n\t"                                          \
+        : "=m" (__SPM_REG)                                 \
+        : "r" ((uint8_t)__BOOT_LOCK_BITS_SET),             \
+          "r" (value)                                      \
+        : "r0", "r30", "r31"                               \
+    );                                                     \
+})
+
+#define __boot_lock_bits_set_alternate(lock_bits)          \
+({                                                         \
+    uint8_t value = (uint8_t)(lock_bits | __BOOT_LOCK_BITS_MASK); \
+    boot_spm_busy_wait();                                  \
+    eeprom_busy_wait();                                    \
+    __asm__ __volatile__                                   \
+    (                                                      \
+        "ldi r30, 1\n\t"                                   \
+        "ldi r31, 0\n\t"                                   \
+        "mov r0, %2\n\t"                                   \
+        "sts %0, %1\n\t"                                   \
+        "spm\n\t"                                          \
+        ".word 0xffff\n\t"                                 \
+        "nop\n\t"                                          \
+        : "=m" (__SPM_REG)                                 \
+        : "r" ((uint8_t)__BOOT_LOCK_BITS_SET),       \
+          "r" (value)                                      \
+        : "r0", "r30", "r31"                               \
+    );                                                     \
+})
+
+/** \ingroup avr_boot
+    \def boot_page_fill(address, data)
+
+    Fill the bootloader temporary page buffer for flash 
+    address with data word. 
+
+    \note The address is a byte address. The data is a word. The AVR 
+    writes data to the buffer a word at a time, but addresses the buffer
+    per byte! So, increment your address by 2 between calls, and send 2
+    data bytes in a word format! The LSB of the data is written to the lower 
+    address; the MSB of the data is written to the higher address.*/
+
+/** \ingroup avr_boot
+    \def boot_page_erase(address)
+
+    Erase the flash page that contains address.
+
+    \note address is a byte address in flash, not a word address. */
+
+/** \ingroup avr_boot
+    \def boot_page_write(address)
+
+    Write the bootloader temporary page buffer 
+    to flash page that contains address.
+    
+    \note address is a byte address in flash, not a word address. */
+
+/** \ingroup avr_boot
+    \def boot_rww_enable()
+
+    Enable the Read-While-Write memory section. */
+
+/** \ingroup avr_boot
+    \def boot_lock_bits_set(lock_bits)
+
+    Set the bootloader lock bits. */
+
+/* Normal versions of the macros use 16-bit addresses.
+   Extended versions of the macros use 32-bit addresses.
+   Alternate versions of the macros use 16-bit addresses and require special
+   instruction sequences after LPM.
+
+   FLASHEND is defined in the ioXXXX.h file.
+   USHRT_MAX is defined in <limits.h>. */ 
+
+#if defined(__AVR_ATmega161__) || defined(__AVR_ATmega163__) \
+    || defined(__AVR_ATmega323__)
+
+/* Alternate: ATmega161/163/323 and 16 bit address */
+#define boot_page_fill(address, data) __boot_page_fill_alternate(address, data)
+#define boot_page_erase(address)      __boot_page_erase_alternate(address)
+#define boot_page_write(address)      __boot_page_write_alternate(address)
+#define boot_rww_enable()             __boot_rww_enable_alternate()
+#define boot_lock_bits_set(lock_bits) __boot_lock_bits_set_alternate(lock_bits)
+
+#elif (FLASHEND > USHRT_MAX) && !defined(__USING_MINT8)
+
+/* Extended: >16 bit address */
+#define boot_page_fill(address, data) __boot_page_fill_extended(address, data)
+#define boot_page_erase(address)      __boot_page_erase_extended(address)
+#define boot_page_write(address)      __boot_page_write_extended(address)
+#define boot_rww_enable()             __boot_rww_enable()
+#define boot_lock_bits_set(lock_bits) __boot_lock_bits_set(lock_bits)
+
+#else
+
+/* Normal: 16 bit address */
+#define boot_page_fill(address, data) __boot_page_fill_normal(address, data)
+#define boot_page_erase(address)      __boot_page_erase_normal(address)
+#define boot_page_write(address)      __boot_page_write_normal(address)
+#define boot_rww_enable()             __boot_rww_enable()
+#define boot_lock_bits_set(lock_bits) __boot_lock_bits_set(lock_bits)
+
+#endif
+
+#endif /* _AVR_BOOT_H_ */
diff --git a/tos/lib/TOSBoot/crc.h b/tos/lib/TOSBoot/crc.h
new file mode 100644
index 00000000..64391d3d
--- /dev/null
+++ b/tos/lib/TOSBoot/crc.h
@@ -0,0 +1,56 @@
+// $Id$
+
+/*									tab:4
+ * "Copyright (c) 2000-2003 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+
+/**
+ * Default CRC function. Note that avrmote has a much more efficient one. 
+ *
+ * This CRC-16 function produces a 16-bit running CRC that adheres to the
+ * ITU-T CRC standard.
+ *
+ * The ITU-T polynomial is: G_16(x) = x^16 + x^12 + x^5 + 1
+ *
+ */
+
+uint16_t crcByte(uint16_t crc, uint8_t b)
+{
+  uint8_t i;
+  
+  crc = crc ^ b << 8;
+  i = 8;
+  do
+    if (crc & 0x8000)
+      crc = crc << 1 ^ 0x1021;
+    else
+      crc = crc << 1;
+  while (--i);
+
+  return crc;
+}
diff --git a/tos/lib/TOSBoot/lib/ExecC.nc b/tos/lib/TOSBoot/lib/ExecC.nc
new file mode 100644
index 00000000..f29fb8c9
--- /dev/null
+++ b/tos/lib/TOSBoot/lib/ExecC.nc
@@ -0,0 +1,45 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/*
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module ExecC {
+  provides {
+    interface Exec;
+  }
+}
+
+implementation {
+
+  command void Exec.exec() {
+
+    //goto *(void*)(TOSBOOT_END);
+
+    typedef void __attribute__((noreturn)) (*tosboot_exec)();
+    ((tosboot_exec)TOSBOOT_END)();
+
+  }
+
+}
diff --git a/tos/lib/TOSBoot/lib/LedsC.nc b/tos/lib/TOSBoot/lib/LedsC.nc
new file mode 100644
index 00000000..476f76e0
--- /dev/null
+++ b/tos/lib/TOSBoot/lib/LedsC.nc
@@ -0,0 +1,80 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module LedsC {
+  provides interface Leds;
+}
+
+implementation {
+
+  enum {
+    RED_BIT = 1,
+    GREEN_BIT = 2,
+    YELLOW_BIT = 4
+  };
+
+  command void Leds.set(uint8_t ledsOn) {
+    if (ledsOn & GREEN_BIT) 
+      TOSH_CLR_GREEN_LED_PIN();
+    else
+      TOSH_SET_GREEN_LED_PIN();
+    if (ledsOn & YELLOW_BIT ) 
+      TOSH_CLR_YELLOW_LED_PIN();
+    else 
+      TOSH_SET_YELLOW_LED_PIN();
+    if (ledsOn & RED_BIT) 
+      TOSH_CLR_RED_LED_PIN();
+    else 
+      TOSH_SET_RED_LED_PIN();
+  }
+
+  command void Leds.flash(uint8_t a) {
+    uint8_t i, j;
+    for ( i = 3; i; i-- ) {
+      call Leds.set(a);
+      for ( j = 4; j; j-- )
+	wait(0xffff);
+      call Leds.set(0);
+      for ( j = 4; j; j-- )
+	wait(0xffff);
+    }
+  }
+
+  command void Leds.glow(uint8_t a, uint8_t b) {
+    int i;
+    for (i = 1536; i > 0; i -= 4) {
+      call Leds.set(a);
+      wait(i);
+      call Leds.set(b);
+      wait(1536-i);
+    }
+  }
+
+}
diff --git a/tos/lib/TOSBoot/micaz/ExecC.nc b/tos/lib/TOSBoot/micaz/ExecC.nc
new file mode 100644
index 00000000..dc789acf
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/ExecC.nc
@@ -0,0 +1,40 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/*
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module ExecC {
+  provides {
+    interface Exec;
+  }
+}
+
+implementation {
+  
+  command void Exec.exec() {
+    __asm__ __volatile__ ("jmp 0x0000\n\t" ::);
+  }
+
+}
diff --git a/tos/lib/TOSBoot/micaz/InternalFlash.h b/tos/lib/TOSBoot/micaz/InternalFlash.h
new file mode 100644
index 00000000..01f69e80
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/InternalFlash.h
@@ -0,0 +1,41 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlash.h - Internal flash implementation for the avr
+ * platform.
+ *
+ * Valid address range is 0x0 - 0xFFF.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __INTERNAL_FLASH_H__
+#define __INTERNAL_FLASH_H__
+
+#include <avr/eeprom.h>
+
+#endif
diff --git a/tos/lib/TOSBoot/micaz/PluginC.nc b/tos/lib/TOSBoot/micaz/PluginC.nc
new file mode 100644
index 00000000..237998ed
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/PluginC.nc
@@ -0,0 +1,13 @@
+
+module PluginC {
+  provides {
+    interface StdControl;
+  }
+}
+
+implementation {
+
+  command error_t StdControl.start() { return SUCCESS; }
+  command error_t StdControl.stop() { return SUCCESS; }
+
+}
diff --git a/tos/lib/TOSBoot/micaz/TOSBoot_platform.h b/tos/lib/TOSBoot/micaz/TOSBoot_platform.h
new file mode 100644
index 00000000..e18285e7
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/TOSBoot_platform.h
@@ -0,0 +1,47 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author  Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __TOSBOOT_PLATFORM_H__
+#define __TOSBOOT_PLATFORM_H__
+
+enum {
+  // address of TOSBoot args in internal flash
+  TOSBOOT_ARGS_ADDR = 0xff0,
+  // number of resets to force golden image
+  TOSBOOT_GESTURE_MAX_COUNT = 3,
+  // address of the golden image in external flash
+  TOSBOOT_GOLDEN_IMG_ADDR = 0x0L,
+  // size of each internal program flash page
+  TOSBOOT_INT_PAGE_SIZE = SPM_PAGESIZE,
+};
+
+enum {
+  DELUGE_MIN_ADV_PERIOD_LOG2 = 9,
+  DELUGE_QSIZE = 2,
+};
+
+#endif
diff --git a/tos/lib/TOSBoot/micaz/VoltageC.nc b/tos/lib/TOSBoot/micaz/VoltageC.nc
new file mode 100644
index 00000000..85b8f103
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/VoltageC.nc
@@ -0,0 +1,58 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module VoltageC {
+  provides {
+    interface Voltage;
+  }
+}
+
+implementation {
+
+  command bool Voltage.okToProgram() {
+
+    // 250 KHz ADC clock (4MHz/16)
+    outp( 0x04, ADCSR );
+    // clear interrupt flag by writing a 1
+    sbi( ADCSR, ADIF );
+    // setup input channel
+    outp( VOLTAGE_PORT, ADMUX );
+    // adc enable
+    sbi( ADCSR, ADEN );
+    // adc start conversion
+    sbi( ADCSR, ADSC );
+    // wait for conversion to complete
+    while ( !bit_is_set( ADCSR, ADIF ) );
+
+    return ( __inw(ADCL) < VTHRESH  );
+
+  }
+
+}
diff --git a/tos/lib/TOSBoot/micaz/avrhardware.h b/tos/lib/TOSBoot/micaz/avrhardware.h
new file mode 100644
index 00000000..4263d56b
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/avrhardware.h
@@ -0,0 +1,196 @@
+// $Id$
+
+/*									tab:4
+ * "Copyright (c) 2000-2003 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+/*
+ *
+ * Authors:             Jason Hill, Philip Levis, Nelson Lee
+ *
+ *
+ */
+
+/**
+ * @author Jason Hill
+ * @author Philip Levis
+ * @author Nelson Lee
+ */
+
+
+#ifndef TOSH_AVRHARDWARE_H
+#define TOSH_AVRHARDWARE_H
+
+// check for a new-look avr-libc
+#if defined(DTOSTR_ALWAYS_SIGN) && !defined(TOSH_NEW_AVRLIBC)
+#define TOSH_NEW_AVRLIBC
+#endif
+
+#ifdef TOSH_NEW_AVRLIBC
+#include <avr/io.h>
+#include <avr/signal.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+#include <avr/pgmspace.h>
+#include <avr/eeprom.h>
+
+#ifndef sbi
+/* avr-libc 1.2.3 doesn't include these anymore. */
+#define sbi(port, bit) ((port) |= _BV(bit))
+#define cbi(port, bit) ((port) &= ~_BV(bit))
+#define inp(port) (port)
+#define inb(port) (port)
+#define outp(value, port) ((port) = (value))
+#define outb(port, value) ((port) = (value))
+#define inw(port) (*(volatile uint16_t *)&(port))
+#define outw(port, value) ((*(volatile uint16_t *)&(port)) = (value))
+#define PRG_RDB(addr) pgm_read_byte(addr)
+#endif
+
+#else
+#include <io.h>
+#include <sig-avr.h>
+#include <interrupt.h>
+#include <wdt.h>
+#include <pgmspace.h>
+#endif /* TOSH_NEW_AVRLIBC */
+
+// check for version 3.3 of GNU gcc or later
+#if ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))
+#define __outw(val, port) outw(port, val);
+#endif
+
+#ifndef __inw
+#ifndef __SFR_OFFSET
+#define __SFR_OFFSET 0
+#endif /* !__SFR_OFFSET */
+#define __inw(_port) inw(_port)
+
+#define __inw_atomic(__sfrport) ({				\
+	uint16_t __t;					\
+	bool bStatus;					\
+	bStatus = bit_is_set(SREG,7);			\
+	cli();						\
+	__t = inw(__sfrport);				\
+	if (bStatus) sei();				\
+	__t;						\
+ })
+
+#endif /* __inw */
+
+#define TOSH_ASSIGN_PIN(name, port, bit) \
+static inline void TOSH_SET_##name##_PIN() {sbi(PORT##port , bit);} \
+static inline void TOSH_CLR_##name##_PIN() {cbi(PORT##port , bit);} \
+static inline int TOSH_READ_##name##_PIN() \
+  {return (inp(PIN##port) & (1 << bit)) != 0;} \
+static inline void TOSH_MAKE_##name##_OUTPUT() {sbi(DDR##port , bit);} \
+static inline void TOSH_MAKE_##name##_INPUT() {cbi(DDR##port , bit);} 
+
+#define TOSH_ASSIGN_OUTPUT_ONLY_PIN(name, port, bit) \
+static inline void TOSH_SET_##name##_PIN() {sbi(PORT##port , bit);} \
+static inline void TOSH_CLR_##name##_PIN() {cbi(PORT##port , bit);} \
+static inline void TOSH_MAKE_##name##_OUTPUT() {;} 
+
+#define TOSH_ALIAS_OUTPUT_ONLY_PIN(alias, connector)\
+static inline void TOSH_SET_##alias##_PIN() {TOSH_SET_##connector##_PIN();} \
+static inline void TOSH_CLR_##alias##_PIN() {TOSH_CLR_##connector##_PIN();} \
+static inline void TOSH_MAKE_##alias##_OUTPUT() {} \
+
+#define TOSH_ALIAS_PIN(alias, connector) \
+static inline void TOSH_SET_##alias##_PIN() {TOSH_SET_##connector##_PIN();} \
+static inline void TOSH_CLR_##alias##_PIN() {TOSH_CLR_##connector##_PIN();} \
+static inline char TOSH_READ_##alias##_PIN() {return TOSH_READ_##connector##_PIN();} \
+static inline void TOSH_MAKE_##alias##_OUTPUT() {TOSH_MAKE_##connector##_OUTPUT();} \
+static inline void TOSH_MAKE_##alias##_INPUT()  {TOSH_MAKE_##connector##_INPUT();} 
+
+// We need slightly different defs than SIGNAL, INTERRUPT
+#define TOSH_SIGNAL(signame)					\
+void signame() __attribute__ ((signal, spontaneous, C))
+
+#define TOSH_INTERRUPT(signame)				\
+void signame() __attribute__ ((interrupt, spontaneous, C))
+
+/* Watchdog Prescaler
+ */
+enum {
+  TOSH_period16 = 0x00, // 47ms
+  TOSH_period32 = 0x01, // 94ms
+  TOSH_period64 = 0x02, // 0.19s
+  TOSH_period128 = 0x03, // 0.38s
+  TOSH_period256 = 0x04, // 0.75s
+  TOSH_period512 = 0x05, // 1.5s
+  TOSH_period1024 = 0x06, // 3.0s
+  TOSH_period2048 = 0x07 // 6.0s
+};
+
+void TOSH_wait()
+{
+  asm volatile("nop");
+  asm volatile("nop");
+}
+
+// atomic statement runtime support
+
+/* typedef uint8_t __nesc_atomic_t; */
+
+/* __nesc_atomic_t __nesc_atomic_start(void); */
+/* void __nesc_atomic_end(__nesc_atomic_t oldSreg); */
+
+/* #ifndef NESC_BUILD_BINARY */
+
+/* inline __nesc_atomic_t __nesc_atomic_start(void) __attribute__((spontaneous)) */
+/* { */
+/*   __nesc_atomic_t result = inp(SREG); */
+/*   cli(); */
+/*   return result; */
+/* } */
+
+/* inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) __attribute__((spontaneous)) */
+/* { */
+/*   outp(oldSreg, SREG); */
+/* } */
+
+/* #endif */
+
+/* inline void __nesc_atomic_sleep() */
+/* { */
+/*   /\* Atomically enable interrupts and sleep *\/ */
+/*   sei();  // Make sure interrupts are on, so we can wake up! */
+/*   asm volatile ("sleep"); */
+/*   TOSH_wait(); */
+/* } */
+
+
+/* inline void __nesc_enable_interrupt() { */
+/*   sei(); */
+/* } */
+
+/* inline void __nesc_disable_interrupt() { */
+/*   cli(); */
+/* } */
+
+#endif //TOSH_AVRHARDWARE_H
diff --git a/tos/lib/TOSBoot/micaz/hardware.h b/tos/lib/TOSBoot/micaz/hardware.h
new file mode 100644
index 00000000..8f7a1c7f
--- /dev/null
+++ b/tos/lib/TOSBoot/micaz/hardware.h
@@ -0,0 +1,143 @@
+// $Id$
+
+/*									tab:4
+ * "Copyright (c) 2000-2003 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2002-2003 Intel Corporation
+ * All rights reserved.
+ *
+ * This file is distributed under the terms in the attached INTEL-LICENSE     
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ * 94704.  Attention:  Intel License Inquiry.
+ */
+/*									tab:4
+ *  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.  By
+ *  downloading, copying, installing or using the software you agree to
+ *  this license.  If you do not agree to this license, do not download,
+ *  install, copy or use the software.
+ *
+ *  Intel Open Source License 
+ *
+ *  Copyright (c) 2002 Intel Corporation 
+ *  All rights reserved. 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ * 
+ *	Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *	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.
+ *      Neither the name of the Intel Corporation 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 COPYRIGHT HOLDERS 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 INTEL OR ITS
+ *  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$
+ *
+ */
+
+#ifndef __HARDWARE_H__
+#define __HARDWARE_H__
+
+#include <atm128hardware.h>
+#include <avrhardware.h>
+
+typedef uint32_t in_flash_addr_t;
+typedef uint32_t ex_flash_addr_t;
+
+void wait( uint16_t t ) {
+  for ( ; t; t-- );
+}
+
+// LED assignments
+TOSH_ASSIGN_PIN(RED_LED, A, 2);
+TOSH_ASSIGN_PIN(GREEN_LED, A, 1);
+TOSH_ASSIGN_PIN(YELLOW_LED, A, 0);
+
+TOSH_ASSIGN_PIN(SERIAL_ID, A, 4);
+
+// Flash assignments
+TOSH_ASSIGN_PIN(FLASH_CS, A, 3);
+TOSH_ASSIGN_PIN(FLASH_CLK,  D, 5);
+TOSH_ASSIGN_PIN(FLASH_OUT,  D, 3);
+TOSH_ASSIGN_PIN(FLASH_IN,  D, 2);
+
+// power control assignments
+TOSH_ASSIGN_PIN(PW0, C, 0);
+TOSH_ASSIGN_PIN(PW1, C, 1);
+TOSH_ASSIGN_PIN(PW2, C, 2);
+TOSH_ASSIGN_PIN(PW3, C, 3);
+TOSH_ASSIGN_PIN(PW4, C, 4);
+TOSH_ASSIGN_PIN(PW5, C, 5);
+TOSH_ASSIGN_PIN(PW6, C, 6);
+TOSH_ASSIGN_PIN(PW7, C, 7);
+
+void TOSH_SET_PIN_DIRECTIONS(void)
+{
+  TOSH_MAKE_RED_LED_OUTPUT();
+  TOSH_MAKE_YELLOW_LED_OUTPUT();
+  TOSH_MAKE_GREEN_LED_OUTPUT();
+      
+  TOSH_MAKE_PW7_OUTPUT();
+  TOSH_MAKE_PW6_OUTPUT();
+  TOSH_MAKE_PW5_OUTPUT();
+  TOSH_MAKE_PW4_OUTPUT();
+  TOSH_MAKE_PW3_OUTPUT(); 
+  TOSH_MAKE_PW2_OUTPUT();
+  TOSH_MAKE_PW1_OUTPUT();
+  TOSH_MAKE_PW0_OUTPUT();
+
+  TOSH_MAKE_SERIAL_ID_INPUT();
+  TOSH_CLR_SERIAL_ID_PIN();  // Prevent sourcing current
+
+  TOSH_MAKE_FLASH_CS_OUTPUT();
+  TOSH_MAKE_FLASH_OUT_OUTPUT();
+  TOSH_MAKE_FLASH_CLK_OUTPUT();
+  TOSH_SET_FLASH_CS_PIN();
+}
+
+enum {
+  VOLTAGE_PORT = 30,
+  VTHRESH = 0x1cf, // 2.7V
+};
+
+#endif
+
+
+
+
diff --git a/tos/lib/TOSBoot/msp430/HPLUSART0M.nc b/tos/lib/TOSBoot/msp430/HPLUSART0M.nc
new file mode 100644
index 00000000..e53c9eb0
--- /dev/null
+++ b/tos/lib/TOSBoot/msp430/HPLUSART0M.nc
@@ -0,0 +1,128 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module HPLUSART0M {
+  provides interface HPLUSARTControl;
+}
+implementation {
+
+  command void HPLUSARTControl.disableSPI() {
+    // USART0 SPI module disable
+    //ME1 &= ~USPIE0;
+
+    // set to PUC values
+    ME1 = 0;
+    U0CTL = 1;
+    U0TCTL = 1;
+    U0RCTL = 0;
+  }
+  
+  command void HPLUSARTControl.setModeSPI() {
+
+    //U0CTL = SWRST;
+
+    // 8-bit char, SPI-mode, USART as master
+    U0CTL = SWRST | CHAR | SYNC | MM;
+
+    // 3-pin + half-cycle delayed UCLK
+    U0TCTL |= STC + CKPH + SSEL_SMCLK; 
+
+    // as fast as possible
+    U0BR0 = 0x02;
+    U0BR1 = 0;
+
+    // enable SPI
+    ME1 |= USPIE0;
+
+    U0CTL &= ~SWRST;  
+    
+    // clear interrupts
+    IFG1 = 0;
+
+  }
+
+  command void HPLUSARTControl.disableI2C() {
+    /*
+    U0CTL = 1;
+    U0TCTL = 1;
+    I2CTCTL = 0;
+    */
+    U0CTL &= ~I2CEN;
+    U0CTL &= ~I2C;
+    I2CTCTL = 0;
+    call HPLUSARTControl.disableSPI();
+  }
+
+  command void HPLUSARTControl.setModeI2C() {
+   
+    // Recommended init procedure
+    U0CTL = I2C + SYNC + MST;
+
+    // use 1MHz SMCLK as the I2C reference
+    I2CTCTL |= I2CSSEL_2 | I2CTRX;
+
+    // Enable I2C
+    U0CTL |= I2CEN;
+
+    return;
+  }
+
+  command error_t HPLUSARTControl.isTxEmpty(){
+    if (U0TCTL & TXEPT) {
+      return SUCCESS;
+    }
+    return FAIL;
+  }
+  
+  command error_t HPLUSARTControl.isTxIntrPending(){
+    if (IFG1 & UTXIFG0){
+      IFG1 &= ~UTXIFG0;
+      return SUCCESS;
+    }
+    return FAIL;
+  }
+
+  command error_t HPLUSARTControl.isRxIntrPending(){
+    if (IFG1 & URXIFG0){
+      IFG1 &= ~URXIFG0;
+      return SUCCESS;
+    }
+    return FAIL;
+  }
+
+  command void HPLUSARTControl.tx(uint8_t data){
+    U0TXBUF = data;
+  }
+  
+  command uint8_t HPLUSARTControl.rx(){
+    return U0RXBUF;
+  }
+
+}
diff --git a/tos/lib/TOSBoot/msp430/HPLUSARTControl.nc b/tos/lib/TOSBoot/msp430/HPLUSARTControl.nc
new file mode 100644
index 00000000..4e4998f7
--- /dev/null
+++ b/tos/lib/TOSBoot/msp430/HPLUSARTControl.nc
@@ -0,0 +1,46 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+ 
+includes msp430usart;
+
+interface HPLUSARTControl {
+
+  command void disableSPI();
+  command void setModeSPI();
+  command void disableI2C();
+  command void setModeI2C();
+  command error_t isTxEmpty();
+  command error_t isTxIntrPending();
+  command error_t isRxIntrPending();
+  command void tx(uint8_t data);
+  command uint8_t rx();
+
+}
+
diff --git a/tos/lib/TOSBoot/msp430/HardwareC.nc b/tos/lib/TOSBoot/msp430/HardwareC.nc
new file mode 100644
index 00000000..ab5ef932
--- /dev/null
+++ b/tos/lib/TOSBoot/msp430/HardwareC.nc
@@ -0,0 +1,48 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module HardwareC {
+  provides {
+    interface Hardware;
+  }
+}
+
+implementation {
+
+  command void Hardware.init() {
+    BCSCTL1 = RSEL0 | RSEL1 | RSEL2 | XT2OFF;
+    DCOCTL = DCO0 | DCO1 | DCO2;
+  }
+  
+  command void Hardware.reboot() {
+    WDTCTL = 0;
+  }
+
+}
diff --git a/tos/lib/TOSBoot/msp430/InternalFlashC.nc b/tos/lib/TOSBoot/msp430/InternalFlashC.nc
new file mode 100644
index 00000000..a913bd71
--- /dev/null
+++ b/tos/lib/TOSBoot/msp430/InternalFlashC.nc
@@ -0,0 +1,122 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlashC.nc - Internal flash implementation for telos msp
+ * platform. On the msp, the flash must first be erased before a value
+ * can be written. However, the msp can only erase the flash at a
+ * segment granularity (128 bytes for the information section). This
+ * module allows transparent read/write of individual bytes to the
+ * information section by dynamically switching between the two
+ * provided segments in the information section.
+ *
+ * Valid address range is 0x1000 - 0x107E (0x107F is used to store the
+ * version number of the information segment).
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+includes InternalFlash;
+
+module InternalFlashC {
+  provides interface InternalFlash;
+}
+
+implementation {
+
+  enum {
+    IFLASH_OFFSET     = 0x1000,
+    IFLASH_SIZE       = 128,
+    IFLASH_SEG0_VNUM_ADDR = 0x107f,
+    IFLASH_SEG1_VNUM_ADDR = 0x10ff,
+    IFLASH_INVALID_VNUM = -1,
+  };
+
+  uint8_t chooseSegment() {
+    int8_t vnum0 = *(int8_t*)IFLASH_SEG0_VNUM_ADDR;
+    int8_t vnum1 = *(int8_t*)IFLASH_SEG1_VNUM_ADDR;
+    if (vnum0 == IFLASH_INVALID_VNUM)
+      return 1;
+    else if (vnum1 == IFLASH_INVALID_VNUM)
+      return 0;
+    return ( (int8_t)(vnum0 - vnum1) < 0 );
+  }
+
+  command error_t InternalFlash.write(void* addr, void* buf, uint16_t size) {
+
+    volatile int8_t *newPtr;
+    int8_t *oldPtr;
+    int8_t *bufPtr = (int8_t*)buf;
+    int8_t version;
+    uint16_t i;
+
+    addr += IFLASH_OFFSET;
+    newPtr = oldPtr = (int8_t*)IFLASH_OFFSET;
+    if (chooseSegment()) {
+      oldPtr += IFLASH_SIZE;
+    }
+    else {
+      addr += IFLASH_SIZE;
+      newPtr += IFLASH_SIZE;
+    }
+
+    FCTL2 = FWKEY + FSSEL1 + FN2;
+    FCTL3 = FWKEY;
+    FCTL1 = FWKEY + ERASE;
+    *newPtr = 0;
+    FCTL1 = FWKEY + WRT;
+    
+    for ( i = 0; i < IFLASH_SIZE-1; i++, newPtr++, oldPtr++ ) {
+      if ((uint16_t)newPtr < (uint16_t)addr || (uint16_t)addr+size <= (uint16_t)newPtr)
+	*newPtr = *oldPtr;
+      else
+	*newPtr = *bufPtr++;
+    }
+    version = *oldPtr + 1;
+    if (version == IFLASH_INVALID_VNUM)
+      version++;
+    *newPtr = version;
+    
+    FCTL1 = FWKEY;
+    FCTL3 = FWKEY + LOCK;
+
+    return SUCCESS;
+
+  }
+
+  command error_t InternalFlash.read(void* addr, void* buf, uint16_t size) {
+
+    addr += IFLASH_OFFSET;
+    if (chooseSegment())
+      addr += IFLASH_SIZE;
+
+    memcpy(buf, addr, size);
+
+    return SUCCESS;
+
+  }
+
+}
diff --git a/tos/lib/TOSBoot/msp430/ProgFlashM.nc b/tos/lib/TOSBoot/msp430/ProgFlashM.nc
new file mode 100644
index 00000000..de8b2628
--- /dev/null
+++ b/tos/lib/TOSBoot/msp430/ProgFlashM.nc
@@ -0,0 +1,70 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module ProgFlashM {
+  provides {
+    interface ProgFlash;
+  }
+}
+
+implementation {
+
+  enum {
+    RESET_ADDR = 0xfffe,
+  };
+
+  command error_t ProgFlash.write(in_flash_addr_t addr, uint8_t* buf, uint16_t len) {
+
+    volatile uint16_t *flashAddr = (uint16_t*)(uint16_t)addr;
+    uint16_t *wordBuf = (uint16_t*)buf;
+    uint16_t i = 0;
+
+    // len is 16 bits so it can't be larger than 0xffff
+    // make sure we can't wrap around
+    if (addr < (0xffff - (len >> 1))) {
+      FCTL2 = FWKEY + FSSEL1 + FN2;
+      FCTL3 = FWKEY;
+      FCTL1 = FWKEY + ERASE;
+      *flashAddr = 0;
+      FCTL1 = FWKEY + WRT;
+      for (i = 0; i < (len >> 1); i++, flashAddr++) {
+	if ((uint16_t)flashAddr != RESET_ADDR)
+	  *flashAddr = wordBuf[i];
+	else
+	  *flashAddr = TOSBOOT_START;
+      }
+      FCTL1 = FWKEY;
+      FCTL3 = FWKEY + LOCK;
+      return SUCCESS;
+    }
+    return FAIL;
+  }
+
+}
diff --git a/tos/lib/TOSBoot/msp430/VoltageC.nc b/tos/lib/TOSBoot/msp430/VoltageC.nc
new file mode 100644
index 00000000..50a08f8d
--- /dev/null
+++ b/tos/lib/TOSBoot/msp430/VoltageC.nc
@@ -0,0 +1,72 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module VoltageC {
+  provides {
+    interface Voltage;
+  }
+}
+
+implementation {
+
+  enum {
+    VTHRESH = 0xE66, // 2.7V
+  };
+
+  command bool Voltage.okToProgram() {
+
+    int i;
+
+    // Turn on and set up ADC12 with REF_1_5V
+    ADC12CTL0 = ADC12ON | SHT0_2 | REFON;
+    // Use sampling timer
+    ADC12CTL1 = SHP;
+    // Set up to sample voltage
+    ADC12MCTL0 = EOS | SREF_1 | INCH_11;
+    // Delay for reference start-up
+    for ( i=0; i<0x3600; i++ );
+
+    // Enable conversions
+    ADC12CTL0 |= ENC;
+    // Start conversion
+    ADC12CTL0 |= ADC12SC;
+    // Wait for completion
+    while ((ADC12IFG & BIT0) == 0);
+
+    // Turn off ADC12
+    ADC12CTL0 &= ~ENC;
+    ADC12CTL0 = 0;
+
+    // Check if voltage is greater than 2.7V
+    return ( ADC12MEM0 > VTHRESH );
+
+  }
+
+}
diff --git a/tos/lib/TOSBoot/stm25p/ExtFlashC.nc b/tos/lib/TOSBoot/stm25p/ExtFlashC.nc
new file mode 100644
index 00000000..d9c507c6
--- /dev/null
+++ b/tos/lib/TOSBoot/stm25p/ExtFlashC.nc
@@ -0,0 +1,51 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+configuration ExtFlashC {
+  provides {
+    interface Init;
+    interface StdControl;
+    interface ExtFlash;
+  }
+}
+
+implementation {
+
+  components 
+    ExtFlashM,
+    HPLUSART0M;
+
+  Init = ExtFlashM;
+  StdControl = ExtFlashM;
+  ExtFlash = ExtFlashM;
+
+  ExtFlashM.USARTControl -> HPLUSART0M;
+
+}
diff --git a/tos/lib/TOSBoot/stm25p/ExtFlashM.nc b/tos/lib/TOSBoot/stm25p/ExtFlashM.nc
new file mode 100644
index 00000000..f3d16c02
--- /dev/null
+++ b/tos/lib/TOSBoot/stm25p/ExtFlashM.nc
@@ -0,0 +1,114 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module ExtFlashM {
+  provides {
+    interface StdControl;
+    interface Init;
+    interface ExtFlash;
+  }
+  uses {
+    interface HPLUSARTControl as USARTControl;
+  }
+}
+
+implementation {
+
+  command error_t Init.init() {
+    TOSH_MAKE_FLASH_HOLD_OUTPUT();
+    TOSH_MAKE_FLASH_CS_OUTPUT();
+    TOSH_SET_FLASH_HOLD_PIN();
+    call USARTControl.setModeSPI();
+    return SUCCESS;
+  }
+
+  command error_t StdControl.start() { 
+    return SUCCESS; 
+  }
+
+  command error_t StdControl.stop() { 
+
+    TOSH_CLR_FLASH_CS_PIN();
+    
+    call USARTControl.tx(0xb9);
+    while(call USARTControl.isTxEmpty() != SUCCESS);
+
+    TOSH_SET_FLASH_CS_PIN();
+
+    call USARTControl.disableSPI();
+
+    return SUCCESS; 
+
+  }
+
+  void powerOnFlash() {
+
+    uint8_t i;
+
+    TOSH_CLR_FLASH_CS_PIN();
+
+    // command byte + 3 dummy bytes + signature
+    for ( i = 0; i < 5; i++ ) {
+      call USARTControl.tx(0xab);
+      while(call USARTControl.isTxIntrPending() != SUCCESS);
+    }
+    
+    TOSH_SET_FLASH_CS_PIN();
+
+  }
+
+  command void ExtFlash.startRead(uint32_t addr) {
+
+    uint8_t i;
+    
+    powerOnFlash();
+    
+    TOSH_CLR_FLASH_CS_PIN();
+    
+    // add command byte to address
+    addr |= (uint32_t)0x3 << 24;
+
+    // address
+    for ( i = 4; i > 0; i-- ) {
+      call USARTControl.tx((addr >> (i-1)*8) & 0xff);
+      while(call USARTControl.isTxIntrPending() != SUCCESS);
+    }    
+
+  }
+
+  command uint8_t ExtFlash.readByte() {
+    call USARTControl.rx();
+    call USARTControl.tx(0);
+    while(call USARTControl.isRxIntrPending() != SUCCESS);
+    return call USARTControl.rx();
+  }
+
+  command void ExtFlash.stopRead() {
+    TOSH_SET_FLASH_CS_PIN();
+  }
+
+}
diff --git a/tos/lib/TOSBoot/telosb/InternalFlash.h b/tos/lib/TOSBoot/telosb/InternalFlash.h
new file mode 100644
index 00000000..aa4f8728
--- /dev/null
+++ b/tos/lib/TOSBoot/telosb/InternalFlash.h
@@ -0,0 +1,45 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlash.h - Internal flash implementation for telos msp
+ * platform. On the msp, the flash must first be erased before a value
+ * can be written. However, the msp can only erase the flash at a
+ * segment granularity (128 bytes for the information section). This
+ * module allows transparent read/write of individual bytes to the
+ * information section by dynamically switching between the two
+ * provided segments in the information section.
+ *
+ * Valid address range is 0x1000 - 0x107E (0x107F is used to store the
+ * version number of the information segment).
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __INTERNAL_FLASH_H__
+#define __INTERNAL_FLASH_H__
+
+#endif
diff --git a/tos/lib/TOSBoot/telosb/InternalFlash.nc b/tos/lib/TOSBoot/telosb/InternalFlash.nc
new file mode 100644
index 00000000..ab860c0e
--- /dev/null
+++ b/tos/lib/TOSBoot/telosb/InternalFlash.nc
@@ -0,0 +1,37 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlash.nc - A generic interface to read and store values in
+ * the internal flash of a microcontroller.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface InternalFlash {
+  command error_t write(void* addr, void* buf, uint16_t size);
+  command error_t read(void* addr, void* buf, uint16_t size);
+}
diff --git a/tos/lib/TOSBoot/telosb/PluginC.nc b/tos/lib/TOSBoot/telosb/PluginC.nc
new file mode 100644
index 00000000..de5a7bd3
--- /dev/null
+++ b/tos/lib/TOSBoot/telosb/PluginC.nc
@@ -0,0 +1,46 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+configuration PluginC {
+  provides {
+    interface StdControl;
+  }
+}
+
+implementation {
+
+  components ExtFlashC, LedsC, PowerOffM;
+
+  StdControl = PowerOffM;
+
+  PowerOffM.Leds -> LedsC;
+  PowerOffM.SubControl -> ExtFlashC;
+
+}
diff --git a/tos/lib/TOSBoot/telosb/PowerOffM.nc b/tos/lib/TOSBoot/telosb/PowerOffM.nc
new file mode 100644
index 00000000..404f892a
--- /dev/null
+++ b/tos/lib/TOSBoot/telosb/PowerOffM.nc
@@ -0,0 +1,85 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+module PowerOffM {
+  provides {
+    interface Init;
+    interface StdControl;
+  }
+  uses {
+    interface Leds;
+    interface StdControl as SubControl;
+  }
+}
+
+implementation {
+
+  void haltsystem() {
+
+    uint16_t _lpmreg;
+
+    TOSH_SET_PIN_DIRECTIONS();
+
+    call SubControl.stop();
+
+    call Leds.glow(0x7, 0x0);
+
+    _lpmreg = LPM4_bits;
+    _lpmreg |= SR_GIE;
+
+    __asm__ __volatile__( "bis  %0, r2" : : "m" ((uint16_t)_lpmreg) );
+
+  }
+
+  command error_t Init.init() {
+    return SUCCESS;
+  }
+
+  command error_t StdControl.start() {
+
+    int i;
+
+    // wait a short period for things to stabilize
+    for ( i = 0; i < 4; i++ )
+      wait(0xffff);
+
+    // if user button is pressed, power down
+    if (!TOSH_READ_USERINT_PIN())
+      haltsystem();
+
+    return SUCCESS;
+
+  }
+
+  command error_t StdControl.stop() {
+    return SUCCESS;
+  }
+
+}
diff --git a/tos/lib/TOSBoot/telosb/TOSBoot_platform.h b/tos/lib/TOSBoot/telosb/TOSBoot_platform.h
new file mode 100644
index 00000000..afc7693a
--- /dev/null
+++ b/tos/lib/TOSBoot/telosb/TOSBoot_platform.h
@@ -0,0 +1,47 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author  Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __TOSBOOT_PLATFORM_H__
+#define __TOSBOOT_PLATFORM_H__
+
+enum {
+  // address of TOSBoot args in internal flash
+  TOSBOOT_ARGS_ADDR = 0x70,
+  // number of resets to force golden image
+  TOSBOOT_GESTURE_MAX_COUNT = 3,
+  // address of the golden image in external flash
+  TOSBOOT_GOLDEN_IMG_ADDR = 0xf0000L,
+  // size of each internal program flash page
+  TOSBOOT_INT_PAGE_SIZE = 512L,
+};
+
+enum {
+  DELUGE_MIN_ADV_PERIOD_LOG2 = 9,
+  DELUGE_QSIZE = 1,
+};
+
+#endif
diff --git a/tos/lib/TOSBoot/telosb/hardware.h b/tos/lib/TOSBoot/telosb/hardware.h
new file mode 100644
index 00000000..ddfae86c
--- /dev/null
+++ b/tos/lib/TOSBoot/telosb/hardware.h
@@ -0,0 +1,88 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __HARDWARE_H__
+#define __HARDWARE_H__
+
+#include "msp430hardware.h"
+
+// internal flash is 16 bits in width
+typedef uint16_t in_flash_addr_t;
+// external flash is 32 bits in width
+typedef uint32_t ex_flash_addr_t;
+
+void wait(uint16_t t) {
+  for ( ; t > 0; t-- );
+}
+
+// LEDs
+TOSH_ASSIGN_PIN(RED_LED, 5, 4);
+TOSH_ASSIGN_PIN(GREEN_LED, 5, 5);
+TOSH_ASSIGN_PIN(YELLOW_LED, 5, 6);
+
+// UART pins
+TOSH_ASSIGN_PIN(SOMI0, 3, 2);
+TOSH_ASSIGN_PIN(SIMO0, 3, 1);
+TOSH_ASSIGN_PIN(UCLK0, 3, 3);
+TOSH_ASSIGN_PIN(UTXD0, 3, 4);
+TOSH_ASSIGN_PIN(URXD0, 3, 5);
+
+// User Interupt Pin
+TOSH_ASSIGN_PIN(USERINT, 2, 7);
+
+// FLASH
+TOSH_ASSIGN_PIN(FLASH_PWR, 4, 3);
+TOSH_ASSIGN_PIN(FLASH_CS, 4, 4);
+TOSH_ASSIGN_PIN(FLASH_HOLD, 4, 7);
+
+void TOSH_SET_PIN_DIRECTIONS(void)
+{
+  P3SEL = 0x0E; // set SPI and I2C to mod func
+  
+  P1DIR = 0xe0;
+  P1OUT = 0x00;
+  
+  P2DIR = 0x7b;
+  P2OUT = 0x10;
+  
+  P3DIR = 0xf1;
+  P3OUT = 0x00;
+  
+  P4DIR = 0xfd;
+  P4OUT = 0xdd;
+  
+  P5DIR = 0xff;
+  P5OUT = 0xff;
+  
+  P6DIR = 0xff;
+  P6OUT = 0x00;
+}
+
+#endif
diff --git a/tos/lib/net/Deluge/AutoStarterC.nc b/tos/lib/net/Deluge/AutoStarterC.nc
new file mode 100644
index 00000000..ea20545a
--- /dev/null
+++ b/tos/lib/net/Deluge/AutoStarterC.nc
@@ -0,0 +1,38 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+configuration AutoStarterC
+{
+  uses interface SplitControl;
+}
+
+implementation
+{
+  components MainC, AutoStarterP;
+  
+  SplitControl = AutoStarterP;
+  AutoStarterP.Boot -> MainC;
+}
diff --git a/tos/lib/net/Deluge/AutoStarterP.nc b/tos/lib/net/Deluge/AutoStarterP.nc
new file mode 100644
index 00000000..d13acff7
--- /dev/null
+++ b/tos/lib/net/Deluge/AutoStarterP.nc
@@ -0,0 +1,45 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+module AutoStarterP
+{
+  uses {
+    interface Boot;
+    interface SplitControl;
+  }
+}
+
+implementation
+{
+  event void Boot.booted()
+  {
+    call SplitControl.start();
+  }
+  
+  event void SplitControl.startDone(error_t error) { }
+  event void SplitControl.stopDone(error_t error) { }
+
+}
diff --git a/tos/lib/net/Deluge/BitVecUtils.h b/tos/lib/net/Deluge/BitVecUtils.h
new file mode 100644
index 00000000..0e5b7166
--- /dev/null
+++ b/tos/lib/net/Deluge/BitVecUtils.h
@@ -0,0 +1,39 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * Provides generic methods for manipulating bit vectors.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __BITVEC_UTILS_H__
+#define __BITVEC_UTILS_H__
+
+#define BIT_GET(x, i) ((x) & (1 << (i)))
+#define BIT_SET(x, i) ((x) | (1 << (i)))
+#define BIT_CLEAR(x, i) ((x) & ~(1 << (i)))
+
+#define BITVEC_GET(x, i) (BIT_GET((x)[(i)/8], (i)%8))
+#define BITVEC_SET(x, i) ((x)[(i)/8] = BIT_SET((x)[(i)/8], (i)%8))
+#define BITVEC_CLEAR(x, i) ((x)[(i)/8] = BIT_CLEAR((x)[(i)/8], (i)%8))
+
+#endif
diff --git a/tos/lib/net/Deluge/BitVecUtils.nc b/tos/lib/net/Deluge/BitVecUtils.nc
new file mode 100644
index 00000000..259a874c
--- /dev/null
+++ b/tos/lib/net/Deluge/BitVecUtils.nc
@@ -0,0 +1,62 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * Provides generic methods for manipulating bit vectors.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface BitVecUtils {
+  /**
+   * Locates the index of the first '1' bit in a bit vector.
+   *
+   * @param result     the location of the '1' bit
+   * @param fromIndex  the index to start search for '1' bit
+   * @param bitVec     the bit vector
+   * @param length     the length of the bit vector in bits
+   * @return           <code>SUCCESS</code> if a '1' bit was found;
+   *                   <code>FAIL</code> otherwise.
+   */
+  command error_t indexOf(uint16_t* pResult, uint16_t fromIndex, 
+			   uint8_t* bitVec, uint16_t length);
+
+  /**
+   * Counts the number of '1' bits in a bit vector.
+   *
+   * @param result  the number of '1' bits
+   * @param bitVec  the bit vector
+   * @param length  the length of the bit vector in bits
+   * @return        <code>SUCCESS</code> if the operation completed successfully;
+   *                <code>FAIL</code> otherwise.
+   */
+  command error_t countOnes(uint16_t* pResult, uint8_t* bitVec, 
+			     uint16_t length);
+
+  /**
+   * Generates an ASCII representation of the bit vector.
+   *
+   * @param buf     the character array to place the ASCII string
+   * @param bitVec  the bit vector
+   * @param length  the length of the bit vector in bits
+   */
+  command void printBitVec(char* buf, uint8_t* bitVec, uint16_t length);
+}
diff --git a/tos/lib/net/Deluge/BitVecUtilsC.nc b/tos/lib/net/Deluge/BitVecUtilsC.nc
new file mode 100644
index 00000000..8c286112
--- /dev/null
+++ b/tos/lib/net/Deluge/BitVecUtilsC.nc
@@ -0,0 +1,80 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * Provides generic methods for manipulating bit vectors.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#include "BitVecUtils.h"
+
+module BitVecUtilsC {
+  provides interface BitVecUtils;
+}
+
+implementation {
+  command error_t BitVecUtils.indexOf(uint16_t* pResult, uint16_t fromIndex, 
+				                               uint8_t* bitVec, uint16_t length) {
+    uint16_t i = fromIndex;
+
+    if (length == 0)
+      return FAIL;
+    
+    do {
+      if (BITVEC_GET(bitVec, i)) {
+        *pResult = i;
+        return SUCCESS;
+      }
+      i = (i+1) % length;
+    } while (i != fromIndex);
+    
+    return FAIL;
+  }
+
+  command error_t BitVecUtils.countOnes(uint16_t* pResult, uint8_t* bitVec, uint16_t length) {
+
+    int count = 0;
+    int i;
+
+    for ( i = 0; i < length; i++ ) {
+      if (BITVEC_GET(bitVec, i))
+	count++;
+    }
+
+    *pResult = count;
+
+    return SUCCESS;
+
+  }
+
+  command void BitVecUtils.printBitVec(char* buf, uint8_t* bitVec, uint16_t length) {
+#ifdef PLATFORM_PC
+    uint16_t i;
+    
+    dbg(DBG_TEMP, "");
+    for ( i = 0; i < length; i++ ) {
+      sprintf(buf++, "%d", !!BITVEC_GET(bitVec, i));
+    }
+#endif	  
+  }
+
+}
diff --git a/tos/lib/net/Deluge/Crc.nc b/tos/lib/net/Deluge/Crc.nc
new file mode 100644
index 00000000..31fedfd8
--- /dev/null
+++ b/tos/lib/net/Deluge/Crc.nc
@@ -0,0 +1,29 @@
+/* 
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface Crc
+{
+  command uint16_t crc16(void* buf, uint8_t len);
+}
diff --git a/tos/lib/net/Deluge/CrcP.nc b/tos/lib/net/Deluge/CrcP.nc
new file mode 100644
index 00000000..06ae498f
--- /dev/null
+++ b/tos/lib/net/Deluge/CrcP.nc
@@ -0,0 +1,48 @@
+/* 
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#include "crc.h"
+
+module CrcP
+{
+  provides interface Crc;
+}
+
+implementation
+{
+  // From T1 "tos/system/CrcC.nc"
+  command uint16_t Crc.crc16(void* buf, uint8_t len)
+  {
+    uint8_t* tmpBuf = (uint8_t*)buf;
+    uint16_t crc;
+    
+    for (crc = 0; len > 0; len--) {
+      crc = crcByte(crc, *tmpBuf);   // Calculates running CRC
+      tmpBuf++;
+    }
+    
+    return crc;
+  }
+}
diff --git a/tos/lib/net/Deluge/Deluge.h b/tos/lib/net/Deluge/Deluge.h
new file mode 100644
index 00000000..c9ec9cbe
--- /dev/null
+++ b/tos/lib/net/Deluge/Deluge.h
@@ -0,0 +1,52 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#ifndef __DELUGE_H__
+#define __DELUGE_H__
+
+#include "DelugeMetadata.h"
+
+enum {
+  DELUGE_INVALID_UID = 0xffffffff,
+  DELUGE_NUM_VOLUMES = 2,
+};
+
+typedef nx_struct DelugeDissemination {
+  nx_uint32_t uid;      // unique id of image
+  nx_uint16_t vNum;     // version num of image
+  nx_uint8_t  imgNum;   // image number
+  nx_uint16_t size;     // size of the image
+} DelugeDissemination;
+
+typedef struct DelugeNodeDesc {
+  imgvnum_t vNum;
+  uint32_t  uid;
+  imgnum_t  imgNum;
+  uint8_t   reserved;
+  uint16_t  crc;
+} DelugeNodeDesc;
+
+#endif
diff --git a/tos/lib/net/Deluge/DelugeC.nc b/tos/lib/net/Deluge/DelugeC.nc
new file mode 100644
index 00000000..957f98c0
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeC.nc
@@ -0,0 +1,71 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "Deluge.h"
+
+configuration DelugeC {}
+
+implementation
+{
+  components DelugeStorageC;
+
+#ifdef DELUGE_BASESTATION
+  components SerialStarterC;
+  components new FlashVolumeManagerC(0xAB);
+
+  DelugeP.ReprogNotify -> FlashVolumeManagerC;
+  FlashVolumeManagerC.BlockRead[0] -> DelugeStorageC.BlockRead[0];
+  FlashVolumeManagerC.BlockWrite[0] -> DelugeStorageC.BlockWrite[0];
+  FlashVolumeManagerC.StorageMap[0] -> DelugeStorageC.StorageMap[0];
+  FlashVolumeManagerC.BlockRead[1] -> DelugeStorageC.BlockRead[1];
+  FlashVolumeManagerC.BlockWrite[1] -> DelugeStorageC.BlockWrite[1];
+  FlashVolumeManagerC.StorageMap[1] -> DelugeStorageC.StorageMap[1];
+#endif
+  
+  components ObjectTransferC;
+  ObjectTransferC.BlockRead[0] -> DelugeStorageC.BlockRead[0];
+  ObjectTransferC.BlockWrite[0] -> DelugeStorageC.BlockWrite[0];
+  ObjectTransferC.BlockRead[1] -> DelugeStorageC.BlockRead[1];
+  ObjectTransferC.BlockWrite[1] -> DelugeStorageC.BlockWrite[1];
+  
+  components new DisseminatorC(DelugeDissemination, 0xDE00), DisseminationC;
+  components ActiveMessageC;
+  components NetProgC, DelugeP;
+  components new TimerMilliC() as Timer;
+  components LedsC, NoLedsC;
+  DelugeP.Leds -> LedsC;  
+  DelugeP.DisseminationValue -> DisseminatorC;
+  DelugeP.DisseminationUpdate -> DisseminatorC;
+  DelugeP.StdControlDissemination -> DisseminationC;
+  DelugeP.ObjectTransfer -> ObjectTransferC;
+  DelugeP.NetProg -> NetProgC;
+  DelugeP.StorageReadyNotify -> DelugeStorageC;
+  DelugeP.DelugeMetadata -> DelugeStorageC;
+  DelugeP.RadioSplitControl -> ActiveMessageC;
+  
+  components InternalFlashC as IFlash;
+  DelugeP.IFlash -> IFlash;
+}
diff --git a/tos/lib/net/Deluge/DelugeMetadata.h b/tos/lib/net/Deluge/DelugeMetadata.h
new file mode 100644
index 00000000..1c17f59c
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeMetadata.h
@@ -0,0 +1,46 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __DELUGE_METADATA_H__
+#define __DELUGE_METADATA_H__
+
+#define DELUGE_METADATA_SIZE 16
+
+typedef int16_t imgvnum_t;
+typedef uint8_t  imgnum_t;
+typedef uint8_t   pgnum_t;
+
+typedef struct DelugeImgDesc {
+  uint32_t  uid;            // unique id of image
+  imgvnum_t vNum;           // version num of image
+  imgnum_t  imgNum;         // image number
+  pgnum_t   numPgs;         // num pages of complete image
+  uint16_t  crc;            // crc for vNum and numPgs
+  uint8_t   numPgsComplete; // numPgsComplete in image
+  uint8_t   reserved;
+  uint16_t  size;           // size of the whole image (metadata + CRCs + ident + binary)
+} DelugeImgDesc;
+
+#endif
diff --git a/tos/lib/net/Deluge/DelugeMetadata.nc b/tos/lib/net/Deluge/DelugeMetadata.nc
new file mode 100644
index 00000000..d6004449
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeMetadata.nc
@@ -0,0 +1,33 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+interface DelugeMetadata {
+  command DelugeImgDesc* getImgDesc(imgnum_t imgNum);
+}
diff --git a/tos/lib/net/Deluge/DelugeMsgs.h b/tos/lib/net/Deluge/DelugeMsgs.h
new file mode 100644
index 00000000..2da6fdd8
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeMsgs.h
@@ -0,0 +1,68 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#ifndef __DELUGE_MSGS_H__
+#define __DELUGE_MSGS_H__
+
+#include "DelugePageTransfer.h"
+
+enum {
+  DELUGE_ADV_NORMAL = 0,
+  DELUGE_ADV_ERROR  = 1,
+  DELUGE_ADV_PC     = 2,
+  DELUGE_ADV_PING   = 3,
+  DELUGE_ADV_RESET  = 4,
+};
+
+typedef nx_struct DelugeAdvMsg {
+  nx_uint16_t       sourceAddr;
+  nx_uint8_t        version;    // Deluge Version
+  nx_uint8_t        type;
+  //DelugeNodeDesc nodeDesc;
+  DelugeObjDesc  objDesc;
+  nx_uint8_t        reserved;
+} DelugeAdvMsg;
+
+typedef nx_struct DelugeReqMsg {
+  nx_uint16_t     dest;
+  nx_uint16_t     sourceAddr;
+  nx_object_id_t  objid;
+  nx_page_num_t   pgNum;
+  nx_uint8_t      requestedPkts[DELUGE_PKT_BITVEC_SIZE];
+} DelugeReqMsg;
+
+typedef nx_struct DelugeDataMsg {
+  nx_object_id_t objid;
+  nx_page_num_t pgNum;
+  nx_uint8_t    pktNum;
+  nx_uint8_t    data[DELUGE_PKT_PAYLOAD_SIZE];
+} DelugeDataMsg;
+
+#endif
diff --git a/tos/lib/net/Deluge/DelugeP.nc b/tos/lib/net/Deluge/DelugeP.nc
new file mode 100644
index 00000000..81020484
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeP.nc
@@ -0,0 +1,140 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+module DelugeP
+{
+  uses {
+    interface Leds;
+    interface Notify<uint8_t> as StorageReadyNotify;
+    interface DisseminationUpdate<DelugeDissemination>;
+    interface DisseminationValue<DelugeDissemination>;
+    interface StdControl as StdControlDissemination;
+    interface DelugeMetadata;
+    interface ObjectTransfer;
+    interface NetProg;
+    interface InternalFlash as IFlash;
+    interface SplitControl as RadioSplitControl;
+    
+#ifdef DELUGE_BASESTATION
+    interface Notify<uint8_t> as ReprogNotify;
+#endif
+  }
+}
+
+implementation
+{
+  uint8_t img_num;
+  
+  /**
+   * Starts the radio
+   */
+  event void StorageReadyNotify.notify(uint8_t val)
+  {
+    call RadioSplitControl.start();
+  }
+
+#ifdef DELUGE_BASESTATION
+  /**
+   * Starts disseminating image information
+   */
+  event void ReprogNotify.notify(uint8_t new_img_num)
+  {
+    DelugeDissemination delugeDis;
+    DelugeImgDesc *imgDesc;
+    
+    imgDesc = call DelugeMetadata.getImgDesc(new_img_num);
+    if (imgDesc->uid != DELUGE_INVALID_UID) {
+      call ObjectTransfer.stop();
+      call Leds.led0Toggle();
+      img_num = new_img_num;
+      
+      delugeDis.uid = imgDesc->uid;
+      delugeDis.vNum = imgDesc->vNum;
+      delugeDis.imgNum = imgDesc->imgNum;
+      delugeDis.size = imgDesc->size;
+      
+      call DisseminationUpdate.change(&delugeDis);   // Disseminates image information
+      call ObjectTransfer.publish(delugeDis.uid,
+                                  delugeDis.size,
+                                  delugeDis.imgNum);   // Prepares to publish image data
+    }
+  }
+#endif
+
+  /**
+   * Receives a disseminated message. If the message contains information about a
+   * newer image, then we should grab this image from the network
+   */
+  event void DisseminationValue.changed()
+  {
+    const DelugeDissemination *delugeDis = call DisseminationValue.get();
+    DelugeImgDesc *imgDesc = call DelugeMetadata.getImgDesc(delugeDis->imgNum);
+    
+    if (imgDesc->uid == delugeDis->uid) {
+      if (imgDesc->vNum < delugeDis->vNum) {
+        img_num = delugeDis->imgNum;   // Note which image number to boot
+        call ObjectTransfer.receive(delugeDis->uid, delugeDis->size, delugeDis->imgNum);
+      }
+    } else {
+      img_num = delugeDis->imgNum;   // Note which image number to boot
+      call ObjectTransfer.receive(delugeDis->uid, delugeDis->size, delugeDis->imgNum);
+    }
+  }
+
+  /**
+   * Reboots and reprograms with the newly received image
+   */
+  event void ObjectTransfer.receiveDone(error_t error)
+  {
+    call ObjectTransfer.stop();
+    if (error == SUCCESS) {
+      call NetProg.programImgAndReboot(img_num);
+    }
+  }
+
+  /**
+   * Prepares to publish the image that was just reprogrammed
+   */
+  event void RadioSplitControl.startDone(error_t error)
+  {
+    if (error == SUCCESS) {
+      // Start publishing the current image
+      DelugeImgDesc *imgDesc;
+      DelugeNodeDesc nodeDesc;
+      call IFlash.read((uint8_t*)IFLASH_NODE_DESC_ADDR,
+                       &nodeDesc,
+                       sizeof(DelugeNodeDesc));   // Reads which image was just reprogrammed
+      imgDesc = call DelugeMetadata.getImgDesc(nodeDesc.imgNum);
+      if (nodeDesc.uid == imgDesc->uid && imgDesc->uid != DELUGE_INVALID_UID) {
+        call ObjectTransfer.publish(imgDesc->uid, imgDesc->size, imgDesc->imgNum);
+      }
+            
+      call StdControlDissemination.start();
+    }
+  }
+  
+  event void RadioSplitControl.stopDone(error_t error) {}
+}
diff --git a/tos/lib/net/Deluge/DelugePageTransfer.h b/tos/lib/net/Deluge/DelugePageTransfer.h
new file mode 100644
index 00000000..cc914528
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugePageTransfer.h
@@ -0,0 +1,96 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#ifndef DELUGEPAGETRANSFER_H
+#define DELUGEPAGETRANSFER_H
+
+#include "extra/telosb/TOSBoot_platform.h"
+
+#define AM_DELUGEADVMSG  161
+#define AM_DELUGEREQMSG  162
+#define AM_DELUGEDATAMSG 163
+
+typedef int32_t object_id_t;
+typedef nx_int32_t nx_object_id_t;
+typedef uint32_t object_size_t;
+typedef nx_uint32_t nx_object_size_t;
+typedef uint8_t page_num_t;
+typedef nx_uint8_t nx_page_num_t;
+
+enum {
+//  DELUGE_PKTS_PER_PAGE    = 48,
+//  DELUGE_PKT_PAYLOAD_SIZE = 23,
+//  DELUGE_BYTES_PER_PAGE   = (DELUGE_PKTS_PER_PAGE * DELUGE_PKT_PAYLOAD_SIZE),
+  DELUGE_PKT_PAYLOAD_SIZE  = TOSH_DATA_LENGTH - sizeof(nx_object_id_t) - sizeof(nx_page_num_t) - sizeof(nx_uint8_t),
+  DELUGE_BYTES_PER_PAGE    = 1024,
+  DELUGE_PKTS_PER_PAGE     = ((DELUGE_BYTES_PER_PAGE - 1) / DELUGE_PKT_PAYLOAD_SIZE) + 1,
+  
+  DELUGE_VERSION                    = 2,
+  DELUGE_MAX_ADV_PERIOD_LOG2        = 22,
+  DELUGE_NUM_NEWDATA_ADVS_REQUIRED  = 2,
+  DELUGE_NUM_MIN_ADV_PERIODS        = 2,
+  DELUGE_MAX_NUM_REQ_TRIES          = 1,
+  DELUGE_REBOOT_DELAY               = 4,
+  DELUGE_FAILED_SEND_DELAY          = 16,
+  DELUGE_MIN_DELAY                  = 16,
+  DELUGE_DATA_OFFSET                = 128,
+  DELUGE_IDENT_SIZE                 = 128,
+  DELUGE_INVALID_ADDR               = (0x7fffffffL),
+  DELUGE_MAX_REQ_DELAY              = (0x1L << (DELUGE_MIN_ADV_PERIOD_LOG2 - 1)),
+  DELUGE_NACK_TIMEOUT               = (DELUGE_MAX_REQ_DELAY >> 0x1),
+  DELUGE_PKT_BITVEC_SIZE            = (((DELUGE_PKTS_PER_PAGE - 1) / 8) + 1),
+  DELUGE_MAX_IMAGE_SIZE             = (128L * 1024L),
+  DELUGE_MAX_PAGES                  = 128,
+  DELUGE_CRC_SIZE                   = sizeof(uint16_t),
+  DELUGE_CRC_BLOCK_SIZE             = DELUGE_MAX_PAGES * DELUGE_CRC_SIZE,
+  DELUGE_GOLDEN_IMAGE_NUM           = 0x0,
+  DELUGE_INVALID_OBJID              = 0xff,
+  DELUGE_INVALID_PKTNUM             = 0xff,
+  DELUGE_INVALID_PGNUM              = 0xff,
+  
+  // From "DelugeMetadata.h"
+};
+
+typedef struct DelugeAdvTimer {
+  uint32_t timer      : 32;
+  uint8_t  periodLog2 : 8;
+  bool     overheard  : 1;
+  uint8_t  newAdvs    : 7;
+} DelugeAdvTimer;
+
+typedef nx_struct DelugeObjDesc {
+  nx_object_id_t objid;
+  nx_page_num_t  numPgs;         // num pages of complete image
+  nx_uint16_t    crc;            // crc for vNum and numPgs
+  nx_page_num_t  numPgsComplete; // numPgsComplete in image
+  nx_uint8_t     reserved;
+} DelugeObjDesc;
+
+#endif
diff --git a/tos/lib/net/Deluge/DelugePageTransfer.nc b/tos/lib/net/Deluge/DelugePageTransfer.nc
new file mode 100644
index 00000000..b2929beb
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugePageTransfer.nc
@@ -0,0 +1,42 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "DelugePageTransfer.h"
+
+interface DelugePageTransfer {
+  command error_t setWorkingPage(object_id_t new_objid, page_num_t new_pgNum);
+  command error_t dataAvailable(uint16_t sourceAddr);
+  command bool isTransferring();
+  event void suppressMsgs(object_id_t new_objid);
+  event void receivedPage(object_id_t new_objid, page_num_t new_pgNum);
+  command void setImgNum(uint8_t new_img_num);
+  
+  command error_t stop();
+}
diff --git a/tos/lib/net/Deluge/DelugePageTransferC.nc b/tos/lib/net/Deluge/DelugePageTransferC.nc
new file mode 100644
index 00000000..b36d09ed
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugePageTransferC.nc
@@ -0,0 +1,72 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+configuration DelugePageTransferC
+{
+  provides interface DelugePageTransfer;
+  uses {
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+    
+    interface Receive as ReceiveDataMsg;
+    interface Receive as ReceiveReqMsg;
+    interface AMSend as SendDataMsg;
+    interface AMSend as SendReqMsg;
+    interface AMPacket;
+    interface PacketAcknowledgements;
+  }
+}
+
+implementation
+{
+  components DelugePageTransferP;
+  
+  DelugePageTransfer = DelugePageTransferP;
+  BlockRead[0] = DelugePageTransferP.BlockRead[0];
+  BlockWrite[0] = DelugePageTransferP.BlockWrite[0];
+  BlockRead[1] = DelugePageTransferP.BlockRead[1];
+  BlockWrite[1] = DelugePageTransferP.BlockWrite[1];
+  
+  ReceiveDataMsg = DelugePageTransferP.ReceiveDataMsg;
+  ReceiveReqMsg = DelugePageTransferP.ReceiveReqMsg;
+  SendDataMsg = DelugePageTransferP.SendDataMsg;
+  SendReqMsg = DelugePageTransferP.SendReqMsg;
+  
+  AMPacket = DelugePageTransferP.AMPacket;
+  PacketAcknowledgements = DelugePageTransferP.PacketAcknowledgements;
+  
+  components RandomC, BitVecUtilsC, new TimerMilliC() as Timer;
+  DelugePageTransferP.Random -> RandomC;
+  DelugePageTransferP.Timer -> Timer;
+  DelugePageTransferP.BitVecUtils -> BitVecUtilsC;
+  
+  components NoLedsC, LedsC;
+  DelugePageTransferP.Leds -> LedsC;
+  
+  // For collecting statistics
+  //components StatsCollectorC;
+  //DelugePageTransferP.StatsCollector -> StatsCollectorC.StatsCollector;
+}
diff --git a/tos/lib/net/Deluge/DelugePageTransferP.nc b/tos/lib/net/Deluge/DelugePageTransferP.nc
new file mode 100644
index 00000000..c2b40742
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugePageTransferP.nc
@@ -0,0 +1,493 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "DelugeMsgs.h"
+#include "BitVecUtils.h"
+
+module DelugePageTransferP
+{
+  provides interface DelugePageTransfer;
+  uses {
+    interface BitVecUtils;
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+    
+    interface Receive as ReceiveDataMsg;
+    interface Receive as ReceiveReqMsg;
+    interface AMSend as SendDataMsg;
+    interface AMSend as SendReqMsg;
+    interface AMPacket;
+    interface PacketAcknowledgements;
+    interface Timer<TMilli> as Timer;
+    interface Random;
+    
+    interface Leds;
+    //interface StatsCollector;
+  }
+}
+
+implementation
+{
+  // send/receive page buffers, and state variables for buffers
+  uint8_t pktsToSend[DELUGE_PKT_BITVEC_SIZE];    // bit vec of packets to send
+  uint8_t pktsToReceive[DELUGE_PKT_BITVEC_SIZE]; // bit vec of packets to receive
+
+  DelugeDataMsg rxQueue[DELUGE_QSIZE];
+  uint8_t       head, size;
+
+  enum {
+    S_DISABLED,
+    S_IDLE,     
+    S_TX_LOCKING,
+    S_SENDING,
+    S_RX_LOCKING,
+    S_RECEIVING,
+  };
+  
+  // state variables
+  uint8_t      state        = S_DISABLED;
+  uint16_t     nodeAddr;
+  uint8_t      remainingAttempts;
+  bool         suppressReq;
+  object_id_t  objToSend    = DELUGE_INVALID_OBJID;
+  page_num_t   pageToSend   = DELUGE_INVALID_PGNUM;
+  object_id_t  workingObjid = DELUGE_INVALID_OBJID;
+  page_num_t   workingPgNum = DELUGE_INVALID_PGNUM;
+  uint8_t      imgNum       = 0;
+  
+  message_t pMsgBuf;
+  bool      isBusy_pMsgBuf = FALSE;
+  uint8_t   publisher_addr;   // For collecting stats only
+  
+  void changeState(uint8_t newState);
+  
+  void startReqTimer(bool first)
+  {
+    uint32_t delay;
+    if (first) {
+      delay = DELUGE_MIN_DELAY + (call Random.rand32() % DELUGE_MAX_REQ_DELAY);
+    } else {
+      delay = DELUGE_NACK_TIMEOUT + (call Random.rand32() % DELUGE_NACK_TIMEOUT);
+    }
+    call Timer.startOneShot(delay);
+  }
+  
+  void setupReqMsg()
+  {
+    DelugeReqMsg *pReqMsg = (DelugeReqMsg *)(call SendReqMsg.getPayload(&pMsgBuf));
+    
+    if (state == S_RX_LOCKING) {
+      if (isBusy_pMsgBuf) {
+        return;
+      }
+      isBusy_pMsgBuf = TRUE;
+      changeState(S_RECEIVING);
+      pReqMsg->dest = nodeAddr;
+      pReqMsg->sourceAddr = TOS_NODE_ID;
+      pReqMsg->objid = workingObjid;
+      pReqMsg->pgNum = workingPgNum;
+    }
+    
+    if (state != S_RECEIVING) {
+      return;
+    }
+    
+    // suppress request
+    if (suppressReq) {
+      startReqTimer(FALSE);
+      suppressReq = FALSE;
+    }
+    // tried too many times, give up
+    else if (remainingAttempts == 0) {
+      changeState(S_IDLE);
+    }
+    // send req message
+    else {
+      uint32_t i;
+      for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+        pReqMsg->requestedPkts[i] = pktsToReceive[i];
+      }
+      //memcpy(pReqMsg->requestedPkts, pktsToReceive, DELUGE_PKT_BITVEC_SIZE);
+      
+      if (call SendReqMsg.send(pReqMsg->dest, &pMsgBuf, sizeof(DelugeReqMsg)) != SUCCESS) {
+	startReqTimer(FALSE);
+      }
+    }
+  }
+  
+  storage_addr_t calcOffset(page_num_t pgNum, uint8_t pktNum)
+  {
+    return (storage_addr_t)pgNum * (storage_addr_t)DELUGE_BYTES_PER_PAGE
+            + (uint16_t)pktNum * (uint16_t)DELUGE_PKT_PAYLOAD_SIZE;
+            //+ DELUGE_METADATA_SIZE;
+  }
+  
+  void setupDataMsg()
+  {
+    DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf));
+    uint16_t nextPkt;
+    
+    if (state != S_SENDING && state != S_TX_LOCKING) {
+      return;
+    }
+    
+    signal DelugePageTransfer.suppressMsgs(objToSend);
+    
+    if (state == S_TX_LOCKING) {
+      if (isBusy_pMsgBuf) {
+        return;
+      }
+      isBusy_pMsgBuf = TRUE;
+      changeState(S_SENDING);
+      pDataMsg->objid = objToSend;
+      pDataMsg->pgNum = pageToSend;
+      pDataMsg->pktNum = 0;
+    }
+    
+    if (call BitVecUtils.indexOf(&nextPkt, pDataMsg->pktNum, pktsToSend, DELUGE_PKTS_PER_PAGE) != SUCCESS) {
+      // no more packets to send
+      //dbg(DBG_USR1, "DELUGE: SEND_DONE\n");
+      changeState(S_IDLE);
+    } else {
+      pDataMsg->pktNum = nextPkt;
+      if (call BlockRead.read[imgNum](calcOffset(pageToSend, nextPkt), pDataMsg->data, DELUGE_PKT_PAYLOAD_SIZE) != SUCCESS) {
+        call Timer.startOneShot(DELUGE_FAILED_SEND_DELAY);
+      }
+    }
+  }
+  
+  void unlockPMsgBuf()
+  {
+    isBusy_pMsgBuf = FALSE;
+    
+    switch(state) {
+      case S_TX_LOCKING:
+        setupDataMsg();
+        break;
+      case S_RX_LOCKING:
+        setupReqMsg();
+        break;
+    }
+  }
+  
+  void changeState(uint8_t newState)
+  {
+    if ((newState == S_DISABLED || newState == S_IDLE)
+	&& (state == S_SENDING || state == S_RECEIVING)) {
+      unlockPMsgBuf();
+    }
+    
+    state = newState;
+  }
+  
+  void suppressMsgs(object_id_t objid, page_num_t pgNum)
+  {
+    if (state == S_SENDING || state == S_TX_LOCKING) {
+      if (objid < objToSend || (objid == objToSend && pgNum < pageToSend)) {
+	uint32_t i;
+	changeState(S_IDLE);
+	for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+          pktsToSend[i] = 0x00;
+	}
+	//memset(pktsToSend, 0x00, DELUGE_PKT_BITVEC_SIZE);
+      }
+    } else if (state == S_RECEIVING || state == S_RX_LOCKING) {
+      if (objid < workingObjid || (objid == workingObjid && pgNum <= workingPgNum)) {
+	// suppress next request since similar request has been overheard
+	suppressReq = TRUE;
+      }
+    }
+  }
+  
+  void writeData()
+  {
+    if(call BlockWrite.write[imgNum](calcOffset(rxQueue[head].pgNum, rxQueue[head].pktNum),
+                            rxQueue[head].data, DELUGE_PKT_PAYLOAD_SIZE) != SUCCESS) {
+      size = 0;
+    }
+  }
+  
+  command error_t DelugePageTransfer.stop()
+  {
+    uint32_t i;
+    
+    call Timer.stop();
+    changeState(S_DISABLED);
+    workingObjid = DELUGE_INVALID_OBJID;
+    workingPgNum = DELUGE_INVALID_PGNUM;
+    
+    for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+      pktsToReceive[i] = 0x00;
+    }
+    for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+      pktsToSend[i] = 0x00;
+    }
+    //memset(pktsToReceive, 0x00, DELUGE_PKT_BITVEC_SIZE);
+    //memset(pktsToSend, 0x00, DELUGE_PKT_BITVEC_SIZE);
+    
+    return SUCCESS;
+  }
+  
+  command error_t DelugePageTransfer.setWorkingPage(object_id_t new_objid, page_num_t new_pgNum)
+  {
+    uint32_t i;
+    
+    if (state == S_DISABLED) {
+      changeState(S_IDLE);
+    }
+    
+    workingObjid = new_objid;
+    workingPgNum = new_pgNum;
+    
+    for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+      pktsToReceive[i] = 0xFF;
+    }
+    //memset(pktsToReceive, (nx_uint8_t)0xff, DELUGE_PKT_BITVEC_SIZE);
+    
+    return SUCCESS;
+  }
+  
+  command bool DelugePageTransfer.isTransferring()
+  {
+    return (state != S_IDLE && state != S_DISABLED);
+  }
+  
+  command error_t DelugePageTransfer.dataAvailable(uint16_t sourceAddr)
+  {
+    if (state == S_IDLE) {
+      // currently idle, so request data from source
+      changeState(S_RX_LOCKING);
+      nodeAddr = sourceAddr;
+      remainingAttempts = DELUGE_MAX_NUM_REQ_TRIES;
+      suppressReq = FALSE;
+      
+      // randomize request to prevent collision
+      startReqTimer(TRUE);
+    }
+    
+    return SUCCESS;
+  }
+  
+  event void Timer.fired()
+  {
+    setupReqMsg();
+    setupDataMsg();
+  }
+  
+  event void SendReqMsg.sendDone(message_t* msg, error_t error)
+  {
+    if (state != S_RECEIVING) {
+      return;
+    }
+    
+    remainingAttempts--;
+    // start timeout timer in case request is not serviced
+    startReqTimer(FALSE);
+  }
+  
+  event message_t* ReceiveReqMsg.receive(message_t* msg, void* payload, uint8_t len)
+  {
+    DelugeReqMsg *rxReqMsg = (DelugeReqMsg*)payload;
+    object_id_t objid;
+    page_num_t pgNum;
+    int i;
+    
+    //dbg(DBG_USR1, "DELUGE: Received REQ_MSG(dest=%d,vNum=%d,imgNum=%d,pgNum=%d,pkts=%x)\n",
+    //    rxReqMsg->dest, rxReqMsg->vNum, rxReqMsg->imgNum, rxReqMsg->pgNum, rxReqMsg->requestedPkts[0]);
+    
+    if (state == S_DISABLED) {
+      return msg;
+    }
+    
+    objid = rxReqMsg->objid;
+    pgNum = rxReqMsg->pgNum;
+    
+    // check if need to suppress req or data msgs
+    suppressMsgs(objid, pgNum);
+    
+    // if not for me, ignore request
+    if (rxReqMsg->dest != TOS_NODE_ID
+        || objid != workingObjid
+	|| pgNum >= workingPgNum) {
+      return msg;
+    }
+    
+    if (state == S_IDLE
+	|| ((state == S_SENDING || state == S_TX_LOCKING)
+           && objid == objToSend
+           && pgNum == pageToSend)) {
+      // take union of packet bit vectors
+      for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+        pktsToSend[i] |= rxReqMsg->requestedPkts[i];
+      }
+    }
+    
+    if (state == S_IDLE) {
+      // not currently sending, so start sending data
+      changeState(S_TX_LOCKING);
+      objToSend = objid;
+      pageToSend = pgNum;
+      nodeAddr = AM_BROADCAST_ADDR;
+      setupDataMsg();
+    }
+    
+    return msg;
+  }
+  
+  event void SendDataMsg.sendDone(message_t* msg, error_t error)
+  {
+    DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf));
+    BITVEC_CLEAR(pktsToSend, pDataMsg->pktNum);
+    call Timer.startOneShot(2);
+    
+// For collecting stats
+if (error == SUCCESS) {
+  //call StatsCollector.endPubPktTransTime();
+}
+  }
+  
+  event message_t* ReceiveDataMsg.receive(message_t* msg, void* payload, uint8_t len)
+  {
+    DelugeDataMsg* rxDataMsg = (DelugeDataMsg*)payload;
+    
+    if (state == S_DISABLED) {
+      return msg;
+    }
+    
+    //dbg(DBG_USR1, "DELUGE: Received DATA_MSG(vNum=%d,imgNum=%d,pgNum=%d,pktNum=%d)\n",
+    //    rxDataMsg->vNum, rxDataMsg->imgNum, rxDataMsg->pgNum, rxDataMsg->pktNum);
+    
+    // check if need to suppress req or data messages
+    suppressMsgs(rxDataMsg->objid, rxDataMsg->pgNum);
+    
+    if (rxDataMsg->objid == workingObjid
+	&& rxDataMsg->pgNum == workingPgNum
+	&& BITVEC_GET(pktsToReceive, rxDataMsg->pktNum)
+	&& size < DELUGE_QSIZE) {
+      // got a packet we need
+      
+// For collecting stats
+if (rxDataMsg->pktNum == 0) {
+  //call StatsCollector.startRecvPageTransTime(0);
+  dbg("Deluge", "%.3f 115 116 116 117 115 1 %d\n", ((float)((sim_time() * 1000) / sim_ticks_per_sec())) / 1000, CC2420_DEF_CHANNEL);
+}
+call Leds.led1Toggle();
+//call Leds.set(rxDataMsg->pktNum);
+      
+      //dbg(DBG_USR1, "DELUGE: SAVING(pgNum=%d,pktNum=%d)\n", 
+      //    rxDataMsg->pgNum, rxDataMsg->pktNum);
+      
+      // copy data
+      memcpy(&rxQueue[head^size], rxDataMsg, sizeof(DelugeDataMsg));
+      if (++size == 1) {
+        publisher_addr = call AMPacket.source(msg);   // For collecting stats
+	writeData();
+      }
+    }
+    
+    return msg;
+  }
+  
+  event void BlockRead.readDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error)
+  {
+    DelugeDataMsg *pDataMsg = (DelugeDataMsg *)(call SendDataMsg.getPayload(&pMsgBuf));
+    // make sure this event for us
+    if (buf != pDataMsg->data) {
+      return;
+    }
+    
+    if (state != S_SENDING) {
+      return;
+    }
+    
+    if (error != SUCCESS) {
+      changeState(S_IDLE);
+      return;
+    }
+    
+    if (call SendDataMsg.send(nodeAddr, &pMsgBuf, sizeof(DelugeDataMsg)) != SUCCESS) {
+      call Timer.startOneShot(DELUGE_FAILED_SEND_DELAY);
+    } else {
+// For collecting stats
+//call StatsCollector.startPubPktTransTime();
+//call Leds.led1Toggle();
+    }
+  }
+  
+  event void BlockRead.computeCrcDone[uint8_t img_num](storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error) { }
+  
+  event void BlockWrite.writeDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error)
+  {
+    uint16_t tmp;
+    
+    // make sure this event for us
+    if (buf != rxQueue[head].data) {
+      return;
+    }
+    
+    // failed to write
+    if (error != SUCCESS) {
+      uint32_t i;
+      for (i = 0; i < DELUGE_PKT_BITVEC_SIZE; i++) {
+        pktsToReceive[i] = 0xFF;
+      }
+      size = 0;
+      return;
+    }
+    
+    // mark packet as received
+    BITVEC_CLEAR(pktsToReceive, rxQueue[head].pktNum);
+    head = (head + 1) % DELUGE_QSIZE;
+    size--;
+    
+    if (call BitVecUtils.indexOf(&tmp, 0, pktsToReceive, DELUGE_PKTS_PER_PAGE) != SUCCESS) {
+// For collecting stats
+//call StatsCollector.endRecvPageTransTime(publisher_addr);
+dbg("Deluge", "%.3f 115 116 116 117 115 2 %d\n", ((float)((sim_time() * 1000) / sim_ticks_per_sec())) / 1000, publisher_addr);
+
+      signal DelugePageTransfer.receivedPage(workingObjid, workingPgNum);
+      changeState(S_IDLE);
+      size = 0;
+    } else if (size) {
+      writeData();
+    }
+  }
+  
+  event void BlockWrite.eraseDone[uint8_t img_num](error_t error) {}
+  event void BlockWrite.syncDone[uint8_t img_num](error_t error) {}
+  
+  command void DelugePageTransfer.setImgNum(uint8_t new_img_num)
+  {
+    imgNum = new_img_num;
+  }
+  
+  default command error_t BlockRead.read[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len) { return FAIL; }
+  default command error_t BlockWrite.write[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len) { return FAIL; }
+}
diff --git a/tos/lib/net/Deluge/DelugeStorageC.nc b/tos/lib/net/Deluge/DelugeStorageC.nc
new file mode 100644
index 00000000..31f76351
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeStorageC.nc
@@ -0,0 +1,65 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "StorageVolumes.h"
+
+configuration DelugeStorageC
+{
+  provides {
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+    interface StorageMap[uint8_t img_num];
+    interface DelugeMetadata;
+    
+    interface Notify<uint8_t>;
+  }
+}
+
+implementation
+{
+  components new BlockStorageC(VOLUME_DELUGE0) as BlockStorageC_0;
+  components new BlockStorageC(VOLUME_DELUGE1) as BlockStorageC_1;
+  components DelugeStorageP;
+
+  BlockRead[0] = DelugeStorageP.BlockRead[0];
+  BlockWrite[0] = DelugeStorageP.BlockWrite[0];
+  StorageMap[0] = BlockStorageC_0;
+  BlockRead[1] = DelugeStorageP.BlockRead[1];
+  BlockWrite[1] = DelugeStorageP.BlockWrite[1];
+  StorageMap[1] = BlockStorageC_1;
+  DelugeMetadata = DelugeStorageP.DelugeMetadata;
+
+  DelugeStorageP.SubBlockRead[0] -> BlockStorageC_0;
+  DelugeStorageP.SubBlockWrite[0] -> BlockStorageC_0;
+  DelugeStorageP.SubBlockRead[1] -> BlockStorageC_1;
+  DelugeStorageP.SubBlockWrite[1] -> BlockStorageC_1;
+  
+  components LedsC, MainC;
+  DelugeStorageP.Leds -> LedsC;
+  DelugeStorageP.Boot -> MainC;
+  
+  Notify = DelugeStorageP.Notify;
+}
diff --git a/tos/lib/net/Deluge/DelugeStorageP.nc b/tos/lib/net/Deluge/DelugeStorageP.nc
new file mode 100644
index 00000000..2bdb5f0b
--- /dev/null
+++ b/tos/lib/net/Deluge/DelugeStorageP.nc
@@ -0,0 +1,188 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "Deluge.h"
+
+module DelugeStorageP
+{
+  uses {
+    interface BlockRead as SubBlockRead[uint8_t img_num];
+    interface BlockWrite as SubBlockWrite[uint8_t img_num];
+    interface Boot;
+    interface Leds;
+  }
+  provides {
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+    interface DelugeMetadata;
+    
+    interface Notify<uint8_t>;
+  }
+}
+
+implementation
+{
+  enum {
+    S_INIT,
+    S_READY,
+  };
+
+  uint8_t state = S_INIT;
+  uint8_t last_init_img_num = 0;
+  DelugeImgDesc imgDesc[DELUGE_NUM_VOLUMES];
+
+  event void Boot.booted()
+  {
+    uint32_t i;
+    for (i = 0; i < DELUGE_NUM_VOLUMES; i++) {
+      imgDesc[i].uid = DELUGE_INVALID_UID;
+      imgDesc[i].vNum = 0;
+      imgDesc[i].imgNum = 0;
+      imgDesc[i].numPgs = 0;
+      imgDesc[i].crc = 0;
+      imgDesc[i].numPgsComplete = 0;
+      imgDesc[i].reserved = 0;
+      imgDesc[i].size = 0;
+    }
+    
+    // Reads image descriptions
+    state = S_INIT;
+    if (DELUGE_NUM_VOLUMES > 0) {
+      call SubBlockRead.read[last_init_img_num](0, &(imgDesc[last_init_img_num]), sizeof(DelugeImgDesc));
+    }
+  }
+
+  command DelugeImgDesc* DelugeMetadata.getImgDesc(imgnum_t imgNum)
+  {
+    return &(imgDesc[imgNum]);
+  }
+
+  // SubBlockRead commands
+  command error_t BlockRead.read[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len)
+  {
+    return call SubBlockRead.read[img_num](addr, buf, len);
+  }
+
+  command error_t BlockRead.computeCrc[uint8_t img_num](storage_addr_t addr, storage_len_t len, uint16_t crc)
+  {
+    return call SubBlockRead.computeCrc[img_num](addr, len, crc);
+  }
+
+  command storage_len_t BlockRead.getSize[uint8_t img_num]()
+  {
+    return call SubBlockRead.getSize[img_num]();
+  }
+
+  // BlockRead events
+  event void SubBlockRead.readDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error)
+  {
+    if (state == S_READY) {
+      signal BlockRead.readDone[img_num](addr, buf, len, error);
+    } else {
+      // Continues reading image descriptions
+      if (error == SUCCESS) {
+        last_init_img_num++;
+        if (last_init_img_num >= DELUGE_NUM_VOLUMES) {
+          signal Notify.notify(SUCCESS);
+          state = S_READY;
+        } else {
+          call SubBlockRead.read[last_init_img_num](0, &(imgDesc[last_init_img_num]), sizeof(DelugeImgDesc));
+        }
+      }
+    }
+  }
+
+  event void SubBlockRead.computeCrcDone[uint8_t img_num](storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error)
+  {
+    signal BlockRead.computeCrcDone[img_num](addr, len, crc, error);
+  }
+
+  // SubBlockWrite commands
+  command error_t BlockWrite.write[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len)
+  {
+    return call SubBlockWrite.write[img_num](addr, buf, len);
+  }
+
+  command error_t BlockWrite.erase[uint8_t img_num]()
+  {
+    return call SubBlockWrite.erase[img_num]();
+  }
+
+  command error_t BlockWrite.sync[uint8_t img_num]()
+  {
+    return call SubBlockWrite.sync[img_num]();
+  }
+
+  // BlockWrite events
+  event void SubBlockWrite.writeDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error)
+  {
+    if (error == SUCCESS) {
+      if (addr < sizeof(DelugeImgDesc)) {
+        memcpy((char*)&(imgDesc[img_num]) + addr, buf, sizeof(DelugeImgDesc) - addr);
+      }
+    }
+    
+    signal BlockWrite.writeDone[img_num](addr, buf, len, error);
+  }
+
+  event void SubBlockWrite.eraseDone[uint8_t img_num](error_t error)
+  {
+    if (error == SUCCESS) {
+      // Successful erase triggers resetting the cached image description
+      imgDesc[img_num].uid = DELUGE_INVALID_UID;
+      imgDesc[img_num].vNum = 0;
+      imgDesc[img_num].imgNum = 0;
+      imgDesc[img_num].numPgs = 0;
+      imgDesc[img_num].crc = 0;
+      imgDesc[img_num].numPgsComplete = 0;
+      imgDesc[img_num].reserved = 0;
+      imgDesc[img_num].size = 0;
+    }
+    
+    signal BlockWrite.eraseDone[img_num](error);
+  }
+
+  event void SubBlockWrite.syncDone[uint8_t img_num](error_t error)
+  {
+    signal BlockWrite.syncDone[img_num](error);
+  }
+
+  default event void BlockRead.readDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
+  default event void BlockRead.computeCrcDone[uint8_t img_num](storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error) {}
+  default event void BlockWrite.writeDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
+  default event void BlockWrite.eraseDone[uint8_t img_num](error_t error) {}
+  default event void BlockWrite.syncDone[uint8_t img_num](error_t error) {}
+  
+  default command error_t SubBlockWrite.write[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len) { return FAIL; }
+  default command error_t SubBlockWrite.erase[uint8_t img_num]() { return FAIL; }
+  default command error_t SubBlockWrite.sync[uint8_t img_num]() { return FAIL; }
+  default command error_t SubBlockRead.read[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len) { return FAIL; }
+  default command error_t SubBlockRead.computeCrc[uint8_t img_num](storage_addr_t addr, storage_len_t len, uint16_t crc) { return FAIL; }
+  default command storage_len_t SubBlockRead.getSize[uint8_t img_num]() { return 0; }
+  
+  command error_t Notify.enable() { return SUCCESS; }
+  command error_t Notify.disable() { return SUCCESS; }
+}
diff --git a/tos/lib/net/Deluge/FakeBlockReaderC.nc b/tos/lib/net/Deluge/FakeBlockReaderC.nc
new file mode 100644
index 00000000..117b1182
--- /dev/null
+++ b/tos/lib/net/Deluge/FakeBlockReaderC.nc
@@ -0,0 +1,95 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+generic module FakeBlockReaderC(uint32_t size)
+{
+  provides interface BlockRead;
+}
+
+implementation
+{
+  enum {
+    S_IDLE,
+    S_BUSY
+  };
+
+  storage_addr_t saddr;
+  uint8_t *oribuf;
+  uint8_t *sbuf;
+  storage_len_t slen;
+  uint8_t state = S_IDLE;
+
+  task void task_read()
+  {
+    while (slen > 0) {
+      *sbuf = saddr & 0xFF;
+      saddr++;
+      sbuf++;
+      slen--;
+    }
+
+    signal BlockRead.readDone(saddr, oribuf, slen, SUCCESS);
+    state = S_IDLE;
+  }
+
+  command error_t BlockRead.read(storage_addr_t addr,
+				 void* buf,
+				 storage_len_t len)
+  {
+    if (state != S_IDLE) {
+      return FAIL;
+    }
+
+
+    state = S_BUSY;
+    saddr = addr;
+    sbuf = buf;
+    oribuf = buf;
+    slen = len;
+    post task_read();
+    return SUCCESS;
+  };
+
+  task void task_computeCRC()
+  {
+    signal BlockRead.computeCrcDone(saddr, slen, 0, SUCCESS);
+  }
+
+  command error_t BlockRead.computeCrc(storage_addr_t addr,
+				       storage_len_t len,
+				       uint16_t crc)
+  {
+    saddr = addr;
+    slen = len;
+    post task_computeCRC();
+    return SUCCESS;
+  }
+
+  command storage_len_t BlockRead.getSize()
+  {
+    return size;
+  }
+}
diff --git a/tos/lib/net/Deluge/FakeBlockWriterC.nc b/tos/lib/net/Deluge/FakeBlockWriterC.nc
new file mode 100644
index 00000000..dfdb1f60
--- /dev/null
+++ b/tos/lib/net/Deluge/FakeBlockWriterC.nc
@@ -0,0 +1,39 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+generic configuration FakeBlockWriterC(uint32_t size)
+{
+  provides interface BlockWrite;
+}
+
+implementation
+{
+  components LedsC, NoLedsC,
+             new FakeBlockWriterP(size);
+  
+  BlockWrite = FakeBlockWriterP;
+  FakeBlockWriterP.Leds -> NoLedsC;
+}
diff --git a/tos/lib/net/Deluge/FakeBlockWriterP.nc b/tos/lib/net/Deluge/FakeBlockWriterP.nc
new file mode 100644
index 00000000..0e1d9463
--- /dev/null
+++ b/tos/lib/net/Deluge/FakeBlockWriterP.nc
@@ -0,0 +1,102 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+generic module FakeBlockWriterP(uint32_t size)
+{
+  provides interface BlockWrite;
+  uses interface Leds;
+}
+
+implementation
+{
+  enum {
+    S_IDLE,
+    S_BUSY
+  };
+  
+  storage_addr_t saddr;
+  uint8_t *oribuf;
+  uint8_t *sbuf;
+  storage_len_t slen;
+  uint8_t state;
+  
+  task void task_write()
+  {
+    error_t error = SUCCESS;
+    
+    while (slen > 0) {
+      if (*sbuf != (saddr & 0xFF)) {
+        error = FAIL;
+call Leds.led2Toggle();
+      }
+      saddr++;
+      sbuf++;
+      slen--;
+    }
+    
+    signal BlockWrite.writeDone(saddr, oribuf, slen, error);
+    state = S_IDLE;
+  }
+  
+  command error_t BlockWrite.write(storage_addr_t addr,
+				   void* buf,
+				   storage_len_t len)
+  {
+    if (state != S_IDLE) {
+      return FAIL;
+    }
+    
+    state = S_BUSY;
+    saddr = addr;
+    sbuf = buf;
+    oribuf = buf;
+    slen = len;
+    post task_write();
+    return SUCCESS;
+  }
+  
+  task void task_erase()
+  {
+    signal BlockWrite.eraseDone(SUCCESS);
+  }
+  
+  command error_t BlockWrite.erase()
+  {
+    post task_erase();
+    return SUCCESS;
+  }
+  
+  task void task_sync()
+  {
+    signal BlockWrite.syncDone(SUCCESS);
+  }
+  
+  command error_t BlockWrite.sync()
+  {
+    post task_sync();
+    return SUCCESS;
+  }
+}
diff --git a/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManager.h b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManager.h
new file mode 100644
index 00000000..5c0a597c
--- /dev/null
+++ b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManager.h
@@ -0,0 +1,54 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#ifndef FLASHVOLUMEMANAGER_H
+#define FLASHVOLUMEMANAGER_H
+
+#define SERIALMSG_ERASE  0
+#define SERIALMSG_WRITE  1
+#define SERIALMSG_READ   2
+#define SERIALMSG_CRC    3
+#define SERIALMSG_ADDR   4
+#define SERIALMSG_REPROG 5
+#define SERIALMSG_DISS   6
+
+typedef nx_struct SerialReqPacket {
+  nx_uint8_t msg_type;
+  nx_uint8_t img_num;
+  nx_uint16_t offset;
+  nx_uint16_t len;
+  nx_uint8_t data[0];
+} SerialReqPacket;
+
+#define SERIALMSG_SUCCESS 0
+#define SERIALMSG_FAIL    1
+
+typedef nx_struct SerialReplyPacket {
+  nx_uint8_t error;
+  nx_uint8_t data[0];
+} SerialReplyPacket;
+
+#endif
diff --git a/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerC.nc b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerC.nc
new file mode 100644
index 00000000..b8a25f12
--- /dev/null
+++ b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerC.nc
@@ -0,0 +1,65 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "AM.h"
+
+generic configuration FlashVolumeManagerC(am_id_t AMId)
+{
+#ifdef DELUGE  
+  provides interface Notify<uint8_t>;
+#endif
+  uses {
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+    interface StorageMap[uint8_t img_num];
+  }
+}
+
+implementation
+{
+  components new SerialAMSenderC(AMId),
+             new SerialAMReceiverC(AMId),
+             new FlashVolumeManagerP(),
+             NoLedsC, LedsC;
+  
+  FlashVolumeManagerP.BlockRead[0] = BlockRead[0];
+  FlashVolumeManagerP.BlockWrite[0] = BlockWrite[0];
+  FlashVolumeManagerP.StorageMap[0] = StorageMap[0];
+  FlashVolumeManagerP.BlockRead[1] = BlockRead[1];
+  FlashVolumeManagerP.BlockWrite[1] = BlockWrite[1];
+  FlashVolumeManagerP.StorageMap[1] = StorageMap[1];
+  FlashVolumeManagerP.SerialAMSender -> SerialAMSenderC;
+  FlashVolumeManagerP.SerialAMReceiver -> SerialAMReceiverC;
+  FlashVolumeManagerP.Leds -> NoLedsC;
+
+#ifdef DELUGE  
+  components NetProgC, new TimerMilliC();
+  FlashVolumeManagerP.NetProg -> NetProgC;
+  FlashVolumeManagerP.Timer -> TimerMilliC;
+  
+  Notify = FlashVolumeManagerP.Notify;
+#endif
+}
diff --git a/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc
new file mode 100644
index 00000000..f31c7160
--- /dev/null
+++ b/tos/lib/net/Deluge/FlashVolumeManager/FlashVolumeManagerP.nc
@@ -0,0 +1,209 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "FlashVolumeManager.h"
+
+generic module FlashVolumeManagerP()
+{
+#ifdef DELUGE
+  provides interface Notify<uint8_t>;
+#endif
+  uses {
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+    interface StorageMap[uint8_t img_num];
+    interface AMSend as SerialAMSender;
+    interface Receive as SerialAMReceiver;
+    interface Leds;
+#ifdef DELUGE
+    interface NetProg;
+    interface Timer<TMilli> as Timer;
+#endif
+  }
+}
+
+implementation
+{
+  // States for keeping track of split-phase events
+  enum {
+    S_IDLE,
+    S_ERASE,
+    S_WRITE,
+    S_READ,
+    S_CRC,
+    S_REPROG,
+  };
+  
+  message_t serialMsg;
+  uint8_t buffer[TOSH_DATA_LENGTH];   // Temporary buffer for "write" operation
+  uint8_t img_num_reboot = 0xFF;       // Image number to reprogram
+  uint8_t state = S_IDLE;              // Manager state for multiplexing "done" events
+  
+  /**
+   * Replies to the PC request with operation results
+   */
+  void sendReply(error_t error, storage_len_t len)
+  {
+    SerialReplyPacket *srpkt = (SerialReplyPacket *)call SerialAMSender.getPayload(&serialMsg);
+    if (error == SUCCESS) {
+      srpkt->error = SERIALMSG_SUCCESS;
+    } else {
+      srpkt->error = SERIALMSG_FAIL;
+    }
+    call SerialAMSender.send(AM_BROADCAST_ADDR, &serialMsg, len);
+  }
+  
+  event void BlockRead.readDone[uint8_t img_num](storage_addr_t addr, 
+				void* buf, 
+				storage_len_t len, 
+				error_t error)
+  {
+    if (state == S_READ) {
+      SerialReplyPacket *serialMsg_payload = (SerialReplyPacket *)call SerialAMSender.getPayload(&serialMsg);
+      if (buf == serialMsg_payload->data) {
+        state = S_IDLE;
+        sendReply(error, len + sizeof(SerialReplyPacket));
+      }
+    }
+  }
+  
+  event void BlockRead.computeCrcDone[uint8_t img_num](storage_addr_t addr, 
+				      storage_len_t len, 
+				      uint16_t crc, 
+				      error_t error)
+  {
+    if (state == S_CRC) {
+      state = S_IDLE;
+      
+      if (error == SUCCESS) {
+        SerialReplyPacket *srpkt = (SerialReplyPacket *)call SerialAMSender.getPayload(&serialMsg);
+        srpkt->data[1] = crc & 0xFF;
+        srpkt->data[0] = (crc >> 8) & 0xFF;
+      }
+      sendReply(error, 2 + sizeof(SerialReplyPacket));
+    }
+  }
+  
+  event void BlockWrite.writeDone[uint8_t img_num](storage_addr_t addr, 
+				  void* buf, 
+				  storage_len_t len, 
+				  error_t error)
+  {
+    if (state == S_WRITE && buf == buffer) {
+      state = S_IDLE;
+      sendReply(error, sizeof(SerialReplyPacket));
+    }
+  }
+  
+  event void BlockWrite.eraseDone[uint8_t img_num](error_t error)
+  {
+    if (state == S_ERASE) {
+      state = S_IDLE;
+      sendReply(error, sizeof(SerialReplyPacket));
+    }
+  }
+  
+  event void BlockWrite.syncDone[uint8_t img_num](error_t error) {}
+  
+  event void SerialAMSender.sendDone(message_t* msg, error_t error) {}
+  
+  event message_t* SerialAMReceiver.receive(message_t* msg, void* payload, uint8_t len)
+  {
+    error_t error = SUCCESS;
+    SerialReqPacket *srpkt = (SerialReqPacket *)payload;
+    SerialReplyPacket *serialMsg_payload =
+                              (SerialReplyPacket *)call SerialAMSender.getPayload(&serialMsg);
+    
+    switch (srpkt->msg_type) {
+      case SERIALMSG_ERASE:    // === Erases a volume ===
+        state = S_ERASE;
+        error = call BlockWrite.erase[srpkt->img_num]();
+        break;
+      case SERIALMSG_WRITE:    // === Writes to a volume ===
+        state = S_WRITE;
+        memcpy(buffer, srpkt->data, srpkt->len);
+        error = call BlockWrite.write[srpkt->img_num](srpkt->offset,
+                                                      buffer,
+                                                      srpkt->len);
+        break;
+      case SERIALMSG_READ:     // === Reads a portion of a volume ===
+        state = S_READ;
+        error = call BlockRead.read[srpkt->img_num](srpkt->offset,
+                                                    serialMsg_payload->data,
+                                                    srpkt->len);
+        break;
+      case SERIALMSG_CRC:      // === Computes CRC over a portion of a volume ===
+        state = S_CRC;
+        error = call BlockRead.computeCrc[srpkt->img_num](srpkt->offset,
+                                                          srpkt->len, 0);
+        break;
+      case SERIALMSG_ADDR:     // === Gets the physical starting address of a volume ===
+	*(nx_uint32_t*)(&serialMsg_payload->data) =
+	                      (uint32_t)call StorageMap.getPhysicalAddress[srpkt->img_num](0);
+	sendReply(SUCCESS, sizeof(SerialReplyPacket) + 4);
+        break;
+#ifdef DELUGE
+      case SERIALMSG_REPROG:   // === Reboots and reprograms ===
+        state = S_REPROG;
+        sendReply(SUCCESS, sizeof(SerialReplyPacket));
+        img_num_reboot = srpkt->img_num;
+	call Timer.startOneShot(1024);
+	break;
+      case SERIALMSG_DISS:     // === Starts disseminating a volume ===
+	signal Notify.notify(srpkt->img_num);   // Notifies Deluge to start disseminate
+	sendReply(SUCCESS, sizeof(SerialReplyPacket));
+	break;
+#endif
+    }
+    
+    // If a split-phase operation fails when being requested, signals the failure now
+    if (error != SUCCESS) {
+      state = S_IDLE;
+      sendReply(error, sizeof(SerialReplyPacket));
+    }
+    
+    return msg;
+  }
+
+#ifdef DELUGE
+  event void Timer.fired()
+  {
+    // Reboots and reprograms
+    call NetProg.programImgAndReboot(img_num_reboot);
+  }
+  
+  command error_t Notify.enable() { return SUCCESS; }
+  command error_t Notify.disable() { return SUCCESS; }
+#endif
+
+  default command error_t BlockWrite.write[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len) { return FAIL; }
+  default command error_t BlockWrite.erase[uint8_t img_num]() { return FAIL; }
+  default command error_t BlockWrite.sync[uint8_t img_num]() { return FAIL; }
+  default command error_t BlockRead.read[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len) { return FAIL; }
+  default command error_t BlockRead.computeCrc[uint8_t img_num](storage_addr_t addr, storage_len_t len, uint16_t crc) { return FAIL; }
+
+  default command storage_addr_t StorageMap.getPhysicalAddress[uint8_t img_num](storage_addr_t addr) { return 0; }
+}
diff --git a/tos/lib/net/Deluge/Globals.nc b/tos/lib/net/Deluge/Globals.nc
new file mode 100644
index 00000000..685dd642
--- /dev/null
+++ b/tos/lib/net/Deluge/Globals.nc
@@ -0,0 +1,57 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+interface Globals
+{
+  command uint32_t getNumPubPktTrans();
+  command void setNumPubPktTrans(uint32_t val);
+  command void incNumPubPktTrans();
+
+  command uint32_t getNumRecvPageTrans();
+  command void setNumRecvPageTrans(uint32_t val);
+  command void incNumRecvPageTrans();
+
+  command uint32_t getAvgPubPktTransTime();
+  command void setAvgPubPktTransTime(uint32_t val);
+
+  command uint32_t getAvgRecvPageTransTime();
+  command void setAvgRecvPageTransTime(uint32_t val);
+
+  command uint32_t getNumPubPktRetrans();
+  command void setNumPubPktRetrans(uint32_t val);
+  command void incNumPubPktRetrans();
+
+  command uint32_t getNumPubHSRetrans();
+  command void setNumPubHSRetrans(uint32_t val);
+  command void incNumPubHSRetrans();
+
+  command uint32_t getNumRecvHSRetrans();
+  command void setNumRecvHSRetrans(uint32_t val);
+  command void incNumRecvHSRetrans();
+
+  command void* _getStartAddr();
+  command uint32_t _getSize();
+}
diff --git a/tos/lib/net/Deluge/GlobalsC.nc b/tos/lib/net/Deluge/GlobalsC.nc
new file mode 100644
index 00000000..5dde9480
--- /dev/null
+++ b/tos/lib/net/Deluge/GlobalsC.nc
@@ -0,0 +1,72 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+module GlobalsC
+{
+  provides interface Globals;
+}
+
+implementation
+{
+  struct {
+    uint32_t NumPubPktTrans;
+    uint32_t NumRecvPageTrans;
+    uint32_t AvgPubPktTransTime;
+    uint32_t AvgRecvPageTransTime;
+    uint32_t NumPubPktRetrans;
+    uint32_t NumPubHSRetrans;
+    uint32_t NumRecvHSRetrans;
+  } _g = {0, 0, 0, 0, 0, 0, 0};
+
+  command uint32_t Globals.getNumPubPktTrans() { return _g.NumPubPktTrans; }
+  command void Globals.setNumPubPktTrans(uint32_t val) { _g.NumPubPktTrans = val; }
+  command void Globals.incNumPubPktTrans() { _g.NumPubPktTrans++; }
+
+  command uint32_t Globals.getNumRecvPageTrans() { return _g.NumRecvPageTrans; }
+  command void Globals.setNumRecvPageTrans(uint32_t val) { _g.NumRecvPageTrans = val; }
+  command void Globals.incNumRecvPageTrans() { _g.NumRecvPageTrans++; }
+
+  command uint32_t Globals.getAvgPubPktTransTime() { return _g.AvgPubPktTransTime; }
+  command void Globals.setAvgPubPktTransTime(uint32_t val) { _g.AvgPubPktTransTime = val; }
+
+  command uint32_t Globals.getAvgRecvPageTransTime() { return _g.AvgRecvPageTransTime; }
+  command void Globals.setAvgRecvPageTransTime(uint32_t val) { _g.AvgRecvPageTransTime = val; }
+
+  command uint32_t Globals.getNumPubPktRetrans() { return _g.NumPubPktRetrans; }
+  command void Globals.setNumPubPktRetrans(uint32_t val) { _g.NumPubPktRetrans = val; }
+  command void Globals.incNumPubPktRetrans() { _g.NumPubPktRetrans++; }
+
+  command uint32_t Globals.getNumPubHSRetrans() { return _g.NumPubHSRetrans; }
+  command void Globals.setNumPubHSRetrans(uint32_t val) { _g.NumPubHSRetrans = val; }
+  command void Globals.incNumPubHSRetrans() { _g.NumPubHSRetrans++; }
+
+  command uint32_t Globals.getNumRecvHSRetrans() { return _g.NumRecvHSRetrans; }
+  command void Globals.setNumRecvHSRetrans(uint32_t val) { _g.NumRecvHSRetrans = val; }
+  command void Globals.incNumRecvHSRetrans() { _g.NumRecvHSRetrans++; }
+
+  command void* Globals._getStartAddr() { return &_g; }
+  command uint32_t Globals._getSize() { return sizeof(_g); }
+}
diff --git a/tos/lib/net/Deluge/ObjectTransfer.nc b/tos/lib/net/Deluge/ObjectTransfer.nc
new file mode 100644
index 00000000..e2d6be3a
--- /dev/null
+++ b/tos/lib/net/Deluge/ObjectTransfer.nc
@@ -0,0 +1,36 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "DelugePageTransfer.h"
+
+interface ObjectTransfer
+{
+  command error_t publish(object_id_t new_objid, object_size_t new_size, uint8_t img_num);
+  command error_t receive(object_id_t new_objid, object_size_t new_size, uint8_t img_num);
+  event void receiveDone(error_t error);
+
+  command error_t stop();
+}
diff --git a/tos/lib/net/Deluge/ObjectTransferC.nc b/tos/lib/net/Deluge/ObjectTransferC.nc
new file mode 100644
index 00000000..9db303eb
--- /dev/null
+++ b/tos/lib/net/Deluge/ObjectTransferC.nc
@@ -0,0 +1,80 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "DelugePageTransfer.h"
+
+configuration ObjectTransferC
+{
+  provides interface ObjectTransfer;
+  uses {
+    interface BlockRead[uint8_t img_num];
+    interface BlockWrite[uint8_t img_num];
+  }
+}
+
+implementation
+{
+  components ObjectTransferP, DelugePageTransferC;
+  
+  ObjectTransfer = ObjectTransferP;
+  BlockRead[0] = DelugePageTransferC.BlockRead[0];
+  BlockWrite[0] = DelugePageTransferC.BlockWrite[0];
+  BlockRead[1] = DelugePageTransferC.BlockRead[1];
+  BlockWrite[1] = DelugePageTransferC.BlockWrite[1];
+  ObjectTransferP.DelugePageTransfer -> DelugePageTransferC.DelugePageTransfer;
+  
+  components CrcP;
+  ObjectTransferP.Crc -> CrcP.Crc;
+  
+  components new AMSenderC(AM_DELUGEADVMSG) as SendAdvMsg, 
+             new AMReceiverC(AM_DELUGEADVMSG) as ReceiveAdvMsg,
+             new AMSenderC(AM_DELUGEREQMSG) as SendReqMsg, 
+             new AMReceiverC(AM_DELUGEREQMSG) as ReceiveReqMsg,
+             new AMSenderC(AM_DELUGEDATAMSG) as SendDataMsg, 
+             new AMReceiverC(AM_DELUGEDATAMSG) as ReceiveDataMsg;
+  
+  ObjectTransferP.SendAdvMsg -> SendAdvMsg;
+  ObjectTransferP.ReceiveAdvMsg -> ReceiveAdvMsg;
+  DelugePageTransferC.SendReqMsg -> SendReqMsg;
+  DelugePageTransferC.ReceiveReqMsg -> ReceiveReqMsg;
+  DelugePageTransferC.SendDataMsg -> SendDataMsg;
+  DelugePageTransferC.ReceiveDataMsg -> ReceiveDataMsg;
+  DelugePageTransferC.AMPacket -> SendDataMsg;
+  
+  ObjectTransferP.BlockWrite[0] = BlockWrite[0];
+  ObjectTransferP.BlockWrite[1] = BlockWrite[1];
+  
+  components MainC, LedsC, NoLedsC;
+  ObjectTransferP.Leds -> NoLedsC;
+  
+  components RandomC, new TimerMilliC() as Timer;
+  ObjectTransferP.Random -> RandomC;
+  ObjectTransferP.Timer -> Timer;
+  
+  // For collecting statistics
+//  components StatsCollectorC;
+//  ObjectTransferP.StatsCollector -> StatsCollectorC.StatsCollector;
+}
diff --git a/tos/lib/net/Deluge/ObjectTransferP.nc b/tos/lib/net/Deluge/ObjectTransferP.nc
new file mode 100644
index 00000000..fec6cd29
--- /dev/null
+++ b/tos/lib/net/Deluge/ObjectTransferP.nc
@@ -0,0 +1,337 @@
+/*
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "DelugePageTransfer.h"
+#include "DelugeMsgs.h"
+
+module ObjectTransferP
+{
+  provides interface ObjectTransfer;
+  uses {
+    interface Random;
+    interface Timer<TMilli> as Timer;
+    interface DelugePageTransfer;
+    interface Crc;
+    
+    interface AMSend as SendAdvMsg;
+    interface Receive as ReceiveAdvMsg;
+    
+    interface BlockWrite[uint8_t img_num];
+    
+    interface Leds;
+//  interface StatsCollector;
+  }
+}
+
+implementation
+{
+  // States
+  enum {
+    S_ERASE,
+    S_INITIALIZING_PUB,
+    S_INITIALIZING_RECV,
+    S_STARTED,
+    S_STOPPED,
+  };
+  
+  DelugeAdvTimer advTimers;
+  //DelugeNodeDesc nodeDesc;
+  uint8_t state = S_STOPPED;
+  
+  object_id_t cont_receive_new_objid;
+  object_size_t cont_receive_new_size;
+  uint8_t cont_receive_img_num;
+  
+  message_t pMsgBuf;
+  bool isBusy_pMsgBuf = FALSE;
+  DelugeObjDesc curObjDesc;
+  
+  void updateTimers()
+  {
+    //advTimers.timer = 0;
+  }
+  
+  void setupAdvTimer()
+  {
+    advTimers.timer = (uint32_t)0x1 << (advTimers.periodLog2 - 1);
+    advTimers.timer += call Random.rand16() & (advTimers.timer - 1);
+    advTimers.overheard = 0;
+    
+    call Timer.stop();
+    call Timer.startOneShot(advTimers.timer);
+  }
+  
+  void resetTimer()
+  {
+    if (advTimers.periodLog2 != DELUGE_MIN_ADV_PERIOD_LOG2) {
+      advTimers.periodLog2 = DELUGE_MIN_ADV_PERIOD_LOG2;
+      setupAdvTimer();
+    }
+  }
+  
+  task void signalObjRecvDone()
+  {
+    signal ObjectTransfer.receiveDone(SUCCESS);
+  }
+  
+  void setNextPage()
+  {
+    if (curObjDesc.numPgsComplete < curObjDesc.numPgs) {
+      call DelugePageTransfer.setWorkingPage(curObjDesc.objid, curObjDesc.numPgsComplete);
+      advTimers.newAdvs = DELUGE_NUM_NEWDATA_ADVS_REQUIRED;    
+      advTimers.overheard = 0;
+      resetTimer();
+    } else {
+      call DelugePageTransfer.setWorkingPage(DELUGE_INVALID_OBJID, DELUGE_INVALID_PGNUM);
+      post signalObjRecvDone();
+    }
+  }
+  
+//  bool isNodeDescValid(DelugeNodeDesc* tmpNodeDesc)
+//  {
+//    return (tmpNodeDesc->crc == crc16(tmpNodeDesc, 4 + sizeof(object_id_t) + 1));
+//  }
+  
+  bool isObjDescValid(DelugeObjDesc* tmpObjDesc)
+  {
+    return (tmpObjDesc->crc == call Crc.crc16(tmpObjDesc, sizeof(object_id_t) + sizeof(page_num_t))
+	    && tmpObjDesc->crc != 0);
+  }
+  
+  void sendAdvMsg(uint16_t addr)
+  {
+    DelugeAdvMsg *pMsg = (DelugeAdvMsg *)(call SendAdvMsg.getPayload(&pMsgBuf));
+    
+    if (isBusy_pMsgBuf == FALSE) {
+      pMsg->sourceAddr = TOS_NODE_ID;
+      pMsg->version = DELUGE_VERSION;
+      //pMsg->type = (imagesLoaded) ? DELUGE_ADV_NORMAL : DELUGE_ADV_ERROR;
+      pMsg->type = DELUGE_ADV_NORMAL;
+      
+      // make sure node desc is valid
+//      if (!isNodeDescValid(&nodeDesc)) {
+//        memset(&nodeDesc, 0xff, sizeof(nodeDesc));
+//      }
+//      memcpy(&pMsg->nodeDesc, &nodeDesc, sizeof(DelugeNodeDesc));
+      
+      // make sure obj desc is valid
+//      if (!isObjDescValid(&curObjDesc)) {
+//        //curObjDesc.objid = objid;
+//      }
+      memcpy(&(pMsg->objDesc), &curObjDesc, sizeof(DelugeObjDesc));
+      
+      if (call SendAdvMsg.send(addr, &pMsgBuf, sizeof(DelugeAdvMsg)) == SUCCESS) {
+        //dbg(DBG_USR1, "DELUGE: Sent ADV_MSG(imgNum=%d)\n", imgDesc->imgNum);
+//call StatsCollector.msg_bcastReq();
+call Leds.led0Toggle();
+        isBusy_pMsgBuf = TRUE;
+      }
+    }
+  }
+  
+  /**
+   * Starts publisher
+   */
+  command error_t ObjectTransfer.publish(object_id_t new_objid, object_size_t new_size, uint8_t img_num)
+  {
+    call ObjectTransfer.stop();
+//call StatsCollector.startStatsCollector();
+    
+    state = S_INITIALIZING_PUB;
+    curObjDesc.objid = new_objid;
+    curObjDesc.numPgs = ((new_size - 1) / DELUGE_BYTES_PER_PAGE) + 1;   // Number of pages to transmit
+    curObjDesc.numPgsComplete = curObjDesc.numPgs;   // Publisher doesn't really care about this
+    curObjDesc.crc = call Crc.crc16(&curObjDesc, sizeof(object_id_t) + sizeof(page_num_t));
+    
+    if (state == S_INITIALIZING_PUB) {
+      resetTimer();
+    }
+    state = S_STARTED;
+    
+    call DelugePageTransfer.setImgNum(img_num);
+    call DelugePageTransfer.setWorkingPage(curObjDesc.objid, curObjDesc.numPgs);
+    
+    return SUCCESS;
+  }
+  
+  /**
+   * Resumes the process of preparing the receiver after the target volume is erased
+   */
+  void cont_receive() {
+    state = S_INITIALIZING_RECV;
+    curObjDesc.objid = cont_receive_new_objid;
+    curObjDesc.numPgs = ((cont_receive_new_size - 1) / DELUGE_BYTES_PER_PAGE) + 1;   // Number of pages to receive
+    curObjDesc.numPgsComplete = 0;
+    curObjDesc.crc = call Crc.crc16(&curObjDesc, sizeof(object_id_t) + sizeof(page_num_t));
+    
+    if (state == S_INITIALIZING_RECV) {
+      resetTimer();
+    }
+    state = S_STARTED;
+    
+    call DelugePageTransfer.setImgNum(cont_receive_img_num);
+    setNextPage();
+  }
+  
+  /**
+   * Starts receiver
+   */
+  command error_t ObjectTransfer.receive(object_id_t new_objid, object_size_t new_size, uint8_t img_num)
+  {
+    error_t error;
+    
+    call ObjectTransfer.stop();
+    state = S_STOPPED;
+//call StatsCollector.startStatsCollector();
+    
+    cont_receive_new_objid = new_objid;
+    cont_receive_new_size = new_size;
+    cont_receive_img_num = img_num;
+    
+    error = call BlockWrite.erase[img_num]();
+    if (error == SUCCESS) {
+      state = S_ERASE;
+    }
+    
+    return error;
+  }
+  
+  command error_t ObjectTransfer.stop()
+  {
+    call Timer.stop();
+    call DelugePageTransfer.stop();
+//call StatsCollector.stopStatsCollector();
+    
+    state = S_STOPPED;
+    curObjDesc.objid = DELUGE_INVALID_OBJID;
+    curObjDesc.numPgs = DELUGE_INVALID_PGNUM;
+    curObjDesc.numPgsComplete = DELUGE_INVALID_PGNUM;
+    
+    return SUCCESS;
+  }
+  
+  event void DelugePageTransfer.receivedPage(object_id_t new_objid, page_num_t new_pgNum)
+  {
+    if (new_objid == curObjDesc.objid && new_pgNum == curObjDesc.numPgsComplete) {
+      curObjDesc.numPgsComplete++;
+      curObjDesc.crc = call Crc.crc16(&curObjDesc, sizeof(object_id_t) + sizeof(page_num_t));
+      if (curObjDesc.numPgsComplete < curObjDesc.numPgs) {
+        setNextPage();
+      } else {
+        call DelugePageTransfer.setWorkingPage(curObjDesc.objid, curObjDesc.numPgsComplete);
+        post signalObjRecvDone();
+      }
+    }
+  }
+  
+  event void DelugePageTransfer.suppressMsgs(object_id_t new_objid)
+  {
+    if (new_objid == curObjDesc.objid) {
+      advTimers.overheard = 1;
+    }
+  }
+  
+  event void SendAdvMsg.sendDone(message_t* msg, error_t error)
+  {
+    isBusy_pMsgBuf = FALSE;
+  }
+  
+  event message_t* ReceiveAdvMsg.receive(message_t* msg, void* payload, uint8_t len)
+  {
+    DelugeAdvMsg *rxAdvMsg = (DelugeAdvMsg*)payload;
+    DelugeObjDesc *cmpObjDesc = &(rxAdvMsg->objDesc);
+    bool isEqual = FALSE;
+ 
+    if (cmpObjDesc->objid != curObjDesc.objid) {
+      return msg;
+    }
+    
+    if (rxAdvMsg->version != DELUGE_VERSION 
+        //|| !isNodeDescValid(&rxAdvMsg->nodeDesc)
+        || state != S_STARTED) {
+      return msg;
+    }
+    
+    if (isObjDescValid(&(rxAdvMsg->objDesc)) && state == S_STARTED) {
+      // Their image is larger (They have something we need)
+      if (cmpObjDesc->numPgsComplete > curObjDesc.numPgsComplete) {
+        if ( advTimers.newAdvs == 0 ) {
+          call DelugePageTransfer.dataAvailable(rxAdvMsg->sourceAddr);
+        }
+      }
+      // Their image is smaller (They need something we have)
+      else if (cmpObjDesc->numPgsComplete < curObjDesc.numPgsComplete) {
+        advTimers.newAdvs = DELUGE_NUM_NEWDATA_ADVS_REQUIRED;
+      }      
+      // image is the same
+      else {
+        advTimers.overheard = 1;
+        isEqual = TRUE;
+      }
+      
+      if (!isEqual) {
+        resetTimer();
+      }
+    }
+    
+    return msg;
+  }
+    
+  event void Timer.fired()
+  {
+    updateTimers();
+    
+    if (advTimers.overheard == 0) {
+      sendAdvMsg(AM_BROADCAST_ADDR);
+    }
+    
+    if (call DelugePageTransfer.isTransferring())
+      advTimers.newAdvs = DELUGE_NUM_NEWDATA_ADVS_REQUIRED;
+    else if (advTimers.newAdvs > 0)
+      advTimers.newAdvs--;
+    
+    if (advTimers.newAdvs == 0 &&
+        advTimers.periodLog2 < DELUGE_MAX_ADV_PERIOD_LOG2) {
+      advTimers.periodLog2++;
+    }
+    
+    setupAdvTimer();
+  }
+  
+  default command error_t BlockWrite.erase[uint8_t img_num]() { return FAIL; }
+  event void BlockWrite.writeDone[uint8_t img_num](storage_addr_t addr, void* buf, storage_len_t len, error_t error) {}
+  event void BlockWrite.eraseDone[uint8_t img_num](error_t error)
+  {
+    if (state == S_ERASE) {
+      cont_receive();
+    }
+  }
+  event void BlockWrite.syncDone[uint8_t img_num](error_t error) {}
+}
diff --git a/tos/lib/net/Deluge/SerialStarterC.nc b/tos/lib/net/Deluge/SerialStarterC.nc
new file mode 100644
index 00000000..0d9855c4
--- /dev/null
+++ b/tos/lib/net/Deluge/SerialStarterC.nc
@@ -0,0 +1,34 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+configuration SerialStarterC { }
+
+implementation
+{
+  components SerialActiveMessageC, AutoStarterC;
+  
+  AutoStarterC.SplitControl -> SerialActiveMessageC;
+}
diff --git a/tos/lib/net/Deluge/StatsCollector.nc b/tos/lib/net/Deluge/StatsCollector.nc
new file mode 100644
index 00000000..45266860
--- /dev/null
+++ b/tos/lib/net/Deluge/StatsCollector.nc
@@ -0,0 +1,43 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+interface StatsCollector
+{
+  command void stopStatsCollector();
+  command void startStatsCollector();
+  command void startPubPktTransTime();
+  command void endPubPktTransTime();
+  command void startRecvPageTransTime(uint8_t channel);
+  command void endRecvPageTransTime(uint8_t senderAddr);
+  command void incPub_numPktRetrans();
+  command void incNumRecvHSRetrans();
+  
+  command void startCCTime();
+  command void endCCTime();
+  
+  command void sendVariableReport(uint32_t value);
+  command void msg_bcastReq();
+}
diff --git a/tos/lib/net/Deluge/StatsCollectorC.nc b/tos/lib/net/Deluge/StatsCollectorC.nc
new file mode 100644
index 00000000..757610c9
--- /dev/null
+++ b/tos/lib/net/Deluge/StatsCollectorC.nc
@@ -0,0 +1,60 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+configuration StatsCollectorC
+{
+  provides {
+    interface StatsCollector;
+  }
+}
+
+implementation
+{
+  components GlobalsC, StatsCollectorP,
+    new CounterToLocalTimeC(TMilli),
+#ifdef TOSSIM
+    HilTimerMilliC,
+#else
+    new TransformCounterC(TMilli, uint32_t, T32khz, uint16_t, 5, uint32_t) as Transform,
+    Msp430Counter32khzC,
+#endif
+    new TimerMilliC() as Timer;
+
+#ifdef TOSSIM
+    StatsCollectorP.LocalTime -> HilTimerMilliC;
+#else
+  CounterToLocalTimeC.Counter -> Transform;
+  Transform.CounterFrom -> Msp430Counter32khzC;
+  StatsCollectorP.LocalTime -> CounterToLocalTimeC;
+#endif
+  
+  StatsCollectorP.Globals -> GlobalsC.Globals;
+  StatsCollector = StatsCollectorP.StatsCollector;
+  StatsCollectorP.Timer -> Timer;
+  
+  components SerialStarterC, new SerialAMSenderC(0);
+  StatsCollectorP.AMSend -> SerialAMSenderC;
+}
diff --git a/tos/lib/net/Deluge/StatsCollectorP.nc b/tos/lib/net/Deluge/StatsCollectorP.nc
new file mode 100644
index 00000000..551f76bd
--- /dev/null
+++ b/tos/lib/net/Deluge/StatsCollectorP.nc
@@ -0,0 +1,203 @@
+/* Copyright (c) 2007 Johns Hopkins University.
+*  All rights reserved.
+*
+*  Permission to use, copy, modify, and distribute this software and its
+*  documentation for any purpose, without fee, and without written
+*  agreement is hereby granted, provided that the above copyright
+*  notice, the (updated) modification history and the author appear in
+*  all copies of this source code.
+*
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS OR CONTRIBUTORS
+*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
+*  OR PROFITS) 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.
+*/
+
+/**
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+module StatsCollectorP
+{
+  provides {
+    interface StatsCollector;
+  }
+  uses {
+    interface LocalTime<TMilli> as LocalTime;
+    interface Globals;
+    interface Timer<TMilli> as Timer;
+    interface AMSend;
+  }
+}
+
+implementation
+{
+  enum {
+    TIMER = 0,
+    FORCED_START = 1,
+    FORCED_END = 2
+  };
+  
+  enum {
+    BROADCAST_REQ = 0,
+    START_RECV_DATA = 1,
+    END_RECV_DATA = 2
+  };
+  
+  typedef nx_struct StatsReport {
+    nx_uint8_t text[5];
+    nx_uint32_t NumPubPktTrans;
+    nx_uint32_t NumRecvPageTrans;
+    nx_uint32_t AvgPubPktTransTime;
+    nx_uint32_t AvgRecvPageTransTime;
+    nx_uint32_t NumPubPktRetrans;
+    nx_uint32_t NumRecvHSRetrans;
+  } StatsReport;
+  
+  typedef nx_struct StatusReport {
+    nx_uint8_t text[5];
+    nx_uint8_t flag;
+    nx_uint8_t channel;
+  } StatusReport;
+  
+  typedef nx_struct VariableReport {
+    nx_uint8_t text[5];
+    nx_uint32_t value;
+  } VariableReport;
+  
+  uint32_t startPubTime = 0;
+  uint32_t startRecvTime = 0;
+  uint32_t startCCTime = 0;   // Change channel
+  message_t stats_msg;
+  message_t status_msg;
+  message_t variable_msg;
+ 
+  void startTimer() {
+    if(call Timer.isRunning() == FALSE || call Timer.isOneShot() == TRUE) {
+      call Timer.startPeriodic(5000);
+    }
+  }
+  
+  void stopTimer() {
+    if(call Timer.isRunning() == TRUE) {
+      call Timer.stop();
+    }
+  }
+  
+  void sendStatsReport() {
+    StatsReport *report = (StatsReport *)call AMSend.getPayload(&stats_msg);
+
+    report->text[0] = 's';
+    report->text[1] = 't';
+    report->text[2] = 'a';
+    report->text[3] = 't';
+    report->text[4] = 's';
+    report->NumPubPktTrans = call Globals.getNumPubPktTrans();
+    report->NumRecvPageTrans = call Globals.getNumRecvPageTrans();
+    report->AvgPubPktTransTime = call Globals.getAvgPubPktTransTime();
+    report->AvgRecvPageTransTime = call Globals.getAvgRecvPageTransTime();
+    report->NumPubPktRetrans = call Globals.getNumPubPktRetrans();
+    report->NumRecvHSRetrans = call Globals.getNumRecvHSRetrans();
+    
+    call AMSend.send(AM_BROADCAST_ADDR, &stats_msg, sizeof(StatsReport));
+  }
+  
+  void sendStatusMsg(uint8_t flag, uint8_t channel) {
+    StatusReport *report = (StatusReport *)call AMSend.getPayload(&status_msg);
+    
+    report->text[0] = 's';
+    report->text[1] = 't';
+    report->text[2] = 't';
+    report->text[3] = 'u';
+    report->text[4] = 's';
+    report->flag = flag;
+    report->channel = channel;
+    
+    call AMSend.send(AM_BROADCAST_ADDR, &status_msg, sizeof(StatusReport));
+  }
+  
+  command void StatsCollector.sendVariableReport(uint32_t value) {
+    VariableReport *report = (VariableReport *)call AMSend.getPayload(&variable_msg);
+    
+    report->text[0] = 'r';
+    report->text[1] = 'e';
+    report->text[2] = 'p';
+    report->text[3] = 'r';
+    report->text[4] = 't';
+    report->value = value;
+    
+    call AMSend.send(AM_BROADCAST_ADDR, &variable_msg, sizeof(VariableReport));
+  }
+  
+  command void StatsCollector.msg_bcastReq() {
+    sendStatusMsg(BROADCAST_REQ, CC2420_DEF_CHANNEL);
+  }
+  
+  event void Timer.fired() {
+    sendStatsReport();
+  }
+  
+  event void AMSend.sendDone(message_t* pstats_msg, error_t error) { }
+  
+  command void StatsCollector.startStatsCollector()
+  {
+    startTimer();
+  }
+  
+  command void StatsCollector.stopStatsCollector()
+  {
+    stopTimer();
+    call Timer.startOneShot(500);
+    //sendStatsReport();   // Just in case
+  }
+  
+  command void StatsCollector.startPubPktTransTime()
+  {
+    startPubTime = call LocalTime.get();
+  }
+  command void StatsCollector.endPubPktTransTime()
+  {
+    uint32_t diff = (call LocalTime.get()) - startPubTime;
+    uint32_t temp = (call Globals.getAvgPubPktTransTime()) * (call Globals.getNumPubPktTrans());
+    call Globals.incNumPubPktTrans();
+    call Globals.setAvgPubPktTransTime((temp + diff) / (call Globals.getNumPubPktTrans()));
+  }
+  command void StatsCollector.startRecvPageTransTime(uint8_t channel)
+  {
+    startRecvTime = call LocalTime.get();
+    sendStatusMsg(START_RECV_DATA, channel);
+  }
+  command void StatsCollector.endRecvPageTransTime(uint8_t senderAddr)
+  {
+    uint32_t curTime = call LocalTime.get();
+    uint32_t temp = (call Globals.getAvgRecvPageTransTime()) * (call Globals.getNumRecvPageTrans());
+    call Globals.incNumRecvPageTrans();
+    call Globals.setAvgRecvPageTransTime((temp + (curTime - startRecvTime)) / (call Globals.getNumRecvPageTrans()));
+    sendStatusMsg(END_RECV_DATA, senderAddr);
+  }
+  
+  command void StatsCollector.incPub_numPktRetrans()
+  {
+    call Globals.incNumPubPktRetrans();
+  }
+  
+  command void StatsCollector.startCCTime() {
+    startCCTime = call LocalTime.get();
+  }
+  
+  command void StatsCollector.endCCTime() {
+    uint32_t diff = (call LocalTime.get()) - startCCTime;
+    call StatsCollector.sendVariableReport(diff);
+  }
+  
+  command void StatsCollector.incNumRecvHSRetrans() {
+    call Globals.incNumRecvHSRetrans();
+  }
+}
diff --git a/tos/lib/net/Deluge/extra/NetProg.h b/tos/lib/net/Deluge/extra/NetProg.h
new file mode 100644
index 00000000..b8624c05
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/NetProg.h
@@ -0,0 +1,48 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __NETPROG_H__
+#define __NETPROG_H__
+
+#include "NetProg_platform.h"
+
+#ifndef IDENT_UID_HASH
+#define IDENT_UID_HASH 0
+#endif
+
+static const uint32_t DELUGE_IMAGE_UID = IDENT_UID_HASH;
+
+typedef struct NetProg_TOSInfo {
+  uint16_t addr;
+  uint8_t  groupId;
+  uint16_t crc;
+} NetProg_TOSInfo;
+
+#endif
diff --git a/tos/lib/net/Deluge/extra/NetProg.nc b/tos/lib/net/Deluge/extra/NetProg.nc
new file mode 100644
index 00000000..5762caef
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/NetProg.nc
@@ -0,0 +1,57 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * Top level interface for network programming integration with
+ * applications.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface NetProg
+{
+
+  /**
+   * Reboot the node.
+   *
+   * @return  Does not return.
+   */
+  command error_t reboot();
+
+  /**
+   * Reboot into the image specified by <code>imgNum</code>. This
+   * assumes that an image has been downloaded into slot <code>imgNum</code>
+   * using Deluge.
+   *
+   * @param imgNum  Number of image to boot in to.
+   * @return        <code>FAIL</code> if the reboot command fails to 
+   *                complete due to an invalid imgNum or incomplete 
+   *                image, 
+   *                does not return, otherwise.
+   */
+  command error_t programImgAndReboot(uint8_t imgNum);
+
+}
diff --git a/tos/lib/net/Deluge/extra/NetProgC.nc b/tos/lib/net/Deluge/extra/NetProgC.nc
new file mode 100644
index 00000000..f8896618
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/NetProgC.nc
@@ -0,0 +1,54 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+includes NetProg;
+includes TOSBoot;
+
+configuration NetProgC {
+  provides {
+    interface NetProg;
+  }
+}
+
+implementation {
+
+  components MainC, InternalFlashC as IFlash, CrcP, 
+    DelugeStorageC, NetProgM;
+
+  NetProg = NetProgM;
+
+  MainC.SoftwareInit -> NetProgM.Init;
+  NetProgM.StorageMap[0] -> DelugeStorageC.StorageMap[0];
+  NetProgM.StorageMap[1] -> DelugeStorageC.StorageMap[1];
+  NetProgM.DelugeMetadata -> DelugeStorageC;
+  NetProgM.IFlash -> IFlash;
+  NetProgM.Crc -> CrcP;
+}
diff --git a/tos/lib/net/Deluge/extra/NetProgM.nc b/tos/lib/net/Deluge/extra/NetProgM.nc
new file mode 100644
index 00000000..998a5fdb
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/NetProgM.nc
@@ -0,0 +1,127 @@
+/*
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ * Copyright (c) 2007 Johns Hopkins University.
+ * All rights reserved.
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Razvan Musaloiu-E. <razvanm@cs.jhu.edu>
+ */
+
+#include "AM.h"
+
+module NetProgM {
+  provides {
+    interface NetProg;
+    interface Init;
+  }
+  uses {
+    interface StorageMap[uint8_t img_num];
+    interface InternalFlash as IFlash;
+    interface Crc;
+    interface DelugeMetadata;
+  }
+}
+
+implementation {
+
+  uint16_t computeTosInfoCrc(NetProg_TOSInfo* tosInfo)
+  {
+    return call Crc.crc16(tosInfo, sizeof(NetProg_TOSInfo)-2);
+  }
+
+  void writeTOSinfo()
+  {
+    NetProg_TOSInfo tosInfo;
+    uint16_t crc;
+    call IFlash.read((uint8_t*)IFLASH_TOS_INFO_ADDR, &tosInfo, sizeof(tosInfo));
+    tosInfo.addr = TOS_NODE_ID;
+    tosInfo.groupId = TOS_AM_GROUP;
+    crc = computeTosInfoCrc(&tosInfo);
+    // don't write if data is already correct
+    if (tosInfo.crc == crc)
+      return;
+    tosInfo.crc = crc;
+    call IFlash.write((uint8_t*)IFLASH_TOS_INFO_ADDR, &tosInfo, sizeof(tosInfo));
+  }
+
+  command error_t Init.init()
+  {
+
+    NetProg_TOSInfo tosInfo;
+
+    call IFlash.read((uint8_t*)IFLASH_TOS_INFO_ADDR, &tosInfo, sizeof(tosInfo));
+
+    if (tosInfo.crc == computeTosInfoCrc(&tosInfo)) {
+      // TOS_AM_GROUP is not a variable in T2
+      //      TOS_AM_GROUP = tosInfo.groupId;
+      atomic TOS_NODE_ID = tosInfo.addr;
+    }
+    else {
+      writeTOSinfo();
+    }
+ 
+    return SUCCESS;
+  }
+  
+  command error_t NetProg.reboot()
+  {
+    atomic {
+      writeTOSinfo();
+      netprog_reboot();
+    }
+    return FAIL;
+  }
+  
+  command error_t NetProg.programImgAndReboot(uint8_t img_num)
+  {
+    tosboot_args_t args;
+    DelugeNodeDesc nodeDesc;
+    DelugeImgDesc *imgDesc;
+    
+    atomic {
+      writeTOSinfo();
+      
+      args.imageAddr = call StorageMap.getPhysicalAddress[img_num](0);
+      args.gestureCount = 0xff;
+      args.noReprogram = FALSE;
+      call IFlash.write((uint8_t*)TOSBOOT_ARGS_ADDR, &args, sizeof(args));
+      
+      // Write info about what img to disseminate after reboot
+      imgDesc = call DelugeMetadata.getImgDesc(img_num);
+      nodeDesc.uid = imgDesc->uid;
+      nodeDesc.imgNum = img_num;
+      call IFlash.write((uint8_t*)IFLASH_NODE_DESC_ADDR, &nodeDesc, sizeof(nodeDesc));
+      
+      // reboot
+      netprog_reboot();
+    }
+
+    // couldn't reboot
+    return FAIL;
+  }
+
+  default command storage_addr_t StorageMap.getPhysicalAddress[uint8_t img_num](storage_addr_t addr) { return 0xFFFFFFFF; }
+
+}
diff --git a/tos/lib/net/Deluge/extra/TOSBoot.h b/tos/lib/net/Deluge/extra/TOSBoot.h
new file mode 100644
index 00000000..ab5524b5
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/TOSBoot.h
@@ -0,0 +1,39 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author  Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __TOSBOOT_H__
+#define __TOSBOOT_H__
+
+#include "TOSBoot_platform.h"
+
+typedef struct tosboot_args_t {
+  uint32_t imageAddr;
+  uint8_t  gestureCount;
+  bool     noReprogram;
+} tosboot_args_t;
+
+#endif
diff --git a/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc b/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc
new file mode 100644
index 00000000..a913bd71
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc
@@ -0,0 +1,122 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlashC.nc - Internal flash implementation for telos msp
+ * platform. On the msp, the flash must first be erased before a value
+ * can be written. However, the msp can only erase the flash at a
+ * segment granularity (128 bytes for the information section). This
+ * module allows transparent read/write of individual bytes to the
+ * information section by dynamically switching between the two
+ * provided segments in the information section.
+ *
+ * Valid address range is 0x1000 - 0x107E (0x107F is used to store the
+ * version number of the information segment).
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+includes InternalFlash;
+
+module InternalFlashC {
+  provides interface InternalFlash;
+}
+
+implementation {
+
+  enum {
+    IFLASH_OFFSET     = 0x1000,
+    IFLASH_SIZE       = 128,
+    IFLASH_SEG0_VNUM_ADDR = 0x107f,
+    IFLASH_SEG1_VNUM_ADDR = 0x10ff,
+    IFLASH_INVALID_VNUM = -1,
+  };
+
+  uint8_t chooseSegment() {
+    int8_t vnum0 = *(int8_t*)IFLASH_SEG0_VNUM_ADDR;
+    int8_t vnum1 = *(int8_t*)IFLASH_SEG1_VNUM_ADDR;
+    if (vnum0 == IFLASH_INVALID_VNUM)
+      return 1;
+    else if (vnum1 == IFLASH_INVALID_VNUM)
+      return 0;
+    return ( (int8_t)(vnum0 - vnum1) < 0 );
+  }
+
+  command error_t InternalFlash.write(void* addr, void* buf, uint16_t size) {
+
+    volatile int8_t *newPtr;
+    int8_t *oldPtr;
+    int8_t *bufPtr = (int8_t*)buf;
+    int8_t version;
+    uint16_t i;
+
+    addr += IFLASH_OFFSET;
+    newPtr = oldPtr = (int8_t*)IFLASH_OFFSET;
+    if (chooseSegment()) {
+      oldPtr += IFLASH_SIZE;
+    }
+    else {
+      addr += IFLASH_SIZE;
+      newPtr += IFLASH_SIZE;
+    }
+
+    FCTL2 = FWKEY + FSSEL1 + FN2;
+    FCTL3 = FWKEY;
+    FCTL1 = FWKEY + ERASE;
+    *newPtr = 0;
+    FCTL1 = FWKEY + WRT;
+    
+    for ( i = 0; i < IFLASH_SIZE-1; i++, newPtr++, oldPtr++ ) {
+      if ((uint16_t)newPtr < (uint16_t)addr || (uint16_t)addr+size <= (uint16_t)newPtr)
+	*newPtr = *oldPtr;
+      else
+	*newPtr = *bufPtr++;
+    }
+    version = *oldPtr + 1;
+    if (version == IFLASH_INVALID_VNUM)
+      version++;
+    *newPtr = version;
+    
+    FCTL1 = FWKEY;
+    FCTL3 = FWKEY + LOCK;
+
+    return SUCCESS;
+
+  }
+
+  command error_t InternalFlash.read(void* addr, void* buf, uint16_t size) {
+
+    addr += IFLASH_OFFSET;
+    if (chooseSegment())
+      addr += IFLASH_SIZE;
+
+    memcpy(buf, addr, size);
+
+    return SUCCESS;
+
+  }
+
+}
diff --git a/tos/lib/net/Deluge/extra/telos/NetProg_platform.h b/tos/lib/net/Deluge/extra/telos/NetProg_platform.h
new file mode 100644
index 00000000..365831a8
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/telos/NetProg_platform.h
@@ -0,0 +1,44 @@
+// $Id$
+
+/*									tab:2
+ *
+ *
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __NETPROG_PLATFORM_H__
+#define __NETPROG_PLATFORM_H__
+
+enum {
+  IFLASH_TOS_INFO_ADDR = 0x60,  // 6 bytes
+  IFLASH_NODE_DESC_ADDR = 0x66, // 10 bytes
+};
+
+void netprog_reboot() {
+  WDTCTL = WDT_ARST_1_9; 
+  while(1);
+}
+
+#endif
diff --git a/tos/lib/net/Deluge/extra/telosb/InternalFlash.h b/tos/lib/net/Deluge/extra/telosb/InternalFlash.h
new file mode 100644
index 00000000..aa4f8728
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/telosb/InternalFlash.h
@@ -0,0 +1,45 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlash.h - Internal flash implementation for telos msp
+ * platform. On the msp, the flash must first be erased before a value
+ * can be written. However, the msp can only erase the flash at a
+ * segment granularity (128 bytes for the information section). This
+ * module allows transparent read/write of individual bytes to the
+ * information section by dynamically switching between the two
+ * provided segments in the information section.
+ *
+ * Valid address range is 0x1000 - 0x107E (0x107F is used to store the
+ * version number of the information segment).
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __INTERNAL_FLASH_H__
+#define __INTERNAL_FLASH_H__
+
+#endif
diff --git a/tos/lib/net/Deluge/extra/telosb/InternalFlash.nc b/tos/lib/net/Deluge/extra/telosb/InternalFlash.nc
new file mode 100644
index 00000000..ab860c0e
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/telosb/InternalFlash.nc
@@ -0,0 +1,37 @@
+// $Id$
+
+/*									tab:4
+ *
+ *
+ * "Copyright (c) 2000-2004 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ *
+ */
+
+/**
+ * InternalFlash.nc - A generic interface to read and store values in
+ * the internal flash of a microcontroller.
+ *
+ * @author Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+interface InternalFlash {
+  command error_t write(void* addr, void* buf, uint16_t size);
+  command error_t read(void* addr, void* buf, uint16_t size);
+}
diff --git a/tos/lib/net/Deluge/extra/telosb/TOSBoot_platform.h b/tos/lib/net/Deluge/extra/telosb/TOSBoot_platform.h
new file mode 100644
index 00000000..afc7693a
--- /dev/null
+++ b/tos/lib/net/Deluge/extra/telosb/TOSBoot_platform.h
@@ -0,0 +1,47 @@
+// $Id$
+
+/*									tab:2
+ * "Copyright (c) 2000-2005 The Regents of the University  of California.  
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice, the following
+ * two paragraphs and the author appear in all copies of this software.
+ * 
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+ */
+
+/**
+ * @author  Jonathan Hui <jwhui@cs.berkeley.edu>
+ */
+
+#ifndef __TOSBOOT_PLATFORM_H__
+#define __TOSBOOT_PLATFORM_H__
+
+enum {
+  // address of TOSBoot args in internal flash
+  TOSBOOT_ARGS_ADDR = 0x70,
+  // number of resets to force golden image
+  TOSBOOT_GESTURE_MAX_COUNT = 3,
+  // address of the golden image in external flash
+  TOSBOOT_GOLDEN_IMG_ADDR = 0xf0000L,
+  // size of each internal program flash page
+  TOSBOOT_INT_PAGE_SIZE = 512L,
+};
+
+enum {
+  DELUGE_MIN_ADV_PERIOD_LOG2 = 9,
+  DELUGE_QSIZE = 1,
+};
+
+#endif
-- 
2.39.2