From: mmaroti <mmaroti>
Date: Mon, 9 Mar 2009 16:33:35 +0000 (+0000)
Subject: rename RF230 to RF2xx to support the RF212 chip
X-Git-Tag: rc_6_tinyos_2_1_1~471
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=1c67d948272948e5392f81f7e3ba7fc976b3460d

rename RF230 to RF2xx to support the RF212 chip
---

diff --git a/tos/chips/rf230/RF2xx.h b/tos/chips/rf230/RF2xx.h
index 8e152ae2..a694df88 100644
--- a/tos/chips/rf230/RF2xx.h
+++ b/tos/chips/rf230/RF2xx.h
@@ -24,11 +24,9 @@
 #ifndef __RF2XX_H__
 #define __RF2XX_H__
 
-enum rf2xx_chipsets_enum
-{
-	RF230_CHIPSET = 0,
-	RF212_CHIPSET = 1,
-};
+/* Set RF2XX_CHIPSET to one of these to enable specific features */
+#define RF230_CHIPSET	0
+#define RF212_CHIPSET	1
 
 enum rf2xx_registers_enum
 {
diff --git a/tos/platforms/iris/chips/rf230/HplRF2xx.h b/tos/platforms/iris/chips/rf230/HplRF2xx.h
index 6f9e21c8..e312080f 100644
--- a/tos/platforms/iris/chips/rf230/HplRF2xx.h
+++ b/tos/platforms/iris/chips/rf230/HplRF2xx.h
@@ -29,11 +29,6 @@
 
 enum
 {
-	/**
-	 * This is an RF230 chip
-	 */
-	RF2XX_CHIPSET = RF230_CHIPSET,
-
 	/**
 	 * This is the value of the TRX_CTRL_0 register
 	 * which configures the output pin currents and the CLKM clock
@@ -67,6 +62,8 @@ enum
 
 #define RF2XX_DEF_CHANNEL	RF230_DEF_CHANNEL
 
+#define RF2XX_CHIPSET		RF230_CHIPSET
+
 /*
  * This is the command used to calculate the CRC for the RF230 chip. 
  * TODO: Check why the default crcByte implementation is in a different endianness