| diff -Ncr SimpliciTI-1.0.6,orig/Components/bsp/boards/EZ430RF/bsp_config.h SimpliciTI-1.0.6/Components/bsp/boards/EZ430RF/bsp_config.h |
| *** SimpliciTI-1.0.6,orig/Components/bsp/boards/EZ430RF/bsp_config.h Wed Sep 19 01:10:22 2007 |
| --- SimpliciTI-1.0.6/Components/bsp/boards/EZ430RF/bsp_config.h Tue Feb 10 20:26:04 2009 |
| *************** |
| *** 55,60 **** |
| --- 55,61 ---- |
| * digitally controlled oscillator.
|
| */
|
| #define BSP_CONFIG_CLOCK_MHZ_SELECT 8 /* approximate MHz */
|
| + // dr #define BSP_CONFIG_CLOCK_MHZ_SELECT 1 /* changed to work with UART @ 9600 */
|
|
|
| /*
|
| * Custom clock configuration is available. Provide values for BCSCTL1 and DCOCTL as
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/bsp/bsp.h SimpliciTI-1.0.6/Components/bsp/bsp.h |
| *** SimpliciTI-1.0.6,orig/Components/bsp/bsp.h Fri Feb 22 04:27:44 2008 |
| --- SimpliciTI-1.0.6/Components/bsp/bsp.h Fri Jan 23 01:42:04 2009 |
| *************** |
| *** 127,133 **** |
| #endif
|
|
|
| /* static assert */
|
| ! #define BSP_STATIC_ASSERT(expr) void bspDummyPrototype( char dummy[1/((expr)!=0)] );
|
|
|
|
|
| /* ------------------------------------------------------------------------------------------------
|
| --- 127,133 ---- |
| #endif
|
|
|
| /* static assert */
|
| ! #define BSP_STATIC_ASSERT(expr) void bspDummyPrototype( char dummy[1/((expr)!=0)] )
|
|
|
|
|
| /* ------------------------------------------------------------------------------------------------
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/bsp/mcus/bsp_msp430_defs.h SimpliciTI-1.0.6/Components/bsp/mcus/bsp_msp430_defs.h |
| *** SimpliciTI-1.0.6,orig/Components/bsp/mcus/bsp_msp430_defs.h Sat May 3 01:30:44 2008 |
| --- SimpliciTI-1.0.6/Components/bsp/mcus/bsp_msp430_defs.h Tue Jan 27 02:19:36 2009 |
| *************** |
| *** 90,98 **** |
| /* ---------------------- Code Composer ---------------------- */
|
| #elif (defined __TI_COMPILER_VERSION__) && (defined __MSP430__)
|
| #define BSP_COMPILER_CODE_COMPOSER
|
| ! #error "ERROR: Support for Code Composer is not yet available."
|
|
|
| - #include <msp430xG46x.h> /* need generic support as in #include <msp430.h> */
|
| #define __bsp_ENABLE_INTERRUPTS__() _enable_interrupts()
|
| #define __bsp_DISABLE_INTERRUPTS__() _disable_interrupts()
|
| #define __bsp_INTERRUPTS_ARE_ENABLED__() (_get_SR_register() & GIE)
|
| --- 90,100 ---- |
| /* ---------------------- Code Composer ---------------------- */
|
| #elif (defined __TI_COMPILER_VERSION__) && (defined __MSP430__)
|
| #define BSP_COMPILER_CODE_COMPOSER
|
| ! // dr #error "ERROR: Support for Code Composer is not yet available."
|
| !
|
| ! // dr #include <msp430xG46x.h> /* need generic support as in #include <msp430.h> */
|
| ! #include <msp430.h> /* // dr */
|
|
|
| #define __bsp_ENABLE_INTERRUPTS__() _enable_interrupts()
|
| #define __bsp_DISABLE_INTERRUPTS__() _disable_interrupts()
|
| #define __bsp_INTERRUPTS_ARE_ENABLED__() (_get_SR_register() & GIE)
|
| *************** |
| *** 118,123 **** |
| --- 120,127 ---- |
| #define __bsp_CODE_MEMSPACE__ /* blank */
|
| #define __bsp_XDATA_MEMSPACE__ /* blank */
|
|
|
| + /* the following are already defined by stdint.h */
|
| + #ifndef _STDINT_H_
|
| typedef signed char int8_t;
|
| typedef signed short int16_t;
|
| typedef signed long int32_t;
|
| *************** |
| *** 125,130 **** |
| --- 129,135 ---- |
| typedef unsigned char uint8_t;
|
| typedef unsigned short uint16_t;
|
| typedef unsigned long uint32_t;
|
| + #endif
|
|
|
| #ifndef NULL
|
| #define NULL 0
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/mrfi/radios/family1/mrfi_radio.c SimpliciTI-1.0.6/Components/mrfi/radios/family1/mrfi_radio.c |
| *** SimpliciTI-1.0.6,orig/Components/mrfi/radios/family1/mrfi_radio.c Wed Jul 30 22:06:16 2008 |
| --- SimpliciTI-1.0.6/Components/mrfi/radios/family1/mrfi_radio.c Fri Jan 23 01:00:04 2009 |
| *************** |
| *** 395,403 **** |
| MRFI_RSSI_VALID_WAIT();
|
|
|
| /* use most random bit of rssi to populate the random seed */
|
| ! for(uint8_t i=0; i<16; i++)
|
| ! {
|
| ! mrfiRndSeed = (mrfiRndSeed << 1) | (mrfiSpiReadReg(RSSI) & 0x01);
|
| }
|
|
|
| /* Force the seed to be non-zero by setting one bit, just in case... */
|
| --- 395,405 ---- |
| MRFI_RSSI_VALID_WAIT();
|
|
|
| /* use most random bit of rssi to populate the random seed */
|
| ! { uint8_t i;
|
| ! for(i=0; i<16; i++)
|
| ! {
|
| ! mrfiRndSeed = (mrfiRndSeed << 1) | (mrfiSpiReadReg(RSSI) & 0x01);
|
| ! }
|
| }
|
|
|
| /* Force the seed to be non-zero by setting one bit, just in case... */
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_QMgmt.c SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_QMgmt.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_QMgmt.c Fri Aug 1 17:56:50 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_QMgmt.c Thu Jan 29 20:53:20 2009 |
| *************** |
| *** 76,82 **** |
| * LOCAL FUNCTIONS
|
| */
|
|
|
| -
|
| /******************************************************************************
|
| * GLOBAL VARIABLES
|
| */
|
| --- 76,81 ---- |
| *************** |
| *** 397,400 **** |
| {
|
| return (INQ == which) ? sInFrameQ : sOutFrameQ;
|
| }
|
| -
|
| --- 396,398 ---- |
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_api.c SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_api.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_api.c Mon Aug 4 18:02:12 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_api.c Tue Jan 27 16:50:40 2009 |
| *************** |
| *** 80,86 **** |
| /******************************************************************************
|
| * LOCAL VARIABLES
|
| */
|
| ! static uint8_t sInit_done;
|
|
|
| /******************************************************************************
|
| * LOCAL FUNCTIONS
|
| --- 80,86 ---- |
| /******************************************************************************
|
| * LOCAL VARIABLES
|
| */
|
| ! static uint8_t sInit_done = 0;
|
|
|
| /******************************************************************************
|
| * LOCAL FUNCTIONS
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_frame.c SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_frame.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_frame.c Wed Jul 2 22:37:52 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_frame.c Fri Mar 13 01:20:48 2009 |
| *************** |
| *** 39,44 **** |
| --- 39,46 ---- |
| * INCLUDES
|
| */
|
|
|
| + #include <xdc/runtime/System.h>
|
| + #include <local/rf/Radio.h>
|
| #include <string.h>
|
| #include "bsp.h"
|
| #include "mrfi.h"
|
| *************** |
| *** 348,353 **** |
| --- 350,360 ---- |
| if (port && (port <= nwkAppSize))
|
| {
|
| rc = func[port-1](&fiPtr->mrfiPkt);
|
| + #if 0
|
| + if (Radio_trace()) {
|
| + System_putch('0' + port);
|
| + }
|
| + #endif
|
| if (FHS_KEEP == rc)
|
| {
|
| fiPtr->fi_usage = FI_INUSE_UNTIL_DEL;
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_globals.c SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_globals.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk/nwk_globals.c Wed Jul 30 18:22:22 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk/nwk_globals.c Tue Jan 27 18:43:14 2009 |
| *************** |
| *** 62,68 **** |
| static const addr_t sMyROMAddress = THIS_DEVICE_ADDRESS;
|
| static addr_t sAPAddress;
|
| static addr_t sMyRAMAddress;
|
| ! static uint8_t sRAMAddressIsSet;
|
| /* Version number set as a 2 byte quantity. Each nibble is a revision number
|
| * in the form w.x.y.z. The subfields are each limited to values 0x0-0xF.
|
| */
|
| --- 62,68 ---- |
| static const addr_t sMyROMAddress = THIS_DEVICE_ADDRESS;
|
| static addr_t sAPAddress;
|
| static addr_t sMyRAMAddress;
|
| ! static uint8_t sRAMAddressIsSet = 0;
|
| /* Version number set as a 2 byte quantity. Each nibble is a revision number
|
| * in the form w.x.y.z. The subfields are each limited to values 0x0-0xF.
|
| */
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk_applications/nwk_join.c SimpliciTI-1.0.6/Components/simpliciti/nwk_applications/nwk_join.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk_applications/nwk_join.c Mon Aug 4 18:02:12 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk_applications/nwk_join.c Tue Jan 27 19:34:58 2009 |
| *************** |
| *** 73,83 **** |
| #ifdef ACCESS_POINT
|
| static uint32_t sLinkToken;
|
| static addr_t sSandFClients[NUM_STORE_AND_FWD_CLIENTS];
|
| ! static uint8_t sCurNumSandFClients;
|
| static uint8_t sJoinOK;
|
| #ifdef AP_IS_DATA_HUB
|
| static addr_t sJoinedED[NUM_CONNECTIONS];
|
| ! static uint8_t sNumJoined;
|
| #endif
|
| #endif
|
|
|
| --- 73,83 ---- |
| #ifdef ACCESS_POINT
|
| static uint32_t sLinkToken;
|
| static addr_t sSandFClients[NUM_STORE_AND_FWD_CLIENTS];
|
| ! static uint8_t sCurNumSandFClients = 0;
|
| static uint8_t sJoinOK;
|
| #ifdef AP_IS_DATA_HUB
|
| static addr_t sJoinedED[NUM_CONNECTIONS];
|
| ! static uint8_t sNumJoined = 0;
|
| #endif
|
| #endif
|
|
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk_applications/nwk_link.c SimpliciTI-1.0.6/Components/simpliciti/nwk_applications/nwk_link.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk_applications/nwk_link.c Mon Aug 4 18:02:12 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk_applications/nwk_link.c Tue Jan 27 19:07:44 2009 |
| *************** |
| *** 65,71 **** |
| /******************************************************************************
|
| * LOCAL VARIABLES
|
| */
|
| ! static uint32_t sLinkToken;
|
| static volatile uint8_t sListenActive;
|
| static volatile linkID_t sServiceLinkID;
|
| static volatile uint8_t sTid;
|
| --- 65,71 ---- |
| /******************************************************************************
|
| * LOCAL VARIABLES
|
| */
|
| ! static uint32_t sLinkToken = 0;
|
| static volatile uint8_t sListenActive;
|
| static volatile linkID_t sServiceLinkID;
|
| static volatile uint8_t sTid;
|
| diff -Ncr SimpliciTI-1.0.6,orig/Components/simpliciti/nwk_applications/nwk_mgmt.c SimpliciTI-1.0.6/Components/simpliciti/nwk_applications/nwk_mgmt.c |
| *** SimpliciTI-1.0.6,orig/Components/simpliciti/nwk_applications/nwk_mgmt.c Fri Aug 1 17:56:18 2008 |
| --- SimpliciTI-1.0.6/Components/simpliciti/nwk_applications/nwk_mgmt.c Tue Jan 27 19:36:20 2009 |
| *************** |
| *** 66,72 **** |
| * LOCAL VARIABLES
|
| */
|
| #ifndef ACCESS_POINT
|
| ! static addr_t const *sAPAddr;
|
| #endif
|
|
|
| static volatile uint8_t sTid;
|
| --- 66,72 ---- |
| * LOCAL VARIABLES
|
| */
|
| #ifndef ACCESS_POINT
|
| ! static addr_t const *sAPAddr = 0;
|
| #endif
|
|
|
| static volatile uint8_t sTid;
|