[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 HPLCC2420C.nc, 1.1, 1.2 HPLCC2420M.nc, 1.2, 1.3 hardware.h, 1.2, 1.3

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26542

Modified Files:
	HPLCC2420C.nc HPLCC2420M.nc hardware.h 
Log Message:

	updated to reflect the IM2 form factor rev1 board.  Also modified to
	keep all radio GPIO definitions in one central location (hardware.h) instead of scattered throughout the HPL components.




Index: HPLCC2420C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/HPLCC2420C.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HPLCC2420C.nc	13 Nov 2004 01:11:44 -0000	1.1
--- HPLCC2420C.nc	9 Mar 2005 01:04:54 -0000	1.2
***************
*** 70,77 ****
    HPLCC2420M.GPIOControl -> PXA27XGPIOIntM.StdControl;
  
!   HPLCC2420M.FIFOP_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[115];
!   HPLCC2420M.FIFO_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[114];
!   HPLCC2420M.CCA_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[116];
!   HPLCC2420M.SFD_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[16];
  
    PXA27XGPIOIntM.GPIOIrq0 -> PXA27XInterruptM.PXA27XIrq[PPID_GPIO_0];
--- 70,77 ----
    HPLCC2420M.GPIOControl -> PXA27XGPIOIntM.StdControl;
  
!   HPLCC2420M.FIFOP_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[CC_FIFOP_PIN];
!   HPLCC2420M.FIFO_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[CC_FIFO_PIN];
!   HPLCC2420M.CCA_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[RADIO_CCA_PIN];
!   HPLCC2420M.SFD_GPIOInt -> PXA27XGPIOIntM.PXA27XGPIOInt[CC_SFD_PIN];
  
    PXA27XGPIOIntM.GPIOIrq0 -> PXA27XInterruptM.PXA27XIrq[PPID_GPIO_0];

Index: HPLCC2420M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/HPLCC2420M.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HPLCC2420M.nc	25 Feb 2005 21:14:42 -0000	1.2
--- HPLCC2420M.nc	9 Mar 2005 01:04:54 -0000	1.3
***************
*** 97,108 ****
  
      // Set the appropriate GPIO bits
!     _GPDR(34) |= _GPIO_bit(34);  // SSP3SCLK
!     _GPDR(35) |= _GPIO_bit(35);  // SSP3TXD
!     _GPDR(41) &= ~(_GPIO_bit(41));  //SSP3RXD
!     _GPIO_setaltfn(34,3);
!     _GPIO_setaltfn(35,3);
!     _GPIO_setaltfn(41,3);
! 
  
      DRCMR(66) = ((1 << 7) | (0 & 0x1f)); // SSP3 Rx = DMA CH0
      DRCMR(67) = ((1 << 7) | (1 & 0x1f)); // SSP3 Tx = DMA CH1
--- 97,110 ----
  
      // Set the appropriate GPIO bits
!     _GPDR(SSP3_SCLK) |= _GPIO_bit(SSP3_SCLK);  // SSP3SCLK
!     _GPDR(SSP3_TXD)  |= _GPIO_bit(SSP3_TXD);  // SSP3TXD
!     _GPDR(SSP3_RXD) &= ~(_GPIO_bit(SSP3_RXD));  //SSP3RXD
!     //_GPDR(SSP3_SFRM)  |= _GPIO_bit(SSP3_SFRM);  // SSP3SFRM
  
+     _GPIO_setaltfn(SSP3_SCLK,SSP3_SCLK_ALTFN);
+     _GPIO_setaltfn(SSP3_TXD,SSP3_TXD_ALTFN);
+     _GPIO_setaltfn(SSP3_RXD,SSP3_RXD_ALTFN);
+     //_GPIO_setaltfn(SSP3_SFRM,SSP3_SFRM_ALTFN);
+     
      DRCMR(66) = ((1 << 7) | (0 & 0x1f)); // SSP3 Rx = DMA CH0
      DRCMR(67) = ((1 << 7) | (1 & 0x1f)); // SSP3 Tx = DMA CH1

Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/hardware.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hardware.h	15 Feb 2005 18:09:48 -0000	1.2
--- hardware.h	9 Mar 2005 01:04:54 -0000	1.3
***************
*** 140,150 ****
  
  // CC2420 RADIO #defines
! TOSH_ASSIGN_PIN(CC_VREN,A,40);  // Dummy for Mainstone devel kit
! TOSH_ASSIGN_PIN(CC_RSTN,A,22);
! TOSH_ASSIGN_PIN(CC_FIFO,A,114);
! TOSH_ASSIGN_PIN(RADIO_CCA,A,116);
! TOSH_ASSIGN_PIN(CC_FIFOP,A,115);
! TOSH_ASSIGN_PIN(CC_SFD,A,16);
! TOSH_ASSIGN_PIN(CC_CSN,A,39)
  
  
--- 140,167 ----
  
  // CC2420 RADIO #defines
! #define CC_VREN_PIN (115)
! #define CC_RSTN_PIN (22)
! #define CC_FIFO_PIN (114)
! #define RADIO_CCA_PIN (116)
! #define CC_FIFOP_PIN (0)
! #define CC_SFD_PIN (16)
! #define CC_CSN_PIN (39)
! 
! #define SSP3_RXD (41)
! #define SSP3_RXD_ALTFN (3)
! #define SSP3_TXD (35)
! #define SSP3_TXD_ALTFN (3)
! #define SSP3_SFRM (39)
! #define SSP3_SFRM_ALTFN (3)
! #define SSP3_SCLK (34)
! #define SSP3_SCLK_ALTFN (3)
! 
! TOSH_ASSIGN_PIN(CC_VREN,A,CC_VREN_PIN); 
! TOSH_ASSIGN_PIN(CC_RSTN,A,CC_RSTN_PIN);
! TOSH_ASSIGN_PIN(CC_FIFO,A,CC_FIFO_PIN);
! TOSH_ASSIGN_PIN(RADIO_CCA,A,RADIO_CCA_PIN);
! TOSH_ASSIGN_PIN(CC_FIFOP,A,CC_FIFO_PIN);
! TOSH_ASSIGN_PIN(CC_SFD,A,CC_SFD_PIN);
! TOSH_ASSIGN_PIN(CC_CSN,A,CC_CSN_PIN);