diff -Ncr SimpliciTI-CCE-1.1.0,orig/Components\bsp\mcus\bsp_msp430_defs.h SimpliciTI-CCE-1.1.0/Components\bsp\mcus\bsp_msp430_defs.h | |
*** SimpliciTI-CCE-1.1.0,orig/Components\bsp\mcus\bsp_msp430_defs.h Fri Apr 03 13:06:12 2009 | |
--- SimpliciTI-CCE-1.1.0/Components\bsp\mcus\bsp_msp430_defs.h Tue Apr 21 07:13:24 2009 | |
*************** | |
*** 96,103 **** | |
#define __bsp_ISR_FUNCTION__(f,v) __bsp_QUOTED_PRAGMA__(vector=v) __interrupt void f(void) | |
/* Initialization call provided in CCE environment before standard C-startup */ | |
#define BSP_EarlyInit(void) _system_pre_init(void) | |
! | |
/* ------------------ Unrecognized Compiler ------------------ */ | |
#else | |
#error "ERROR: Unknown compiler." | |
--- 96,105 ---- | |
#define __bsp_ISR_FUNCTION__(f,v) __bsp_QUOTED_PRAGMA__(vector=v) __interrupt void f(void) | |
/* Initialization call provided in CCE environment before standard C-startup */ | |
+ #ifndef xdc_target_name__ | |
#define BSP_EarlyInit(void) _system_pre_init(void) | |
! #endif | |
! | |
/* ------------------ Unrecognized Compiler ------------------ */ | |
#else | |
#error "ERROR: Unknown compiler." | |
*************** | |
*** 124,129 **** | |
--- 126,133 ---- | |
#define __bsp_CODE_MEMSPACE__ /* blank */ | |
#define __bsp_XDATA_MEMSPACE__ /* blank */ | |
+ #if !defined(__TI_COMPILER_VERSION__) || !defined( _STDINT_H_) | |
+ /* the following are already defined by stdint.h */ | |
typedef signed char int8_t; | |
typedef signed short int16_t; | |
typedef signed long int32_t; | |
*************** | |
*** 131,136 **** | |
--- 135,141 ---- | |
typedef unsigned char uint8_t; | |
typedef unsigned short uint16_t; | |
typedef unsigned long uint32_t; | |
+ #endif | |
#ifndef NULL | |
#define NULL 0 | |
diff -Ncr SimpliciTI-CCE-1.1.0,orig/Components\simpliciti\nwk\nwk_globals.c SimpliciTI-CCE-1.1.0/Components\simpliciti\nwk\nwk_globals.c | |
*** SimpliciTI-CCE-1.1.0,orig/Components\simpliciti\nwk\nwk_globals.c Fri Apr 03 13:06:14 2009 | |
--- SimpliciTI-CCE-1.1.0/Components\simpliciti\nwk\nwk_globals.c Tue Apr 21 12:44:14 2009 | |
*************** | |
*** 100,106 **** | |
{ | |
memset(&sAPAddress, 0x00, sizeof(addr_t)); | |
! memset(&sMyRAMAddress, 0x00, sizeof(addr_t)); | |
/* populate RAM address from ROM default if it hasn't laready been set | |
* using the IOCTL interface. | |
--- 100,106 ---- | |
{ | |
memset(&sAPAddress, 0x00, sizeof(addr_t)); | |
! // memset(&sMyRAMAddress, 0x00, sizeof(addr_t)); | |
/* populate RAM address from ROM default if it hasn't laready been set | |
* using the IOCTL interface. |