X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Firis%2Fplatform_message.h;h=3b2ffb021e2a6226ac3065550c189304d42ba4ff;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=9b55ed77732e4bc8007cfdd24ebc3f9346eb1fba;hpb=c200f0d798d7f9631eabfb79008615936a52b5af;p=tinyos-2.x.git

diff --git a/tos/platforms/iris/platform_message.h b/tos/platforms/iris/platform_message.h
index 9b55ed77..3b2ffb02 100644
--- a/tos/platforms/iris/platform_message.h
+++ b/tos/platforms/iris/platform_message.h
@@ -1,32 +1,3 @@
-/* $Id$
- * "Copyright (c) 2005 The Regents of the University  of California.  
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written agreement is
- * hereby granted, provided that the above copyright notice, the following
- * two paragraphs and the author appear in all copies of this software.
- * 
- * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
- * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
- * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
- *
- * Copyright (c) 2002-2005 Intel Corporation
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached INTEL-LICENSE     
- * file. If you do not find these files, copies can be found by writing to
- * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
- * 94704.  Attention:  Intel License Inquiry.
- */
-
 /*
  * Copyright (c) 2007, Vanderbilt University
  * All rights reserved.
@@ -49,32 +20,23 @@
  *
  */
 
-/**
- * Defining the platform-independently named packet structures to be the
- * chip-specific CC1000 packet structures.
- *
- * @author Philip Levis
- * @date   May 16 2005
- * Revision:  $Revision$
- */
-
-
 #ifndef PLATFORM_MESSAGE_H
 #define PLATFORM_MESSAGE_H
 
-#include <DefaultMac.h>
+#include <RF230Radio.h>
 #include <Serial.h>
 
 typedef union message_header {
-  defaultmac_header_t rf230;
-  serial_header_t serial;
+	rf230packet_header_t rf230;
+	serial_header_t serial;
 } message_header_t;
 
 typedef union message_footer {
+	rf230packet_footer_t rf230;
 } message_footer_t;
 
 typedef union message_metadata {
-  defaultmac_metadata_t rf230;
+	rf230packet_metadata_t rf230;
 } message_metadata_t;
 
 #endif