[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 hardware.h, 1.6, 1.7

[Robbie Adler]

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

Modified Files:
	hardware.h 
Log Message:
updated to consolidate conflicting priorities

Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/hardware.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** hardware.h	18 Aug 2005 20:54:35 -0000	1.6
--- hardware.h	18 Aug 2005 23:03:51 -0000	1.7
***************
*** 61,71 ****
  /*
   *
!  * Authors:  Philip Buonadonna
!  *
   *
   */
  
! #ifndef TOSH_HARDWARE_H
! #define TOSH_HARDWARE_H
  
  #include "pxa27xhardware.h"
--- 61,71 ----
  /*
   *
!  * @Author Philip Buonadonna
!  * @Author Robbie Adler
   *
   */
  
! #ifndef __TOSH_HARDWARE_H__
! #define __TOSH_HARDWARE_H__
  
  #include "pxa27xhardware.h"
***************
*** 99,107 ****
  				   0xFF, // PPID  5 Memory Stick
  				   0xFF, // PPID  6 Power I2C
! 				   0x00, // PPID  7 OST match Register 4-11
! 				   0x01, // PPID  8 GPIO_0
! 				   0x02, // PPID  9 GPIO_1
! 				   0x03, // PPID 10 GPIO_x
! 				   0x06, // PPID 11 USBC
  				   0xFF, // PPID 12 PMU
  				   0xFF, // PPID 13 I2S
--- 99,107 ----
  				   0xFF, // PPID  5 Memory Stick
  				   0xFF, // PPID  6 Power I2C
! 				   0x01, // PPID  7 OST match Register 4-11
! 				   0x02, // PPID  8 GPIO_0
! 				   0x03, // PPID  9 GPIO_1
! 				   0x04, // PPID 10 GPIO_x
! 				   0x08, // PPID 11 USBC
  				   0xFF, // PPID 12 PMU
  				   0xFF, // PPID 13 I2S
***************
*** 112,121 ****
  				   0xFF, // PPID 18 I2C Service Req
  				   0xFF, // PPID 19 TX/RX ERROR IRDA
! 				   0x05, // PPID 20 TX/RX ERROR STUART
  				   0xFF, // PPID 21 TX/RX ERROR BTUART
! 				   0xFF, // PPID 22 TX/RX ERROR FFUART
  				   0xFF, // PPID 23 Flash Card status/Error Detect
! 				   0xFF, // PPID 24 SSP_1 Service Req
! 				   0x04, // PPID 25 DMA Channel Service Req
  				   0xFF, // PPID 26 OST equals Match Register 0
  				   0xFF, // PPID 27 OST equals Match Register 1
--- 112,121 ----
  				   0xFF, // PPID 18 I2C Service Req
  				   0xFF, // PPID 19 TX/RX ERROR IRDA
! 				   0x07, // PPID 20 TX/RX ERROR STUART
  				   0xFF, // PPID 21 TX/RX ERROR BTUART
! 				   0x06, // PPID 22 TX/RX ERROR FFUART
  				   0xFF, // PPID 23 Flash Card status/Error Detect
! 				   0x05, // PPID 24 SSP_1 Service Req
! 				   0x00, // PPID 25 DMA Channel Service Req
  				   0xFF, // PPID 26 OST equals Match Register 0
  				   0xFF, // PPID 27 OST equals Match Register 1
***************
*** 157,160 ****
--- 157,169 ----
  #define SSP3_SCLK_ALTFN (3)
  
+ #define SSP1_RXD (26)
+ #define SSP1_RXD_ALTFN (1 )
+ #define SSP1_TXD (25)
+ #define SSP1_TXD_ALTFN (2 )
+ #define SSP1_SCLK (23)
+ #define SSP1_SCLK_ALTFN (2 )
+ #define SSP1_SFRM (24)
+ #define SSP1_SFRM_ALTFN (2 )
+ 
  TOSH_ASSIGN_PIN(CC_VREN,A,CC_VREN_PIN); 
  TOSH_ASSIGN_PIN(CC_RSTN,A,CC_RSTN_PIN);