deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

moved synchronization word definition to the right place.

Browse source 
removed memcpy call for a two byte copy. also led to a relocation error
in some versions of the mspgcc linker.
This commit is contained in:
nvt-se 2009-09-22 16:20:39 +00:00
parent ce32792812
commit aef32d8144
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/msb430/dev/cc1020-internal.h
View file

@ -236,8 +236,6 @@ enum cc1020_state {
* @{ * @{
*/ */
const uint8_t syncword[2] = {0xD3,0x91};
// header: number of bytes in packet including header // header: number of bytes in packet including header
struct cc1020_header { struct cc1020_header {
uint8_t pad; uint8_t pad;
@ -251,7 +249,7 @@ struct cc1020_header {
#define PREAMBLE_SIZE 6 #define PREAMBLE_SIZE 6
#define PREAMBLE 0xAA #define PREAMBLE 0xAA
#define SYNCWORD_SIZE (sizeof (syncword)) #define SYNCWORD_SIZE 2
#define HDR_SIZE (sizeof (struct cc1020_header)) #define HDR_SIZE (sizeof (struct cc1020_header))
#define CRC_SIZE 2 #define CRC_SIZE 2

5
platform/msb430/dev/cc1020.c
View file

@ -75,6 +75,8 @@ static void cc1020_write_reg(uint8_t addr, uint8_t adata);
static void cc1020_load_config(const uint8_t *); static void cc1020_load_config(const uint8_t *);
static void cc1020_reset(void); static void cc1020_reset(void);
static const uint8_t syncword[SYNCWORD_SIZE] = {0xD3, 0x91};
/* current mode of cc1020 chip */ /* current mode of cc1020 chip */
static volatile enum cc1020_state cc1020_state = CC1020_OFF; static volatile enum cc1020_state cc1020_state = CC1020_OFF;
static volatile uint8_t cc1020_rxbuf[HDR_SIZE + CC1020_BUFFERSIZE]; static volatile uint8_t cc1020_rxbuf[HDR_SIZE + CC1020_BUFFERSIZE];
@ -138,7 +140,8 @@ cc1020_init(const uint8_t *config)
/* init tx buffer with preamble + syncword */ /* init tx buffer with preamble + syncword */
memset(cc1020_txbuf, PREAMBLE, PREAMBLE_SIZE); memset(cc1020_txbuf, PREAMBLE, PREAMBLE_SIZE);
memcpy((char *)cc1020_txbuf + PREAMBLE_SIZE, &syncword, SYNCWORD_SIZE); cc1020_txbuf[PREAMBLE_SIZE] = syncword[0];
cc1020_txbuf[PREAMBLE_SIZE + 1] = syncword[1];
/* calibrate receiver */ /* calibrate receiver */
cc1020_wakeupRX(RX_CURRENT); cc1020_wakeupRX(RX_CURRENT);