Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosboot / at45db / ExtFlashC.nc

diff --git a/tos/lib/tosboot/at45db/ExtFlashC.nc b/tos/lib/tosboot/at45db/ExtFlashC.nc
index 6bb2099ee9bf6e61599ddb2622a9bfc3ce40a9d8..6fd7ac9a426aa48a1b36cbb39919805bd54fe360 100644 (file)
--- a/tos/lib/tosboot/at45db/ExtFlashC.nc
+++ b/tos/lib/tosboot/at45db/ExtFlashC.nc
@@ -92,10 +92,17 @@ implementation {
 
     addr = newAddr;
 
+#if defined(PLATFORM_MULLE)
+    cmdBuf[0] = 0x68;
+    cmdBuf[1] = (addr >> 15);
+    cmdBuf[2] = ((addr >> 7) & 0xFC) + ((addr >> 8) & 0x1);
+    cmdBuf[3] = addr & 0xff;
+#else
     cmdBuf[0] = 0x68;
     cmdBuf[1] = (addr >> 15) & 0xff;
     cmdBuf[2] = (addr >> 7) & 0xfe;
     cmdBuf[3] = addr & 0xff;
+#endif
     
     TOSH_CLR_FLASH_CLK_PIN();
     TOSH_CLR_FLASH_CS_PIN();
@@ -111,7 +118,11 @@ implementation {
   }
 
   command uint8_t ExtFlash.readByte() {
+#if defined(PLATFORM_MULLE)
+    if (!(addr & 0x1ff)) {
+#else
     if (!(addr & 0xff)) {
+#endif
       call ExtFlash.stopRead();
       call ExtFlash.startRead(addr);
     }