CVS: msp430-libc/include msp430x21x1.h,NONE,1.1 msp430x42x0.h,NONE,1.1 io.h,1.12,1.13 msp430xE42x.h,1.2,1.3 msp430xG43x.h,1.3,1.4

Steve Underwood <[email protected]>
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/msp430-libc/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28330/msp430-libc/include

Modified Files:
	io.h msp430xE42x.h msp430xG43x.h 
Added Files:
	msp430x21x1.h msp430x42x0.h 
Log Message:
Additions for 42x 42x0 and 21x1


--- NEW FILE: msp430x21x1.h ---
#ifndef __msp430x21x1
#define __msp430x21x1

/* msp430x21x1.h
 *
 * mspgcc project: MSP430 device headers
 * MSP430x11x1 family header
 *
 * (c) 2005 by Steve Underwood <[email protected]>
 * Originally based in part on work by Texas Instruments Inc.
 *
 * $Id: msp430x21x1.h,v 1.1 2005/03/11 15:49:49 coppice Exp $
 */

#include <iomacros.h>

#define __msp430_have_port1
#define __msp430_have_port2
#define __msp430_have_compa_extended mux
#define __msp430_have_flash_extra_flags

#include <msp430/basic_clock.h>
#include <msp430/flash.h>
#include <msp430/eprom.h>
#include <msp430/timera.h>
#include <msp430/gpio.h>
#include <msp430/compa.h>

#include <msp430/common.h>

#define IE1_                0x0000  /* Interrupt Enable 1 */
sfrb(IE1,IE1_);
#define WDTIE               (1<<0)
#define OFIE                (1<<1)
#define NMIIE               (1<<4)
#define ACCVIE              (1<<5)

#define IFG1_               0x0002  /* Interrupt Flag 1 */
sfrb(IFG1,IFG1_);
#define WDTIFG              (1<<0)
#define OFIFG               (1<<1)
#define NMIIFG              (1<<4)

/************************************************************
* Calibration Data in Info Mem
************************************************************/

#ifndef __DisableCalData

#define CALDCO_16MHZ_         (0x10F8)  /* DCOCTL  Calibration Data for 16MHz */
READ_ONLY DEFC( CALDCO_16MHZ     , CALDCO_16MHZ_)
#define CALBC1_16MHZ_         (0x10F9)  /* BCSCTL1 Calibration Data for 16MHz */
READ_ONLY DEFC( CALBC1_16MHZ     , CALBC1_16MHZ_)
#define CALDCO_12MHZ_         (0x10FA)  /* DCOCTL  Calibration Data for 12MHz */
READ_ONLY DEFC( CALDCO_12MHZ     , CALDCO_12MHZ_)
#define CALBC1_12MHZ_         (0x10FB)  /* BCSCTL1 Calibration Data for 12MHz */
READ_ONLY DEFC( CALBC1_12MHZ     , CALBC1_12MHZ_)
#define CALDCO_8MHZ_          (0x10FC)  /* DCOCTL  Calibration Data for 8MHz */
READ_ONLY DEFC( CALDCO_8MHZ      , CALDCO_8MHZ_)
#define CALBC1_8MHZ_          (0x10FD)  /* BCSCTL1 Calibration Data for 8MHz */
READ_ONLY DEFC( CALBC1_8MHZ      , CALBC1_8MHZ_)
#define CALDCO_1MHZ_          (0x10FE)  /* DCOCTL  Calibration Data for 1MHz */
READ_ONLY DEFC( CALDCO_1MHZ      , CALDCO_1MHZ_)
#define CALBC1_1MHZ_          (0x10FF)  /* BCSCTL1 Calibration Data for 1MHz */
READ_ONLY DEFC( CALBC1_1MHZ      , CALBC1_1MHZ_)

#endif /* #ifndef __DisableCalData */
#define PORT1_VECTOR        (2 * 2u)    /* 0xFFE4 Port 1 */
#define PORT2_VECTOR        (3 * 2u)    /* 0xFFE6 Port 2 */
#define TIMERA1_VECTOR      (8 * 2u)    /* 0xFFF0 Timer A CC1-2, TA */
#define TIMERA0_VECTOR      (9 * 2u)    /* 0xFFF2 Timer A CC0 */
#define WDT_VECTOR          (10 * 2u)   /* 0xFFF4 Watchdog Timer */
#define COMPARATORA_VECTOR  (11 * 2u)   /* 0xFFF6 Comparator A */
#define NMI_VECTOR          (14 * 2u)   /* 0xFFFC Non-maskable */

#endif /* #ifndef __msp430x21x1 */


--- NEW FILE: msp430x42x0.h ---
#ifndef __msp430x42x0
#define __msp430x42x0

/* msp430x42x0.h
 *
 * mspgcc project: MSP430 device headers
 * MSP430x42x0 family header
 *
 * (c) 2005 by Steve Underwood <[email protected]>
 * Originally based in part on work by Texas Instruments Inc.
 *
 * $Id: msp430x42x0.h,v 1.1 2005/03/11 15:49:49 coppice Exp $
 */

#include <iomacros.h>

#define __msp430_have_port1
#define __msp430_have_port2
#define __msp430_have_port5
#define __msp430_have_port6
#define __msp430_have_fll
#define __msp430_have_lcd_a
#define __msp430_have_lcd_16_20
#define LCD_BASE 0x90
#define __msp430_have_sd16a
#define __msp430_have_dac12_op_amp

#include <msp430/basic_timer.h>
#include <msp430/system_clock.h>
#include <msp430/svs.h>
#include <msp430/lcd.h>
#include <msp430/flash.h>
#include <msp430/timera.h>
#include <msp430/gpio.h>
#include <msp430/sd16.h>
#include <msp430/dac12.h>

#include <msp430/common.h>

#define IE1_                0x0000  /* Interrupt Enable 1 */
sfrb(IE1,IE1_);
#define WDTIE               (1<<0)
#define OFIE                (1<<1)
#define NMIIE               (1<<4)
#define ACCVIE              (1<<5)

#define IFG1_               0x0002  /* Interrupt Flag 1 */
sfrb(IFG1,IFG1_);

#define WDTIFG              (1<<0)    /* Watchdog Interrupt Flag */
#define OFIFG               (1<<1)    /* Osc. Fault Interrupt Flag */
#define PORIFG              (1<<2)    /* Power On Interrupt Flag */
#define RSTIFG              (1<<3)    /* Reset Interrupt Flag */
#define NMIIFG              (1<<4)    /* NMI Interrupt Flag */

#define IE2_                0x0001  /* Interrupt Enable 2 */
sfrb(IE2,IE2_);
#define BTIE                (1<<7)

#define IFG2_               0x0003  /* Interrupt Flag 2 */
sfrb(IFG2,IFG2_);
#define BTIFG               (1<<7)

#define BASICTIMER_VECTOR   (0 * 2u)  /* 0xFFE0 Basic Timer */
#define PORT2_VECTOR        (1 * 2u)  /* 0xFFE2 Port 2 */

#define DAC12_VECTOR        (3 * 2u)  /* 0xFFE6 DAC 12 */
#define PORT1_VECTOR        (4 * 2u)  /* 0xFFE8 Port 1 */
#define TIMERA1_VECTOR      (5 * 2u)  /* 0xFFEA Timer A CC1-2, TA */
#define TIMERA0_VECTOR      (6 * 2u)  /* 0xFFEC Timer A CC0 */

#define WDT_VECTOR          (10 * 2u) /* 0xFFF4 Watchdog Timer */

#define SD16_VECTOR         (12 * 2u) /* 0xFFF8 Sigma Delta ADC */

#define NMI_VECTOR          (14 * 2u) /* 0xFFFC Non-maskable */

#endif /* #ifndef __msp430x42x0 */

Index: io.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/io.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- io.h	8 Jul 2004 18:58:57 -0000	1.12
+++ io.h	11 Mar 2005 15:49:49 -0000	1.13
@@ -62,6 +62,9 @@
 #elif defined(__MSP430_167__) || defined(__MSP430_168__) || defined(__MSP430_169__) || defined(__MSP430_1610__) || defined(__MSP430_1611__) || defined(__MSP430_1612__)
 #include <msp430x16x.h>
 
+#elif defined(__MSP430_2101__) || defined(__MSP430_2111__) || defined(__MSP430_2121__) || defined(__MSP430_2131__)
+#include <msp430x21x1.h>
+
 #elif defined(__MSP430_311__) || defined(__MSP430_312__) || defined(__MSP430_313__) || defined(__MSP430_314__) || defined(__MSP430_315__)
 #include <msp430x31x.h>
 
@@ -74,6 +77,12 @@
 #elif defined(__MSP430_412__) || defined(__MSP430_413__) || defined(__MSP430_415__) || defined(__MSP430_417__)
 #include <msp430x41x.h>
 
+#elif defined(__MSP430_423__) || defined(__MSP430_425__) || defined(__MSP430_427__)
+#include <msp430x42x.h>
+
+#elif defined(__MSP430_4250__) || defined(__MSP430_4260__) || defined(__MSP430_4270__)
+#include <msp430x42x0.h>
+
 #elif defined(__MSP430_E423__) || defined(__MSP430_E425__) || defined(__MSP430_E427__)
 #include <msp430xE42x.h>
 

Index: msp430xE42x.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430xE42x.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430xE42x.h	5 Oct 2004 15:44:05 -0000	1.2
+++ msp430xE42x.h	11 Mar 2005 15:49:49 -0000	1.3
@@ -19,6 +19,8 @@
 #define __msp430_have_fll
 #define __msp430_have_lcd_16_20
 #define LCD_BASE 0x90
+#define __msp430_have_sd16_1
+#define __msp430_have_sd16_2
 
 #include <msp430/basic_timer.h>
 #include <msp430/system_clock.h>

Index: msp430xG43x.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430xG43x.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- msp430xG43x.h	3 Nov 2004 14:29:09 -0000	1.3
+++ msp430xG43x.h	11 Mar 2005 15:49:49 -0000	1.4
@@ -24,6 +24,11 @@
 #define __msp430_have_lcd_16_20
 #define __msp430_have_dac12_op_amp
 #define LCD_BASE 0x90
+#define __msp430_have_opamp_1
+#define __msp430_have_opamp_2
+#define __msp430_have_opamp_feedback_taps
+#define __msp430_have_opamp_output_select
+#define __msp430_have_opamp_rail_to_rail
 
 #include <msp430/basic_timer.h>
 #include <msp430/system_clock.h>



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.