From 7aa9f4c0d02a4af51e2bdd168bdc3151931717c4 Mon Sep 17 00:00:00 2001
From: sd <sd@ubuntu.(none)>
Date: Tue, 8 Jan 2013 10:26:12 +0100
Subject: [PATCH 1/3] RF230 Blip2.0 patch

---
 tos/chips/rf212/RF212RadioP.nc                |  23 +-
 tos/chips/rf230/BareMessageC.nc               |  25 ++
 tos/chips/rf230/RF230BarePacketP.nc           |  37 ++
 tos/chips/rf230/RF230RadioC.nc                |  14 +
 tos/chips/rf230/RF230RadioP.nc                |  21 +-
 tos/lib/net/blip/IPAddressP.nc                |   8 +
 tos/lib/net/blip/IPDispatchC.nc               |  18 +
 tos/lib/net/blip/IPDispatchP.nc               | 320 +++++++++++++++++-
 tos/lib/net/blip/Ieee154AddressC.nc           |  17 +
 tos/lib/net/blip/Ieee154AddressP.nc           |  27 +-
 .../net/blip/interfaces/ShortAddressConfig.nc |   6 +
 tos/platforms/iris/chips/rf230/RadioConfig.h  |   4 +-
 .../chips/bluetooth/RovingNetworksP.nc        |   6 +-
 13 files changed, 501 insertions(+), 25 deletions(-)
 create mode 100644 tos/chips/rf230/BareMessageC.nc
 create mode 100644 tos/chips/rf230/RF230BarePacketP.nc
 create mode 100644 tos/lib/net/blip/interfaces/ShortAddressConfig.nc

diff --git a/tos/chips/rf212/RF212RadioP.nc b/tos/chips/rf212/RF212RadioP.nc
index 33da2970e7..951acff101 100644
--- a/tos/chips/rf212/RF212RadioP.nc
+++ b/tos/chips/rf212/RF212RadioP.nc
@@ -176,7 +176,6 @@ implementation
 // SHR:  BPSK: 40; OQPSK: 10
 // phySymbolsPerOctet: BPSK: 8; OQPSK: 2
 // plus we add a constant for safety
-//TODO: this const seems way too high. I think we can even go with 0...
 #ifndef SOFTWAREACK_TIMEOUT_PLUS
 #define SOFTWAREACK_TIMEOUT_PLUS	1000
 #endif
@@ -282,32 +281,24 @@ implementation
 
 /*----------------- RandomCollisionConfig -----------------*/
 
-
-#ifndef RF212_BACKOFF_MIN
-#define RF212_BACKOFF_MIN 20
-#endif
+// 802.15.4 constants:
+// aUnitBackoffPeriod: 20 symbol
+// macMinBE:0..5 (8), default 3
+// but we don't care about the standard yet, just converted the rf230 lpl timeouts to SymbolTime base
 
 	async command uint16_t RandomCollisionConfig.getMinimumBackoff()
 	{
-		return (uint16_t)(RF212_BACKOFF_MIN * getSymbolTime() * RADIO_ALARM_MICROSEC);
+		return (uint16_t)(10 * 8 * getSymbolTime() * RADIO_ALARM_MICROSEC);
 	}
 
-#ifndef RF212_BACKOFF_INIT
-#define RF212_BACKOFF_INIT 310
-#endif
-
 	async command uint16_t RandomCollisionConfig.getInitialBackoff(message_t* msg)
 	{
-		return (uint16_t)(RF212_BACKOFF_INIT * getSymbolTime() * RADIO_ALARM_MICROSEC);
+		return (uint16_t)(50 * 8 * getSymbolTime() * RADIO_ALARM_MICROSEC);
 	}
-	
-#ifndef RF212_BACKOFF_CONG
-#define RF212_BACKOFF_CONG 140
-#endif
 
 	async command uint16_t RandomCollisionConfig.getCongestionBackoff(message_t* msg)
 	{
-		return (uint16_t)(RF212_BACKOFF_CONG * getSymbolTime() * RADIO_ALARM_MICROSEC);
+		return (uint16_t)(100 * 8 * getSymbolTime() * RADIO_ALARM_MICROSEC);
 	}
 
 // 802.15.4 standard: SIFS (no ack requested): 12 symbol; LIFS (ack requested): 40 symbol
diff --git a/tos/chips/rf230/BareMessageC.nc b/tos/chips/rf230/BareMessageC.nc
new file mode 100644
index 0000000000..86564410a4
--- /dev/null
+++ b/tos/chips/rf230/BareMessageC.nc
@@ -0,0 +1,25 @@
+configuration BareMessageC
+{
+  provides
+  {
+    interface BareSend;
+    interface BareReceive;
+    interface Packet as BarePacket;
+    interface PacketLink;
+    interface LowPowerListening;
+    interface SplitControl as RadioControl;
+    interface ShortAddressConfig;
+  }
+}
+implementation
+{
+  components RF230RadioC;
+
+  BareSend = RF230RadioC;
+  BareReceive = RF230RadioC;
+  BarePacket = RF230RadioC.BarePacket;
+  PacketLink = RF230RadioC;
+  LowPowerListening = RF230RadioC;
+  RadioControl = RF230RadioC.SplitControl;
+  ShortAddressConfig = RF230RadioC;
+}
diff --git a/tos/chips/rf230/RF230BarePacketP.nc b/tos/chips/rf230/RF230BarePacketP.nc
new file mode 100644
index 0000000000..ecb07cb035
--- /dev/null
+++ b/tos/chips/rf230/RF230BarePacketP.nc
@@ -0,0 +1,37 @@
+module RF230BarePacketP
+{
+  provides interface Packet as BarePacket;
+  uses interface RadioPacket;
+}
+implementation
+{
+  command void BarePacket.clear(message_t *msg)
+  {
+    call RadioPacket.clear(msg);
+  }
+
+  command uint8_t BarePacket.payloadLength(message_t *msg)
+  {
+    //return call RadioPacket.payloadLength(msg);
+    return call RadioPacket.payloadLength(msg)+sizeof(rf230_header_t);
+  }
+
+  command void BarePacket.setPayloadLength(message_t *msg, uint8_t len)
+  {
+    //call RadioPacket.setPayloadLength(msg, len);
+    call RadioPacket.setPayloadLength(msg, len-sizeof(rf230_header_t));
+  }
+
+  command uint8_t BarePacket.maxPayloadLength()
+  {
+    return call RadioPacket.maxPayloadLength();
+  }
+
+  command void *BarePacket.getPayload(message_t *msg, uint8_t len)
+  {
+    if (len > call RadioPacket.maxPayloadLength())
+      return NULL;
+    else
+      return (void*)msg;
+  }
+}
diff --git a/tos/chips/rf230/RF230RadioC.nc b/tos/chips/rf230/RF230RadioC.nc
index 59042f02a6..b013f0159c 100644
--- a/tos/chips/rf230/RF230RadioC.nc
+++ b/tos/chips/rf230/RF230RadioC.nc
@@ -56,13 +56,17 @@ configuration RF230RadioC
 
 #ifndef TFRAMES_ENABLED
 		interface Ieee154Send;
+		interface BareSend;
 		interface Receive as Ieee154Receive;
+		interface BareReceive;
 		interface SendNotifier as Ieee154Notifier;
 
 		interface Resource as SendResource[uint8_t clint];
 
 		interface Ieee154Packet;
 		interface Packet as PacketForIeee154Message;
+		interface Packet as BarePacket;
+		interface ShortAddressConfig;
 #endif
 
 		interface PacketAcknowledgements;
@@ -94,6 +98,15 @@ implementation
 // -------- RadioP
 
 	components RF230RadioP as RadioP;
+	
+	BareSend = TinyosNetworkLayerC.Ieee154Send;
+	BareReceive = TinyosNetworkLayerC.Ieee154Receive;
+	ShortAddressConfig = RadioP;
+	
+	components RF230BarePacketP as BarePacketP;
+	BarePacket = BarePacketP;
+	BarePacketP.RadioPacket -> RadioDriverLayerC;
+
 
 #ifdef RADIO_DEBUG
 	components AssertC;
@@ -175,6 +188,7 @@ implementation
 	components new Ieee154PacketLayerC();
 	Ieee154PacketLayerC.SubPacket -> PacketLinkLayerC;
 
+
 // -------- UniqueLayer Send part (wired twice)
 
 	components new UniqueLayerC();
diff --git a/tos/chips/rf230/RF230RadioP.nc b/tos/chips/rf230/RF230RadioP.nc
index db0e48467e..1f21a2bffe 100644
--- a/tos/chips/rf230/RF230RadioP.nc
+++ b/tos/chips/rf230/RF230RadioP.nc
@@ -50,6 +50,8 @@ module RF230RadioP
 		interface ActiveMessageConfig;
 		interface DummyConfig;
 
+		interface ShortAddressConfig;
+
 #ifdef LOW_POWER_LISTENING
 		interface LowPowerListeningConfig;
 #endif
@@ -78,6 +80,7 @@ implementation
 	async command uint8_t RF230DriverConfig.maxPayloadLength()
 	{
 		return sizeof(rf230packet_header_t) + TOSH_DATA_LENGTH;
+		
 	}
 
 	async command uint8_t RF230DriverConfig.metadataLength(message_t* msg)
@@ -129,7 +132,7 @@ implementation
 	}
 
 #ifndef SOFTWAREACK_TIMEOUT
-#define SOFTWAREACK_TIMEOUT	1000
+#define SOFTWAREACK_TIMEOUT	3000//1000
 #endif
 
 	async command uint16_t SoftwareAckConfig.getAckTimeout()
@@ -235,6 +238,20 @@ implementation
 	 * congestion backoff = 0x7 * CC2420_BACKOFF_PERIOD = 70 jiffies = 2240 microsec
 	 */
 
+/*----------------- ShortAddressConfig-----------------*/
+
+    command void ShortAddressConfig.setShortAddr(uint16_t address)
+    {
+        // TODO: actually write the new ID
+        signal ShortAddressConfig.setShortAddrDone(FAIL);
+    }
+
+    default event void ShortAddressConfig.setShortAddrDone(error_t error)
+    {
+    }
+
+ /*----------------- LowPowerListening -----------------*/
+
 #ifndef LOW_POWER_LISTENING
 
 #ifndef RF230_BACKOFF_MIN
@@ -337,7 +354,7 @@ implementation
 
 	command uint16_t LowPowerListeningConfig.getListenLength()
 	{
-		return 5;
+		return 12;//5
 	}
 
 	async command uint16_t RandomCollisionConfig.getMinimumBackoff()
diff --git a/tos/lib/net/blip/IPAddressP.nc b/tos/lib/net/blip/IPAddressP.nc
index 755c45fb10..2954c132be 100644
--- a/tos/lib/net/blip/IPAddressP.nc
+++ b/tos/lib/net/blip/IPAddressP.nc
@@ -31,7 +31,15 @@ module IPAddressP {
     interface Ieee154Address;
   }
 } implementation {
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  bool m_valid_addr = FALSE, m_short_addr = TRUE;
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+  bool m_valid_addr = FALSE, m_short_addr = FALSE;
+#else
   bool m_valid_addr = FALSE, m_short_addr = FALSE;
+#endif
+
   struct in6_addr m_addr;
 
   command bool IPAddress.getLLAddr(struct in6_addr *addr) {
diff --git a/tos/lib/net/blip/IPDispatchC.nc b/tos/lib/net/blip/IPDispatchC.nc
index 95a61a2c9d..d62454d34c 100644
--- a/tos/lib/net/blip/IPDispatchC.nc
+++ b/tos/lib/net/blip/IPDispatchC.nc
@@ -40,7 +40,16 @@ configuration IPDispatchC {
 
   /* IPDispatchP wiring -- fragment rassembly and lib6lowpan bindings */
   components IPDispatchP;
+  
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  components BareMessageC as MessageC;
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+  components CC2420RadioC as MessageC;
+#else
   components CC2420RadioC as MessageC;
+#endif
+
   components ReadLqiC;
   components new TimerMilliC();
 
@@ -58,8 +67,17 @@ configuration IPDispatchC {
   IPDispatchP.RadioControl -> MessageC;
 
   IPDispatchP.BarePacket -> MessageC.BarePacket;
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  IPDispatchP.BareSend -> MessageC;
+  IPDispatchP.BareReceive -> MessageC;
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+  IPDispatchP.Ieee154Send -> MessageC.BareSend;
+  IPDispatchP.Ieee154Receive -> MessageC.BareReceive;
+#else
   IPDispatchP.Ieee154Send -> MessageC.BareSend;
   IPDispatchP.Ieee154Receive -> MessageC.BareReceive;
+#endif
 
 #ifdef LOW_POWER_LISTENING
    IPDispatchP.LowPowerListening -> MessageC;
diff --git a/tos/lib/net/blip/IPDispatchP.nc b/tos/lib/net/blip/IPDispatchP.nc
index 628f39a0dd..67851ba5f2 100644
--- a/tos/lib/net/blip/IPDispatchP.nc
+++ b/tos/lib/net/blip/IPDispatchP.nc
@@ -55,8 +55,17 @@ module IPDispatchP {
     interface SplitControl as RadioControl;
 
     interface Packet as BarePacket;
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+    interface BareSend;
+    interface BareReceive;
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+    interface Send as Ieee154Send;
+    interface Receive as Ieee154Receive;
+#else
     interface Send as Ieee154Send;
     interface Receive as Ieee154Receive;
+#endif
 
     /* context lookup */
     interface NeighborDiscovery;
@@ -332,6 +341,102 @@ void SENDINFO_DECR(struct send_info *si) {
     return ret;
   }
 
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  event message_t *BareReceive.receive(message_t *msg) {
+    struct packed_lowmsg lowmsg;
+    struct ieee154_frame_addr frame_address;
+    uint8_t len = call BarePacket.payloadLength(msg);
+    void *msg_payload = call BarePacket.getPayload(msg, len);
+    uint8_t *buf = msg_payload;
+
+    // printf(" -- RECEIVE -- len : %i\n", len);
+
+    BLIP_STATS_INCR(stats.rx_total);
+
+    /* unpack the 802.15.4 address fields */
+    buf  = unpack_ieee154_hdr(msg_payload, &frame_address);
+    len -= buf - (uint8_t *)msg_payload;
+
+    /* unpack and 6lowpan headers */
+    lowmsg.data = buf;
+    lowmsg.len  = len;
+    lowmsg.headers = getHeaderBitmap(&lowmsg);
+    if (lowmsg.headers == LOWMSG_NALP) {
+      goto fail;
+    }
+
+    if (hasFrag1Header(&lowmsg) || hasFragNHeader(&lowmsg)) {
+      // start reassembly
+      int rv;
+      struct lowpan_reconstruct *recon;
+      uint16_t tag, source_key;
+
+      source_key = ieee154_hashaddr(&frame_address.ieee_src);
+      getFragDgramTag(&lowmsg, &tag);
+      recon = get_reconstruct(source_key, tag);
+      if (!recon) {
+        goto fail;
+      }
+
+      /* fill in metadata: on fragmented packets, it applies to the
+         first fragment only  */
+      memcpy(&recon->r_meta.sender, &frame_address.ieee_src,
+             sizeof(ieee154_addr_t));
+      recon->r_meta.lqi = call ReadLqi.readLqi(msg);
+      recon->r_meta.rssi = call ReadLqi.readRssi(msg);
+
+      if (hasFrag1Header(&lowmsg)) {
+        if (recon->r_buf != NULL) goto fail;
+        rv = lowpan_recon_start(&frame_address, recon, buf, len);
+      } else {
+        rv = lowpan_recon_add(recon, buf, len);
+      }
+        
+      if (rv < 0) {
+        recon->r_timeout = T_FAILED1;
+        goto fail;
+      } else {
+        // printf("start recon buf: %p\n", recon->r_buf);
+        recon->r_timeout = T_ACTIVE;
+        recon->r_source_key = source_key;
+        recon->r_tag = tag;
+      }
+
+      if (recon->r_size == recon->r_bytes_rcvd) {
+        deliver(recon);
+      }
+
+    } else {
+      /* no fragmentation, just deliver it */
+      int rv;
+      struct lowpan_reconstruct recon;
+
+      /* fill in metadata */
+      memcpy(&recon.r_meta.sender, &frame_address.ieee_src, 
+             sizeof(ieee154_addr_t));
+      recon.r_meta.lqi = call ReadLqi.readLqi(msg);
+      recon.r_meta.rssi = call ReadLqi.readRssi(msg);
+
+      buf = getLowpanPayload(&lowmsg);
+      if ((rv = lowpan_recon_start(&frame_address, &recon, buf, len)) < 0) {
+        goto fail;
+      }
+
+      if (recon.r_size == recon.r_bytes_rcvd) {
+        deliver(&recon);
+      } else {
+        // printf("ip_free(%p)\n", recon.r_buf);
+        ip_free(recon.r_buf);
+      }
+    }
+    goto done;
+  fail:
+    BLIP_STATS_INCR(stats.rx_drop);
+  done:
+    return msg;
+  }
+
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
   event message_t *Ieee154Receive.receive(message_t *msg, void *msg_payload, uint8_t len) {
     struct packed_lowmsg lowmsg;
     struct ieee154_frame_addr frame_address;
@@ -423,8 +528,99 @@ void SENDINFO_DECR(struct send_info *si) {
   done:
     return msg;
   }
+#else
+  event message_t *Ieee154Receive.receive(message_t *msg, void *msg_payload, uint8_t len) {
+    struct packed_lowmsg lowmsg;
+    struct ieee154_frame_addr frame_address;
+    uint8_t *buf = msg_payload;
+
+    // printf(" -- RECEIVE -- len : %i\n", len);
+
+    BLIP_STATS_INCR(stats.rx_total);
+
+    /* unpack the 802.15.4 address fields */
+    buf  = unpack_ieee154_hdr(msg_payload, &frame_address);
+    len -= buf - (uint8_t *)msg_payload;
+
+    /* unpack and 6lowpan headers */
+    lowmsg.data = buf;
+    lowmsg.len  = len;
+    lowmsg.headers = getHeaderBitmap(&lowmsg);
+    if (lowmsg.headers == LOWMSG_NALP) {
+      goto fail;
+    }
+
+    if (hasFrag1Header(&lowmsg) || hasFragNHeader(&lowmsg)) {
+      // start reassembly
+      int rv;
+      struct lowpan_reconstruct *recon;
+      uint16_t tag, source_key;
+
+      source_key = ieee154_hashaddr(&frame_address.ieee_src);
+      getFragDgramTag(&lowmsg, &tag);
+      recon = get_reconstruct(source_key, tag);
+      if (!recon) {
+        goto fail;
+      }
+
+      /* fill in metadata: on fragmented packets, it applies to the
+         first fragment only  */
+      memcpy(&recon->r_meta.sender, &frame_address.ieee_src,
+             sizeof(ieee154_addr_t));
+      recon->r_meta.lqi = call ReadLqi.readLqi(msg);
+      recon->r_meta.rssi = call ReadLqi.readRssi(msg);
+
+      if (hasFrag1Header(&lowmsg)) {
+        if (recon->r_buf != NULL) goto fail;
+        rv = lowpan_recon_start(&frame_address, recon, buf, len);
+      } else {
+        rv = lowpan_recon_add(recon, buf, len);
+      }
+        
+      if (rv < 0) {
+        recon->r_timeout = T_FAILED1;
+        goto fail;
+      } else {
+        // printf("start recon buf: %p\n", recon->r_buf);
+        recon->r_timeout = T_ACTIVE;
+        recon->r_source_key = source_key;
+        recon->r_tag = tag;
+      }
+
+      if (recon->r_size == recon->r_bytes_rcvd) {
+        deliver(recon);
+      }
+
+    } else {
+      /* no fragmentation, just deliver it */
+      int rv;
+      struct lowpan_reconstruct recon;
 
+      /* fill in metadata */
+      memcpy(&recon.r_meta.sender, &frame_address.ieee_src, 
+             sizeof(ieee154_addr_t));
+      recon.r_meta.lqi = call ReadLqi.readLqi(msg);
+      recon.r_meta.rssi = call ReadLqi.readRssi(msg);
+
+      buf = getLowpanPayload(&lowmsg);
+      if ((rv = lowpan_recon_start(&frame_address, &recon, buf, len)) < 0) {
+        goto fail;
+      }
 
+      if (recon.r_size == recon.r_bytes_rcvd) {
+        deliver(&recon);
+      } else {
+        // printf("ip_free(%p)\n", recon.r_buf);
+        ip_free(recon.r_buf);
+      }
+    }
+    goto done;
+  fail:
+    BLIP_STATS_INCR(stats.rx_drop);
+  done:
+    return msg;
+  }
+#endif
   /*
    * Send-side functionality
    */
@@ -448,6 +644,24 @@ void SENDINFO_DECR(struct send_info *si) {
       goto fail;
     }
 
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  if (call BareSend.send(s_entry->msg) != SUCCESS) {
+      dbg("Drops", "drops: sendTask: send failed\n");
+      goto fail;
+    } else {
+      radioBusy = TRUE;
+    }
+
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+    if ((call Ieee154Send.send(s_entry->msg,
+                               call BarePacket.payloadLength(s_entry->msg))) != SUCCESS) {
+      dbg("Drops", "drops: sendTask: send failed\n");
+      goto fail;
+    } else {
+      radioBusy = TRUE;
+    }
+
+#else
     if ((call Ieee154Send.send(s_entry->msg,
                                call BarePacket.payloadLength(s_entry->msg))) != SUCCESS) {
       dbg("Drops", "drops: sendTask: send failed\n");
@@ -456,6 +670,8 @@ void SENDINFO_DECR(struct send_info *si) {
       radioBusy = TRUE;
     }
 
+#endif
+
     return;
   fail:
     printf("SEND FAIL\n");
@@ -491,6 +707,9 @@ void SENDINFO_DECR(struct send_info *si) {
     struct send_entry *s_entry;
     message_t *outgoing;
 
+//#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+    uint8_t max_len;
+//#endif
     int frag_len = 1;
     error_t rc = SUCCESS;
 
@@ -530,11 +749,28 @@ void SENDINFO_DECR(struct send_info *si) {
       }
 
       call BarePacket.clear(outgoing);
-      frag_len = lowpan_frag_get(call Ieee154Send.getPayload(outgoing, 0),
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+      max_len = call BarePacket.maxPayloadLength()-1;
+      frag_len = lowpan_frag_get(call BarePacket.getPayload(outgoing, max_len),
+                                 max_len,
+                                 msg,
+                                 frame_addr,
+                                 &ctx);
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+      	max_len = call BarePacket.maxPayloadLength();//TEST############
+	frag_len = lowpan_frag_get(call Ieee154Send.getPayload(outgoing, max_len),//max_len statt 0##################
+                                 call BarePacket.maxPayloadLength(), //TEST################
+                                 msg,
+                                 frame_addr,
+                                 &ctx);
+#else
+frag_len = lowpan_frag_get(call Ieee154Send.getPayload(outgoing, 0),
                                  call BarePacket.maxPayloadLength(),
                                  msg,
                                  frame_addr,
                                  &ctx);
+#endif
+
       if (frag_len < 0) {
         printf(" get frag error: %i\n", frag_len);
       }
@@ -578,7 +814,47 @@ void SENDINFO_DECR(struct send_info *si) {
   cleanup_outer:
     return rc;
   }
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  event void BareSend.sendDone(message_t *msg, error_t error) {
+    struct send_entry *s_entry = call SendQueue.head();
 
+    radioBusy = FALSE;
+
+    // printf("sendDone: %p %i\n", msg, error);
+
+    if (state == S_STOPPING) {
+      call RadioControl.stop();
+      state = S_STOPPED;
+      goto done;
+    }
+    
+    s_entry->info->link_transmissions += (call PacketLink.getRetries(msg));
+    s_entry->info->link_fragment_attempts++;
+
+    if (!call PacketLink.wasDelivered(msg)) {
+      printf("sendDone: was not delivered! (%i tries)\n", 
+                 call PacketLink.getRetries(msg));
+      s_entry->info->failed = TRUE;
+      signal IPLower.sendDone(s_entry->info);
+/*       if (s_entry->info->policy.dest[0] != 0xffff) */
+/*         dbg("Drops", "drops: sendDone: frag was not delivered\n"); */
+      // need to check for broadcast frames
+      // BLIP_STATS_INCR(stats.tx_drop);
+    } else if (s_entry->info->link_fragment_attempts == 
+               s_entry->info->link_fragments) {
+      signal IPLower.sendDone(s_entry->info);
+    }
+
+  done:
+    // kill off any pending fragments
+    SENDINFO_DECR(s_entry->info);
+    call FragPool.put(s_entry->msg);
+    call SendEntryPool.put(s_entry);
+    call SendQueue.dequeue();
+
+    post sendTask();
+  }
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
   event void Ieee154Send.sendDone(message_t *msg, error_t error) {
     struct send_entry *s_entry = call SendQueue.head();
 
@@ -619,6 +895,47 @@ void SENDINFO_DECR(struct send_info *si) {
     post sendTask();
   }
 
+#else 
+   event void Ieee154Send.sendDone(message_t *msg, error_t error) {
+    struct send_entry *s_entry = call SendQueue.head();
+
+    radioBusy = FALSE;
+
+    // printf("sendDone: %p %i\n", msg, error);
+
+    if (state == S_STOPPING) {
+      call RadioControl.stop();
+      state = S_STOPPED;
+      goto done;
+    }
+    
+    s_entry->info->link_transmissions += (call PacketLink.getRetries(msg));
+    s_entry->info->link_fragment_attempts++;
+
+    if (!call PacketLink.wasDelivered(msg)) {
+      printf("sendDone: was not delivered! (%i tries)\n", 
+                 call PacketLink.getRetries(msg));
+      s_entry->info->failed = TRUE;
+      signal IPLower.sendDone(s_entry->info);
+/*       if (s_entry->info->policy.dest[0] != 0xffff) */
+/*         dbg("Drops", "drops: sendDone: frag was not delivered\n"); */
+      // need to check for broadcast frames
+      // BLIP_STATS_INCR(stats.tx_drop);
+    } else if (s_entry->info->link_fragment_attempts == 
+               s_entry->info->link_fragments) {
+      signal IPLower.sendDone(s_entry->info);
+    }
+
+  done:
+    // kill off any pending fragments
+    SENDINFO_DECR(s_entry->info);
+    call FragPool.put(s_entry->msg);
+    call SendEntryPool.put(s_entry);
+    call SendQueue.dequeue();
+
+    post sendTask();
+  }
+#endif
 #if 0
   command struct tlv_hdr *IPExtensions.findTlv(struct ip6_ext *ext, uint8_t tlv_val) {
     int len = ext->len - sizeof(struct ip6_ext);
@@ -669,3 +986,4 @@ void SENDINFO_DECR(struct send_info *si) {
 /*                                                    struct ip_metadata *meta) { */
 /*   } */
 }
+
diff --git a/tos/lib/net/blip/Ieee154AddressC.nc b/tos/lib/net/blip/Ieee154AddressC.nc
index 74d83eb43d..15343f15d3 100644
--- a/tos/lib/net/blip/Ieee154AddressC.nc
+++ b/tos/lib/net/blip/Ieee154AddressC.nc
@@ -5,13 +5,30 @@ configuration Ieee154AddressC {
 } implementation {
   components Ieee154AddressP;
   components LocalIeeeEui64C;
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  components BareMessageC;
+#endif
+
   components MainC;
   Ieee154Address = Ieee154AddressP;
 
   MainC.SoftwareInit -> Ieee154AddressP;
   Ieee154AddressP.LocalIeeeEui64 -> LocalIeeeEui64C;
 
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+  Ieee154AddressP.ShortAddressConfig -> BareMessageC;
+
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
   // workaround until the radio stack uses this interface
   components CC2420ControlC;
   Ieee154AddressP.CC2420Config -> CC2420ControlC;
+
+#else
+  // workaround until the radio stack uses this interface
+  components CC2420ControlC;
+  Ieee154AddressP.CC2420Config -> CC2420ControlC;
+#endif
+
+
 }
diff --git a/tos/lib/net/blip/Ieee154AddressP.nc b/tos/lib/net/blip/Ieee154AddressP.nc
index 82a58a8b81..6621e20ed4 100644
--- a/tos/lib/net/blip/Ieee154AddressP.nc
+++ b/tos/lib/net/blip/Ieee154AddressP.nc
@@ -6,7 +6,14 @@ module Ieee154AddressP {
   }
   uses {
     interface LocalIeeeEui64;
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+    interface ShortAddressConfig;
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+    interface CC2420Config;
+#else
     interface CC2420Config;
+#endif
   }
 } implementation {
   ieee154_saddr_t m_saddr;
@@ -40,11 +47,29 @@ module Ieee154AddressP {
 
   command error_t Ieee154Address.setShortAddr(ieee154_saddr_t addr) {
     m_saddr = addr;
+
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+    call ShortAddressConfig.setShortAddr(addr);
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+    call CC2420Config.setShortAddr(addr);
+    call CC2420Config.sync();
+#else
     call CC2420Config.setShortAddr(addr);
     call CC2420Config.sync();
+#endif
+
+
     signal Ieee154Address.changed();
     return SUCCESS;
   }
 
-  event void CC2420Config.syncDone(error_t err) {}
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+   event void ShortAddressConfig.setShortAddrDone(error_t error){}
+#elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
+   event void CC2420Config.syncDone(error_t err) {}
+#else
+   event void CC2420Config.syncDone(error_t err) {}
+#endif
+
+
 }
diff --git a/tos/lib/net/blip/interfaces/ShortAddressConfig.nc b/tos/lib/net/blip/interfaces/ShortAddressConfig.nc
new file mode 100644
index 0000000000..1b8c051abb
--- /dev/null
+++ b/tos/lib/net/blip/interfaces/ShortAddressConfig.nc
@@ -0,0 +1,6 @@
+interface ShortAddressConfig
+{
+  command void setShortAddr(uint16_t address);
+
+  event void setShortAddrDone(error_t error);
+}
diff --git a/tos/platforms/iris/chips/rf230/RadioConfig.h b/tos/platforms/iris/chips/rf230/RadioConfig.h
index 5ae9ccc75a..8d91f35c61 100644
--- a/tos/platforms/iris/chips/rf230/RadioConfig.h
+++ b/tos/platforms/iris/chips/rf230/RadioConfig.h
@@ -67,12 +67,12 @@ enum
 
 /* This is the default value of the CHANNEL field of the PHY_CC_CCA register. */
 #ifndef RF230_DEF_CHANNEL
-#define RF230_DEF_CHANNEL	11
+#define RF230_DEF_CHANNEL	13
 #endif
 
 /* The number of microseconds a sending IRIS mote will wait for an acknowledgement */
 #ifndef SOFTWAREACK_TIMEOUT
-#define SOFTWAREACK_TIMEOUT	1000
+#define SOFTWAREACK_TIMEOUT	5000
 #endif
 
 /*
diff --git a/tos/platforms/shimmer/chips/bluetooth/RovingNetworksP.nc b/tos/platforms/shimmer/chips/bluetooth/RovingNetworksP.nc
index 462a2056f8..1f2891b348 100644
--- a/tos/platforms/shimmer/chips/bluetooth/RovingNetworksP.nc
+++ b/tos/platforms/shimmer/chips/bluetooth/RovingNetworksP.nc
@@ -147,9 +147,9 @@ implementation {
     call UARTControl.setUbr(0x08);
     call UARTControl.setUmctl(0xee);
 
-    /* 4000000hz smclk
-    call UARTControl.setUbr(0x22);
-    call UARTControl.setUmctl(0xdd);
+    /* 4mhz smclk
+    call UARTControl.setUbr(0x23);
+    call UARTControl.setUmctl(0xd6);
     */
 #endif
 

From eb8eaa2313b6aadd46ca54bc05f63880ff0503d5 Mon Sep 17 00:00:00 2001
From: sd <sd@ubuntu.(none)>
Date: Tue, 8 Jan 2013 11:14:26 +0100
Subject: [PATCH 2/3] RF230 Blip2.0 patch working tree

---
 apps/BaseStation15.4/Makefile                 |   8 +-
 apps/BaseStation15.4/readme.txt               |  91 ++++++
 apps/BaseStation15.4/seriallisten15-4         | Bin 0 -> 34014 bytes
 apps/BaseStation15.4/seriallisten15-4.c       | 276 ++++++++++++------
 apps/BaseStation15.4/seriallisten15-4.o       | Bin 0 -> 6840 bytes
 apps/PppRouter/Makefile                       |  26 +-
 apps/PppRouter/PppRouterC.nc                  |   2 +-
 apps/UDPEcho/Makefile                         |  94 +++---
 apps/UDPEcho/UDPEchoC.nc                      |   2 +-
 apps/UDPEcho/UDPEchoP.nc                      |   0
 apps/tests/tkn154/packetsniffer/app_profile.h |   2 +-
 11 files changed, 364 insertions(+), 137 deletions(-)
 create mode 100644 apps/BaseStation15.4/readme.txt
 create mode 100755 apps/BaseStation15.4/seriallisten15-4
 create mode 100644 apps/BaseStation15.4/seriallisten15-4.o
 mode change 100644 => 100755 apps/UDPEcho/Makefile
 mode change 100644 => 100755 apps/UDPEcho/UDPEchoC.nc
 mode change 100644 => 100755 apps/UDPEcho/UDPEchoP.nc

diff --git a/apps/BaseStation15.4/Makefile b/apps/BaseStation15.4/Makefile
index c58ce5213c..4bd5457f3b 100644
--- a/apps/BaseStation15.4/Makefile
+++ b/apps/BaseStation15.4/Makefile
@@ -1,14 +1,14 @@
 COMPONENT=BaseStationC
-CFLAGS += -DCC2420_NO_ACKNOWLEDGEMENTS
+#CFLAGS += -DCC2420_NO_ACKNOWLEDGEMENTS
+CFLAGS += -DCC2420_HW_ACKNOWLEDGEMENTS
 CFLAGS += -DCC2420_NO_ADDRESS_RECOGNITION
 
 BUILD_EXTRA_DEPS += seriallisten15-4
 CLEAN_EXTRA = seriallisten15-4.o seriallisten15-4
 
 seriallisten15-4: seriallisten15-4.o
-	gcc -o $@ $< $(TOSDIR)/../support/sdk/c/sf/libmote.a
+	gcc -o $@ $< $(TOSDIR)/../support/sdk/c/sf/libmote.a -I /usr/msp430/include/ -I /usr/lib/gcc/msp430/4.6.3/include/ -I /usr/include/i386-linux-gnu -I /usr/include/c++/4.6/parallel/ -I /usr/include/i386-linux-gnu/bits/
 
 seriallisten15-4.o: seriallisten15-4.c
-	gcc -c -o $@ -I$(TOSDIR)/../support/sdk/c/sf -I$(TOSDIR)/lib/serial -I$(TOSDIR)/types $<
-
+	gcc -c -o $@ -I$(TOSDIR)/../support/sdk/c/sf -I$(TOSDIR)/lib/serial -I$(TOSDIR)/types $< -I /usr/msp430/include/ -I /usr/lib/gcc/msp430/4.6.3/include/ -I /usr/include/i386-linux-gnu -I /usr/include/c++/4.6/parallel/ -I /usr/include/i386-linux-gnu/bits/
 include $(MAKERULES)
diff --git a/apps/BaseStation15.4/readme.txt b/apps/BaseStation15.4/readme.txt
new file mode 100644
index 0000000000..bcb3e79ac9
--- /dev/null
+++ b/apps/BaseStation15.4/readme.txt
@@ -0,0 +1,91 @@
+Sniffer
+-----------------------------------
+
+	by 		Silvia Krug
+	date	20120921
+
+
+-----------------------------------
+Hardware
+-----------
+
+tmote / telosB Knoten
+
+-----------------------------------
+Software - auf Knoten
+-----------
+	Anwendung: packetsniffer
+	Pfad: 	   tinyos-2.x/apps/tests/tkn15.4/packetsniffer
+
+	notwendige Einstellungen:
+		Kanal: in app_profile.h INITAL_RADIO_CHANNEL setzen
+
+	übersetzen mit: 
+		make tmote install,<id>
+
+		<id> = Knoten-ID 
+
+Der Knoten ist in dieser Anwendung passiv und zeichnet alle Pakete auf 
+der Luftschnittstelle auf. Die Anwendung stellt eine Art Basisstation 
+bereit, d.h. die Pakete werden über die Serielle Schnittstelle zum 
+Rechner übertragen.
+
+-----------------------------------
+Software - auf Rechnerseite
+-----------
+	Anwendung: BaseStation15.4
+	Pfad: 	   tinyos-2.x/apps/BaseStation15.4
+
+	übersetzen mit: 
+		make tmote
+
+Auf Rechnerseite wird ein C-Programm verwendet, das sich im genannten 
+Ordner befindet. Dieses wurde erweitert, um
+
+	1) Pakete im Wireshark-Format pcap zu speichern und
+	2) die Zusatzinformationen (LQI,RSSI,CRC ok,MAC Header Länge,PHY 
+	   Kanal und Zeitstemple) des TKN15.4-Protokolls anzuzeigen
+
+Das C.Programm wird mit der Anwendung übersetzt und ist anschließend 
+einsatzbereit. Die Wireshark-Datei wird im gleichen Verzeichnis angelegt.
+	   
+	Aufruf:
+		./seriallisten15-4 iframe </dev/ttyUSB0> 115200 <mac.pcap>
+
+		</dev/ttyUSB0> = Serielle Schnittstelle an der der Sniffer 
+		                 angeschlossen ist
+		                 
+		<mac.pcap> = Datei, in der die Pakete für Wireshark gespeichert 
+		             werden         
+
+Fehlermeldungen werden in die Konsole geschrieben. Ggf. ist nach dem 
+Start des C-Programms ein Reset der Knotens notwendig.
+
+
+-----------------------------------
+Auswertung mit Wireshark
+-----------
+
+Die erzeugte Datei kann mit Wireshark geöffnet und analysiert werden. 
+Der Funkchip der Tmotes schneidet die letzen 2 Byte (CRC des Paketes) ab 
+und ersetzt sie durch andere Informationen. Damit die Pakete in 
+Wireshark korrekt angezeigt werden sind folgende Einstellungen 
+notwendig:
+
+	Unter: Eintstellungen -> Protokolle -> IEEE 802.15.4 
+	den Haken bei 'TI CC24xx FCS format' setzen
+
+ 
+Pakete, die mit Blip 1 versendet wurden können aber nicht korrekt 
+entschlüsselt werden. Ohne weitere Einstellungen werden diese Pakete 
+ggf. als ZigBee Pakete interpretiert. Um dies zu verhindern sollten die 
+ZigBee-Protokolle in Wireshark deaktiviert werden.
+
+	Unter: Analyze -> Enabled Protocols
+	die entsprechenden Haken bei ZigBee entfernen.
+
+Blip 2 Pakete sollten von der in Wireshark enthaltenen 6LoWPAN Engine 
+dekodiert werden können.
+
+
+
diff --git a/apps/BaseStation15.4/seriallisten15-4 b/apps/BaseStation15.4/seriallisten15-4
new file mode 100755
index 0000000000000000000000000000000000000000..acddfb6acf0e80094437a4c6966c3edd1f136d82
GIT binary patch
literal 34014
zcmd6Qdwdkt+5efHNf=1TZXjwDlm!9;LT&^NHwh*ygo_|IL9I(jHf%~rVzNQ75CR*N
zb-@NptF4#dwN|mE)t4e54HpS&FL-&;wpi18OA1yhO3}9F_x+wTvl$lrynWxlegh}Z
z^*rY}&$-N*nKQF%eKW4tG)>rtOXz}BW5h7?0NZa@l04xRJ;g9FL<|y%U{RLW2puFZ
zGB728XCUcF^FYsAXP8WVK{HVXwoCvh#4wpwX9~f@{KBK;X<0&~{mL+zK1U|QC1kmj
z0~Ny{9|jrI5ztKZi)Ancktc|<nTkL&*|OOmhRQ~c5MtyrhRO5-WK6dFM#w>)ci8sl
zK<@PKBs7_rpY_YCtXPs&SvIP&qN;vnW?gk=u9CrZDW7t~d|;{`w3&{?ylF^`9p&Gd
z_=kIjXouTo?Roqy|J%P?bNclS`&jQmNGwCf%IhL2dHJ73`#(4R{Z`V>qc@eUqYvPZ
zYyyxp{k9L%@7n|*>4doaL*wWt<Mg-3(O<^V1#$GTI64qV&xoU2;%N3m`=GzSvk5@b
z&2jYearBfp+EG2>g=~179NjK<(0-aD1L+ensVe_y99<VjpN^w33}OfEeJe&Odu!w9
z$~gMDIC^&+&2eJxH%#`oRB@@e3~<vEHtiO|?_avSy2@V{Dya?m{Q_ONlwJ60;V+&A
zZdpZ@zrHR|CITxfLZZC7CQyYe<z<1&kiRszOw?5@ttzP$HT9u7@L{EN8TtP5k_yQ!
z4VKi3x<F;1G$iUmwV~=tQCeOX2vyY81Yp(g57gFHRr@QeOG`o()m0)?3SmhoR4Zx&
zC1s*KRIxlDmIs!X)~picrIponph_yCj;y7jRW$+s5@v?&GFTGjchpvd0%B<(#EjMD
zWhJX%vb?gsE-1=tYAdQj<uFqfvb?BPUcmnH>J<SxSh~ChmKg;rB+E-GsziBhARwm9
zD88=HpPM;4hUJWjp?NVZCx&Gs)~<8@=`qRxmJp-9SuYVf>~b2kIiE1`=vz_In={~5
z5R&)(EkD52k|4%dbefbKqQIh4C9R8T7VVL=OU~Q0cM9`rA|@pEl?2W*t%lhHx&|R8
zB9jo4RWczulZOzKQW_yjPABXkM1Mk42rpqzAu<SiVeTeO!W>MPEJQXTYLG{mB1AqR
zy5j^wRH%S374tYD2F6rEoK$8I!q3@+7vY>kc(D)*2`>@iRzgg$iwQ3kqKpuoK1kS4
zh)Tl#LevmmE<}j%3L#b!4#0Vd&?`hE;XonghEJLu4A3p>4(`bpA{zczS6A1D)=)yn
zjR;T2Uc{#3V;Bq{GH*F3MAw+Jh-BB0f8j5)bqx`)6eQZ&j+|XX7||eQoku0j$OhSj
zovo5)go8XqbncKeBOUaT-X>{AJUEPWv!ogMU^eMSNwWol@KkixNZL!ffb?QXvqgea
zNzaxvTP8T0bb+MVLcxWkvn9=z3N9w?l{8x{$O?6OB+Zr!){qvGW(x*al0Nk{7()t3
zH<E6bG+Q*dk@QhXvt@(Lq+2D;77ji@dWWRh(!p({w@I2U9(<Z~v!vPb!5yR<CCwfX
z+(o)Z(u+yAl3pxn_K4sS(z7Mao)J7sx<JzGA;EV@XG@wrCD=~dD{1zaU<YZBq}g+V
zr$`G)vj+vwl0Nls*1wT7$8cvm=$ub(i~KqK!KvBv<^;1b4+mQxH_RIs1jj`Uvm*=o
zpEsX#%#VDCE@(7POvb<z^^+d;0PgXkcda|oAAk4%(-l6UjeV!?ip@JwrU<uck5i>9
zZ3D$pee6569fuQWKnou-Zu!>1&7q-U^WH0|5BuSh>5pbW7oEBf<0gRgY%?;*>pJ?%
z!DgwG-{xz7>)<aQEpPLEV7T!2Bg56^>p1oIuC6xUNoISr6*Z0cPPO?y$3PI#i_%cy
zW?y?`UPf|TQHF^S2tXqpFk)nMypC|Za!?uH>^n);BVa{=`i{GQ={x2AWoyLO9`(WK
z2T@;g#MfclJRWb;W7%BOZ8IGiqsbfE;neOg5a~xbwMAxRn8<6yl~3L9Sy%m~kJ4uf
zU%)U&3}9AttdvGK&&V*)a9y|m3ohTZVD63UPO=wAUTgC`M78kvgwR#dLL+MK7EfNF
zxFxUxi<mD&$57U@&<M90Q4u+?>sIK$$dzH_SfuUrQ||i@xbJI?ygqDy<cND;>xS0)
zo>mzrN*uXL|C3w{`U%Ue$_u&mnyM(KcG2-&;Ie>ZxP>5eVS<g$HNpqXXdkp(@`v{r
zCR-A^B7&BTq-AuxhDkf(dm+5$1yMiF%A75siAd~?6&cD%b_Rc*DwghbqyyjG4o#WO
zgR-p_s)pckwn)b+1`j2sVwl)L%=u?mSEN01u+6uNL2dKx#rZ}=eS4$xcSVj3KO8v~
z@wIODJwQ*Rz86@bpW+M>@g0i#9=Hmk*<F$OM>fxP?_%!>cWBztHeVBQxrq8lebcg5
z&+tQ=i!wanR`>o6V}H95@%_5ZcN8ip?rDPXnnR*K+3qPfz@@0~kb9??;0g^=n0x2Z
zT_2!w3>^KmE9d%3>SDk`-MtfC{jFV|rx1ksZ`msEeMyxE#`@k0^^4AbU{^N8kU3TM
zLZ!|31P!0KH0pa|^VF~LSEmo2sPESs)6B5%2~Adb?|9!6YmdXc9H?Ut+%Y!ldn?@P
zQt^3<@nOKDy%}++Av;<unFTWRY%1zp2EW^U+gM`Mw+-&g!dQd-?PlZvcrixLqva9b
zAHq;}{|d0ZNBFE(pMqfBi;8q;Fmz&kOya7)2$DxB`B+x!Y1wx#qeA3B_%A(nwW{jN
z!F%XzSC`7ld8@~+_aHlwu<K)h-KVH$b<c-ldLF4Kek}D2fZaXt$JPtQ^t|Wk^>^sa
zi0Kuar<di>%jnjN_>RVcveEY;!lAkM&Hr#$0oARZ{>4AKy25Lo*4$0C7>Stt{!qUE
zY_D*;zR~v)=Gx=zZ=7uaHW4(g`N$PY#9zI>AZGj<o8V6@Q<nRy`G4AVi=*5%DA&Eu
z_YoQ<l!-rUd!klpo$TS54?`ovXZ299b3Y3<GVVaej_Iga=U&CwO2#-co(1DVemJ{_
z><!1^271H%<Gc1c+&FUvUE$kpzU?q0PUJ>?8>90#xt};-vP=0kM&@s_jhpVB`{nTL
z>D$<I{w7ti?OJ%v_8tvKUOWz)Dzj`?^xQ~tM#lrRF30H8@b?~8Sp_&n2KZwHxSf%0
zX6bFdtpwpUM{%~bOLg|{^Q!b0t4e>_l>z&9iw;Jii0sGzQDn!{vA-jS9oczgw3G24
zN4DK^qkY#3hZ_%lp(4A3m11O@qw}}MBHJ99ztygzBeKms=WkV!-GRvNU}U$zrpoM$
z?6tJc$nK!O+3+{K<{=RpZQB$RCb_q^(o_=%sdMoCj!s&G^dFydo{P;JN10*QpB%L~
zrWD5e-dfG+<8zjFfMrkFmGu+Y!L;-|R89<ZTG=(8B5Qzcg_vg5lsDeDZS7ky<by`X
zDj0I+lci5_<Xw0n_ZB%6uDOsxr9<K33n?@?6uvlp0Uw@lD7*y)IE*VP(Gi5hyY^9t
zdhdbY+<Hs@oppae8pmm5+v>ONN;knH+g`d1z#&?D7^;!uoljy+t7Rw_pXt$}jEv~5
z8D2J5RHxcds9{;s1Cn78tYZ$P-*Ql`Kj*&4)j{OV{eLmbM>mheqUJ;rmz&xfjh$L3
zwS2=Ht3KD>C|~#4Ko1!8pO#0Y(&oA0=*A3aH-4o>n}-2eanZ*9so?`!L{c#S!ccbM
z!$#^Fr5Qf$-FR!N7CzvLsi2(sH!X<#c5dWg_~giFWk%7)c^Unqt1}8V7meyg$JfAd
z_f9Z3v_`@#4->8?M0s17u7ce8#$nMAd8aK*A0QDOBd{osoWfZ=@=nJUz&Cu-kd|}C
zy)*5a$UEV~T1PMN#{RATZ|+|{PaC%CX<Q6MK8w7w|F1Zo0gpaUi&0tVVI#XCsv~nm
zG563Dt`Fz}&$YZ;Lw9eJadvNf3UtmV8_ullbHb<MJp8csvevfYOv4zoNGQXMtX7NK
zWSL`Cd&gWL;d~=>JX&bJ1Q&VD%2j<&nCdzj)n#!g&{^E4pHXe);PAh@Lf0!->BUB@
z@pD?kheqCVn;#bs@;U=nVenYY;EC6qd`CgD!nAT7tn8vAC;n^m3M?y4No;r{^c4D4
ze;8uzyWWU`h!wR$w&yXl=em=>hIn&R2Cq<%VdRE0p{W+hDu62^HWH;o7Z_J<&EPpI
zns}AUvEhw~;zShf-uO7g8(Q5Pd8v}~$%|fq&8su=BOU)b{jBQb18J&n<n8@k1NMK~
zZ*%gv@Sg_^|MFMt6mNdqb9GbxhBIzoWyVN!Qmhg4;YBh;B2t;*k-;TyO>j@0VqjOz
z>39h?(JJnyi3kK@u!jLb3}OL$W8EQEH1dv&b$Ro;0|nQ)xi~%7|IW$C$8m+z%cXxj
z@oKX)bmBlW`hP51(Ot=K7Bk?;&CR@T32egVVDjcrMnUt~Jsxlx7Dvv8+qCHS(y*L!
z?<~@jBYT)<!yE1m;{d~F8|wcXP2Coz0vHHc$c?t*>JPn0Dl1cM;r?XeXbY!X*xE;%
zqchM{uY~fg4hIv6k6gih_BY1Fz2QD&>39+WY7@9WBvk!XPec7=!$kg((;91*dp?bC
zmIGQ`%M>8~9_fnJCb9Misf(72VFMj~(D`27D!mGAglFG<nw}-WvnT?Q<ZdcK%)@8V
zcvk|E1Hj$XA82e4bf&OX)cE)w!?EtGF4$-op+*Y>$LlORa4M?wvvWCSh-S8DG|J#1
zVg-o3yNNLmpYnExbYoLrHYF!USwiP%<ivQ2gxQ|5bLO;mUIk|O>>78|&taU6cqIIl
z-rYj(d;g8=sm;^AMvoYVHGUpfNlQ@kC}_-#MH$)drZ<okgE0>+I6>-Regd5hec68N
zKT-OaUbCT-t*_3=bMI{G+ZTSgcW&+52N27*o(FPT%aMQF*e^r#+&fdl`!$>!a*poi
za6i#QYi<0i7J9!NqvLa}wS3G#&xyaO+9JE?oDV;(NdFdfLI82kF&4ni-QbmvEy@^&
z=}JyW97mW-sX<pU?Ywpp7Gyu|G`o%c8y7lIl~az@jXOJe@x!X`%npBD<ZjvkJ2IfV
z=*n*X(IG}%^Ej@lI{bBcO^agYp%@tC4A7B|$e{l;HG)7yvm;-&6|f``@$lS}H|$lM
zW+JnV$Y<`IuddtQB-Nsx%`>7NOa;9*Pcx%)%nfhUpNVLlpIA=qE`-)TAO8G`gUh{h
zs)n<aHSwWf@I*%!PTTTYcsF%AZ?L<moL;QDT48zN1lE?#Fn*%<Irp2wCs#)|Wo$zB
zXj29~i`<$~8Qq%ENHmmDgZlOl;1ZGKjEq}zUYRI<0CaUm2;+LCyXhoKZn$$ICoOkV
z7YO&g?1K}x4H*i?Ba$%;e<!vt9RtQPjE9M$=R}|jh_)Uc1@vYpSm*nkH`I8F97QB=
z4UE2sCA&A=2xTluDx+`-9WaD*{mSs6)d!m=jzl}To9bbq;X4x-<80?{+96AQjBYdz
zA)}`(bvn_{A)DBW8_f0J-^a%5+=D+DPZNdN1LEE?YYS{n6t9|K+(&)kNddZssP|E*
zZCHRv?@Pdxb7HOKcld0TyJ-qE8s<+#fS_JU^&=9!iRfKKH}q#tp1n@^<oKVs1BAQj
z_bd?}06j!>A#%7ke2VVAkL`FOJ$yFT-Sl^e!e^(uHyon?Dxw*;WY{ZQsCdWGzv8_8
z2FCNt?u~n)v6*YQqc7ryjflK=`dR1=+W~8UUXCg>uMz2=(eZm^v+<WY(XERzWcLE3
zqardgqhmh!JbS)G`c`#=z?Stye##yN13fbv<FO+_@*)S^O;K=jT3_4**CTJAel{}V
z@Om#ahM>D`gb1Unf8;tNGR^Gl374BEE`I-F5n3~`vFQpCs+=gcrXmg>V<7MAiEwxJ
zM)*|R!~qS#`Y)K6D4KMj+a&sD#_gBX*Qoz41J#?@n+yo%O;l#8j8o?iq1C)EnZlh^
zOCq+NSTACa0V{9bXAu7ZGs}5?AEViMS2v9|6P+u%X_NZpp!ad@-gzrAuE9Fz5Ys80
zO3X#<T40u4o(nrOyJ>V;(Rl?m5joMBMvM<iI(rdIB*y#C`#Ae`o?(UArky8=xhee%
zu@qwONQ~0o62ns%(Rm11hr8pv`2e#V?ol3$oU!f~hfnrLd#B0Eflx-eS}FBFZ$Qt9
z9Paqm$6PE!nud{?9zN9nVBGwIQEcS2M(^R-YV18+Ypm`ay)O^7%W1``V{7YaYk_H%
zw?NLjxC)U)mN#P&ekm^Cqu*l|%$8S1uQSnSGNQSWFj>)?jmV`K1RZaFgj3+5w8*Jj
zZaXN~n?_WgB9W)>*sv`4`J6MhMzh7*mh%QmxSJP5bBz=Cl{e4dU4-ypQN;_2TQdp}
zkE!mRQFd9J$u>&Fz4I08gisVQGLZicti5-mXUbu)4f(O;N{<bnyo`>!;2a{+AD*Xg
zUcc=wO~@G&R{A$gT=&;)dwSD4&YJx($)=weQQjP#Vn)IvS-~Feox@N}$7dfR)Dto~
z{z}-9AEry80vRs2@HwlnhZ#0>)gMq*x9WJDmn9vK;{p&T-QUR!Sa3&<$~70ToHuTX
z9F;45tVdAqVI9|?RZ;nD_rAVSai(atX1X`bMbn`tq+?P^N86)zoXR*^m;y5^Yx`?l
zqIT@TidV@^@n^+<o&3igd`tgr@}mwuhBWQ8lV5i}|0D8mIiLRt`Gx26&yatWgKzos
zFY^1I&v#+3NXI|1{<HnJ{OLvh`wqTk=OXf7bMP(w%gBHJeEuNv9|Rwr3fDZtZaIkl
zEkkK?u3*&xM8^YYVJXI$n(O<H3UJpQysAI?;K}|t^<{6~!)J3Hv);$_5hgmkZGV?*
zLsw{c&KYYxiYpY%b?9MS#K{Fr*VgB$ip$WkU)R5fu_`-2+;}~GFxo%kVD}OM&pyy4
zj7PaoCw#Um)OQcD^5*afgIASc)qftA51E>qp%{C1x)#q~JF;X&<a1JVOss8PqP}Wb
zRrMWJ{u*o?2!#B6qA$3IKt8^&$DV;zRiz?S%^d<&OC?eltga1-B_(BkDI-!^TPoz<
zfHHx-1bCWXUAqdFD^_xML3ORTp*j>8=N(dqsLrn|St@bwgo^UolI4NbAqlSaPAChk
zs3;8psVxZ+l$O+l>T3g|$}1{Cj`Eh(FR$?`KkK~ZwbjeLCEmI~ZAD3?w+1ft63UWL
zc2U3oysZDgIP4Wx*H@NRT^aIn7lyNFZ%GKX8^;RXu|zO7mY?2XmV=C|x1!EFBs+KI
zNN-g&^nnfUCFTT50~IR*u?*Ga-pWAL(ooPlq+*=6mzXWv#amuoyBvkcaE|kGYldBd
zr9Es&Ft~C!izuroFAvlPszTmSu%yZxSXqO;A1FXZOvc))lrwt?ulIVkftT)$^Olu_
zO5#{39o?fcP_{I%941AaxH=RJ)Oxd5qB1BR?gpw#mOxvSRn#fO>zx}Yt;eR2RjLE5
z3e=&G#LOU&*x|BN$-LglrOQyc+v@{$A)8fP6{;;6HGA?6He)X3Riy!MRsHfMf!c8_
z9)+_qMaWlCB{#BoWe(-pd9sqSvf4mh-8eKvRe*JJW{e3ds#cU#R+LTh4$EGdoiqF!
z^;k&W`3}VFP@Z#jWhLDBMjJIHwRHh@DGnFJth&AyHH@!=#g184?sx0Q1o5uNEXFh(
zPRCn~^EX}`=W6jN*@f)ZnLN|#OtivIflB|6eHgt~&MN3j=k(c3RBd+2s><q;vT<Hv
zTl5OH^^6;fWz*X|&+DBtcWykZa89AOdf7R8vJGZVF7!^tAVPs^{G6kLLZ>eBV&_y<
zRiH9XG7sCDu*+(B4IEltQCcGZ<f^}A)gciIV2_mgyF{QfuBxgo3y9Ei%z#qqP7%Nm
zD87E7z+R|8CHc9cqPC(=)CDV+FAvm;`qJeURXoE8t)D)A2OypTi@bNcx_D#CZ13ti
z1sDM28tz5FY`_lzX9K4ExvQ%N(7>8{8(<z_E8q)&9{@JtIyoO#Dlgy~c_rZIIPLP1
z)xfiZ4*=5u&jQW^Ovg#036QH81B<>OAue(E0&c}4!Vc1Sh{)4qB49osFAsTWcg_*o
zYE$c%Y#19+t`|I<FU8{HU0q(-7b)iTDaq5^Ng-pUm~`3r5xE(IC@(<ryw}ww_u)-W
zF*mrb>z&|Q^fJt-{E*Ltd>){P$!EvpjbN{Xe56wzlwz5G8~B?c$8he>A5e1UX+`=0
z<fnL<SA=D1u_wV*FN)lHeNCcAch!eHiLUyUo*u6H)%2HbaVwVXBLL}7*j1R~ElV*c
zrx*vlV6lxVAzvMnyKd?Q+0>+44yGVpv%$}U&JpPR22j;$a!T^u`s5VPT}EL_S~$U%
zQlQV#dZna+br7<{D5wo3ygVhzwHVxkDW1uPQ<5jQq1=~Kj0rHqm=~eVv%bmZ)RcD3
z)d`!0aW)H+nEwd!<>4Mh4wpbO&fPvurcW~eo(uToOB#kOeAJ$YyL=k+7p637uE`r*
zck6c<;RM&62*As2hYwzdYb+1MdC*PAlAV`sJQ&xh;H80=Lk2=RHLMrk<+?S+IDAm%
z3DQ2~gDJ<6kF*-R+2A#h0iW-3p^Jre<X+J$CAl!gMC^>iMM*c4I*3>uPBG{M+kj(W
zEAsx!%DaJitu~PLEleqJy?cRhO-@1+!J4Pg(E`|S2Rq3a9|c(EZ?@WieIr{Bq9JAX
zC``Hq2zmj1&xh_4xMnDcl^+-H8&a}e)6VY!j9&<O-$7nfK_2971n)3-4FCV{M;8wI
zXhY%*8SBA&LfLm4CNGjJv5V-7ue++ZufrZm%A2rf67VQ!o?CB2CN!ta$2pS+!XQ4!
z3YoDnA?N&rZH)q36~(Z-43l^|AnriPeAu8OIP`HTU%hJsHednL7hEM&SAholzdpEU
z-p;fFb-4@a2S`sL?L<0^bPVYuq%%l~8x8Yfq@hSxBVCWQ0I3{l1=3weKR|j4X(!TQ
zq+>`QA)P@=j37VKP^7Dou18vcRF1R)$@b;{0#!?WbIxY8(Gy5Jkp2s4AJP$|*O7jY
z)Q<F5q$!1k<GjP>FR8Bz)o0DXqOG>to0oZY=IBv5^^!SexT583pnA6I%h_A8tBrSk
ztfNmlckl8rv>bE`?M1Y?2M85k!tOqbT$;HS*<G$4zk$SM^mv#|qsIeMmbgyJ64)tp
zBLQb-;W87rmEL9c_#S}q3i?2g`~^gN;!lswcT#91d`-?hFxlhYGNRWL{XT_83!Lh4
zKhXrk;1tl~g;^jH4c;SjX^9(Artw|y&8jD;-wd?pTcd&Y_%nL7*=xW*ft$0S)@$G<
z<{2!^uSgBLUs49j0GV_R%jnsdH2HEGy9KjoQZZ5Ji(a%b3PchO4-m#0IG8je5gcPF
zN=Z&10=_X9nUXK1it#4gPQFaK(E)lw^5w^9)`y@b54b^@HSY&Z_A1ISe*!O(2P(=m
z7tz2VMJ1clU?X{OzRc$_E2x=4gRa4;<{`?46iO=3{1!_Xs;GR?i&;KGvK&t|RPa6n
zD>>2l5}-E&nPPZyc)Qx&g4#5?+|97kXt>{lsL^zvBJj9xLZutM?j@vJg?k!m+t{eN
z2a-mf4`EDmPlS@o?SU=B%^S|9@SK6Mt-VvVesDW=4U6of(G5g4^>>i<zC`<(B#qQ5
zl%`vxnc4zly)U)M<kayfvG-*b=}CPKh4k)ck!h);;Ck==7MY&f2$Q`px5)mfn^Ac0
zD=gBR${Xgry%w2~x|?|iTI8_QR+c-+B1fh!VBQRE5rAuOcIwYb4%PgU%uD?ieI91j
zC_i;RYc$d#C#1eXX{J^!D_D^FG|60zYb4j;qST`_HCmf2$?H=K0DI?Y0cm+kYBo*f
zYxR<xn#u<6Jy}~Pm1m^(qR-Q`$0Ru~HI?Lai(HtRPI87t-kLgq<V=fPoH~@`4O*Mb
zTb4S4Zp^lP4yNuWIY;}BEVokhIYB>m_TYjux%Xa%!E9oLUQ!XkZhJ;^p9+X!PGj~1
zs)bFA)Ip#V4R)_y>}#x!?2hEJPe^Xm=3Xg`r{P^n&JgGtgHUuzF2iMPfB|>%c4_Pv
z_}lkA{K-z#3KQW=T6vk!d{(bAxs23`7l7{?Y?w*tHrlk0VbnF)H2EMxoA;%ZC7Vew
zs@?n}$n?S6k}(e4DbpcxuSB`ReFl8Z{SkCr?rZT^ce@}o+>b(<;O>H@M0Y(Dd$=Re
zG~FXnQcq$0hIucgTgFw;)UKpoDTX$DCruZ@ZQ)L&Q|@$_XmnjPbKZQ8x{IN_ZF8dg
zIEwmOxJ#h@Z{g-vx`V>ar#**+`vv59S-2T%l;7ifP)*h*d;(Q709?D4C`MKquE>No
zNks&^qQTV)PD>fvgyBv!=+DJziQ3FN>HZ4p+(49b<fXJWi~04zjV^O0D`JsNE>+fS
z>gt0xy38L^dLsi4(lFn5kek%%K%1jXHDlj5EziA2=G|(DUi5{O>=a$17rkVQSaeU1
zHvf+x&B<)J1=Oa0vW%NlZE>Q6g0@iA)=cA_G;Prjq-L_XL}S~hvt3bVn({mk2Tkos
z{Zh0->OA`Ml>Re_VK{XU!|-EW*)qhXvirQQX%nG)Ssg9E{wOS8w!CgBP-(T_Ji1ow
z(paQc1I7N*g<=;O{g+Tizb~&4+H{GDE4H$j%XCfqKGmh&%XAv1`ei!R#T9k<tK~sy
zcT6cSrj%zX4S-B5fYN`*lnSJh=-0`x4AAAs*0>^51r3nm0bI2~%9@HRy4Yq}u+lH4
zmZhwCwfkX4&zG}@uFZyg;Bjc{`Hvyvz<v0m=buCb2EGb+_53zz&&!bXb!pm<WA^&G
zSib>LmXs#LFhKU%G#8t(zwEJ!KWH;-XqULy6$X9E_PNAGJ7_<$yxJ8o<QlB)W!c(a
z=+Sambq!`+2Bu1(bgmMfy9P^-244cU_O^<}x3K<Djrlfx8YpLsw`FcQ4Blq$%P@i@
zFQdGyPH2DN3LpcoT?y@v)EqJkMut8EO#77d(4WOnab<?zj~VIIII!rii}A{_B6uJ2
zsR-tDM=+;5f;rOPekH8;BCAuqf;<D-6sJ2{i(D-Da@pB#k)2KS<GWMZ<C>~xVK2MQ
zAJ=5?m$TbFu91IvXob+8(YQn6a#_J=HP-NQS;Orz|ByWB4U$#dFByYm9ThIFyj)iD
zfTn7hXwZ~b`zh*bjF9TOh8xOa;4R=ABTmEkz*#8Y7(uUxL3J@ZmO3rz+E1t|JJw7Y
zmSs@VXHr#lteGk-e4k6pb7`Dyw6~B)_31oE=gL!KtlxNc{}C>YeMU>dMU7G&;ZPkR
zRaJi*Df^okuAQO&SeFXnRk3_yWj=AmyEMBTLuEEajN)=#2D%=-WVz0TB#cy{UnTZe
z?V#5{bHHH5VI0JW8vN0Az{pjX^#Jyau5qP(GZM4E2mO&RaG*S+6L)P9Bjr5xjLz(?
zEyl<Y<M51{r?!}*m}}53cJb{x12w3La)oo;d;+I4IoB*k5yz2=p!8q3FwA<K<<HLk
z8Nf#HayZeIKmk_-Lc3ZofKE2o!#@X|JqySoAfvMJCpQ2}Uh9h-n*I@TO=Ye;{YT72
zle~3f6_LZ4kvc)@jMdjdXY@Vbtr2+?9fF7+Xyf#3vIirp5MwBM7NTDwX%m%bycG4z
z;edEo#aJ_Nb*mcqUDem+NPbu2z*2MFyQ&ZW2@I`W;#XddG2SUrA+FA5_@=1ovK^&8
z_XEQ$fpRBa?Yl-!(NpA<cnylp$K!dSO_g)-V$z>7v!d%jkCanevCh0~JvrGHTg_#R
z<(WVd4?%aV9Ked^*)fMR`KNGT8>2BtKZ%-Uodz#)i;+0kXvzK<_;0Dm*bMr<VIHO8
z2>mT6%Fz7-LNSJ?w<zlHB$Ae)kIn&YA{YOxLaq+xx=qi3i`gmQU5YBnmY`5DN;xXr
z*Fb=L>@E?AxNOnN^drpo9(ao&&VCcf9YorIJO*SGFFtZlfNBLbE(q#g<j6e>j)q`K
z_r8F+9(3<hEt~EQfIx`x^n5zliz)g_+s=|G9!;^#SPDrEr5~t_Q)EUlfoIAQ;OA3T
zp-Y;24W!F;jD$~NtT)fEnVeL2fdAh8hItDZYuza3k6?ZQBKu<?!!Z*~JPpLPW#PoH
z0rf5KH01WetTP9aYcE2^AxJZkaZ*2UCtZm@;#%^ukjlW%9RpSkw3XlA1^ZDX?TGT5
zD`_G6y?{SjsWs*7L^jovOVw00LP=)<$R4{)&igoPUyaCW9XQK!Ux>=mp|Z&C*Woy`
zcE~(~WVijR!rx{)DqLLkHxip%T05LeeaJ8$fMbjM+8uwBw3>@aBwsqSNm?icT_8(p
zmL-KjkJ<=B1q*3yt5kX%%p8W+d;mRK@oO<0vK|Ic-}38*>@7fcGV42#PJ9NGHamxB
z^%~?5=*rqM*8=32+!HO3{WS!~shtkV#LH!)v^V4q1H!dhb{deYfL!++6j#E+y-3=7
zUn4@<$H4j)WRqV5lHH0wb)dwxJD{=`>0*>JDIW$V72=P$mb}AAqrlId4c6UMFQny^
z9~x!`lJ<qPiXBuAtG}e0)#5Xt6r|!>m+Zr@E1B%$1+YCANqfZAj3T7`L&~Le6>@E2
z&Zk^IwWVKDIxZVkFGAxKfGxC_WSo1$se*R2nzm0i#$3_?#`{-tY0wC|sFQL<BgPzN
znLom$%^1Jx>Wlk#(uJQvRpfA;vH;S>lpb~60qNu&;AKC7KL?>Qsu7Z0zOeQWP<cFY
zP=6csZ*$3$hL`$0Y2*PJ)k=MyH0FTfk;AV3d*o?no_AcsQKziqvR}N_kabidM;o#Z
z0qMErctc{ZG_8NjC_Y-r?EtSFW^z9VvIR&USEjV(;h^}3D|<cYBM@YN8^{?VD}bb7
zIA-4l<Z2+J3ZR>NFQ_t5xjzE39*CS_PCtmwhk>B=bJ;T|JeH#4D5Vogd)I1G<gr9M
z!G43HpDEFYQX~dfu_12Lct=Ouh*}Q35jnKmX5sHpc`9E_RQNRRu+#c#@)YJp@dLLR
z=9e(C3O8Lx{#psu8bFNP$=2*EPhVUTjG)Ohi!?{dE0>Gp)sJgSa?ufn<qB;PJkYmn
zTYEh(nFmN^ZT=vZt$C$;IUMyjqU0K8@M_nf;H=xhLlL94F<z@djK-=2?N<!X+8@RV
zh`K|x+n}4h6uh5clFz;s$Zvp%Db<hQ8VzZzJc~}2mHUJeF;$y|v8=6CC-H1l_8KHt
z$ao5-ilzEmsg9E<qO+C(xKAk;K=F2@B%Jl$k7?g$Ymcp7CbS>Q3SI*ZF^wz0M(97T
z3g8pLtSi*w3YK4`8(+EP8hr;eG9N|HN50cgQ+|9U=Ro*TEH72Qa`Da@gThC6MVnEC
zmY~bE=A0ZZOxs|EpRCY&=<8r)^k?AtvOdCJ*cj!7B=>6&XX%_6$LD?zLQT!5y>zbf
zufnNH<k0Vb!q#lsO4VP4Qa1g*nbI*liKW9=`m6QTNAt8LvUnClDN}68B%Z`3@eDSJ
zXD=Q;t)5k0rPe#y$UgEh!>oeQi*O59Re6<M@4%2+&aBe8m_n6R1XkIr&mwtQu~z2=
z0M3--xn{lx26xe?h#tBa9v6XEgrS-}7Dy!!F)D}(skq&%;&zja8*??Xu3Pk%n3Hk4
zpE()2!$3wo0I7`KXS5^6?Ew8YR11E{Y+L1`>?+LnDmrIiuQ#fuJ*dl*dI`@23{VKj
z6kB@12tCIE_6sXQFu^<F8<FchL}=u6_QhYQ8wXoNkzB67sB@w1+7g^@YP<D2pf;nV
z3<GVC{snN{Uzo8{XnWO~9@hf}*T6~bCH+PSPr>eVL))is1CiPnv!u3P;>bn8uk;rw
zkf+;L6?q6QuL|IT^niXhWMg<ivJEcoLegH=vr0ju@$jHVWAW*{lt|~~kv<Ddtc6&Q
znOC76sXyT@B~6=&C6Y*eMiJ<3+K`mKNqS1ZlvJ&c=3&(`L{ieVU||-qP)wS}#X?UR
zmoz@97*j)n8!E6)K)Od?O;1TmqF4ior%<+TJ{q)VUtF5mvR;~2+?Ps814VJ)ELce%
z3P*bn1tssHb*s9E!AyUQ9Z$@B0&}KX<`ath(tID=Gu$zhiV1dEX;3tk&s4k!_DtHl
z7!JjhF1bj%GMQ%66Qm25W}+_4bY-$v*5<N=m=!GJENQ}($;Ew@yuT%fJ7}ytr7Vdn
zx|Nmc0I1TolzKC@Ny&CmG?pjb7-;Fpzz%}BScbvfp4nw*Sj9=@AxRqRG1ST<c~>T(
zFAU>_-tbs)4&O&)TJ~94%tqY~vo{nZ(%#5!r(KBRs3dJZdP!!cmeaReDJwzb^rbjk
zB2dV=913%wyD({yY_{Aysz5TDD*aJho>K*#n<Py#2hQHz&J;UJx~4naG?wr14&>PG
z_)|KL&ax8YowmuCa5<dlE^MN74*p-8gdx#K267U4m~y(?fF>u?d#pVj24y!XbTTmO
zIdZ|Q@7(Bj2kv@@!_b?eipN>=0vUSI@nT2)kzrb_9i()+HP&RrXITB;8YnX@m(VdL
zB~ReF`L_tOOEjR1XxcwhdgHGKTwWJu)z{T#RaBK$)|UmcDn{pDtv(wzYH3w{){+W*
zMJY2g3;(}evZ5pl6I2%W@Ko1jseOmSnfn|f-c;SHIwj|~$(ELuW>s8$PEmN)X?uZ{
zyxhfDCpUd%mcmhPp2QcGGUazm@Kq#iksGZD`SGM&g<n@vUp5DOB{S(P>dTKXp*RRJ
z6LL#mozk;WOq0+k3zUP60C9__Qc&NA0uGH(pmuphwUrarDyqSUJ><l5Q44qa8>GMT
zQ&8QCRvt{KF5Vl`pXs4ZFP?4=tk>^eyIp^v!K-&_3-$XOGS6nsTXcv17j0p^9+;r_
zE4Tk<>VtOcw>9fmJfbfN>4Tc}<nrzMP1E$@)9`ms-O@^ZRI@&1f<AVFJ|$Bh`^cg_
z!ezLY@=t(&Ci2fsGwb*01-tdbYd+I=yE647qFMiXb-CH8_db@DrQe=8!yKe{>c{kl
zR!`91U$bz!{)DSpKj|`$=(jD@haJn(JH;`*Yt@A5dSjy5M`3?6n)M;a^iRYidRM~)
zz41H9c7Fn-yH;=4`y6{_h8cYLzEO26mfdyQb!A^yX5Sh5y~Z*9i|<U(?`eSU-6+EU
z!P4>ddg^C-?Rx!nZT+6Wbp0mNtLGlkmzC=mZEw<FbS>0hSu;W3x%!dm`uFq?^!)M`
zeaa*Hnbi{vmwvQiy`ky5G;`qw{cC-@9$Edt9&_pV)2@uZknU-i2I(u1>i=?0(=S`E
z*M#oVkD*x9B&;9R%?bJrmsPLh`Ufrgsz<inkGoTk=v&vCA^lp@`~Ah^wtd^o3QRY2
z{p6kHF!x}B`GNk@+G+Yhv0LA?)|{q)E;99d*P=qz<*jH${bRAdMSl=}%Tm@GDCKJ{
zq+)iD(QFRJ?LSM1`xX;cm?QP%g|L6<PF7}b!g`5k0)JQEy*Hx2txeOPZOE(zlBqw}
zaAeWL)2EMLp&!vguH1{zV-S8e%n{V9u>sB<ZgAyj`fikQxM97%UvtgT^xup1`bTSA
z!!*Ot=eZhP8m#|a`)m}*<^~pZ3bx(lD0!O<+Ml)U;qac9n$USPvtIrkzhUplY$)8<
zz%cw>+n!TfUp#RV`ffQ^l&-~E6GX0OG)@1J%XPD67WQ4L_j%-_$FCWEi~g8q?$)Nm
zjBf7L_h=ssylL7}{h5YPaJv4kHess%WJ4y9@<n>j^*`31M`!vCZu30fFirohwmw&X
zU`;a{E0i&>{D$Jw=JcC3>J{dM;^|9onx4IM{B(Wyn)UjJuI8J=VSVKz`a^4W2lYlY
z&?mZCKK<r{qxJOdddf7tb|L<Lp|6;xW2aq${_;vjdq)pE>P*mIUpWE9&lK^7Bz~%h
zHzo0$BHoh3c18TRB%W2oF-bh5h_@y26GgluiKi9udrACQ5r2@xQ;PVbB%V~naY^h3
zG2KYiU%fK~=XNHTAw0R%v?ZA9$}3Bj;^T1D<>mg6D6PiU5p0^o&TlU_Z1{`kF0C!8
z31W9~m4697Nw*A>rkGt>65`%z;g_0A>dQqbzAjf4z~}AcHe>k>yqc0wkOt~7%Ln*j
zyC8OF;&Xd=Q0BMxwexFy$n9TJQWwB3=MXlyb4R>a{;99xXZQkT$`OBAHf)sT$S>&m
zm#o6hPkfn=Tjc%LSNGI>?^hGPpO52Ecu8eVu*9Bz$tbH>3Lm;lVJ+2Z$dCEHqLLe|
z#dY(qpIdyh4<7)m3;Jtnt3%bL)s@z6eqj}GM+xlI1#YjZhS^zu?jHAJ-?hNKTgyFe
zv4>Pjct=<6@kL$h%eWU`_!)WmeZgEmFCbB!x{5mkYz4H2Y!&*C4cWqv&E9^vP`|uN
z%=XWoTsYk~&ws-#KM<HNU4gu}*Q0ziSaoF?+Y;X!#2W{pdVIwYm0nU=QngGuQc_jM
z8kJ(FwrmM(tCw#Y)X{gS*3?(wqlRdd8tk}b#g>=UF2e>|d8UfhU4D;{4H<ihp~mVH
z{wi#JXLpb_U@)wcJh%7z&uJs|c0(M`YKuyosTmP`rLnZSs;rJxgER6&i2fRUND=+4
z9x<$A=aXCP)r$`DyND(5OUzw#L!tk=Me}^Jn)0oR$`TrdnYxk{_{1VRo%IpMSWp>J
zB>%kPnZ8-`=ZSjskDRMvZb>yh^2m=eE)!Px?24fS%DTc6`AtdHuDNVQ^&v)tt{N|W
z@B@=*J(j@8UFaPV#J{ro4n!N@r<5L3ku4+%`I$;|B6OO#wM|vv4t!@)R!#Oc1_*-%
zd#XjCuC%0v;}O-S_f{aUFP`C3!vZ_|1Ae8&OpK@1N;Cydm9(~;JFZpu<?9aUMe-#I
zasA{ObA7_k?h;yo#>6))RhOwlW#`{8{f1dL-GEq>mWq;4b%o`R8X>U}Udr!j(nFLk
z2N6xP?D8@gt6RqWYD7R2U#>*Q$WddazKSu=1xF5{6(NpadjOo%+fecHirTu6DjKe`
zYsr>iA6D<*WL4MLYtvD=nJcsE>TCECOjcdlvaHgqx^jNh)>~+8p+jTg(P%Atg?z7v
zf$bi*E7d&Xn_D<}woi4#GK5o3lBgu!B@w6_N2$Lmuu^3$zd8>_R8#nQmw*wG?J2uz
zY=m(J@vAAs?#mp!YSxa$loK1~2KgQg=Jn<Hm}$Ts>U_P&o+ty$YeK8wdQAx?R|yzR
zP@@&dQ(%nrMs)y|R#RPb{>&&>u(o0Jc8o4ov9weMr;4+7oz;n~wy`=9`+4_EPRJ&|
zT#5*z0l0e~mC29AM)pT`7W9((8a0k(n9j9{2+D@R`zG?l6YJzG3|V7uW6hg0ACm+o
zM7%^L-!4E`M*Z=fR(v4!oLr8#uh=#!8nSUXbMiy1LJoOZT|7hg%WEGl<$0mx5;*w+
z;(CC%{Ce#$g?kByTYSP13a6?(vhg<ui8cr~DqKDvZMOJ?&su!K?G_(E9<(tYNfUDj
zXhIWnBLLjD2^4?j;ZSt4t^=Wqn(fI%xN8%J_$dF|3MF8XQUy>RR4qbsiToDD!6QQ;
zaV2iGSc#%enBFU6s^0<M@{@o$dy1MTk`rs5PEH&IN*+7#_vc6q4&g5pZW2DP@MOZB
z3ilB1QFt05--p-n(Nu|~fPkSiLbt*_gxtdjellUI!c9Uxbz;GUE0LrjBCC`jjqpx|
zdkDXy@MJ=6u198*kZ<185FC;RYxNqECT0`RAGA>)09tf37ZrJ@70rRa^5|yWNQrzv
zD;CU0K6;?Z){~0-o&}{Yk=-&Ba0HS=oC9*!xvX8t_aC|SDHMC5G+metEp(g3OG1{6
zKgF<24Xav|JE~<%zd8T6WBC`@_8q=cx(-Pfbx$M{QAOR<t$LH~NVg#w-#AAoy$^{o
zdI<0_Bu&ic(^6$}K2460-p?l}K%%m3o|zw!nPzjp-d=^;(w9NfmP?F{<>+S_bn-^W
zEO+ZQg11hV7BUFeE8HXuD?FL-E`@st?^SpjAs^7A!?tTg?nFWdOe6e`!aanm6`oAE
zM&Tx5qrwfspCL&@cCF~y_mR+h3CbWx+cp3^sn8z-Jf~1+o*&9Qa|l>A+LL)`-qEzv
zK+ch@*$)BG6w0y9e1W`QBe^h{*oPk~w<9?Nx&!pjB@fdE;4c(z5^_f%Vv$V98~MOJ
zgnJd9MtBE?stO*El}HR8;VOlD2=7#QGNIf-i_uQlsQ3oqpK)*hoZ!*3w~<gO0@_6I
z2&mdq#2$Ux)nkTV%M5b}ltDa7x8-~srwq;^u;j;M^1E>7>PaL=6#uh=C&8!Nk#vF5
zRs+d}6-m(CZkw?ED37W4>}vS~h;}4Lp|&|}0~K0}ZBJ3QK}FdXr&<=z=Y9(kXBXH6
z`uj*`EPS?&KY@D|>0BG+p1z<y?%~UNIy+M$H0ixd<i<uZZoZ0Jkz8VQjCTYyALU`P
zCJ5mkaSyTOt%k(Gu9n9@9Cb221;Mt8Y1kg0rBw(KIs#fj(2q9Ig4MW3V~snlTjLK>
zgJnSd4-K|`N!YgEgp>m3Dcd%oi5pqOE+nATO5t-Uabpv}g9^3nFwY{XIGcI4E0lRo
zE7Vq;2a+{#iQCsYc~wfS))G6q3C(h^pwq=Opp`QV=*)f6nFT)wXhp(F#20G=Th%3U
zT9}2qL(m?~Mt!pFe9q?Nc5dom{Jqt%Rl7s<Z=q?%+rhGHU~6OAvb7vDm@Sp9X3HfJ
zpWiXsZ9NCe*3P$lLy)L-5Xlj*5|B%g+~W2oEjNSH$Dm#YwoZ^)jg%s87fwET+zEr0
zT>-F0p>|<xO7<a_xH=ZoyFjy<U1Cg(cM93KO%3y+LHJXX4H0V8i0~sl6cGMB$r9Kl
zoB;C+sW72sL{BVzkuW+FJS}CwmLa)BUJG}5JRtG>mLKBj#^XrP>gj2D1=yR4(mXB1
z-c?j@Ps^vkzEV`Or$u5Y9{G|yEe5a@MfLKu5W7rKhNp$t2qc%7)IvB;;@7kgPD6qP
z)6+t1o|KGhA-qlEV_OJ=NYK(fEyQXS<?^%;TaV-t<68*tllbVChX9{KLY^L;7GgUT
zmFQ_9wi}6UKzK;vV_FD*i-bIGPYbbk6qVv>A@&y}m$<ft@T9~i#@dUUdDg1PxO%oQ
zVvH3mfwEi1)^Uj~GN#lZZXdHi--LwTM?iCqb*Tr>k@_OB;R(5!6u6ggvc<P8WrEH{
zf+d295?w$*O-Ju;1i220MhWj$xJh`A!jlPG749WGXz>XTDcmGHqHu%oFADb(eyH$d
z!jBYg5_TxuApBb4Ub_MhgWijji0~v1ej)K?;IAPe9t7O?Xp8JDJHTTWO!zWOA_@A1
zse^zf95w%MkRKyC8$jTZwT8rK5cW{G{9OvZ@Ckl0VNZp72$L0_M%amjLE0)2?leV)
zG{R35?jih}!jlO<Rk%rbO5q0KX(VZg$QdO_Bm7d~9>T8_o=o^pg`0%`QaDbi>bM#7
zM@WexnI9HvVFA>!>3BWFiz+MvC;_!G!7hyT<h#JwA(>`j%U&R~kMl%f%(x_M%eFdW
zZEF*^J#n^yt*eQf4#4PfB-PT}6N$4Rh?tZ025J}b1CS3R>EaHNNQ4gJT7#<G7lgJa
zV1&T6a~%e$Z1SpH9yZJA6=r#%A<3QrXeity<OUq@vk8|g+$5|~xIq|IcsAiCg`0$%
z6&`CVmP4DpgwE%bE#EV~XON~Io-tdzEkOuucZp!S7wF64GMfp=TOC&;<s&UdvX5`#
ze;W!lNL=`@LTW~O2FX4yB<H;c`yl=!q(_mQ`F;iZAW|FBr%0b6eS!23Bt8URh|7(7
zB>RY$+k9Tra>Ly%NM%U&@lAYNmzSVlAn_(cfukI!9N%RUyq2UMuOGQ5)V^l4%Xt7Y
zUWxJ&*4F2>r+vJGivup_8<DuKu@CY;MB=M|e1DU#E(}MSh-B+yZ-saoiHm;wC~(Lx
z1)nSD|4EN4ar<!Qck;Q4=91A~@7nrbgMS71_8Qja^99EdNQFo~Bzrykf0f%y)^Exm
zFaHV3<f_SDaNGI*Cq9>nMM&2pao6mvNL+&2E5Ud>-=xp=ptC&(Vz3QG%0$|T#6=j-
z?2WyIXh%AQ#MOa){BQMXs}<=G(qSa~xE}-jB_y6+`KEw<+H}gF0RI^zo(t`R`7XqF
z@@UsScz%5yi6=;wV;>u>nUbfZFOckm{4GeF*g19D$2ak*%c(iuj>xQAwH(hN0P(Y6
z5(aGycZUPDH6jz=sS0FHzOHyw2oGKrg>5pKOX@4|YkL)CB9m0Gq%J5j%T`svo`QI!
zBPA;WwRQYWF(=`NtTs?deTCFihD4@(+L{^S<Auy}e*Gr1wpu<a%M1kl@*$2tScaT7
zB{EAx)wS5GQ>MVTOCf~G5`2;e#o;?V{F5ndD?3Z@5HS<a7UWl~GRp!>>Tzeiwxnt)
zZu47YMOAsVjh8H0QX5!dQ}S7erG*&9*wrXZnX)X|jqyLjeo*0T#u-xnZX<}kj%@Z!
zHyAvO2&pH3Ul9VYL(iUpc$%^GHm<`~Pv~V_K(7cqeA1_y<?=fk+buoJM)IINrW=qr
zs;I~BYaE4M0SL?t(r@Z`ka!x$EGzZ+Jq`~9w?WrFZ1grT_$>|E<99TwP~cSHcDdv;
zEkokBH;D858@r&e7`U@skb<wOakNs8-|ygC<MhY2NB=NWh%l0^$M1dcBk(4iq8>+^
zt+xp{ePucP-bglrnF-uJsK?`OBwKGW^cF+UODC*@K2Y~QBwMc$-`r?~6DJ+(1?us5
z0Lj+l_f0A@&Rtg6<vwERv8avE+X%f!?aG2@>pkVrlfSn)0(S+$vkzO3JeEs)?f4F2
zJM?&i(mrgxePB?JB7SL*zr)G6+J~+8G8ncVfB35ZH|YJ^p~oM%%7C72gEnpab>M6Z
zmMedE6naN29)Q%NAAdly%jIwAow|TM+I-KU$M3;>4!vgZ?1MT?9Z0slZLN4CBpVmQ
zwi2M%!v6-y^64Lc*viBJwA+*_c0Eo5r#+aF2lWu@*g+W+-$f*}k6h?^Z357iaoekn
zQ#=QH7jqk|b=a~?;`D;W7*~$=we^O?>6OpK6B<Xqvi10Qg}7ah{JD6Cg%gf-P{uUD
z(zE%G+>9kys!etK&hKSV-#+$Z;2*Jr2Bs}zR)^anQiG>6w$PzRmSY%-r|-aN5B_C<
zKOTvu**=^Loc0#3#UqCc)E8>!9h|4hRKM7Zei5Tp$((nUT$RB2Rne+qoJSR{3gmpL
zX!dk9FDhCEmh+#YC6M!+qFD=!3(RMV#u^9*=PgC6^$_PLMXPlM=OIO_bpz)cMdOkO
z2j>+<yCu!}L(z<!nkN*k8kF;aqWcgCj(bI`Ga1LXqSFZEI94>?1Hr-Zs_2U)&2g#d
zOC-(lr)br|InES~AC`0+`Z*V3Y#*LoyANG{L&!;A-c110#T9Y%fH>M4M-PnkPYMk2
z_bx`*j)#U{!sS$N$3w%JeHdsv9vZ$vH3sw!t36z})|?Jn{z4$2hTn<Buo3(nLG~Qd
zLDKiA`cvOA1Z4Rk$kVO(vHW$QSN>G#Yxv^TcR@SLe-Lzm)!wxCbI|s|`Wyn$j`-7W
z4ZoQDiY)}B{2f4E9&;{Z{&xZSe)ejM?gZqE$iIQ3l>ZwvUs&b$=t%SBYQC?Tg9?%!
z2-=Pxe|a|-wEf*I4evYgwP~lEZ=>1$MZ?#;c!`>g`fw!nfjz#MW*_XGxDz9Ct@`$H
z^%f7u$)5vl_ct%<yDLuqY8?G8=xn@Jvl)=(odRV4WP9;<eqC^cKbAKfH069QZy)q$
zP#m2Ln(uBkKt_FEoSdJmxBI^b@xLujUIUtMmE~CZo8sgT#?kx)k$upgm*eQSLEG~~
zAKWH+7xWhNzj@H5f2ZU0-I((DyLEQ`Qyr76tZy7W4m95p<m=S5$FH>52le?Bl)th`
zUaG6FsEm`Zi=)2>+HOA&+HYH&oR1yt!wckB4w~ihb52iK^G&KNT^x^-p9H-L{YTZ$
zE&d5Q5ApaG^3wla6j%rCT^UD@i=(H<(Mv${r$|eXm-cGo<l#6PpPz{xEbqsl)2;cD
z{exc{vJc9SfaZ&GTxZb!anSbpfb{#IIsY>oKJhR93dGsp&Vc4`q@F^HQ2(Ex`E!&b
zEqjSLrST2L!4{2|i(-ctSSDz`BFQrw^G^cZig>H?(nXO&pZ+eOzIFcUgDVj}oU{+h
zm&eiA%o?f-VY?dMpYZz&=gpeqpHVz_9)3~V?=L!snpWr#l~wzfR#q>;9y56*=`X2Y
zDR-b%2CxM!^Xi;2V+95Nin5iUuFk<mD{LC|<5Sejxf4y6<GZ0q7IXca$uoU^n_@9G
z-d&2kY?Y;`9bnu%8mP({Gb#^$W4G6N`z7V>E^DKm+)8|*jg5|dzM0r{8Oj`U{tjBd
zpBLG<=B+JRB{wemix%B5d1i4Ts^O5x-ys+NDKlnWH+hDC*7euV_099on|$32A0sJ$
zm%FsC-Y+lGaVd<S>n<p;f0&!wp81+fCVu|gUxS@=LF^pOT(VL+<5c4%x%zo;>`=wc
zhH|IS`nhl?>jL`;u~QWvOLi)83$`EM>@BOrHau%zo>R^(a!&dJ`|#8jTc?sgAa5V2
zUq0^^<Xmt=u>4_lwUf46HQV}$b|=UA^XN{#dJo6RQGv$3SbhoJ+Q;e-$}blq*ysM-
zdw0G(fnQnY>pk5pwoU9;<Gb1T1@#N;c2>XQ-mS&VauBHw9s7-Vr-u4fcqa$jdL8YI
zAE-Z9c+St>^VjXq6_?djTdgTQJV(gAq<kHT8)LDJ-HMJH$Z%EmQrVHQCAXr=nbrCY
zdM8T`C?`WUquQzOWIKAlyj>;V#BwT>Gm_nm9PG&tal3Fg3vrZt*ZEm|>><S_XZfvi
zr-B;Z=WY+RhKj$u#vi-`^~1d^i^b}3zdP*7*9fe9)_h>?mz}o4KPRx16HRR)_LbM+
pj@P+**#25qRZ;^(wV~=tr#EtDP<{OzwqL&Q<zK=obPGm{{|8T_XPE#1

literal 0
HcmV?d00001

diff --git a/apps/BaseStation15.4/seriallisten15-4.c b/apps/BaseStation15.4/seriallisten15-4.c
index e84272a380..8acc81861b 100644
--- a/apps/BaseStation15.4/seriallisten15-4.c
+++ b/apps/BaseStation15.4/seriallisten15-4.c
@@ -1,9 +1,33 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
+
+#include <sys/timeb.h>
 
 #include "serialsource.h"
 
+FILE * f;						// file handle for capture file
+unsigned int snap = 65535;
+
+typedef struct pcaprec_hdr_s {	// header for each packet
+  unsigned int ts_sec;
+  unsigned int ts_usec;
+  unsigned int incl_len;
+  unsigned int orig_len;
+} pcaprec_hdr_t;
+
+typedef struct pcap_hdr_s {		// header for capture file
+  unsigned int magic_number;
+  unsigned short version_major;
+  unsigned short version_minor;
+  int thiszone;
+  unsigned int sigfigs;
+  unsigned int snaplen;
+  unsigned int network;
+} pcap_hdr_t;
+
+
 static char *msgs[] = {
   "unknown_packet_type",
   "ack_timeout"	,
@@ -17,11 +41,50 @@ static char *msgs[] = {
   "unix_error"
 };
 
+void capture_global(){		// write file header with values for 802.15.4 - no change needed
+  pcap_hdr_t globalheader;
+
+  globalheader.magic_number = 0xa1b2c3d4;
+  globalheader.version_major = 0x0204;
+  globalheader.version_minor = 0x0204;
+  globalheader.thiszone = -3600;
+  globalheader.sigfigs = 0;
+  globalheader.snaplen = snap;
+  globalheader.network = 195;
+
+  fwrite(&globalheader, sizeof(globalheader),1,f);
+
+}
+
+void capture_packet_header (int wire_len, int org_len){ // write packet header 
+  pcaprec_hdr_t headerpkt;
+
+  struct timeb temps;
+  ftime(&temps);
+
+  headerpkt.ts_sec = temps.time;
+  headerpkt.ts_usec = temps.millitm;
+  headerpkt.incl_len = wire_len;
+  headerpkt.orig_len = org_len;
+
+  fwrite(&headerpkt, sizeof(headerpkt), 1, f);
+	 
+}
+
 void stderr_msg(serial_source_msg problem)
 {
   fprintf(stderr, "Note: %s\n", msgs[problem]);
 }
 
+void sign_handler(int signum){
+  switch (signum) {
+    case SIGINT:
+     fclose(f);
+     exit(0);
+     break;
+  }
+}
+
 enum {
   TOS_SERIAL_802_15_4_ID = 2,
 };
@@ -30,8 +93,8 @@ int main(int argc, char **argv)
 {
   serial_source src;
   int iframes = 0;
-  if (argc != 4) {
-    fprintf(stderr, "Usage: %s <iframe|tframe> <device> <rate> - dump packets from a serial port\n", argv[0]);
+  if (argc != 5) {
+    fprintf(stderr, "Usage: %s <iframe|tframe> <device> <rate> <capture-file> - dump packets from a serial port\n", argv[0]);
     exit(2);
   }
 
@@ -53,13 +116,22 @@ int main(int argc, char **argv)
 	    argv[2], argv[3]);
     exit(1);
   }
+
+  f=fopen(argv[4],"wb");				// open capture file, name provided by user
+  capture_global();						// write header
+  signal(SIGINT, sign_handler);
 	      
   for (;;)
     {
-      int len, i, plen;
+      int len, i, plen, x;
       short fcf;
+      int offset_serial = 2;
+      int offset_meta = 9;
+      int offset = offset_serial - offset_meta;
       const unsigned char *packet = read_serial_packet(src, &len);
+      unsigned char wireshark_packet[len - offset];
       int intraPan = 0;
+      int ack = 0;
       
       if (!packet)
 	exit(0);
@@ -69,10 +141,19 @@ int main(int argc, char **argv)
 
       plen = packet[1];
       printf("Received packet of length %i: \n", plen);
+
       if (plen != len) {
 	printf("Packet format error: read packet length (%hhx) is different than expected from frame (%hhx).\n", plen, len);
       }
       
+      for(x=2; x<len-offset_meta; x++){				// copy raw packet to buffer without seriall overhead
+        wireshark_packet[x-2] = packet[x];
+      }
+      if(plen <= snap){								// write raw packet to file
+        capture_packet_header(plen, plen+2);	// 2 byte crc missing
+        fwrite(wireshark_packet, 1, plen, f);     
+      }
+
       i = 2;
       // Read in FCF and i+=2
       fcf = packet[i+1] << 8 | packet[i];
@@ -85,9 +166,10 @@ int main(int argc, char **argv)
 	}
 	else if ((fcf & 0x7) == 0x02) {
 	  printf("  Frame type: acknowledgement\n");
+	  ack = 1;
 	}
 	else {
-	  printf("  Frame type: other\n");
+	  printf("  Frame type: other 0x%02hhx \n", (fcf & 0x7));
 	}
 
 	printf("  Security: %s\n", (fcf & (1 << 3)) ? "enabled":"disabled");
@@ -103,98 +185,118 @@ int main(int argc, char **argv)
 	printf("  Sequence number: 0x%hhx\n", seqno);
       }
       
-      {
-	char addrLen = (fcf >> 10) & 0x3;
-	short saddr = 0;
-	long long laddr = 0;
-
-	// 16- and 64-bit destinations have a PAN ID
-	if (addrLen == 2 || addrLen == 3) { 
-	  short destPan = packet[i++] << 8 | packet[i++];
-	  printf("  Destination PAN: 0x%02hx\n", destPan);
-	}
-	
-	switch (addrLen) {
-	case 0:
-	  printf("  Destination address: none\n");
-	  break;
-	case 1:
-	  printf("  Destination address: invalid? (0x01)\n");
-	  break;
-	case 2:
-	  saddr =  (packet[i] << 8 | packet[i+1]);
-	  i += 2;
-	  printf("  Destination address: 0x%04hx\n", saddr);
-	  break;
-	case 3: {
-	  int j;
-	  for (j = 0; j < 8; j++) {
-	    laddr = laddr << 8;
-	    laddr |= packet[i++];
+      if (ack != 1) {	// no addresses, no payload
+        {
+	  char addrLen = (fcf >> 10) & 0x3;
+	  short saddr = 0;
+	  long long laddr = 0;
+
+	  // 16- and 64-bit destinations have a PAN ID
+	  if (addrLen == 2 || addrLen == 3) { 
+	    short destPan = packet[i++] << 8 | packet[i++];
+	    printf("  Destination PAN: 0x%02hx\n", destPan);
 	  }
-	  printf("  Destination address: 0x%016llx\n", laddr);
-	  break;
-	}
-	default:
-	  printf("  Destination address: parse serror\n");
-	}
-      }
+
+	  switch (addrLen) {
+	    case 0:
+	      printf("  Destination address: none\n");
+	      break;
+ 	    case 1:
+	      printf("  Destination address: invalid? (0x01)\n");
+	      break;
+	    case 2:
+	      saddr =  (packet[i] << 8 | packet[i+1]);
+	      i += 2;
+	      printf("  Destination address: 0x%04hx\n", saddr);
+	      break;
+	    case 3: {
+	      int j;
+	      for (j = 0; j < 8; j++) {
+	        laddr = laddr << 8;
+	        laddr |= packet[i++];
+	      }
+	      printf("  Destination address: 0x%016llx\n", laddr);
+	      break;
+	    }
+	    default:
+	      printf("  Destination address: parse serror\n");
+	  }
+        }
 
       
-      {
-	char addrLen = (fcf >> 14) & 0x3;
-	short saddr = 0;
-	long long laddr = 0;
-
-	if (!intraPan) { // Intra-PAN packet
-	  short srcPan = packet[i] << 8 | packet[i+1];
-	  i += 2;
-	  printf("  Source PAN: 0x%02hx\n", srcPan);
-	}
-	
-	switch (addrLen) {
-	case 0:
-	  printf("  Source address: none\n");
-	  break;
-	case 1:
-	  printf("  Source address: invalid? (0x01)\n");
-	  break;
-	case 2:
-	  saddr =  (packet[i] << 8 | packet[i + 1]);
-	  i += 2;
-	  printf("  Source address: 0x%04hx\n", saddr);
-	  break;
-	case 3: {
-	  int j;
-	  for (j = 0; j < 8; j++) {
-	    laddr = laddr << 8;
-	    laddr |= packet[i++];
+        {
+	  char addrLen = (fcf >> 14) & 0x3;
+	  short saddr = 0;
+	  long long laddr = 0;
+ 
+	  if (!intraPan) { // Intra-PAN packet
+	    short srcPan = packet[i] << 8 | packet[i+1];
+	    i += 2;
+	    printf("  Source PAN: 0x%02hx\n", srcPan);
 	  }
-	  printf("  Source address: 0x%016llx\n", laddr);
-	  break;
-	}
-	default:
-	  printf("  Source address: parse serror\n");
-	}
-      }
 
-      if (iframes) {
-	printf("  I-Frame: %s\n", (packet[i++] == 0x3f)? "yes":"no");
-      }
+	  switch (addrLen) {
+	    case 0:
+	      printf("  Source address: none\n");
+	      break;
+	    case 1:
+	      printf("  Source address: invalid? (0x01)\n");
+	      break;
+	    case 2:
+	      saddr =  (packet[i] << 8 | packet[i + 1]);
+	      i += 2;
+	      printf("  Source address: 0x%04hx\n", saddr);
+	      break;
+	    case 3: {
+	      int j;
+	      for (j = 0; j < 8; j++) {
+	        laddr = laddr << 8;
+	        laddr |= packet[i++];
+	      }
+	      printf("  Source address: 0x%016llx\n", laddr);
+	      break;
+	    }
+	    default:
+	      printf("  Source address: parse serror\n");
+	  }
+        }
+
+        if (iframes) {
+	  printf("  I-Frame: %s\n", (packet[i++] == 0x3f)? "yes":"no");
+        }
       
-      printf("  AM type: 0x%02hhx\n", packet[i++]);
+        printf("  AM type: 0x%02hhx\n", packet[i++]);
+
+        if (i >= plen) {
+	  printf("Packet format error: read packet is shorter than expected.\n");
+        }
+        else {
+	  printf("  Payload: ");
+	  for (; i < plen + 2; i++) {		// first two bytes of len where skipped by i but are not counted for plen
+	    printf("0x%02hhx ", packet[i]);
+	  }
 
-      if (i >= plen) {
-	printf("Packet format error: read packet is shorter than expected.\n");
+	  printf("\n\n");
+        }
       }
-      else {
-	printf("  Payload: ");
-	for (; i < plen; i++) {
-	  printf("0x%02hhx ", packet[i]);
-	}
-	printf("\n\n");
-	putchar('\n');
+
+      // additional info from tkn15.4 Mac Layer
+
+      printf("  LQI: 0x%02hhx \n", packet[i++]);
+      printf("  RSSI: 0x%02hhx \n", packet[i++]);
+      printf("  CRC ok: 0x%02hhx \n", packet[i++]);
+      printf("  MAC Header length: 0x%02hhx \n", packet[i++]);
+      printf("  PHY channel: 0x%02hhx \n", packet[i++]);
+      printf("\n");
+      printf("  Timestamp: ");
+
+      while(i < len){
+	printf("0x%02hhx ", packet[i++]);
       }
+
+      printf("\n\n");
+      putchar('\n');
+
       free((void *)packet);
     }
 }
diff --git a/apps/BaseStation15.4/seriallisten15-4.o b/apps/BaseStation15.4/seriallisten15-4.o
new file mode 100644
index 0000000000000000000000000000000000000000..d46ee27dac71c56a082094a3c96baac721a17bb4
GIT binary patch
literal 6840
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

literal 0
HcmV?d00001

diff --git a/apps/PppRouter/Makefile b/apps/PppRouter/Makefile
index 297ff80863..f88d3fb504 100644
--- a/apps/PppRouter/Makefile
+++ b/apps/PppRouter/Makefile
@@ -1,6 +1,18 @@
 COMPONENT=PppRouterC
-# PFLAGS += -DENABLE_SPI0_DMA
-# PFLAGS += -DCC2420_DEF_CHANNEL=21
+#PFLAGS += -DENABLE_SPI0_DMA
+PFLAGS += -DCC2420_DEF_CHANNEL=13
+
+#IRIS Software-Ack
+CFLAGS+=-DRF230_HARDWARE_ACK
+CFLAGS+=-DCC2420_HARDWARE_ACK
+
+CFLAGS += -DHARDWAREACK
+CFLAGS += -DCC2420_HARDWAREACK
+CFLAGS += -DRF230_HARDWAREACK
+
+CFLAGS+=-DCC2420_HW_ACKNOWLEDGEMENTS 
+CFLAGS+=-DRF230_HW_ACKNOWLEDGEMENTS 
+#CFLAGS += -DSOFTWAREACK_TIMEOUT=3000 
 
 # use rpl
 PFLAGS += -DRPL_ROUTING -DRPL_STORING_MODE -I$(LOWPAN_ROOT)/tos/lib/net/rpl
@@ -20,4 +32,14 @@ PFLAGS += -DIN6_PREFIX=\"fec0::\"
 # derive short address from the dhcp address assignment, if possible
 PFLAGS += -DBLIP_DERIVE_SHORTADDRS
 
+# tell the 6lowpan layer to not generate hc-compressed headers
+#PFLAGS += -DLIB6LOWPAN_HC_VERSION=-1
+
+#LPL FLAGS
+#CFLAGS += -DLOW_POWER_LISTENING
+#CFLAGS += -DLPL_SLEEP_INTERVAL=512
+#CFLAGS += -DBLIP_L2_RETRIES=2
+#CFLAGS += -DBLIP_L2_DELAY=2048 
+#CFLAGS += -DDUTY_ON_TIME=15
+
 include $(MAKERULES)
diff --git a/apps/PppRouter/PppRouterC.nc b/apps/PppRouter/PppRouterC.nc
index 4584a50df7..8ceaf9a2ea 100644
--- a/apps/PppRouter/PppRouterC.nc
+++ b/apps/PppRouter/PppRouterC.nc
@@ -57,7 +57,7 @@ configuration PppRouterC {
   components UDPShellC;
 
   // prints the routing table
-  components RouteCmdC;
+  //components RouteCmdC;
 
 #ifndef IN6_PREFIX
   components Dhcp6ClientC;
diff --git a/apps/UDPEcho/Makefile b/apps/UDPEcho/Makefile
old mode 100644
new mode 100755
index e26d94923e..45d1b218ee
--- a/apps/UDPEcho/Makefile
+++ b/apps/UDPEcho/Makefile
@@ -1,41 +1,53 @@
-COMPONENT=UDPEchoC
-# uncomment this for network programming support
-# BOOTLOADER=tosboot
-
-# radio options
-# CFLAGS += -DCC2420_DEF_CHANNEL=26
-# CFLAGS += -DRF230_DEF_CHANNEL=26
-# CFLAGS += -DCC2420_DEF_RFPOWER=4 -DENABLE_SPI0_DMA
-
-# enable dma on the radio
-# PFLAGS += -DENABLE_SPI0_DMA
-
-# you can compile with or without a routing protocol... of course,
-# without it, you will only be able to use link-local communication.
-PFLAGS += -DRPL_ROUTING -DRPL_STORING_MODE -I$(TOSDIR)/lib/net/rpl
-# PFLAGS += -DRPL_OF_MRHOF 
-
-# tell the 6lowpan layer to not generate hc-compressed headers
-# PFLAGS += -DLIB6LOWPAN_HC_VERSION=-1
-
-# if this is set, motes will send debugging information to the address
-# listed.  BLIP_STATS causes blip to record statistics.
-# you can log this information using the util/Listener.py script
-# PFLAGS += -DREPORT_DEST=\"fec0::100\" -DBLIP_STATS
-
-# if you're using DHCP, set this to try and derive a 16-bit address
-# from the IA received from the server.  This will work if the server
-# gives out addresses from a /112 prefix.  If this is not set, blip
-# will only use EUI64-based link addresses.  If not using DHCP, this
-# causes blip to use TOS_NODE_ID as short address.  Otherwise the
-# EUI will be used in either case.
-PFLAGS += -DBLIP_DERIVE_SHORTADDRS
-
-# this disables dhcp and statically chooses a prefix.  the motes form
-# their ipv6 address by combining this with TOS_NODE_ID
-PFLAGS += -DIN6_PREFIX=\"fec0::\"
-
-# PFLAGS += -DNEW_PRINTF_SEMANTICS -DPRINTFUART_ENABLED
-
-include $(MAKERULES)
-
+COMPONENT=UDPEchoC
+# uncomment this for network programming support
+# BOOTLOADER=tosboot
+
+# radio options
+CFLAGS += -DCC2420_DEF_CHANNEL=13
+CFLAGS += -DRF230_DEF_CHANNEL=13
+CFLAGS += -DCC2420_DEF_RFPOWER=4 -DENABLE_SPI0_DMA
+
+#IRIS Software-Ack
+CFLAGS+=-DRF230_HARDWARE_ACK
+CFLAGS+=-DCC2420_HARDWARE_ACK
+
+CFLAGS += -DHARDWAREACK
+CFLAGS += -DCC2420_HARDWAREACK
+#CFLAGS += -DRF230_HARDWAREACK
+
+CFLAGS+=-DCC2420_HW_ACKNOWLEDGEMENTS 
+CFLAGS+=-DRF230_HW_ACKNOWLEDGEMENTS 
+CFLAGS += -DSOFTWAREACK_TIMEOUT=3000 
+
+# enable dma on the radio
+# PFLAGS += -DENABLE_SPI0_DMA
+
+# you can compile with or without a routing protocol... of course,
+# without it, you will only be able to use link-local communication.
+PFLAGS += -DRPL_ROUTING -DRPL_STORING_MODE -I$(TOSDIR)/lib/net/rpl
+# PFLAGS += -DRPL_OF_MRHOF 
+
+# tell the 6lowpan layer to not generate hc-compressed headers
+#PFLAGS += -DLIB6LOWPAN_HC_VERSION=-1
+
+# if this is set, motes will send debugging information to the address
+# listed.  BLIP_STATS causes blip to record statistics.
+# you can log this information using the util/Listener.py script
+PFLAGS += -DREPORT_DEST=\"fec0::100\" #-DBLIP_STATS -BLIP_STAPS_IP_MEM
+
+# if you're using DHCP, set this to try and derive a 16-bit address
+# from the IA received from the server.  This will work if the server
+# gives out addresses from a /112 prefix.  If this is not set, blip
+# will only use EUI64-based link addresses.  If not using DHCP, this
+# causes blip to use TOS_NODE_ID as short address.  Otherwise the
+# EUI will be used in either case.
+PFLAGS += -DBLIP_DERIVE_SHORTADDRS
+
+# this disables dhcp and statically chooses a prefix.  the motes form
+# their ipv6 address by combining this with TOS_NODE_ID
+PFLAGS += -DIN6_PREFIX=\"fec0::\"
+
+# PFLAGS += -DNEW_PRINTF_SEMANTICS -DPRINTFUART_ENABLED
+
+include $(MAKERULES)
+
diff --git a/apps/UDPEcho/UDPEchoC.nc b/apps/UDPEcho/UDPEchoC.nc
old mode 100644
new mode 100755
index 5e598eedc8..bd8920c314
--- a/apps/UDPEcho/UDPEchoC.nc
+++ b/apps/UDPEcho/UDPEchoC.nc
@@ -69,7 +69,7 @@ configuration UDPEchoC {
   components UDPShellC;
 
   // prints the routing table
-  components RouteCmdC;
+  //components RouteCmdC;
 #ifndef  IN6_PREFIX
   components DhcpCmdC;
 #endif
diff --git a/apps/UDPEcho/UDPEchoP.nc b/apps/UDPEcho/UDPEchoP.nc
old mode 100644
new mode 100755
diff --git a/apps/tests/tkn154/packetsniffer/app_profile.h b/apps/tests/tkn154/packetsniffer/app_profile.h
index ab843b10bf..d6f7de2c39 100644
--- a/apps/tests/tkn154/packetsniffer/app_profile.h
+++ b/apps/tests/tkn154/packetsniffer/app_profile.h
@@ -37,7 +37,7 @@
 #define __APP_PROFILE_H
 
 enum {
-  INITAL_RADIO_CHANNEL = 26, // may be changed later via command over serial line
+  INITAL_RADIO_CHANNEL = 13, // may be changed later via command over serial line
   RX_QUEUE_SIZE = 10,        // max. packets queued after received over radio
 };
 

From e8340aa5af84f49004cc914fefccec985cbe7f62 Mon Sep 17 00:00:00 2001
From: Andras Biro <bbandi86@gmail.com>
Date: Thu, 24 Jan 2013 00:07:25 +0100
Subject: [PATCH 3/3] Ported blip2 rfxlink patch to ucmini

---
 apps/PppRouter/PppRouterC.nc                  |  2 +-
 apps/UDPEcho/UDPEchoC.nc                      |  2 +-
 tos/chips/atm128rfa1/radio/BareMessageC.nc    | 25 +++++
 tos/chips/atm128rfa1/radio/RFA1BarePacketP.nc | 37 +++++++
 .../atm128rfa1/radio/RFA1Ieee154MessageC.nc   | 98 +++++++++++++++++++
 tos/chips/atm128rfa1/radio/RFA1RadioC.nc      | 13 +++
 tos/chips/atm128rfa1/radio/RFA1RadioP.nc      | 16 +++
 tos/lib/net/blip/IPAddressP.nc                |  2 +-
 tos/lib/net/blip/IPDispatchC.nc               |  4 +-
 tos/lib/net/blip/IPDispatchP.nc               | 10 +-
 tos/lib/net/blip/Ieee154AddressC.nc           |  4 +-
 tos/lib/net/blip/Ieee154AddressP.nc           |  6 +-
 tos/lib/net/blip/ReadLqiC.nc                  |  7 +-
 13 files changed, 210 insertions(+), 16 deletions(-)
 create mode 100644 tos/chips/atm128rfa1/radio/BareMessageC.nc
 create mode 100644 tos/chips/atm128rfa1/radio/RFA1BarePacketP.nc
 create mode 100644 tos/chips/atm128rfa1/radio/RFA1Ieee154MessageC.nc

diff --git a/apps/PppRouter/PppRouterC.nc b/apps/PppRouter/PppRouterC.nc
index 8ceaf9a2ea..4584a50df7 100644
--- a/apps/PppRouter/PppRouterC.nc
+++ b/apps/PppRouter/PppRouterC.nc
@@ -57,7 +57,7 @@ configuration PppRouterC {
   components UDPShellC;
 
   // prints the routing table
-  //components RouteCmdC;
+  components RouteCmdC;
 
 #ifndef IN6_PREFIX
   components Dhcp6ClientC;
diff --git a/apps/UDPEcho/UDPEchoC.nc b/apps/UDPEcho/UDPEchoC.nc
index bd8920c314..5e598eedc8 100755
--- a/apps/UDPEcho/UDPEchoC.nc
+++ b/apps/UDPEcho/UDPEchoC.nc
@@ -69,7 +69,7 @@ configuration UDPEchoC {
   components UDPShellC;
 
   // prints the routing table
-  //components RouteCmdC;
+  components RouteCmdC;
 #ifndef  IN6_PREFIX
   components DhcpCmdC;
 #endif
diff --git a/tos/chips/atm128rfa1/radio/BareMessageC.nc b/tos/chips/atm128rfa1/radio/BareMessageC.nc
new file mode 100644
index 0000000000..1cd59170e8
--- /dev/null
+++ b/tos/chips/atm128rfa1/radio/BareMessageC.nc
@@ -0,0 +1,25 @@
+configuration BareMessageC
+{
+  provides
+  {
+    interface BareSend;
+    interface BareReceive;
+    interface Packet as BarePacket;
+    interface PacketLink;
+    interface LowPowerListening;
+    interface SplitControl as RadioControl;
+    interface ShortAddressConfig;
+  }
+}
+implementation
+{
+  components RFA1RadioC;
+
+	BareSend = RFA1RadioC;
+	BareReceive = RFA1RadioC;
+	BarePacket = RFA1RadioC.BarePacket;
+	PacketLink = RFA1RadioC;
+	LowPowerListening = RFA1RadioC;
+	RadioControl = RFA1RadioC.SplitControl;
+	ShortAddressConfig = RFA1RadioC;
+}
diff --git a/tos/chips/atm128rfa1/radio/RFA1BarePacketP.nc b/tos/chips/atm128rfa1/radio/RFA1BarePacketP.nc
new file mode 100644
index 0000000000..9ed60e9e99
--- /dev/null
+++ b/tos/chips/atm128rfa1/radio/RFA1BarePacketP.nc
@@ -0,0 +1,37 @@
+module RFA1BarePacketP
+{
+  provides interface Packet as BarePacket;
+  uses interface RadioPacket;
+}
+implementation
+{
+  command void BarePacket.clear(message_t *msg)
+  {
+    call RadioPacket.clear(msg);
+  }
+
+  command uint8_t BarePacket.payloadLength(message_t *msg)
+  {
+    //return call RadioPacket.payloadLength(msg);
+    return call RadioPacket.payloadLength(msg)+sizeof(rfa1_header_t);
+  }
+
+  command void BarePacket.setPayloadLength(message_t *msg, uint8_t len)
+  {
+    //call RadioPacket.setPayloadLength(msg, len);
+    call RadioPacket.setPayloadLength(msg, len-sizeof(rfa1_header_t));
+  }
+
+  command uint8_t BarePacket.maxPayloadLength()
+  {
+    return call RadioPacket.maxPayloadLength();
+  }
+
+  command void *BarePacket.getPayload(message_t *msg, uint8_t len)
+  {
+    if (len > call RadioPacket.maxPayloadLength())
+      return NULL;
+    else
+      return (void*)msg;
+  }
+}
diff --git a/tos/chips/atm128rfa1/radio/RFA1Ieee154MessageC.nc b/tos/chips/atm128rfa1/radio/RFA1Ieee154MessageC.nc
new file mode 100644
index 0000000000..98e6b6e1df
--- /dev/null
+++ b/tos/chips/atm128rfa1/radio/RFA1Ieee154MessageC.nc
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2007, Vanderbilt University
+ * 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 holder 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 COPYRIGHT HOLDER 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.
+ *
+ * Author: Miklos Maroti
+ */
+
+#include <RadioConfig.h>
+
+#ifdef TFRAMES_ENABLED
+#error "You cannot use Ieee154MessageC with TFRAMES_ENABLED defined"
+#endif
+
+configuration RFA1Ieee154MessageC
+{
+	provides 
+	{
+		interface SplitControl;
+
+		interface Ieee154Send;
+		interface Receive as Ieee154Receive;
+		interface SendNotifier;
+
+		interface Ieee154Packet;
+		interface Packet;
+		interface Resource as SendResource[uint8_t clint];
+
+		interface PacketAcknowledgements;
+		interface LowPowerListening;
+		interface PacketLink;
+
+		interface RadioChannel;
+
+		interface PacketField<uint8_t> as PacketLinkQuality;
+		interface PacketField<uint8_t> as PacketTransmitPower;
+		interface PacketField<uint8_t> as PacketRSSI;
+
+		interface LocalTime<TRadio> as LocalTimeRadio;
+		interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
+		interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
+	}
+}
+
+implementation
+{
+	components RFA1RadioC;
+
+	SplitControl = RFA1RadioC;
+
+	Ieee154Send = RFA1RadioC.Ieee154Send;
+	Ieee154Receive = RFA1RadioC.Ieee154Receive;
+	SendNotifier = RFA1RadioC.Ieee154Notifier;
+
+	Packet = RFA1RadioC.PacketForIeee154Message;
+	Ieee154Packet = RFA1RadioC;
+	SendResource = RFA1RadioC;
+
+	PacketAcknowledgements = RFA1RadioC;
+	LowPowerListening = RFA1RadioC;
+	PacketLink = RFA1RadioC;
+
+	RadioChannel = RFA1RadioC;
+
+	PacketLinkQuality = RFA1RadioC.PacketLinkQuality;
+	PacketTransmitPower = RFA1RadioC.PacketTransmitPower;
+	PacketRSSI = RFA1RadioC.PacketRSSI;
+
+	LocalTimeRadio = RFA1RadioC;
+	PacketTimeStampMilli = RFA1RadioC;
+	PacketTimeStampRadio = RFA1RadioC;
+}
diff --git a/tos/chips/atm128rfa1/radio/RFA1RadioC.nc b/tos/chips/atm128rfa1/radio/RFA1RadioC.nc
index ecd27566a6..1ee1ee8fbb 100644
--- a/tos/chips/atm128rfa1/radio/RFA1RadioC.nc
+++ b/tos/chips/atm128rfa1/radio/RFA1RadioC.nc
@@ -57,13 +57,17 @@ configuration RFA1RadioC
 
 #ifndef TFRAMES_ENABLED
 		interface Ieee154Send;
+		interface BareSend;
 		interface Receive as Ieee154Receive;
+		interface BareReceive;
 		interface SendNotifier as Ieee154Notifier;
 
 		interface Resource as SendResource[uint8_t clint];
 
 		interface Ieee154Packet;
 		interface Packet as PacketForIeee154Message;
+		interface Packet as BarePacket;
+		interface ShortAddressConfig;
 #endif
 
 		interface PacketAcknowledgements;
@@ -95,6 +99,15 @@ implementation
 // -------- RadioP
 
 	components RFA1RadioP as RadioP;
+	
+	BareSend = TinyosNetworkLayerC.Ieee154Send;
+	BareReceive = TinyosNetworkLayerC.Ieee154Receive;
+	ShortAddressConfig = RadioP;
+	
+	components RFA1BarePacketP as BarePacketP;
+	BarePacket = BarePacketP;
+	BarePacketP.RadioPacket -> RadioDriverLayerC;
+
 
 #ifdef RADIO_DEBUG
 	components AssertC;
diff --git a/tos/chips/atm128rfa1/radio/RFA1RadioP.nc b/tos/chips/atm128rfa1/radio/RFA1RadioP.nc
index bcc921bcf7..36b4da65b0 100644
--- a/tos/chips/atm128rfa1/radio/RFA1RadioP.nc
+++ b/tos/chips/atm128rfa1/radio/RFA1RadioP.nc
@@ -51,6 +51,8 @@ module RFA1RadioP
 		interface ActiveMessageConfig;
 		interface DummyConfig;
 
+		interface ShortAddressConfig;
+
 #ifdef LOW_POWER_LISTENING
 		interface LowPowerListeningConfig;
 #endif
@@ -230,6 +232,20 @@ implementation
 	 * congestion backoff = 0x7 * CC2420_BACKOFF_PERIOD = 70 jiffies = 2240 microsec
 	 */
 
+/*----------------- ShortAddressConfig-----------------*/
+
+    command void ShortAddressConfig.setShortAddr(uint16_t address)
+    {
+        // TODO: actually write the new ID
+        signal ShortAddressConfig.setShortAddrDone(FAIL);
+    }
+
+    default event void ShortAddressConfig.setShortAddrDone(error_t error)
+    {
+    }
+
+ /*----------------- LowPowerListening -----------------*/
+
 #ifndef LOW_POWER_LISTENING
 
 #ifndef RFA1_BACKOFF_MIN
diff --git a/tos/lib/net/blip/IPAddressP.nc b/tos/lib/net/blip/IPAddressP.nc
index 2954c132be..304fce9cc7 100644
--- a/tos/lib/net/blip/IPAddressP.nc
+++ b/tos/lib/net/blip/IPAddressP.nc
@@ -32,7 +32,7 @@ module IPAddressP {
   }
 } implementation {
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   bool m_valid_addr = FALSE, m_short_addr = TRUE;
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
   bool m_valid_addr = FALSE, m_short_addr = FALSE;
diff --git a/tos/lib/net/blip/IPDispatchC.nc b/tos/lib/net/blip/IPDispatchC.nc
index d62454d34c..961f9aab1c 100644
--- a/tos/lib/net/blip/IPDispatchC.nc
+++ b/tos/lib/net/blip/IPDispatchC.nc
@@ -42,7 +42,7 @@ configuration IPDispatchC {
   components IPDispatchP;
   
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   components BareMessageC as MessageC;
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
   components CC2420RadioC as MessageC;
@@ -68,7 +68,7 @@ configuration IPDispatchC {
 
   IPDispatchP.BarePacket -> MessageC.BarePacket;
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   IPDispatchP.BareSend -> MessageC;
   IPDispatchP.BareReceive -> MessageC;
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
diff --git a/tos/lib/net/blip/IPDispatchP.nc b/tos/lib/net/blip/IPDispatchP.nc
index 67851ba5f2..02cb409ede 100644
--- a/tos/lib/net/blip/IPDispatchP.nc
+++ b/tos/lib/net/blip/IPDispatchP.nc
@@ -56,7 +56,7 @@ module IPDispatchP {
 
     interface Packet as BarePacket;
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
     interface BareSend;
     interface BareReceive;
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
@@ -341,7 +341,7 @@ void SENDINFO_DECR(struct send_info *si) {
     return ret;
   }
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   event message_t *BareReceive.receive(message_t *msg) {
     struct packed_lowmsg lowmsg;
     struct ieee154_frame_addr frame_address;
@@ -644,7 +644,7 @@ void SENDINFO_DECR(struct send_info *si) {
       goto fail;
     }
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   if (call BareSend.send(s_entry->msg) != SUCCESS) {
       dbg("Drops", "drops: sendTask: send failed\n");
       goto fail;
@@ -749,7 +749,7 @@ void SENDINFO_DECR(struct send_info *si) {
       }
 
       call BarePacket.clear(outgoing);
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
       max_len = call BarePacket.maxPayloadLength()-1;
       frag_len = lowpan_frag_get(call BarePacket.getPayload(outgoing, max_len),
                                  max_len,
@@ -814,7 +814,7 @@ frag_len = lowpan_frag_get(call Ieee154Send.getPayload(outgoing, 0),
   cleanup_outer:
     return rc;
   }
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   event void BareSend.sendDone(message_t *msg, error_t error) {
     struct send_entry *s_entry = call SendQueue.head();
 
diff --git a/tos/lib/net/blip/Ieee154AddressC.nc b/tos/lib/net/blip/Ieee154AddressC.nc
index 15343f15d3..77edf3f980 100644
--- a/tos/lib/net/blip/Ieee154AddressC.nc
+++ b/tos/lib/net/blip/Ieee154AddressC.nc
@@ -6,7 +6,7 @@ configuration Ieee154AddressC {
   components Ieee154AddressP;
   components LocalIeeeEui64C;
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   components BareMessageC;
 #endif
 
@@ -16,7 +16,7 @@ configuration Ieee154AddressC {
   MainC.SoftwareInit -> Ieee154AddressP;
   Ieee154AddressP.LocalIeeeEui64 -> LocalIeeeEui64C;
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
   Ieee154AddressP.ShortAddressConfig -> BareMessageC;
 
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
diff --git a/tos/lib/net/blip/Ieee154AddressP.nc b/tos/lib/net/blip/Ieee154AddressP.nc
index 6621e20ed4..e70001286c 100644
--- a/tos/lib/net/blip/Ieee154AddressP.nc
+++ b/tos/lib/net/blip/Ieee154AddressP.nc
@@ -7,7 +7,7 @@ module Ieee154AddressP {
   uses {
     interface LocalIeeeEui64;
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
     interface ShortAddressConfig;
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
     interface CC2420Config;
@@ -48,7 +48,7 @@ module Ieee154AddressP {
   command error_t Ieee154Address.setShortAddr(ieee154_saddr_t addr) {
     m_saddr = addr;
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
     call ShortAddressConfig.setShortAddr(addr);
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
     call CC2420Config.setShortAddr(addr);
@@ -63,7 +63,7 @@ module Ieee154AddressP {
     return SUCCESS;
   }
 
-#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
+#if defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS) || defined(PLATFORM_UCMINI)
    event void ShortAddressConfig.setShortAddrDone(error_t error){}
 #elif defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC) || defined (PLATFORM_TINYNODE)
    event void CC2420Config.syncDone(error_t err) {}
diff --git a/tos/lib/net/blip/ReadLqiC.nc b/tos/lib/net/blip/ReadLqiC.nc
index 3949c209b1..1ab920c2f8 100644
--- a/tos/lib/net/blip/ReadLqiC.nc
+++ b/tos/lib/net/blip/ReadLqiC.nc
@@ -20,11 +20,16 @@ configuration ReadLqiC {
   components CC2420ReadLqiC, CC2420PacketC;
   ReadLqi = CC2420ReadLqiC;
   CC2420ReadLqiC.CC2420Packet -> CC2420PacketC;
-#elif defined(PLATFORM_IRIS) || defined(PLATFORM_MULLE) 
+#elif defined(PLATFORM_IRIS) || defined(PLATFORM_MULLE)
   components RF230ReadLqiC, RF230Ieee154MessageC;
   ReadLqi = RF230ReadLqiC;
   RF230ReadLqiC.SubLqi -> RF230Ieee154MessageC.PacketLinkQuality;
   RF230ReadLqiC.SubRssi -> RF230Ieee154MessageC.PacketRSSI;
+#elif defined(PLATFORM_UCMINI)
+	components RF230ReadLqiC, RFA1Ieee154MessageC;
+	ReadLqi = RF230ReadLqiC;
+	RF230ReadLqiC.SubLqi -> RFA1Ieee154MessageC.PacketLinkQuality;
+	RF230ReadLqiC.SubRssi -> RFA1Ieee154MessageC.PacketRSSI;
 #else
 #error "No radio support is available for your platform"
 #endif