Merge over into the trunk.

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

diff --git a/tos/platforms/mica2/chips/at45db/HplAt45dbIOP.nc b/tos/platforms/mica2/chips/at45db/HplAt45dbIOP.nc
index 135eb3f7008a75de34166cb72f01abcd1048346d..5f1cd7dbec4b8b7f6342edb471d055fc55694592 100644 (file)
--- a/tos/platforms/mica2/chips/at45db/HplAt45dbIOP.nc
+++ b/tos/platforms/mica2/chips/at45db/HplAt45dbIOP.nc
@@ -99,7 +99,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...
@@ -117,7 +117,7 @@ implementation
        BIT(0);
       }
 
-    *pspiIn = spiIn;
+    return spiIn;
   }
 
   task void avail() {