[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/telosa/chips/at45db HplAt45dbC.nc, 1.2, 1.3 HplAt45dbP.nc, 1.2, 1.3

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/chips/at45db
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14951/tos/platforms/telosa/chips/at45db

Modified Files:
	HplAt45dbC.nc HplAt45dbP.nc 
Log Message:
Deluge T2 support for Epic. This includes support for at45db161d and some refactoring and cleaning.


Index: HplAt45dbC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/chips/at45db/HplAt45dbC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HplAt45dbC.nc	13 Dec 2006 02:34:15 -0000	1.2
--- HplAt45dbC.nc	25 Aug 2008 16:48:47 -0000	1.3
***************
*** 33,43 ****
  implementation {
  
!   components  new HplAt45dbByteC(9),
! 							new Msp430Spi0C() as Spi,
! 							HplAt45dbP,
! 							HplMsp430GeneralIOC as MspGeneralIO,
! 							new Msp430GpioC() as Select;
  
! 	HplAt45db = HplAt45dbByteC;
  
    HplAt45dbByteC.Resource -> Spi;
--- 33,43 ----
  implementation {
  
!   components new HplAt45dbByteC(9),
! 	new Msp430Spi0C() as Spi,
! 	HplAt45dbP,
! 	HplMsp430GeneralIOC as MspGeneralIO,
! 	new Msp430GpioC() as Select;
  
!   HplAt45db = HplAt45dbByteC;
  
    HplAt45dbByteC.Resource -> Spi;
***************
*** 45,50 ****
    HplAt45dbByteC.HplAt45dbByte -> HplAt45dbP;
  
! 	Select -> MspGeneralIO.Port44;
! 	HplAt45dbP.Select -> Select;
! 	HplAt45dbP.FlashSpi -> Spi;
  }
--- 45,50 ----
    HplAt45dbByteC.HplAt45dbByte -> HplAt45dbP;
  
!   Select -> MspGeneralIO.Port44;
!   HplAt45dbP.Select -> Select;
!   HplAt45dbP.FlashSpi -> Spi;
  }

Index: HplAt45dbP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/chips/at45db/HplAt45dbP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HplAt45dbP.nc	13 Dec 2006 02:34:15 -0000	1.2
--- HplAt45dbP.nc	25 Aug 2008 16:48:47 -0000	1.3
***************
*** 34,38 ****
    }
    uses {
! 		interface SpiByte as FlashSpi;
      interface GeneralIO as Select;
    }
--- 34,38 ----
    }
    uses {
!     interface SpiByte as FlashSpi;
      interface GeneralIO as Select;
    }
***************
*** 48,68 ****
    }
  
! 	task void idleTask() {
! 		uint8_t status;
! 		status = call FlashSpi.write(0);
! 		if (!(status & 0x80)) {
! 			post idleTask();
! 		} else {
! 			signal HplAt45dbByte.idle();
! 		}
! 	}
  
    command void HplAt45dbByte.waitIdle() {
! 		post idleTask();
    }
  
    command bool HplAt45dbByte.getCompareStatus() {
! 		uint8_t status;
! 		status = call FlashSpi.write(0);
      return (!(status & 0x40));
    }
--- 48,68 ----
    }
  
!   task void idleTask() {
!     uint8_t status;
!     status = call FlashSpi.write(0);
!     if (!(status & 0x80)) {
!       post idleTask();
!     } else {
!       signal HplAt45dbByte.idle();
!     }
!   }
  
    command void HplAt45dbByte.waitIdle() {
!     post idleTask();
    }
  
    command bool HplAt45dbByte.getCompareStatus() {
!     uint8_t status;
!     status = call FlashSpi.write(0);
      return (!(status & 0x40));
    }