From f7060f62d941269b18795ce4bac6fc802a7ead63 Mon Sep 17 00:00:00 2001 From: andreaskoepke Date: Tue, 24 Jul 2007 12:22:42 +0000 Subject: [PATCH] add accessor function for strength field --- tos/chips/tda5250/Tda5250ActiveMessageC.nc | 2 + tos/chips/tda5250/Tda5250ActiveMessageP.nc | 20 +++++++--- tos/chips/tda5250/Tda5250Packet.nc | 43 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 tos/chips/tda5250/Tda5250Packet.nc diff --git a/tos/chips/tda5250/Tda5250ActiveMessageC.nc b/tos/chips/tda5250/Tda5250ActiveMessageC.nc index a620d055..611937c8 100644 --- a/tos/chips/tda5250/Tda5250ActiveMessageC.nc +++ b/tos/chips/tda5250/Tda5250ActiveMessageC.nc @@ -58,6 +58,7 @@ configuration Tda5250ActiveMessageC { interface AMPacket; interface Packet; interface PacketAcknowledgements; + interface Tda5250Packet; } } implementation { @@ -69,6 +70,7 @@ implementation { Packet = Radio; PacketAcknowledgements = Radio; + Tda5250Packet = AM; AMSend = AM; Receive = AM.Receive; diff --git a/tos/chips/tda5250/Tda5250ActiveMessageP.nc b/tos/chips/tda5250/Tda5250ActiveMessageP.nc index f46eb588..c44da61d 100644 --- a/tos/chips/tda5250/Tda5250ActiveMessageP.nc +++ b/tos/chips/tda5250/Tda5250ActiveMessageP.nc @@ -1,6 +1,5 @@ -// $Id$ - -/* tab:4 +// -*- mode:c++; indent-tabs-mode: nil -*- $Id$ +/* * "Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * @@ -47,6 +46,7 @@ module Tda5250ActiveMessageP { interface Receive[am_id_t id]; interface Receive as Snoop[am_id_t id]; interface AMPacket; + interface Tda5250Packet; } uses { interface Send as SubSend; @@ -57,10 +57,14 @@ module Tda5250ActiveMessageP { } implementation { - tda5250_header_t* getHeader( message_t* msg ) { - return (tda5250_header_t*)( msg->data - sizeof(tda5250_header_t) ); - } + tda5250_header_t* getHeader( message_t* msg ) { + return (tda5250_header_t*)( msg->data - sizeof(tda5250_header_t) ); + } + tda5250_metadata_t* getMetadata(message_t* amsg) { + return (tda5250_metadata_t*)((uint8_t*)amsg->footer + sizeof(message_radio_footer_t)); + } + command error_t AMSend.send[am_id_t id](am_addr_t addr, message_t* msg, uint8_t len) { @@ -164,6 +168,10 @@ implementation { command am_group_t AMPacket.localGroup() { return TOS_AM_GROUP; } + + async command uint8_t Tda5250Packet.getSnr(message_t* msg) { + return getMetadata(msg)->strength; + } default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len) { return msg; diff --git a/tos/chips/tda5250/Tda5250Packet.nc b/tos/chips/tda5250/Tda5250Packet.nc new file mode 100644 index 00000000..17effea8 --- /dev/null +++ b/tos/chips/tda5250/Tda5250Packet.nc @@ -0,0 +1,43 @@ +/* -*- mode:c++; indent-tabs-mode: nil -*- + * Copyright (c) 2007, Technische Universitaet Berlin + * 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 Technische Universitaet Berlin 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 + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $Revision$ + * $Date$ + */ + +/** + * Access the specific fields of this radio + * @author: Andreas Koepke + */ + + +#include "message.h" + +interface Tda5250Packet { + async command uint8_t getSnr(message_t* msg); +} -- 2.39.2