From: janhauer <janhauer>
Date: Tue, 7 Apr 2009 15:40:12 +0000 (+0000)
Subject: Removed some unused code
X-Git-Tag: rc_6_tinyos_2_1_1~428
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=f8588baf987238122a928ded58831bea72cb35b1

Removed some unused code
---

diff --git a/tos/lib/mac/tkn154/PibP.nc b/tos/lib/mac/tkn154/PibP.nc
index 645b0e57..d5695cf2 100644
--- a/tos/lib/mac/tkn154/PibP.nc
+++ b/tos/lib/mac/tkn154/PibP.nc
@@ -567,7 +567,7 @@ implementation
 
   command uint8_t Packet.maxPayloadLength()
   {
-#if TOSH_DATA_LENGTH < 118
+#if TOSH_DATA_LENGTH < IEEE154_aMaxMACPayloadSize
 #warning Payload portion in message_t is smaller than required (TOSH_DATA_LENGTH < IEEE154_aMaxMACPayloadSize). This means that larger packets cannot be sent/received.
 #endif
     return TOSH_DATA_LENGTH;
diff --git a/tos/platforms/telosb/mac/tkn154/platform_message.h b/tos/platforms/telosb/mac/tkn154/platform_message.h
index 8dabee10..f13513df 100644
--- a/tos/platforms/telosb/mac/tkn154/platform_message.h
+++ b/tos/platforms/telosb/mac/tkn154/platform_message.h
@@ -6,27 +6,11 @@
 
 #include <Serial.h>
 
-#ifndef IEEE154_OLD_INTERFACES
+/* The following include pulls in the ieee154_header_t/ieee154_metadata_t definitions */
 #include <TKN154_MAC.h>
-#else
-typedef struct {
-  uint8_t control;  // stores length (lower 7 bits), top bit -> promiscuous mode
-  uint8_t mhr[MHR_MAX_LEN];  // maximum header size without security
-} ieee154_header_t;
-
-typedef struct {
-  uint8_t rssi;
-  uint8_t linkQuality;
-  uint32_t timestamp;
-} ieee154_metadata_t;
-#endif
 
-//#ifdef TOSH_DATA_LENGTH
-//#undef TOSH_DATA_LENGTH
-//#endif
-// TOSH_DATA_LENGTH may be smaller than 118, but then we'll
-// not be able to receive/send all IEEE 802.15.4 packets 
-#define TOSH_DATA_LENGTH 118
+/* TOSH_DATA_LENGTH should be the maximum length of the MAC payload */
+#define TOSH_DATA_LENGTH IEEE154_aMaxMACPayloadSize
 
 typedef union message_header {
   ieee154_header_t ieee154;