WISMOTE external flash driver support

tpmullan · Aug 24, 2015 · fd5b03b · fd5b03b
1 parent 6ac939b
commit fd5b03b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 40 deletions.
diff --git a/platform/wismote/Makefile.wismote b/platform/wismote/Makefile.wismote
@@ -7,7 +7,7 @@ CONTIKI_TARGET_SOURCEFILES += contiki-wismote-platform.c \
      sky-sensors.c uip-ipchksum.c \
      uart1.c slip_uart1.c uart1-putchar.c
 
-ARCH=spi.c i2c.c node-id.c sensors.c cfs-coffee.c sht15.c \
+ARCH=spi.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c sht15.c \
      cc2520.c cc2520-arch.c cc2520-arch-sfd.c \
      sky-sensors.c uip-ipchksum.c \
      uart1.c slip_uart1.c uart1-putchar.c

diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c
@@ -221,7 +221,7 @@ main(int argc, char **argv)
   //ds2411_id[2] &= 0xfe;
 
   leds_on(LEDS_BLUE);
-  //xmem_init();
+  xmem_init();
 
   leds_off(LEDS_RED);
   rtimer_init();

diff --git a/platform/wismote/dev/xmem.c b/platform/wismote/dev/xmem.c
@@ -32,21 +32,24 @@
  * \file
  *         Device driver for the ST M25P80 40MHz 1Mbyte external memory.
  * \author
- *         Björn Grönvall <[email protected]>
+ *         Björn Grönvall <[email protected]>
+ *         Sumankumar Panchal <[email protected]>
+ *         
  *
  *         Data is written bit inverted (~-operator) to flash so that
  *         unwritten data will read as zeros (UNIX style).
  */
 
+
 #include "contiki.h"
+#include <stdio.h>
 #include <string.h>
 
 #include "dev/spi.h"
 #include "dev/xmem.h"
 #include "dev/watchdog.h"
 
 #if 0
-#include <stdio.h>
 #define PRINTF(...) printf(__VA_ARGS__)
 #else
 #define PRINTF(...) do {} while (0)
@@ -72,8 +75,7 @@ write_enable(void)
   s = splhigh();
   SPI_FLASH_ENABLE();
 
-  //FASTSPI_TX(SPI_FLASH_INS_WREN);
-  //SPI_WAITFORTx_ENDED();
+  SPI_WRITE(SPI_FLASH_INS_WREN);
 
   SPI_FLASH_DISABLE();
   splx(s);
@@ -89,11 +91,10 @@ read_status_register(void)
   s = splhigh();
   SPI_FLASH_ENABLE();
 
-  //FASTSPI_TX(SPI_FLASH_INS_RDSR);
-  //SPI_WAITFORTx_ENDED();
+  SPI_WRITE(SPI_FLASH_INS_RDSR);
 
-  //FASTSPI_CLEAR_RX();
-  //FASTSPI_RX(u);
+  SPI_FLUSH();
+  SPI_READ(u);
 
   SPI_FLASH_DISABLE();
   splx(s);
@@ -110,6 +111,7 @@ wait_ready(void)
   unsigned u;
   do {
     u = read_status_register();
+    watchdog_periodic();
   } while(u & 0x01);		/* WIP=1, write in progress */
   return u;
 }
@@ -121,18 +123,18 @@ static void
 erase_sector(unsigned long offset)
 {
   int s;
-  wait_ready();
 
+  wait_ready();
   write_enable();
 
   s = splhigh();
   SPI_FLASH_ENABLE();
 
-  //FASTSPI_TX(SPI_FLASH_INS_SE);
-  //FASTSPI_TX(offset >> 16);	/* MSB */
-  //FASTSPI_TX(offset >> 8);
-  //FASTSPI_TX(offset >> 0);	/* LSB */
-  //SPI_WAITFORTx_ENDED();
+  SPI_WRITE_FAST(SPI_FLASH_INS_SE);
+  SPI_WRITE_FAST(offset >> 16);	/* MSB */
+  SPI_WRITE_FAST(offset >> 8);
+  SPI_WRITE_FAST(offset >> 0);	/* LSB */
+  SPI_WAITFORTx_ENDED();
 
   SPI_FLASH_DISABLE();
   splx(s);
@@ -144,12 +146,20 @@ erase_sector(unsigned long offset)
 void
 xmem_init(void)
 {
+  int s;
   spi_init();
 
-  P4DIR |= BV(FLASH_CS) | BV(FLASH_HOLD) | BV(FLASH_PWR);
-  P4OUT |= BV(FLASH_PWR);       /* P4.3 Output, turn on power! */
+
+  P4DIR |= BIT0;
 
+  /* Release from Deep Power-down */
+  s = splhigh();
+  SPI_FLASH_ENABLE();
+  SPI_WRITE_FAST(SPI_FLASH_INS_RES);
+  SPI_WAITFORTx_ENDED();
   SPI_FLASH_DISABLE();		/* Unselect flash. */
+  splx(s);
+
   SPI_FLASH_UNHOLD();
 }
 /*---------------------------------------------------------------------------*/
@@ -159,23 +169,24 @@ xmem_pread(void *_p, int size, unsigned long offset)
   unsigned char *p = _p;
   const unsigned char *end = p + size;
   int s;
+
   wait_ready();
 
   ENERGEST_ON(ENERGEST_TYPE_FLASH_READ);
 
   s = splhigh();
   SPI_FLASH_ENABLE();
 
-  //FASTSPI_TX(SPI_FLASH_INS_READ);
-  //FASTSPI_TX(offset >> 16);	/* MSB */
-  //FASTSPI_TX(offset >> 8);
-  //FASTSPI_TX(offset >> 0);	/* LSB */
-  //SPI_WAITFORTx_ENDED();
+  SPI_WRITE_FAST(SPI_FLASH_INS_READ);
+  SPI_WRITE_FAST(offset >> 16);	/* MSB */
+  SPI_WRITE_FAST(offset >> 8);
+  SPI_WRITE_FAST(offset >> 0);	/* LSB */
+  SPI_WAITFORTx_ENDED();
 
-  //FASTSPI_CLEAR_RX();
+  SPI_FLUSH();
   for(; p < end; p++) {
     unsigned char u;
-    //FASTSPI_RX(u);
+    SPI_READ(u);
     *p = ~u;
   }
 
@@ -187,28 +198,27 @@ xmem_pread(void *_p, int size, unsigned long offset)
   return size;
 }
 /*---------------------------------------------------------------------------*/
-static const char *
+static const unsigned char *
 program_page(unsigned long offset, const unsigned char *p, int nbytes)
 {
   const unsigned char *end = p + nbytes;
   int s;
 
   wait_ready();
-
   write_enable();
 
   s = splhigh();
   SPI_FLASH_ENABLE();
 
- // FASTSPI_TX(SPI_FLASH_INS_PP);
-  //FASTSPI_TX(offset >> 16);	/* MSB */
-  //FASTSPI_TX(offset >> 8);
-  //FASTSPI_TX(offset >> 0);	/* LSB */
+  SPI_WRITE_FAST(SPI_FLASH_INS_PP);
+  SPI_WRITE_FAST(offset >> 16);	/* MSB */
+  SPI_WRITE_FAST(offset >> 8);
+  SPI_WRITE_FAST(offset >> 0);	/* LSB */
 
   for(; p < end; p++) {
-    //FASTSPI_TX(~*p);
+    SPI_WRITE_FAST(~*p);
   }
-  //SPI_WAITFORTx_ENDED();
+  SPI_WAITFORTx_ENDED();
 
   SPI_FLASH_DISABLE();
   splx(s);
@@ -224,7 +234,7 @@ xmem_pwrite(const void *_buf, int size, unsigned long addr)
   unsigned long i, next_page;
 
   ENERGEST_ON(ENERGEST_TYPE_FLASH_WRITE);
-  
+
   for(i = addr; i < end;) {
     next_page = (i | 0xff) + 1;
     if(next_page > end) {
@@ -254,14 +264,10 @@ xmem_erase(long size, unsigned long addr)
     return -1;
   }
 
-  watchdog_stop();
-
   for (; addr < end; addr += XMEM_ERASE_UNIT_SIZE) {
     erase_sector(addr);
   }
 
-  watchdog_start();
-
   return size;
 }
 /*---------------------------------------------------------------------------*/
diff --git a/platform/wismote/platform-conf.h b/platform/wismote/platform-conf.h
@@ -124,8 +124,10 @@ typedef unsigned long off_t;
 
 /* Enable/disable flash access to the SPI bus (active low). */
 
-#define SPI_FLASH_ENABLE()  //( P4OUT &= ~BV(FLASH_CS) )
-#define SPI_FLASH_DISABLE() //( P4OUT |=  BV(FLASH_CS) )
+ /* ENABLE CSn (active low) */
+#define SPI_FLASH_ENABLE()     do{ UCB0CTL1 &= ~UCSWRST;  clock_delay(5); P4OUT &= ~BIT0;clock_delay(5);}while(0)
+ /* DISABLE CSn (active low) */
+#define SPI_FLASH_DISABLE()    do{clock_delay(5);UCB0CTL1 |= UCSWRST;clock_delay(1); P4OUT |= BIT0;clock_delay(5);}while(0)
 
 #define SPI_FLASH_HOLD()               // ( P4OUT &= ~BV(FLASH_HOLD) )
 #define SPI_FLASH_UNHOLD()              //( P4OUT |=  BV(FLASH_HOLD) )