io.h is deprecated, so now msp430.h is included instead.

[goodfet] / firmware / apps / spi / spi.c

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index e07cdb5..bb1753a 100644 (file)
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -5,15 +5,23 @@
 
 //Higher level left to client application.
 
-#include "platform.h"
+
 #include "command.h"
 
+#ifdef __MSPGCC__
+#include <msp430.h>
+#else
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
+#endif
 
 #include "spi.h"
 
+#define SPIAPPLICATION
+
+#include "platform.h"
+
 //! Handles a monitor command.
 void spi_handle_fn( uint8_t const app,
                                        uint8_t const verb,
@@ -45,15 +53,14 @@ app_t const spi_app = {
 //! Set up the pins for SPI mode.
 void spisetup(){
   SETSS;
-  P5DIR|=MOSI+SCK+BIT0; //BIT0 might be SS
-  P5DIR&=~MISO;
+  SPIDIR|=MOSI+SCK+BIT0; //BIT0 might be SS
+  SPIDIR&=~MISO;
   DIRSS;
-  
+
   //Begin a new transaction.
-  
-  CLRSS; 
+
+  CLRSS;
   SETSS;
-  
 }
 
 
@@ -62,7 +69,7 @@ unsigned char spitrans8(unsigned char byte){
   register unsigned int bit;
   //This function came from the SPI Wikipedia article.
   //Minor alterations.
-  
+
   for (bit = 0; bit < 8; bit++) {
     /* write MOSI on trailing edge of previous clock */
     if (byte & 0x80)
@@ -70,11 +77,11 @@ unsigned char spitrans8(unsigned char byte){
     else
       CLRMOSI;
     byte <<= 1;
-    
+
     //SPIDELAY(100);
     SETCLK;
     //SPIDELAY(100);
-  
+
     /* read MISO on trailing edge */
     byte |= READMISO;
     CLRCLK;
@@ -125,16 +132,16 @@ void spiflash_peekblock(unsigned long adr,
                        unsigned char *buf,
                        unsigned int len){
   unsigned char i;
-  
+
   SETSS;
   CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x03);//Flash Read Command
-  
+
   //Send address
   spitrans8((adr&0xFF0000)>>16);
   spitrans8((adr&0xFF00)>>8);
   spitrans8(adr&0xFF);
-  
+
   for(i=0;i<len;i++)
     buf[i]=spitrans8(0);
   SETSS;  //Raise !SS to end transaction.
@@ -145,24 +152,24 @@ void spiflash_pokeblock(unsigned long adr,
                        unsigned char *buf,
                        unsigned int len){
   unsigned int i;
-  
+
   SETSS;
-  
+
   //if(len!=0x100)
   //  debugstr("Non-standard block size.");
-  
+
   while(spiflash_status()&0x01);//minor performance impact
-  
+
   spiflash_setstatus(0x02);
   spiflash_wrten();
-  
+
   //Are these necessary?
   //spiflash_setstatus(0x02);
   //spiflash_wrten();
-  
+
   CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x02); //Poke command.
-  
+
   //Send address
   spitrans8((adr&0xFF0000)>>16);
   spitrans8((adr&0xFF00)>>8);
@@ -171,7 +178,7 @@ void spiflash_pokeblock(unsigned long adr,
   for(i=0;i<len;i++)
     spitrans8(buf[i]);
   SETSS;  //Raise !SS to end transaction.
-  
+
   while(spiflash_status()&0x01);//minor performance impact
   return;
 }
@@ -184,7 +191,7 @@ void spiflash_pokeblocks(unsigned long adr,
   long off=0;//offset of this block
   int blen;//length of this block
   SETSS;
-  
+
   while(off<len){
     //calculate block length
     blen=(len-off>0x100?0x100:len-off);
@@ -209,14 +216,14 @@ void spiflash_peek(unsigned char app,
   len=3;//write 3 byte pointer
   for(i=0;i<len;i++)
     spitrans8(cmddata[i]);
-  
+
   //Send reply header
   len=0x1000;
   txhead(app,verb,len);
-  
+
   while(len--)
     serial_tx(spitrans8(0));
-  
+
   SETSS;  //Raise !SS to end transaction.
 }
 
@@ -251,7 +258,7 @@ void em260_wake(){
   P2DIR|=RST;
   SETRST;
   delay(1024);
-  
+
   CLRRST;//Wake chip.
   while(P4IN&1);
   SETRST;//Woken.
@@ -262,22 +269,22 @@ void em260_wake(){
 void spi_rw_em260(u8 app, u8 verb, u32 len){
   unsigned long i;
   u8 lastin;
-    
+
   P4DIR=0; //TODO ASAP remove P4 references.
   P4OUT=0xFF;
   //P4REN=0xFF;
-    
+
   //See GoodFETEM260.py for details.
   //The EM260 requires that the host wait for the client.
-    
+
   /*
     if((~P4IN)&1)
     debugstr("Detected HOST_INT.");
   */
-    
+
   em260_wake();
-  
-    
+
+
   SETMOSI; //Autodetected SPI mode.
   CLRSS; //Drop !SS to begin transaction.
   //Host to slave.  Ignore data.
@@ -290,10 +297,10 @@ void spi_rw_em260(u8 app, u8 verb, u32 len){
     }
   }
   //debugstr("Finished transmission to EM260.");
-    
+
   //Wait for nHOST_INT to drop.
   i=0xffff;
-  
+
   /*
   while(P4IN&1
        && --i
@@ -302,10 +309,10 @@ void spi_rw_em260(u8 app, u8 verb, u32 len){
   */
   while((cmddata[0]=spitrans8(0xFF))==0xFF
        && --i);
-  
+
   if(!i)
     debugstr("Gave up on host interrupt.");
-  
+
  response:
   len=1;
   while(
@@ -315,7 +322,7 @@ void spi_rw_em260(u8 app, u8 verb, u32 len){
     while(len<cmddata[1]+3)
       cmddata[len++]=spitrans8(0xFF);
   SETSS;  //Raise !SS to end transaction.
-  
+
   txdata(app,verb,len);
   return;
 }
@@ -363,7 +370,7 @@ void spi_handle_fn( uint8_t const app,
        case POKE://Poke up bytes from an SPI Flash ROM.
                spiflash_pokeblocks(cmddatalong[0],//adr
                cmddata+4,//buf
-               len-4);//len    
+               len-4);//len
                txdata(app,verb,0);
                break;
 
@@ -374,8 +381,8 @@ void spi_handle_fn( uint8_t const app,
                SETSS;  //Raise !SS to end transaction.
 
                while(spiflash_status()&0x01)//while busy
-               PLEDOUT^=PLEDPIN;
-               PLEDOUT&=~PLEDPIN;
+                       led_toggle();
+               led_off();
 
                txdata(app,verb,0);
                break;