CVS: msp430-libc4/include msp430x22x4.h,NONE,1.1 msp430xG461x.h,NONE,1.1 io.h,1.1.1.1,1.2 math.h,1.2,1.3 stdlib.h,1.1.1.1,1.2
Peter <[email protected]>
| Newsgroups | gmane.comp.hardware.texas-instruments.msp430.gcc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mspgcc/msp430-libc4/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14802/include Modified Files: io.h math.h stdlib.h Added Files: msp430x22x4.h msp430xG461x.h Log Message: changes for gcc-4.0.2 --- NEW FILE: msp430x22x4.h --- #ifndef __msp430x22x4 #define __msp430x22x4 /* msp430x22x4.h * * mspgcc project: MSP430 device headers * MSP430x22x4 family header * * (c) 2005 by Steve Underwood <[email protected]> * Originally based in part on work by Texas Instruments Inc. * * $Id: msp430x22x4.h,v 1.1 2006/01/28 10:13:32 pjansen Exp $ */ #include <iomacros.h> #define __MSP430_HAS_ADC10__ #define __MSP430_HAS_WDT__ #define __MSP430_HAS_PORT1_R__ #define __MSP430_HAS_PORT2_R__ #define __MSP430_HAS_PORT3_R__ #define __MSP430_HAS_PORT4_R__ #define __MSP430_HAS_TA3__ #define __MSP430_HAS_TB5__ #define __MSP430_HAS_BC2__ #define __MSP430_HAS_FLASH2__ #define __MSP430_HAS_OA_2__ #define __MSP430_HAS_USCI__ #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/timerb.h> #include <msp430/gpio.h> #include <msp430/adc10.h> #include <msp430/opamp.h> #include <msp430/usci.h> #include <msp430/common.h> #define IE1_ 0x0000 /* Interrupt Enable 1 */ sfrb(IE1, IE1_); #define WDTIE (1<<0) /* Watchdog Interrupt Enable */ #define OFIE (1<<1) /* Osc. Fault Interrupt Enable */ #define NMIIE (1<<4) /* NMI Interrupt Enable */ #define ACCVIE (1<<5) /* Flash Access Violation Interrupt Enable */ #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_ 0x0000 /* Interrupt Enable 2 */ sfrb(IE2, IE2_); #define UCARXIE (1<<0) #define UCATXIE (1<<1) #define UCBRXIE (1<<2) #define UCBTXIE (1<<3) #define IFG2_ 0x0002 /* Interrupt Flag 2 */ sfrb(IFG1,IFG2_); #define UCARXIFG (1<<0) #define UCATXIFG (1<<1) #define UCBRXIFG (1<<2) #define UCBTXIFG (1<<3) /************************************************************ * Calibration Data in Info Mem ************************************************************/ #ifndef __DisableCalData #define CALDCO_16MHZ_ 0x10F8 /* DCOCTL Calibration Data for 16MHz */ sfrb(CALDCO_16MHZ, CALDCO_16MHZ_) #define CALBC1_16MHZ_ 0x10F9 /* BCSCTL1 Calibration Data for 16MHz */ sfrb(CALBC1_16MHZ, CALBC1_16MHZ_) #define CALDCO_12MHZ_ 0x10FA /* DCOCTL Calibration Data for 12MHz */ sfrb(CALDCO_12MHZ, CALDCO_12MHZ_) #define CALBC1_12MHZ_ 0x10FB /* BCSCTL1 Calibration Data for 12MHz */ sfrb(CALBC1_12MHZ, CALBC1_12MHZ_) #define CALDCO_8MHZ_ 0x10FC /* DCOCTL Calibration Data for 8MHz */ sfrb(CALDCO_8MHZ, CALDCO_8MHZ_) #define CALBC1_8MHZ_ 0x10FD /* BCSCTL1 Calibration Data for 8MHz */ sfrb(CALBC1_8MHZ, CALBC1_8MHZ_) #define CALDCO_1MHZ_ 0x10FE /* DCOCTL Calibration Data for 1MHz */ sfrb(CALDCO_1MHZ, CALDCO_1MHZ_) #define CALBC1_1MHZ_ 0x10FF /* BCSCTL1 Calibration Data for 1MHz */ sfrb(CALBC1_1MHZ, CALBC1_1MHZ_) #endif /* #ifndef __DisableCalData */ #define PORT1_VECTOR 4 /* 0xFFE4 Port 1 */ #define PORT2_VECTOR 6 /* 0xFFE6 Port 2 */ #define ADC10_VECTOR 10 /* 0xFFEA ADC10 */ #define USCITX_VECTOR 12 /* 0xFFEC USCI A/B Transmit */ #define USCIRX_VECTOR 14 /* 0xFFEE USCI A/B Receive */ #define TIMERA1_VECTOR 16 /* 0xFFF0 Timer A CC1-2, TA */ #define TIMERA0_VECTOR 18 /* 0xFFF2 Timer A CC0 */ #define WDT_VECTOR 20 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 22 /* 0xFFF6 Comparator A */ #define NMI_VECTOR 28 /* 0xFFFC Non-maskable */ #endif /* #ifndef __msp430x22x4 */ --- NEW FILE: msp430xG461x.h --- #ifndef __msp430xG461x #define __msp430xG461x /* msp430xG461x.h * * mspgcc project: MSP430 device headers * MSP430xG461x family header * * (c) 2006 by Steve Underwood <[email protected]> * Originally based in part on work by Texas Instruments Inc. * * $Id: msp430xG461x.h,v 1.1 2006/01/28 10:13:32 pjansen Exp $ */ #include <iomacros.h> #define __MSP430_HAS_WDT__ #define __MSP430_HAS_PORT1__ #define __MSP430_HAS_PORT2__ #define __MSP430_HAS_PORT3__ #define __MSP430_HAS_PORT4__ #define __MSP430_HAS_PORT5__ #define __MSP430_HAS_PORT6__ #define __MSP430_HAS_PORT7__ #define __MSP430_HAS_PORT8__ #define __MSP430_HAS_PORTA__ #define __MSP430_HAS_PORT9__ #define __MSP430_HAS_PORT10__ #define __MSP430_HAS_PORTB__ #define __MSP430_HAS_FLLPLUS__ #define __MSP430_HAS_BT_RTC__ #define __MSP430_HAS_LCD_A__ #define __MSP430_HAS_UART0__ #define __MSP430_HAS_USCI__ #define __MSP430_HAS_TA3__ #define __MSP430_HAS_TB3__ #define __MSP430_HAS_FLASH__ #define __MSP430_HAS_CA__ #define __MSP430_HAS_SVS__ #define __MSP430_HAS_ADC12__ #define __MSP430_HAS_DAC12__ #define __MSP430_HAS_DMAX_3__ #define __MSP430_HAS_OA_3__ #define __msp430_have_fll_and_xt2 #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> #include <msp430/svs.h> #include <msp430/lcd_a.h> #include <msp430/flash.h> #include <msp430/timera.h> #include <msp430/timerb.h> #include <msp430/usart.h> #include <msp430/usci.h> #include <msp430/adc12.h> #include <msp430/dac12.h> #include <msp430/dma.h> #include <msp430/gpio.h> #include <msp430/opamp.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 URXIE0 (1<<6) #define UTXIE0 (1<<7) #define IFG1_ 0x0002 /* Interrupt Flag 1 */ sfrb(IFG1,IFG1_); #define WDTIFG (1<<0) #define OFIFG (1<<1) #define NMIIFG (1<<4) #define URXIFG0 (1<<6) #define UTXIFG0 (1<<7) #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 ME1_ 0x0004 /* Module Enable 1 */ sfrb(ME1,ME1_); #define URXE0 (1<<6) #define USPIE0 (1<<6) #define UTXE0 (1<<7) #define DAC12_VECTOR 28 /* 0xFFDC DAC 12 */ #define DMA_VECTOR 30 /* 0xFFDE DMA */ #define BASICTIMER_VECTOR 32 /* 0xFFE0 Basic Timer / RTC */ #define PORT2_VECTOR 34 /* 0xFFE2 Port 2 */ #define USART1TX_VECTOR 36 /* 0xFFE4 USART 1 Transmit */ #define USART1RX_VECTOR 38 /* 0xFFE6 USART 1 Receive */ #define PORT1_VECTOR 40 /* 0xFFE8 Port 1 */ #define TIMERA1_VECTOR 42 /* 0xFFEA Timer A CC1-2, TA */ #define TIMERA0_VECTOR 44 /* 0xFFEC Timer A CC0 */ #define ADC12_VECTOR 46 /* 0xFFEE ADC */ #define USCITX_VECTOR 48 /* 0xFFF0 USCI A0/B0 Transmit */ #define USCIRX_VECTOR 50 /* 0xFFF2 USCI A0/B0 Receive */ #define WDT_VECTOR 52 /* 0xFFF4 Watchdog Timer */ #define COMPARATORA_VECTOR 54 /* 0xFFF6 Comparator A */ #define TIMERB1_VECTOR 56 /* 0xFFF8 Timer B CC1-2, TB */ #define TIMERB0_VECTOR 58 /* 0xFFFA Timer B CC0 */ #define NMI_VECTOR 60 /* 0xFFFC Non-maskable */ #define UART0TX_VECTOR USART0TX_VECTOR #define UART0RX_VECTOR USART0RX_VECTOR #define TIMERA1_VECTOR TIMER0_A1_VECTOR #define TIMERA0_VECTOR TIMER0_A0_VECTOR #endif /* #ifndef __msp430xG461x */ Index: io.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc4/include/io.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -w -d -r1.1.1.1 -r1.2 --- io.h 29 Aug 2005 16:48:45 -0000 1.1.1.1 +++ io.h 28 Jan 2006 10:13:32 -0000 1.2 @@ -29,73 +29,73 @@ #ifndef _IO_H_ #define _IO_H_ -#if defined(__MSP430_1101__) || defined(__MSP430_1111__) || defined(__MSP430_1121__) +#if defined(__MSP430_1101) || defined(__MSP430_1111) || defined(__MSP430_1121) #include <msp430x11x1.h> -#elif defined(__MSP430_110__) || defined(__MSP430_112__) +#elif defined(__MSP430_110) || defined(__MSP430_112) #include <msp430x11x.h> -#elif defined(__MSP430_122__) || defined(__MSP430_123__) +#elif defined(__MSP430_122) || defined(__MSP430_123) #include <msp430x12x.h> -#elif defined(__MSP430_1122__) || defined(__MSP430_1132__) +#elif defined(__MSP430_1122) || defined(__MSP430_1132) #include <msp430x11x2.h> -#elif defined(__MSP430_1222__) || defined(__MSP430_1232__) +#elif defined(__MSP430_1222) || defined(__MSP430_1232) #include <msp430x12x2.h> -#elif defined(__MSP430_133__) || defined(__MSP430_135__) +#elif defined(__MSP430_133) || defined(__MSP430_135) #include <msp430x13x.h> -#elif defined(__MSP430_147__) || defined(__MSP430_148__) || defined(__MSP430_149__) +#elif defined(__MSP430_147) || defined(__MSP430_148) || defined(__MSP430_149) #include <msp430x14x.h> -#elif defined(__MSP430_1331__) || defined(__MSP430_1351__) +#elif defined(__MSP430_1331) || defined(__MSP430_1351) #include <msp430x13x1.h> -#elif defined(__MSP430_1471__) || defined(__MSP430_1481__) || defined(__MSP430_1491__) +#elif defined(__MSP430_1471) || defined(__MSP430_1481) || defined(__MSP430_1491) #include <msp430x14x1.h> -#elif defined(__MSP430_155__) || defined(__MSP430_156__) || defined(__MSP430_157__) +#elif defined(__MSP430_155) || defined(__MSP430_156) || defined(__MSP430_157) #include <msp430x15x.h> -#elif defined(__MSP430_167__) || defined(__MSP430_168__) || defined(__MSP430_169__) || defined(__MSP430_1610__) || defined(__MSP430_1611__) || defined(__MSP430_1612__) +#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__) +#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__) +#elif defined(__MSP430_311) || defined(__MSP430_312) || defined(__MSP430_313) || defined(__MSP430_314) || defined(__MSP430_315) #include <msp430x31x.h> -#elif defined(__MSP430_323__) || defined(__MSP430_325__) +#elif defined(__MSP430_323) || defined(__MSP430_325) #include <msp430x32x.h> -#elif defined(__MSP430_336__) || defined(__MSP430_337__) +#elif defined(__MSP430_336) || defined(__MSP430_337) #include <msp430x33x.h> -#elif defined(__MSP430_412__) || defined(__MSP430_413__) || defined(__MSP430_415__) || defined(__MSP430_417__) +#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__) +#elif defined(__MSP430_423) || defined(__MSP430_425) || defined(__MSP430_427) #include <msp430x42x.h> -#elif defined(__MSP430_4250__) || defined(__MSP430_4260__) || defined(__MSP430_4270__) +#elif defined(__MSP430_4250) || defined(__MSP430_4260) || defined(__MSP430_4270) #include <msp430x42x0.h> -#elif defined(__MSP430_E423__) || defined(__MSP430_E425__) || defined(__MSP430_E427__) +#elif defined(__MSP430_E423) || defined(__MSP430_E425) || defined(__MSP430_E427) #include <msp430xE42x.h> -#elif defined(__MSP430_W423__) || defined(__MSP430_W425__) || defined(__MSP430_W427__) +#elif defined(__MSP430_W423) || defined(__MSP430_W425) || defined(__MSP430_W427) #include <msp430xW42x.h> -#elif defined(__MSP430_G437__) || defined(__MSP430_G438__) || defined(__MSP430_G439__) +#elif defined(__MSP430_G437) || defined(__MSP430_G438) || defined(__MSP430_G439) #include <msp430xG43x.h> -#elif defined(__MSP430_435__) || defined(__MSP430_436__) || defined(__MSP430_437__) +#elif defined(__MSP430_435) || defined(__MSP430_436) || defined(__MSP430_437) #include <msp430x43x.h> -#elif defined(__MSP430_447__) || defined(__MSP430_448__) || defined(__MSP430_449__) +#elif defined(__MSP430_447) || defined(__MSP430_448) || defined(__MSP430_449) #include <msp430x44x.h> #else Index: math.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc4/include/math.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -d -r1.2 -r1.3 --- math.h 31 Aug 2005 17:59:05 -0000 1.2 +++ math.h 28 Jan 2006 10:13:32 -0000 1.3 @@ -52,10 +52,10 @@ : __fpclassifyl(x)) #define isfinite(x) ((fpclassify(x) & (FP_INFINITE|FP_NAN)) == 0) -#define isinf(x) (fpclassify(x) == FP_INFINITE) -#define isnan(x) (fpclassify(x) == FP_NAN) -#define isnanf(x) isnan(x) -#define isnormal(x) (fpclassify(x) == FP_NORMAL) +// #define isinf(x) (fpclassify(x) == FP_INFINITE) +// #define isnan(x) (fpclassify(x) == FP_NAN) +// #define isnanf(x) isnan(x) +// #define isnormal(x) (fpclassify(x) == FP_NORMAL) #define isgreater(x, y) (!isunordered((x), (y)) && (x) > (y)) #define isgreaterequal(x, y) (!isunordered((x), (y)) && (x) >= (y)) Index: stdlib.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc4/include/stdlib.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -w -d -r1.1.1.1 -r1.2 --- stdlib.h 29 Aug 2005 16:48:45 -0000 1.1.1.1 +++ stdlib.h 28 Jan 2006 10:13:32 -0000 1.2 @@ -104,7 +104,7 @@ #ifndef RAND_MAX -#define RAND_MAX 0x7fffffffL +#define RAND_MAX 32767 #endif int rand(void); ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642