From 83a2281d106e4f029e97523d2e7f53034a152212 Mon Sep 17 00:00:00 2001 From: mmaroti Date: Fri, 16 May 2008 17:43:48 +0000 Subject: [PATCH] rename RF230 specific files to conform the TEP naming conventions --- .../tests/rf230/RF230Sniffer/RF230SnifferC.nc | 13 +++-- .../tests/rf230/RF230Sniffer/RF230SnifferP.nc | 2 +- apps/tests/rf230/RF230Test/RF230TestC.nc | 4 +- ...{DefaultMacC.nc => RF230ActiveMessageC.nc} | 58 +++++++++---------- ...{DefaultMacP.nc => RF230ActiveMessageP.nc} | 14 ++--- .../rf230/{DefaultPacket.h => RF230Packet.h} | 30 +++++----- .../{DefaultPacketC.nc => RF230PacketC.nc} | 26 ++++----- .../{DefaultPacketP.nc => RF230PacketP.nc} | 44 +++++++------- tos/platforms/iris/ActiveMessageC.nc | 2 +- tos/platforms/iris/platform_message.h | 8 +-- 10 files changed, 101 insertions(+), 100 deletions(-) rename tos/chips/rf230/{DefaultMacC.nc => RF230ActiveMessageC.nc} (71%) rename tos/chips/rf230/{DefaultMacP.nc => RF230ActiveMessageP.nc} (95%) rename tos/chips/rf230/{DefaultPacket.h => RF230Packet.h} (69%) rename tos/chips/rf230/{DefaultPacketC.nc => RF230PacketC.nc} (76%) rename tos/chips/rf230/{DefaultPacketP.nc => RF230PacketP.nc} (84%) diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc index d5ad506c..43d495a7 100644 --- a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc +++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc @@ -27,17 +27,18 @@ configuration RF230SnifferC implementation { - components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, DefaultMacP, DefaultPacketC, IEEE154PacketC, AssertC; + components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, RF230ActiveMessageP, RF230PacketC, IEEE154PacketC, AssertC; RF230SnifferP.Boot -> MainC; RF230SnifferP.SplitControl -> SerialActiveMessageC; RF230SnifferP.RadioState -> RF230LayerC; - RF230LayerC.RF230Config -> DefaultMacP; - RF230LayerC.PacketLinkQuality -> DefaultPacketC.PacketLinkQuality; - RF230LayerC.PacketTransmitPower -> DefaultPacketC.PacketTransmitPower; - RF230LayerC.PacketTimeStamp -> DefaultPacketC.PacketTimeStamp; + RF230LayerC.RF230Config -> RF230ActiveMessageP; + RF230LayerC.PacketLinkQuality -> RF230PacketC.PacketLinkQuality; + RF230LayerC.PacketRSSI -> RF230PacketC.PacketRSSI; + RF230LayerC.PacketTransmitPower -> RF230PacketC.PacketTransmitPower; + RF230LayerC.PacketTimeStamp -> RF230PacketC.PacketTimeStamp; - DefaultMacP.IEEE154Packet -> IEEE154PacketC; + RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC; } diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc index 96187bd9..98bd7f7c 100644 --- a/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc +++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferP.nc @@ -21,7 +21,7 @@ * Author: Miklos Maroti */ -#include +#include #include #include diff --git a/apps/tests/rf230/RF230Test/RF230TestC.nc b/apps/tests/rf230/RF230Test/RF230TestC.nc index 9bdc578f..27463abf 100644 --- a/apps/tests/rf230/RF230Test/RF230TestC.nc +++ b/apps/tests/rf230/RF230Test/RF230TestC.nc @@ -37,8 +37,8 @@ implementation RF230TestM.SplitControl -> SerialActiveMessageC; RF230TestM.Timer -> TimerMilliC; - components RF230LayerC, DefaultMacC; + components RF230LayerC, RF230ActiveMessageC; RF230TestM.RadioState -> RF230LayerC; - RF230TestM.AMSend -> DefaultMacC; + RF230TestM.AMSend -> RF230ActiveMessageC; } diff --git a/tos/chips/rf230/DefaultMacC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc similarity index 71% rename from tos/chips/rf230/DefaultMacC.nc rename to tos/chips/rf230/RF230ActiveMessageC.nc index 105100ed..f5b676e1 100644 --- a/tos/chips/rf230/DefaultMacC.nc +++ b/tos/chips/rf230/RF230ActiveMessageC.nc @@ -23,7 +23,7 @@ #include -configuration DefaultMacC +configuration RF230ActiveMessageC { provides { @@ -49,27 +49,27 @@ configuration DefaultMacC implementation { - components DefaultMacP, DefaultPacketC, IEEE154PacketC, RadioAlarmC; + components RF230ActiveMessageP, RF230PacketC, IEEE154PacketC, RadioAlarmC; #ifdef RF230_DEBUG components AssertC; #endif - DefaultMacP.IEEE154Packet -> IEEE154PacketC; - DefaultMacP.Packet -> DefaultPacketC; - DefaultMacP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")]; - - Packet = DefaultPacketC; - AMPacket = DefaultPacketC; - PacketAcknowledgements = DefaultPacketC; - PacketLinkQuality = DefaultPacketC.PacketLinkQuality; - PacketTransmitPower = DefaultPacketC.PacketTransmitPower; - PacketRSSI = DefaultPacketC.PacketRSSI; - PacketTimeStamp = DefaultPacketC.PacketTimeStamp; + RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC; + RF230ActiveMessageP.Packet -> RF230PacketC; + RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")]; + + Packet = RF230PacketC; + AMPacket = RF230PacketC; + PacketAcknowledgements = RF230PacketC; + PacketLinkQuality = RF230PacketC.PacketLinkQuality; + PacketTransmitPower = RF230PacketC.PacketTransmitPower; + PacketRSSI = RF230PacketC.PacketRSSI; + PacketTimeStamp = RF230PacketC.PacketTimeStamp; LowPowerListening = LowPowerListeningLayerC; - PacketLastTouch = DefaultPacketC; - RF230LayerC.lastTouch -> DefaultPacketC.lastTouch; + PacketLastTouch = RF230PacketC; + RF230LayerC.lastTouch -> RF230PacketC.lastTouch; components ActiveMessageLayerC; #ifdef LOW_POWER_LISTENING @@ -94,50 +94,50 @@ implementation Receive = ActiveMessageLayerC.Receive; Snoop = ActiveMessageLayerC.Snoop; - ActiveMessageLayerC.Config -> DefaultMacP; + ActiveMessageLayerC.Config -> RF230ActiveMessageP; ActiveMessageLayerC.AMPacket -> IEEE154PacketC; ActiveMessageLayerC.SubSend -> UniqueLayerC; ActiveMessageLayerC.SubReceive -> LowPowerListeningLayerC; - UniqueLayerC.Config -> DefaultMacP; + UniqueLayerC.Config -> RF230ActiveMessageP; UniqueLayerC.SubSend -> LowPowerListeningLayerC; LowPowerListeningLayerC.SubControl -> MessageBufferLayerC; LowPowerListeningLayerC.SubSend -> MessageBufferLayerC; LowPowerListeningLayerC.SubReceive -> MessageBufferLayerC; #ifdef LOW_POWER_LISTENING - LowPowerListeningLayerC.PacketSleepInterval -> DefaultPacketC; + LowPowerListeningLayerC.PacketSleepInterval -> RF230PacketC; LowPowerListeningLayerC.IEEE154Packet -> IEEE154PacketC; - LowPowerListeningLayerC.PacketAcknowledgements -> DefaultPacketC; + LowPowerListeningLayerC.PacketAcknowledgements -> RF230PacketC; #endif - MessageBufferLayerC.Packet -> DefaultPacketC; + MessageBufferLayerC.Packet -> RF230PacketC; MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC; MessageBufferLayerC.RadioReceive -> UniqueLayerC; MessageBufferLayerC.RadioState -> TrafficMonitorLayerC; UniqueLayerC.SubReceive -> TrafficMonitorLayerC; - TrafficMonitorLayerC.Config -> DefaultMacP; + TrafficMonitorLayerC.Config -> RF230ActiveMessageP; TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC; TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC; TrafficMonitorLayerC.SubState -> RF230LayerC; - CollisionAvoidanceLayerC.Config -> DefaultMacP; + CollisionAvoidanceLayerC.Config -> RF230ActiveMessageP; CollisionAvoidanceLayerC.SubSend -> SoftwareAckLayerC; CollisionAvoidanceLayerC.SubReceive -> SoftwareAckLayerC; - SoftwareAckLayerC.Config -> DefaultMacP; + SoftwareAckLayerC.Config -> RF230ActiveMessageP; SoftwareAckLayerC.SubSend -> CsmaLayerC; SoftwareAckLayerC.SubReceive -> RF230LayerC; - CsmaLayerC.Config -> DefaultMacP; + CsmaLayerC.Config -> RF230ActiveMessageP; CsmaLayerC -> RF230LayerC.RadioSend; CsmaLayerC -> RF230LayerC.RadioCCA; - RF230LayerC.RF230Config -> DefaultMacP; - RF230LayerC.PacketLinkQuality -> DefaultPacketC.PacketLinkQuality; - RF230LayerC.PacketTransmitPower -> DefaultPacketC.PacketTransmitPower; - RF230LayerC.PacketRSSI -> DefaultPacketC.PacketRSSI; - RF230LayerC.PacketTimeStamp -> DefaultPacketC.PacketTimeStamp; + RF230LayerC.RF230Config -> RF230ActiveMessageP; + RF230LayerC.PacketLinkQuality -> RF230PacketC.PacketLinkQuality; + RF230LayerC.PacketTransmitPower -> RF230PacketC.PacketTransmitPower; + RF230LayerC.PacketRSSI -> RF230PacketC.PacketRSSI; + RF230LayerC.PacketTimeStamp -> RF230PacketC.PacketTimeStamp; } diff --git a/tos/chips/rf230/DefaultMacP.nc b/tos/chips/rf230/RF230ActiveMessageP.nc similarity index 95% rename from tos/chips/rf230/DefaultMacP.nc rename to tos/chips/rf230/RF230ActiveMessageP.nc index ddd131fb..b241ee58 100644 --- a/tos/chips/rf230/DefaultMacP.nc +++ b/tos/chips/rf230/RF230ActiveMessageP.nc @@ -21,11 +21,11 @@ * Author: Miklos Maroti */ -#include +#include #include #include -module DefaultMacP +module RF230ActiveMessageP { provides { @@ -67,9 +67,9 @@ implementation return ((uint8_t*)(call IEEE154Packet.getHeader(msg))) + 1; } - inline defpacket_metadata_t* getMeta(message_t* msg) + inline rf230packet_metadata_t* getMeta(message_t* msg) { - return (defpacket_metadata_t*)(msg->metadata); + return (rf230packet_metadata_t*)(msg->metadata); } async command uint8_t RF230Config.getHeaderLength() @@ -81,7 +81,7 @@ implementation async command uint8_t RF230Config.getMaxLength() { // note, that the ieee154_footer_t is not stored, but we should include it here - return sizeof(defpacket_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t); + return sizeof(rf230packet_header_t) - 1 + TOSH_DATA_LENGTH + sizeof(ieee154_footer_t); } async command uint8_t RF230Config.getDefaultChannel() @@ -124,9 +124,9 @@ implementation async command void SoftwareAckConfig.setAckReceived(message_t* msg, bool acked) { if( acked ) - getMeta(msg)->flags |= DEFPACKET_WAS_ACKED; + getMeta(msg)->flags |= RF230PACKET_WAS_ACKED; else - getMeta(msg)->flags &= ~DEFPACKET_WAS_ACKED; + getMeta(msg)->flags &= ~RF230PACKET_WAS_ACKED; } async command uint16_t SoftwareAckConfig.getAckTimeout() diff --git a/tos/chips/rf230/DefaultPacket.h b/tos/chips/rf230/RF230Packet.h similarity index 69% rename from tos/chips/rf230/DefaultPacket.h rename to tos/chips/rf230/RF230Packet.h index 98cc340f..b3b0c393 100644 --- a/tos/chips/rf230/DefaultPacket.h +++ b/tos/chips/rf230/RF230Packet.h @@ -21,36 +21,36 @@ * Author: Miklos Maroti */ -#ifndef __DEFAULTPACKET_H__ -#define __DEFAULTPACKET_H__ +#ifndef __RF230PACKET_H__ +#define __RF230PACKET_H__ #include #include -typedef ieee154_header_t defpacket_header_t; +typedef ieee154_header_t rf230packet_header_t; -typedef nx_struct defpacket_footer_t +typedef nx_struct rf230packet_footer_t { timesync_footer_t timesync; -} defpacket_footer_t; +} rf230packet_footer_t; -typedef nx_struct defpacket_metadata_t +typedef nx_struct rf230packet_metadata_t { nx_uint8_t flags; nx_uint8_t lqi; nx_uint8_t power; // shared between TXPOWER and RSSI nx_uint16_t timestamp; -} defpacket_metadata_t; +} rf230packet_metadata_t; -enum defpacket_metadata_flags +enum rf230packet_metadata_flags { - DEFPACKET_WAS_ACKED = 0x01, // PacketAcknowledgements - DEFPACKET_TIMESTAMP = 0x02, // PacketTimeStamp - DEFPACKET_LAST_TOUCH = 0x04, // PacketLastTouch.touch - DEFPACKET_TXPOWER = 0x10, // PacketTransmitPower - DEFPACKET_RSSI = 0x20, // PacketRSSI + RF230PACKET_WAS_ACKED = 0x01, // PacketAcknowledgements + RF230PACKET_TIMESTAMP = 0x02, // PacketTimeStamp + RF230PACKET_LAST_TOUCH = 0x04, // PacketLastTouch.touch + RF230PACKET_TXPOWER = 0x10, // PacketTransmitPower + RF230PACKET_RSSI = 0x20, // PacketRSSI - DEFPACKET_CLEAR_METADATA = 0x00, + RF230PACKET_CLEAR_METADATA = 0x00, }; -#endif//__DEFAULTPACKET_H__ +#endif//__RF230PACKET_H__ diff --git a/tos/chips/rf230/DefaultPacketC.nc b/tos/chips/rf230/RF230PacketC.nc similarity index 76% rename from tos/chips/rf230/DefaultPacketC.nc rename to tos/chips/rf230/RF230PacketC.nc index f101b326..3a60a25e 100644 --- a/tos/chips/rf230/DefaultPacketC.nc +++ b/tos/chips/rf230/RF230PacketC.nc @@ -23,7 +23,7 @@ #include -configuration DefaultPacketC +configuration RF230PacketC { provides { @@ -44,19 +44,19 @@ configuration DefaultPacketC implementation { - components DefaultPacketP, IEEE154PacketC; + components RF230PacketP, IEEE154PacketC; - DefaultPacketP.IEEE154Packet -> IEEE154PacketC; + RF230PacketP.IEEE154Packet -> IEEE154PacketC; - Packet = DefaultPacketP; + Packet = RF230PacketP; AMPacket = IEEE154PacketC; - PacketAcknowledgements = DefaultPacketP; - PacketLinkQuality = DefaultPacketP.PacketLinkQuality; - PacketTransmitPower = DefaultPacketP.PacketTransmitPower; - PacketRSSI = DefaultPacketP.PacketRSSI; - PacketSleepInterval = DefaultPacketP.PacketSleepInterval; - PacketTimeStamp = DefaultPacketP; - - PacketLastTouch = DefaultPacketP; - lastTouch = DefaultPacketP; + PacketAcknowledgements = RF230PacketP; + PacketLinkQuality = RF230PacketP.PacketLinkQuality; + PacketTransmitPower = RF230PacketP.PacketTransmitPower; + PacketRSSI = RF230PacketP.PacketRSSI; + PacketSleepInterval = RF230PacketP.PacketSleepInterval; + PacketTimeStamp = RF230PacketP; + + PacketLastTouch = RF230PacketP; + lastTouch = RF230PacketP; } diff --git a/tos/chips/rf230/DefaultPacketP.nc b/tos/chips/rf230/RF230PacketP.nc similarity index 84% rename from tos/chips/rf230/DefaultPacketP.nc rename to tos/chips/rf230/RF230PacketP.nc index bdc9964c..4458dd86 100644 --- a/tos/chips/rf230/DefaultPacketP.nc +++ b/tos/chips/rf230/RF230PacketP.nc @@ -21,9 +21,9 @@ * Author: Miklos Maroti */ -#include +#include -module DefaultPacketP +module RF230PacketP { provides { @@ -51,13 +51,13 @@ implementation enum { PACKET_LENGTH_INCREASE = - sizeof(defpacket_header_t) - 1 // the 8-bit length field is not counted + sizeof(rf230packet_header_t) - 1 // the 8-bit length field is not counted + sizeof(ieee154_footer_t), // the CRC is not stored in memory }; - inline defpacket_metadata_t* getMeta(message_t* msg) + inline rf230packet_metadata_t* getMeta(message_t* msg) { - return (defpacket_metadata_t*)(msg->metadata); + return (rf230packet_metadata_t*)(msg->metadata); } /*----------------- Packet -----------------*/ @@ -70,7 +70,7 @@ implementation call IEEE154Packet.set6LowPan(msg, TINYOS_6LOWPAN_NETWORK_ID); #endif - getMeta(msg)->flags = DEFPACKET_CLEAR_METADATA; + getMeta(msg)->flags = RF230PACKET_CLEAR_METADATA; } inline command void Packet.setPayloadLength(message_t* msg, uint8_t len) @@ -116,7 +116,7 @@ implementation async command bool PacketAcknowledgements.wasAcked(message_t* msg) { - return getMeta(msg)->flags & DEFPACKET_WAS_ACKED; + return getMeta(msg)->flags & RF230PACKET_WAS_ACKED; } /*----------------- PacketLinkQuality -----------------*/ @@ -144,7 +144,7 @@ implementation async command bool PacketTimeStamp.isSet(message_t* msg) { - return getMeta(msg)->flags & DEFPACKET_TIMESTAMP; + return getMeta(msg)->flags & RF230PACKET_TIMESTAMP; } async command uint16_t PacketTimeStamp.get(message_t* msg) @@ -154,12 +154,12 @@ implementation async command void PacketTimeStamp.clear(message_t* msg) { - getMeta(msg)->flags &= ~DEFPACKET_TIMESTAMP; + getMeta(msg)->flags &= ~RF230PACKET_TIMESTAMP; } async command void PacketTimeStamp.set(message_t* msg, uint16_t value) { - getMeta(msg)->flags |= DEFPACKET_TIMESTAMP; + getMeta(msg)->flags |= RF230PACKET_TIMESTAMP; getMeta(msg)->timestamp = value; } @@ -167,7 +167,7 @@ implementation async command bool PacketTransmitPower.isSet(message_t* msg) { - return getMeta(msg)->flags & DEFPACKET_TXPOWER; + return getMeta(msg)->flags & RF230PACKET_TXPOWER; } async command uint8_t PacketTransmitPower.get(message_t* msg) @@ -177,13 +177,13 @@ implementation async command void PacketTransmitPower.clear(message_t* msg) { - getMeta(msg)->flags &= ~DEFPACKET_TXPOWER; + getMeta(msg)->flags &= ~RF230PACKET_TXPOWER; } async command void PacketTransmitPower.set(message_t* msg, uint8_t value) { - getMeta(msg)->flags &= ~DEFPACKET_RSSI; - getMeta(msg)->flags |= DEFPACKET_TXPOWER; + getMeta(msg)->flags &= ~RF230PACKET_RSSI; + getMeta(msg)->flags |= RF230PACKET_TXPOWER; getMeta(msg)->power = value; } @@ -191,7 +191,7 @@ implementation async command bool PacketRSSI.isSet(message_t* msg) { - return getMeta(msg)->flags & DEFPACKET_RSSI; + return getMeta(msg)->flags & RF230PACKET_RSSI; } async command uint8_t PacketRSSI.get(message_t* msg) @@ -201,13 +201,13 @@ implementation async command void PacketRSSI.clear(message_t* msg) { - getMeta(msg)->flags &= ~DEFPACKET_RSSI; + getMeta(msg)->flags &= ~RF230PACKET_RSSI; } async command void PacketRSSI.set(message_t* msg, uint8_t value) { - getMeta(msg)->flags &= ~DEFPACKET_TXPOWER; - getMeta(msg)->flags |= DEFPACKET_RSSI; + getMeta(msg)->flags &= ~RF230PACKET_TXPOWER; + getMeta(msg)->flags |= RF230PACKET_RSSI; getMeta(msg)->power = value; } @@ -249,22 +249,22 @@ implementation async command void PacketLastTouch.request(message_t* msg) { - getMeta(msg)->flags |= DEFPACKET_LAST_TOUCH; + getMeta(msg)->flags |= RF230PACKET_LAST_TOUCH; } async command void PacketLastTouch.cancel(message_t* msg) { - getMeta(msg)->flags &= ~DEFPACKET_LAST_TOUCH; + getMeta(msg)->flags &= ~RF230PACKET_LAST_TOUCH; } async command bool PacketLastTouch.isPending(message_t* msg) { - return getMeta(msg)->flags & DEFPACKET_LAST_TOUCH; + return getMeta(msg)->flags & RF230PACKET_LAST_TOUCH; } async event void lastTouch(message_t* msg) { - if( getMeta(msg)->flags & DEFPACKET_LAST_TOUCH ) + if( getMeta(msg)->flags & RF230PACKET_LAST_TOUCH ) signal PacketLastTouch.touch(msg); } diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc index d86fd0f9..50fc9879 100644 --- a/tos/platforms/iris/ActiveMessageC.nc +++ b/tos/platforms/iris/ActiveMessageC.nc @@ -45,7 +45,7 @@ configuration ActiveMessageC implementation { - components DefaultMacC as MAC; + components RF230ActiveMessageC as MAC; SplitControl = MAC; AMSend = MAC; diff --git a/tos/platforms/iris/platform_message.h b/tos/platforms/iris/platform_message.h index f966cbd5..9bc04c4a 100644 --- a/tos/platforms/iris/platform_message.h +++ b/tos/platforms/iris/platform_message.h @@ -62,20 +62,20 @@ #ifndef PLATFORM_MESSAGE_H #define PLATFORM_MESSAGE_H -#include +#include #include typedef union message_header { - defpacket_header_t rf230; + rf230packet_header_t rf230; serial_header_t serial; } message_header_t; typedef union message_footer { - defpacket_footer_t rf230; + rf230packet_footer_t rf230; } message_footer_t; typedef union message_metadata { - defpacket_metadata_t rf230; + rf230packet_metadata_t rf230; } message_metadata_t; #endif -- 2.39.2