GCC 4.4.3 seems to have proper bitfield support.

[tinyos-2.x.git] / tos / chips / msp430 / adc12 / Msp430Adc12.h

diff --git a/tos/chips/msp430/adc12/Msp430Adc12.h b/tos/chips/msp430/adc12/Msp430Adc12.h
index d8ce94ea1d0df7d935350dad9938cdb5f4258137..6cbce0175d4ca765e5d182e682a62070178f6b06 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12.h
+++ b/tos/chips/msp430/adc12/Msp430Adc12.h
@@ -37,12 +37,16 @@
 #define MSP430ADC12_H
 #include "Msp430RefVoltGenerator.h"
 
-#define P6PIN_AUTO_CONFIGURE
+#define ADC12_TIMERA_ENABLED
+#define ADC12_P6PIN_AUTO_CONFIGURE
+#define ADC12_CHECK_ARGS
+//#define ADC12_ONLY_WITH_DMA
+
+// for HIL clients 
 #define REF_VOLT_AUTO_CONFIGURE
-#define CHECK_ARGS
- 
+
 typedef struct { 
-  // see README.txt for a more detailed explanation
+  // see README.txt
   unsigned int inch: 4;            // input channel 
   unsigned int sref: 3;            // reference voltage 
   unsigned int ref2_5v: 1;         // reference voltage level 
@@ -56,7 +60,7 @@ typedef struct {
 
 typedef struct 
 {
-  // see README.txt for a more detailed explanation
+  // see README.txt
   volatile unsigned
   inch: 4,                                     // input channel
   sref: 3,                                     // reference voltage
@@ -160,15 +164,19 @@ enum sampcon_id_enum
 // The unique string for accessing HAL2 via ReadStream
 #define ADCC_READ_STREAM_SERVICE "AdcC.ReadStream.Client"
 
-/* Test for GCC bug (bitfield access) - only version 3.2.3 is known to be stable */
+/* Test for GCC bug (bitfield access) - versions 3.2.3 and 4.4.3 are known to
+ * be stable
+ */
 // TODO: check whether this is still relevant...
 #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__)
 #if GCC_VERSION == 332
 #error "The msp430-gcc version (3.3.2) contains a bug which results in false accessing \
 of bitfields in structs and makes MSP430ADC12M.nc fail ! Use version 3.2.3 instead."
 #elif GCC_VERSION != 323
+#if GCC_VERSION < 443
 #warning "This version of msp430-gcc might contain a bug which results in false accessing \
 of bitfields in structs (MSP430ADC12M.nc would fail). Use version 3.2.3 instead."
+#endif
 #endif  
 
 #ifndef __msp430_have_adc12