CVS: msp430-libc/include msp430x54xx.h,1.2,1.3

"Sergey A. Borshch" <[email protected]> Sat, 28 Feb 2009 12:16:15 +0000
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/msp430-libc/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29258

Modified Files:
	msp430x54xx.h 
Log Message:
some additions and comments fixes by JMGross


Index: msp430x54xx.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x54xx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x54xx.h	7 Dec 2008 22:45:57 -0000	1.2
+++ msp430x54xx.h	28 Feb 2009 12:16:13 -0000	1.3
@@ -46,9 +46,16 @@
 
 */
 #define SFRIE1_             0x0100  /* Interrupt Enable 1 */
+#define SFRIE1_L_           SFRIE1_
+#define SFRIE1_H_           (SFRIE1_+1)
 sfrw(SFRIE1, SFRIE1_);
+sfrb(SFRIE1_L, SFRIE1_L_);
+sfrb(IE1, SFRIE1_L_);
+sfrb(SFRIE1_H, SFRIE1_H_);
+sfrb(IE2, SFRIE1_H_);
 #define WDTIE               (1<<0)
 #define OFIE                (1<<1)
+/* RESERVED                 (1<<2)*/
 #define VMAIE               (1<<3)
 #define NMIIE               (1<<4)
 #define ACCVIE              (1<<5)
@@ -56,34 +63,54 @@
 #define JMBOUTIE            (1<<7)
 
 #define SFRIFG1_            0x0102  /* Interrupt Flag 1 */
+#define SFRIFG1_L_          SFRIFG1_
+#define SFRIFG1_H_          (SFRIFG1_+1)
 sfrw(SFRIFG1, SFRIFG1_);
+sfrb(SFRIFG1_L, SFRIFG1_L_);
+sfrb(IFG1, SFRIFG1_L_);
+sfrb(SFRIFG1_H, SFRIFG1_H_);
+sfrb(IFG2, SFRIFG1_H_);
 #define WDTIFG              (1<<0)
 #define OFIFG               (1<<1)
+/* RESERVED                 (1<<2)*/
 #define VMAIFG              (1<<3)
 #define NMIIFG              (1<<4)
+/* RESERVED                 (1<<5)*/
 #define JMBINIFG            (1<<6)
 #define JMBOUTIFG           (1<<7)
 
+#define SFRRPCR_            0x0104  /* Reset pin control */
+sfrw(SFRRPCR, SFRRPCR_);
+#define SFRRPCR_L_          SFRRPCR_
+#define SFRRPCR_H_          (SFRRPCR_+1)
+sfrb(SFRRPCR_L, SFRRPCR_L_);
+sfrb(SFRRPCR_H, SFRRPCR_H_);
+#define SYSNMI              (1<<0)  /* RST/NMI pin (0:Reset, 1: NMI) */
+#define SYSNMIIES           (1<<1)  /* NMI edge select (0:rising edge). Can trigger NMI */
+#define SYSRSTUP            (1<<2)  /* Reset resistor pin pullup (0: pulldown, 1: pullup) */
+#define SYSRSTRE            (1<<3)  /* Reset pin resistor enable (0: disabled, 1: enabled) */
+
+
 #define RTC_A_VECTOR        0x52    /* 0xFFD2 Basic Timer / RTC */
 #define PORT2_VECTOR        0x54    /* 0xFFD4 Port 2 */
-#define USCIB3_RXTX_VECTOR  0x56    /* 0xFFD6 USCI A1/B1 Transmit */
-#define USCIA3_RXTX_VECTOR  0x58    /* 0xFFD8 USCI A1/B1 Receive */
-#define USCIB1_RXTX_VECTOR  0x5A    /* 0xFFDA USCI A1/B1 Transmit */
-#define USCIA1_RXTX_VECTOR  0x5C    /* 0xFFDC USCI A1/B1 Receive */
+#define USCIB3_RXTX_VECTOR  0x56    /* 0xFFD6 USCI B3 RX/TX */
+#define USCIA3_RXTX_VECTOR  0x58    /* 0xFFD8 USCI A3 RX/TX */
+#define USCIB1_RXTX_VECTOR  0x5A    /* 0xFFDA USCI B1 RX/TX */
+#define USCIA1_RXTX_VECTOR  0x5C    /* 0xFFDC USCI A1 RX/TX */
 #define PORT1_VECTOR        0x5E    /* 0xFFDE Port 1 */
-#define TIMER1_A1_VECTOR    0x60    /* 0xFFE0 Timer A CC1-2, TA */
-#define TIMER1_A0_VECTOR    0x62    /* 0xFFE2 Timer A CC0 */
-#define DMA_VECTOR          0x64    /* 0xFFE4 Port 2 */
-#define USCIB2_RXTX_VECTOR  0x66    /* 0xFFE6 USCI A1/B1 Transmit */
-#define USCIA2_RXTX_VECTOR  0x68    /* 0xFFE8 USCI A1/B1 Receive */
-#define TIMER0_A1_VECTOR    0x6A    /* 0xFFEA Timer A CC1-2, TA */
-#define TIMER0_A0_VECTOR    0x6C    /* 0xFFEC Timer A CC0 */
+#define TIMER1_A1_VECTOR    0x60    /* 0xFFE0 Timer1_A3 CC1-2, TA1 */
+#define TIMER1_A0_VECTOR    0x62    /* 0xFFE2 Timer1_A3 CC0 */
+#define DMA_VECTOR          0x64    /* 0xFFE4 DMA */
+#define USCIB2_RXTX_VECTOR  0x66    /* 0xFFE6 USCI B2 RX/TX */
+#define USCIA2_RXTX_VECTOR  0x68    /* 0xFFE8 USCI A2 RX/TX */
+#define TIMER0_A1_VECTOR    0x6A    /* 0xFFEA Timer0_A5 CC1-4, TA0 */
+#define TIMER0_A0_VECTOR    0x6C    /* 0xFFEC Timer0_A5 CC0 */
 #define AD12_A_VECTOR       0x6E    /* 0xFFEE ADC */
-#define USCIB0_RXTX_VECTOR  0x70    /* 0xFFF0 USCI A0/B0 Transmit */
-#define USCIA0_RXTX_VECTOR  0x72    /* 0xFFF2 USCI A0/B0 Receive */
+#define USCIB0_RXTX_VECTOR  0x70    /* 0xFFF0 USCI B0 RX/TX */
+#define USCIA0_RXTX_VECTOR  0x72    /* 0xFFF2 USCI A0 RX/TX */
 #define WDT_VECTOR          0x74    /* 0xFFF4 Watchdog Timer */
-#define TIMER0_B1_VECTOR    0x76    /* 0xFFF6 Timer B CC1-2, TB */
-#define TIMER0_B0_VECTOR    0x78    /* 0xFFF8 Timer B CC0 */
+#define TIMER0_B1_VECTOR    0x76    /* 0xFFF6 Timer_B7 CC1-6, TB */
+#define TIMER0_B0_VECTOR    0x78    /* 0xFFF8 Timer_B7 CC0 */
 #define USER_NMI_VECTOR     0x7A    /* 0xFFFA Non-maskable */
 #define NMI_VECTOR          0x7C    /* 0xFFFC Non-maskable */
 


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H