X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf230%2FTimeSyncMessageP.nc;h=c4f9ca3e55a90cde6db757e78f22e901de1cf54f;hb=db2e8d4744ab819c8cf63f99dfa748e86f1e84f4;hp=9a936c80266df4cf48fa5671b140ff26b2556746;hpb=cd16c7e5736a66fed8943bfbab582ea3577a3ba9;p=tinyos-2.x.git diff --git a/tos/chips/rf230/TimeSyncMessageP.nc b/tos/chips/rf230/TimeSyncMessageP.nc index 9a936c80..c4f9ca3e 100644 --- a/tos/chips/rf230/TimeSyncMessageP.nc +++ b/tos/chips/rf230/TimeSyncMessageP.nc @@ -22,205 +22,167 @@ */ #include +#include module TimeSyncMessageP { provides { - interface TimeSyncSend as TimeSyncSendMicro[uint8_t id]; - interface TimeSyncSend as TimeSyncSendMilli[uint8_t id]; + interface TimeSyncAMSend as TimeSyncAMSendRadio[uint8_t id]; + interface TimeSyncAMSend as TimeSyncAMSendMilli[uint8_t id]; interface Packet; - interface TimeSyncPacket as TimeSyncPacketMicro; - interface TimeSyncPacket as TimeSyncPacketMilli; + + interface TimeSyncPacket as TimeSyncPacketRadio; + interface TimeSyncPacket as TimeSyncPacketMilli; } uses { interface AMSend as SubSend[uint8_t id]; interface Packet as SubPacket; - interface PacketTimeStamp; - interface PacketLastTouch; - interface LocalTime as LocalTimeMicro; + interface PacketTimeStamp as PacketTimeStampRadio; + interface PacketTimeStamp as PacketTimeStampMilli; + + interface LocalTime as LocalTimeRadio; interface LocalTime as LocalTimeMilli; + + interface PacketField as PacketTimeSyncOffset; } } implementation { -/*----------------- Packet -----------------*/ - - typedef struct timesync_local_t - { - uint32_t event_time; // in microsec - } timesync_local_t; - - inline timesync_footer_t* getFooter(message_t* msg) + // TODO: change the Packet.payloadLength and Packet.maxPayloadLength commands to async + inline void* getFooter(message_t* msg) { - return (timesync_footer_t*)(msg->data + call SubPacket.payloadLength(msg) - sizeof(timesync_footer_t)); + // we use the payload length that we export (the smaller one) + return msg->data + call Packet.payloadLength(msg); } - inline timesync_local_t* getLocal(message_t* msg) - { - return (timesync_local_t*)(msg->data + call SubPacket.maxPayloadLength() - sizeof(timesync_local_t)); - } +/*----------------- Packet -----------------*/ command void Packet.clear(message_t* msg) { call SubPacket.clear(msg); - call PacketLastTouch.cancel(msg); // TODO: check if we need to do this } command void Packet.setPayloadLength(message_t* msg, uint8_t len) { - call SubPacket.setPayloadLength(msg, len + sizeof(timesync_footer_t)); + call SubPacket.setPayloadLength(msg, len + sizeof(timesync_relative_t)); } command uint8_t Packet.payloadLength(message_t* msg) { - return call SubPacket.payloadLength(msg) - sizeof(timesync_footer_t); + return call SubPacket.payloadLength(msg) - sizeof(timesync_relative_t); } command uint8_t Packet.maxPayloadLength() { - return call SubPacket.maxPayloadLength() - sizeof(timesync_footer_t) - sizeof(timesync_local_t); + return call SubPacket.maxPayloadLength() - sizeof(timesync_relative_t); } command void* Packet.getPayload(message_t* msg, uint8_t len) { - return call SubPacket.getPayload(msg, len + sizeof(timesync_footer_t) + sizeof(timesync_local_t)); + return call SubPacket.getPayload(msg, len + sizeof(timesync_relative_t)); } -/*----------------- TimeSyncSendMicro -----------------*/ +/*----------------- TimeSyncAMSendRadio -----------------*/ - command error_t TimeSyncSendMicro.send[am_id_t id](uint32_t event_time, am_addr_t addr, message_t* msg, uint8_t len) + command error_t TimeSyncAMSendRadio.send[am_id_t id](am_addr_t addr, message_t* msg, uint8_t len, uint32_t event_time) { - timesync_local_t* local = getLocal(msg); - - local->event_time = event_time; + *(timesync_absolute_t*)(msg->data + len) = event_time; - call PacketLastTouch.request(msg); + call PacketTimeSyncOffset.set(msg, len); - return call SubSend.send[id](addr, msg, len); + return call SubSend.send[id](addr, msg, len + sizeof(timesync_relative_t)); } - command error_t TimeSyncSendMicro.cancel[am_id_t id](message_t* msg) + command error_t TimeSyncAMSendRadio.cancel[am_id_t id](message_t* msg) { - call PacketLastTouch.cancel(msg); return call SubSend.cancel[id](msg); } - default event void TimeSyncSendMicro.sendDone[am_id_t id](message_t* msg, error_t error) + default event void TimeSyncAMSendRadio.sendDone[am_id_t id](message_t* msg, error_t error) { } - command uint8_t TimeSyncSendMicro.maxPayloadLength[am_id_t id]() + command uint8_t TimeSyncAMSendRadio.maxPayloadLength[am_id_t id]() { - return call SubSend.maxPayloadLength[id]() - sizeof(timesync_footer_t); + return call SubSend.maxPayloadLength[id]() - sizeof(timesync_relative_t); } - command void* TimeSyncSendMicro.getPayload[am_id_t id](message_t* msg, uint8_t len) + command void* TimeSyncAMSendRadio.getPayload[am_id_t id](message_t* msg, uint8_t len) { - return call SubSend.getPayload[id](msg, len + sizeof(timesync_footer_t)); + return call SubSend.getPayload[id](msg, len + sizeof(timesync_relative_t)); } -/*----------------- TimeSyncSendMilli -----------------*/ +/*----------------- TimeSyncAMSendMilli -----------------*/ - command error_t TimeSyncSendMilli.send[am_id_t id](uint32_t event_time, am_addr_t addr, message_t* msg, uint8_t len) + command error_t TimeSyncAMSendMilli.send[am_id_t id](am_addr_t addr, message_t* msg, uint8_t len, uint32_t event_time) { - timesync_local_t* local = getLocal(msg); - // compute elapsed time in millisecond - event_time = ((event_time - call LocalTimeMilli.get()) << 10) + call LocalTimeMicro.get(); + event_time = ((int32_t)(event_time - call LocalTimeMilli.get()) << 10) + call LocalTimeRadio.get(); - local->event_time = event_time; - - call PacketLastTouch.request(msg); - - return call SubSend.send[id](addr, msg, len); + return call TimeSyncAMSendRadio.send[id](addr, msg, len, event_time); } - command error_t TimeSyncSendMilli.cancel[am_id_t id](message_t* msg) + command error_t TimeSyncAMSendMilli.cancel[am_id_t id](message_t* msg) { - return call SubSend.cancel[id](msg); + return call TimeSyncAMSendRadio.cancel[id](msg); } - default event void TimeSyncSendMilli.sendDone[am_id_t id](message_t* msg, error_t error) + default event void TimeSyncAMSendMilli.sendDone[am_id_t id](message_t* msg, error_t error) { } - command uint8_t TimeSyncSendMilli.maxPayloadLength[am_id_t id]() + command uint8_t TimeSyncAMSendMilli.maxPayloadLength[am_id_t id]() { - return call SubSend.maxPayloadLength[id]() - sizeof(timesync_footer_t); + return call TimeSyncAMSendRadio.maxPayloadLength[id](); } - command void* TimeSyncSendMilli.getPayload[am_id_t id](message_t* msg, uint8_t len) + command void* TimeSyncAMSendMilli.getPayload[am_id_t id](message_t* msg, uint8_t len) { - return call SubSend.getPayload[id](msg, len + sizeof(timesync_footer_t)); + return call TimeSyncAMSendRadio.getPayload[id](msg, len); } /*----------------- SubSend.sendDone -------------------*/ event void SubSend.sendDone[am_id_t id](message_t* msg, error_t error) { - signal TimeSyncSendMicro.sendDone[id](msg, error); - signal TimeSyncSendMilli.sendDone[id](msg, error); - } - - /*----------------- PacketLastTouch.touch -------------------*/ - - enum - { - TIMESYNC_INVALID_STAMP = 0x80000000L, - }; - - async event void PacketLastTouch.touch(message_t* msg) - { - timesync_footer_t* footer = footer = getFooter(msg); - timesync_local_t* local; - - if( call PacketTimeStamp.isSet(msg) ) - { - local = getLocal(msg); - - footer->time_offset = local->event_time - call PacketTimeStamp.get(msg); - } - else - footer->time_offset = TIMESYNC_INVALID_STAMP; + signal TimeSyncAMSendRadio.sendDone[id](msg, error); + signal TimeSyncAMSendMilli.sendDone[id](msg, error); } - /*----------------- TimeSyncPacketMicro -----------------*/ + /*----------------- TimeSyncPacketRadio -----------------*/ - async command bool TimeSyncPacketMicro.hasValidTime(message_t* msg) + async command bool TimeSyncPacketRadio.isValid(message_t* msg) { - timesync_footer_t* footer = getFooter(msg); + timesync_relative_t* timesync = getFooter(msg); - return call PacketTimeStamp.isSet(msg) && footer->time_offset != TIMESYNC_INVALID_STAMP; + return call PacketTimeStampRadio.isValid(msg) && *timesync != 0x80000000L; } - async command uint32_t TimeSyncPacketMicro.getEventTime(message_t* msg) + async command uint32_t TimeSyncPacketRadio.eventTime(message_t* msg) { - timesync_footer_t* footer = getFooter(msg); + timesync_relative_t* timesync = getFooter(msg); - return (uint32_t)(footer->time_offset) + call PacketTimeStamp.get(msg); + return (*timesync) + call PacketTimeStampRadio.timestamp(msg); } /*----------------- TimeSyncPacketMilli -----------------*/ - async command bool TimeSyncPacketMilli.hasValidTime(message_t* msg) + async command bool TimeSyncPacketMilli.isValid(message_t* msg) { - timesync_footer_t* footer = getFooter(msg); + timesync_relative_t* timesync = getFooter(msg); - return call PacketTimeStamp.isSet(msg) && footer->time_offset != TIMESYNC_INVALID_STAMP; + return call PacketTimeStampMilli.isValid(msg) && *timesync != 0x80000000L; } - async command uint32_t TimeSyncPacketMilli.getEventTime(message_t* msg) + async command uint32_t TimeSyncPacketMilli.eventTime(message_t* msg) { - timesync_footer_t* footer = getFooter(msg); - - // time offset compared to now in microsec, important that this is signed - int32_t elapsed = (uint32_t)(footer->time_offset) + call PacketTimeStamp.get(msg) - call LocalTimeMicro.get(); + timesync_relative_t* timesync = getFooter(msg); - return (elapsed >> 10) + call LocalTimeMilli.get(); + return ((int32_t)(*timesync) >> 10) + call PacketTimeStampMilli.timestamp(msg); } }