[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430
msp430regtypes.h, 1.2, 1.3
Vlado Handziski
vlahan at users.sourceforge.net
Wed Jan 17 07:11:04 PST 2007
Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1635/tos/chips/msp430
Modified Files:
msp430regtypes.h
Log Message:
Updated msp430regtypes.h from tinyos-1.x
Index: msp430regtypes.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/msp430regtypes.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msp430regtypes.h 12 Jul 2006 17:01:39 -0000 1.2
--- msp430regtypes.h 17 Jan 2007 15:11:01 -0000 1.3
***************
*** 1,4 ****
! /* "Copyright (c) 2000-2003 The Regents of the University of California.
* All rights reserved.
*
--- 1,4 ----
! /* "Copyright (c) 2000-2003 The Regents of the University of California.
* All rights reserved.
*
***************
*** 31,35 ****
find . | xargs perl -ne '
BEGIN { %t = qw(b uint8_t w uint16_t); }
! print "#define TYPE_$2 $t{$1}\n" if /\bsfr([bw])\s*\(\s*(\w+)/;
' | sort -u
*/
--- 31,40 ----
find . | xargs perl -ne '
BEGIN { %t = qw(b uint8_t w uint16_t); }
! if( /\bsfr([bw])\s*\(\s*(\w+)/ && length($2) > 1 ) {
! $r{$2} = $t{$1};
! print "#define TYPE_$2 $t{$1}\n" if /\bsfr([bw])\s*\(\s*(\w+)/;
! } elsif( /^#define\s+(\w+)\s+(\w+)\s+$/ ) {
! print "#define TYPE_$1 $r{$2}\n" if $r{$2};
! }
' | sort -u
*/
***************
*** 98,105 ****
#define TYPE_CCTL1 uint16_t
#define TYPE_CCTL2 uint16_t
- #define TYPE_DAC12CTL0 uint16_t
- #define TYPE_DAC12IFG uint16_t
#define TYPE_DAC12_0CTL uint16_t
#define TYPE_DAC12_1CTL uint16_t
#define TYPE_DCOCTL uint8_t
#define TYPE_DMA0CTL uint16_t
--- 103,110 ----
#define TYPE_CCTL1 uint16_t
#define TYPE_CCTL2 uint16_t
#define TYPE_DAC12_0CTL uint16_t
+ #define TYPE_DAC12_0DAT uint16_t
#define TYPE_DAC12_1CTL uint16_t
+ #define TYPE_DAC12_1DAT uint16_t
#define TYPE_DCOCTL uint8_t
#define TYPE_DMA0CTL uint16_t
***************
*** 118,121 ****
--- 123,127 ----
#define TYPE_DMACTL1 uint16_t
#define TYPE_EPCTL uint8_t
+ #define TYPE_ESPCTL uint16_t
#define TYPE_FCTL1 uint16_t
#define TYPE_FCTL2 uint16_t
***************
*** 168,180 ****
#define TYPE_MAC uint16_t
#define TYPE_MACS uint16_t
#define TYPE_ME1 uint8_t
#define TYPE_ME2 uint8_t
#define TYPE_MPY uint16_t
#define TYPE_MPYS uint16_t
#define TYPE_OP2 uint16_t
- #define TYPE_PORT_OUT uint8_t
- #define TYPE_PORT_IN uint8_t
- #define TYPE_PORT_DIR uint8_t
- #define TYPE_PORT_SEL uint8_t
#define TYPE_P0DIR uint8_t
#define TYPE_P0IE uint8_t
--- 174,193 ----
#define TYPE_MAC uint16_t
#define TYPE_MACS uint16_t
+ #define TYPE_MBCTL uint16_t
+ #define TYPE_MBIN0 uint16_t
+ #define TYPE_MBIN1 uint16_t
+ #define TYPE_MBOUT0 uint16_t
+ #define TYPE_MBOUT1 uint16_t
#define TYPE_ME1 uint8_t
#define TYPE_ME2 uint8_t
#define TYPE_MPY uint16_t
#define TYPE_MPYS uint16_t
+ #define TYPE_OA0CTL0 uint8_t
+ #define TYPE_OA0CTL1 uint8_t
+ #define TYPE_OA1CTL0 uint8_t
+ #define TYPE_OA1CTL1 uint8_t
+ #define TYPE_OA2CTL0 uint8_t
+ #define TYPE_OA2CTL1 uint8_t
#define TYPE_OP2 uint16_t
#define TYPE_P0DIR uint8_t
#define TYPE_P0IE uint8_t
***************
*** 215,218 ****
--- 228,263 ----
#define TYPE_RESHI uint16_t
#define TYPE_RESLO uint16_t
+ #define TYPE_RET0 uint16_t
+ #define TYPE_RET1 uint16_t
+ #define TYPE_RET10 uint16_t
+ #define TYPE_RET11 uint16_t
+ #define TYPE_RET12 uint16_t
+ #define TYPE_RET13 uint16_t
+ #define TYPE_RET14 uint16_t
+ #define TYPE_RET15 uint16_t
+ #define TYPE_RET16 uint16_t
+ #define TYPE_RET17 uint16_t
+ #define TYPE_RET18 uint16_t
+ #define TYPE_RET19 uint16_t
+ #define TYPE_RET2 uint16_t
+ #define TYPE_RET20 uint16_t
+ #define TYPE_RET21 uint16_t
+ #define TYPE_RET22 uint16_t
+ #define TYPE_RET23 uint16_t
+ #define TYPE_RET24 uint16_t
+ #define TYPE_RET25 uint16_t
+ #define TYPE_RET26 uint16_t
+ #define TYPE_RET27 uint16_t
+ #define TYPE_RET28 uint16_t
+ #define TYPE_RET29 uint16_t
+ #define TYPE_RET3 uint16_t
+ #define TYPE_RET30 uint16_t
+ #define TYPE_RET31 uint16_t
+ #define TYPE_RET4 uint16_t
+ #define TYPE_RET5 uint16_t
+ #define TYPE_RET6 uint16_t
+ #define TYPE_RET7 uint16_t
+ #define TYPE_RET8 uint16_t
+ #define TYPE_RET9 uint16_t
#define TYPE_RXBUF uint8_t
#define TYPE_RXBUF0 uint8_t
***************
*** 223,228 ****
--- 268,348 ----
#define TYPE_SCFI1 uint8_t
#define TYPE_SCFQCTL uint8_t
+ #define TYPE_SD16CCTL0 uint16_t
+ #define TYPE_SD16CCTL1 uint16_t
+ #define TYPE_SD16CCTL2 uint16_t
+ #define TYPE_SD16CTL uint16_t
+ #define TYPE_SD16INCTL0 uint8_t
+ #define TYPE_SD16INCTL1 uint8_t
+ #define TYPE_SD16INCTL2 uint8_t
+ #define TYPE_SD16IV uint16_t
+ #define TYPE_SD16MEM0 uint16_t
+ #define TYPE_SD16MEM1 uint16_t
+ #define TYPE_SD16MEM2 uint16_t
+ #define TYPE_SD16PRE0 uint8_t
+ #define TYPE_SD16PRE1 uint8_t
+ #define TYPE_SD16PRE2 uint8_t
+ #define TYPE_SIFCNT uint16_t
+ #define TYPE_SIFCTL0 uint16_t
+ #define TYPE_SIFCTL1 uint16_t
+ #define TYPE_SIFCTL2 uint16_t
+ #define TYPE_SIFCTL3 uint16_t
+ #define TYPE_SIFCTL4 uint16_t
+ #define TYPE_SIFDACR0 uint16_t
+ #define TYPE_SIFDACR1 uint16_t
+ #define TYPE_SIFDACR2 uint16_t
+ #define TYPE_SIFDACR3 uint16_t
+ #define TYPE_SIFDACR4 uint16_t
+ #define TYPE_SIFDACR5 uint16_t
+ #define TYPE_SIFDACR6 uint16_t
+ #define TYPE_SIFDACR7 uint16_t
+ #define TYPE_SIFDEBUG uint16_t
+ #define TYPE_SIFTPSMV uint16_t
+ #define TYPE_SIFTSM0 uint16_t
+ #define TYPE_SIFTSM1 uint16_t
+ #define TYPE_SIFTSM10 uint16_t
+ #define TYPE_SIFTSM11 uint16_t
+ #define TYPE_SIFTSM12 uint16_t
+ #define TYPE_SIFTSM13 uint16_t
+ #define TYPE_SIFTSM14 uint16_t
+ #define TYPE_SIFTSM15 uint16_t
+ #define TYPE_SIFTSM16 uint16_t
+ #define TYPE_SIFTSM17 uint16_t
+ #define TYPE_SIFTSM18 uint16_t
+ #define TYPE_SIFTSM19 uint16_t
+ #define TYPE_SIFTSM2 uint16_t
+ #define TYPE_SIFTSM20 uint16_t
+ #define TYPE_SIFTSM21 uint16_t
+ #define TYPE_SIFTSM22 uint16_t
+ #define TYPE_SIFTSM23 uint16_t
+ #define TYPE_SIFTSM3 uint16_t
+ #define TYPE_SIFTSM4 uint16_t
+ #define TYPE_SIFTSM5 uint16_t
+ #define TYPE_SIFTSM6 uint16_t
+ #define TYPE_SIFTSM7 uint16_t
+ #define TYPE_SIFTSM8 uint16_t
+ #define TYPE_SIFTSM9 uint16_t
#define TYPE_SUMEXT uint16_t
#define TYPE_SVSCTL uint8_t
+ #define TYPE_TA0CCR0 uint16_t
+ #define TYPE_TA0CCR1 uint16_t
+ #define TYPE_TA0CCR2 uint16_t
+ #define TYPE_TA0CCTL0 uint16_t
+ #define TYPE_TA0CCTL1 uint16_t
+ #define TYPE_TA0CCTL2 uint16_t
+ #define TYPE_TA0CTL uint16_t
+ #define TYPE_TA0IV uint16_t
+ #define TYPE_TA0R uint16_t
+ #define TYPE_TA1CCR0 uint16_t
+ #define TYPE_TA1CCR1 uint16_t
+ #define TYPE_TA1CCR2 uint16_t
+ #define TYPE_TA1CCR3 uint16_t
+ #define TYPE_TA1CCR4 uint16_t
+ #define TYPE_TA1CCTL0 uint16_t
+ #define TYPE_TA1CCTL1 uint16_t
+ #define TYPE_TA1CCTL2 uint16_t
+ #define TYPE_TA1CCTL3 uint16_t
+ #define TYPE_TA1CCTL4 uint16_t
+ #define TYPE_TA1CTL uint16_t
+ #define TYPE_TA1IV uint16_t
#define TYPE_TACCR0 uint16_t
#define TYPE_TACCR1 uint16_t
***************
*** 234,237 ****
--- 354,358 ----
#define TYPE_TAIV uint16_t
#define TYPE_TAR uint16_t
+ #define TYPE_TAR1 uint16_t
#define TYPE_TBCCR0 uint16_t
#define TYPE_TBCCR1 uint16_t
More information about the Tinyos-2-commits
mailing list