Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / sensorboards / tmote_onboard / CHamamatsuS1087ParP.nc

diff --git a/tos/lib/tosthreads/sensorboards/tmote_onboard/CHamamatsuS1087ParP.nc b/tos/lib/tosthreads/sensorboards/tmote_onboard/CHamamatsuS1087ParP.nc
index 683b606cf3dc67753d7503772a9a525e722e6a15..bd45a932614a2184151c4b7590e12592009b2bb0 100644 (file)
--- a/tos/lib/tosthreads/sensorboards/tmote_onboard/CHamamatsuS1087ParP.nc
+++ b/tos/lib/tosthreads/sensorboards/tmote_onboard/CHamamatsuS1087ParP.nc
@@ -42,13 +42,25 @@ module CHamamatsuS1087ParP {
 }
 implementation {
 
-  error_t hamamatsuS1087_par_read(uint16_t* val) @C() @spontaneous() {
+  error_t hamamatsuS1087_par_read(uint16_t* val) @C() AT_SPONTANEOUS {
     return call Read.read(val);
   }
-  error_t hamamatsuS1087_par_readStream(uint32_t* usPeriod, uint16_t* buf, uint16_t count) @C() @spontaneous() {
+  error_t hamamatsuS1087_par_readStream(uint32_t* usPeriod, uint16_t* buf, uint16_t count) @C() AT_SPONTANEOUS {
     return call ReadStream.read(usPeriod, buf, count);                                           
   }                                           
-  uint8_t hamamatsuS1087_par_getNumBits() @C() @spontaneous() {
+  uint8_t hamamatsuS1087_par_getNumBits() @C() AT_SPONTANEOUS {
     return call DeviceMetadata.getSignificantBits();
   }
+  
+  default command error_t Read.read(uint16_t* val) {
+    return FAIL;
+  }
+  
+  default command error_t ReadStream.read(uint32_t* usPeriod, uint16_t* buf, uint16_t count) {
+    return FAIL;
+  }
+  
+  default command uint8_t DeviceMetadata.getSignificantBits() {
+    return 0;
+  }
 }