Merge over into the trunk.

[tinyos-2.x.git] / tos / platforms / mica2dot / chips / at45db / HplAt45dbIOP.nc

diff --git a/tos/platforms/mica2dot/chips/at45db/HplAt45dbIOP.nc b/tos/platforms/mica2dot/chips/at45db/HplAt45dbIOP.nc
index cf7e565e5ff9ca51bb582bc0f2b99116927e0fcd..1d1ac297d2b2f496917baa9bd1cd7b93b1a582ae 100644 (file)
--- a/tos/platforms/mica2dot/chips/at45db/HplAt45dbIOP.nc
+++ b/tos/platforms/mica2dot/chips/at45db/HplAt45dbIOP.nc
@@ -94,7 +94,7 @@ implementation
         "\tori %0,1<<" #n "\n" \
         : "=d" (spiIn) : "0" (spiIn), "r" (spiOut))
 
-  async command void FlashSpi.write(uint8_t spiOut, uint8_t *pspiIn) {
+  async command uint8_t FlashSpi.write(uint8_t spiOut) {
     uint8_t spiIn = 0;
 
     // This atomic ensures integrity at the hardware level...
@@ -112,7 +112,7 @@ implementation
        BIT(0);
       }
 
-    *pspiIn = spiIn;
+    return spiIn;
   }
 
   task void idleWait() {