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

minor refactoring.

Browse source
This commit is contained in:
nvt-se 2009-05-14 12:18:49 +00:00
parent b0a8154e96
commit f9b35795c7
3 changed files with 369 additions and 369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,9 +89,6 @@
#define RX_CURRENT 0x86 #define RX_CURRENT 0x86
// CC1020 driver configuration // CC1020 driver configuration
#define CC1020_BUFFERSIZE 128
#define CRC_LEN 2
// PDI (Data in) is on P21 // PDI (Data in) is on P21
#define PDO (P2IN & 0x01) #define PDO (P2IN & 0x01)
@ -248,13 +245,20 @@ struct cc1020_header {
} __attribute__((packed)); } __attribute__((packed));
#define PREAMBLESIZE 6 #define CC1020_BUFFERSIZE 128
#define PREAMBLE_SIZE 6
#define PREAMBLE 0xAA #define PREAMBLE 0xAA
#define TAILSIZE 2
#define SYNCWORD_SIZE (sizeof (syncword))
#define HDR_SIZE (sizeof (struct cc1020_header))
#define CRC_SIZE 2
#define TAIL_SIZE 2
#define TAIL 0xFA #define TAIL 0xFA
#define SYNCWDSIZE (sizeof (syncword))
#define HDRSIZE (sizeof (struct cc1020_header))
///@} ///@}

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

@ -77,9 +77,9 @@ static void cc1020_reset(void);
/* 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[HDRSIZE + CC1020_BUFFERSIZE]; static volatile uint8_t cc1020_rxbuf[HDR_SIZE + CC1020_BUFFERSIZE];
static uint8_t cc1020_txbuf[PREAMBLESIZE + SYNCWDSIZE + HDRSIZE + static uint8_t cc1020_txbuf[PREAMBLE_SIZE + SYNCWORD_SIZE + HDR_SIZE +
CC1020_BUFFERSIZE + TAILSIZE]; CC1020_BUFFERSIZE + TAIL_SIZE];
/* number of bytes in receive and transmit buffers respectively. */ /* number of bytes in receive and transmit buffers respectively. */
static uint8_t cc1020_rxlen; static uint8_t cc1020_rxlen;
@ -137,8 +137,8 @@ cc1020_init(const uint8_t *config)
cc1020_load_config(config); cc1020_load_config(config);
/* init tx buffer with preamble + syncword */ /* init tx buffer with preamble + syncword */
memset(cc1020_txbuf, PREAMBLE, PREAMBLESIZE); memset(cc1020_txbuf, PREAMBLE, PREAMBLE_SIZE);
memcpy((char *)cc1020_txbuf + PREAMBLESIZE, &syncword, SYNCWDSIZE); memcpy((char *)cc1020_txbuf + PREAMBLE_SIZE, &syncword, SYNCWORD_SIZE);
/* calibrate receiver */ /* calibrate receiver */
cc1020_wakeupRX(RX_CURRENT); cc1020_wakeupRX(RX_CURRENT);
@ -233,9 +233,8 @@ int
cc1020_send(const void *buf, unsigned short len) cc1020_send(const void *buf, unsigned short len)
{ {
int try; int try;
int normal_header = HDRSIZE + len; int normal_header = HDR_SIZE + len;
int i; uint16_t rxcrc = 0xffff; /* For checksum purposes */
uint16_t rxcrc = 0xFFFF; /* For checksum purposes */
rtimer_clock_t timeout_time; rtimer_clock_t timeout_time;
timeout_time = RTIMER_NOW() + RTIMER_SECOND / 1000 * SEND_TIMEOUT; timeout_time = RTIMER_NOW() + RTIMER_SECOND / 1000 * SEND_TIMEOUT;
@ -255,27 +254,25 @@ cc1020_send(const void *buf, unsigned short len)
} }
/* The preamble and the sync word are already in buffer. */ /* The preamble and the sync word are already in buffer. */
cc1020_txlen = PREAMBLESIZE + SYNCWDSIZE; cc1020_txlen = PREAMBLE_SIZE + SYNCWORD_SIZE;
/* header */ /* header */
cc1020_txbuf[cc1020_txlen++] = 0x00; cc1020_txbuf[cc1020_txlen++] = 0x00;
cc1020_txbuf[cc1020_txlen++] = normal_header + CRC_LEN; cc1020_txbuf[cc1020_txlen++] = normal_header + CRC_SIZE;
/* Adding the checksum on header and data */ /* Adding the checksum on header and data */
rxcrc = crc16_add((uint8_t) (normal_header & 0xff), rxcrc); rxcrc = crc16_add(normal_header & 0xff, rxcrc);
rxcrc = crc16_add((uint8_t) ((normal_header >> 8)& 0xff), rxcrc); rxcrc = crc16_add((normal_header >> 8) & 0xff, rxcrc);
for(i = 0; i < len; i++) { rxcrc = crc16_data(buf, len, rxcrc);
rxcrc = crc16_add((uint8_t) ((char*)buf)[i], rxcrc);
}
/* data to send */ /* data to send */
memcpy((char *)cc1020_txbuf + cc1020_txlen, buf, len); memcpy((char *)cc1020_txbuf + cc1020_txlen, buf, len);
cc1020_txlen += len; cc1020_txlen += len;
/* Send checksum */ /* Send checksum */
cc1020_txbuf[cc1020_txlen++] = (uint8_t)(rxcrc >> 8); cc1020_txbuf[cc1020_txlen++] = rxcrc >> 8;
cc1020_txbuf[cc1020_txlen++] = (uint8_t)(rxcrc & 0xFF); cc1020_txbuf[cc1020_txlen++] = rxcrc & 0xff;
/* suffix */ /* suffix */
cc1020_txbuf[cc1020_txlen++] = TAIL; cc1020_txbuf[cc1020_txlen++] = TAIL;
@ -325,17 +322,17 @@ cc1020_read(void *buf, unsigned short size)
{ {
unsigned len; unsigned len;
if(cc1020_rxlen <= HDRSIZE) { if(cc1020_rxlen <= HDR_SIZE) {
return 0; return 0;
} }
len = cc1020_rxlen - HDRSIZE; len = cc1020_rxlen - HDR_SIZE;
if(len > size) { if(len > size) {
RIMESTATS_ADD(toolong); RIMESTATS_ADD(toolong);
return -1; return -1;
} }
memcpy(buf, (char *)cc1020_rxbuf + HDRSIZE, len); memcpy(buf, (char *)cc1020_rxbuf + HDR_SIZE, len);
RIMESTATS_ADD(llrx); RIMESTATS_ADD(llrx);
reset_receiver(); reset_receiver();
@ -414,17 +411,16 @@ PROCESS_THREAD(cc1020_receiver_process, ev, data)
if(receiver_callback != NULL) { if(receiver_callback != NULL) {
/* Verify the checksum. */ /* Verify the checksum. */
uint16_t expected_crc = 0xffff; uint16_t expected_crc = 0xffff;
uint16_t actual_crc = -1; uint16_t actual_crc;
actual_crc = (cc1020_rxbuf[cc1020_rxlen - CRC_LEN] << 8) | cc1020_rxbuf[cc1020_rxlen - CRC_LEN + 1];
cc1020_rxlen -= CRC_LEN;
expected_crc = crc16_add((uint8_t) (cc1020_rxlen & 0xff), expected_crc); actual_crc = (cc1020_rxbuf[cc1020_rxlen - CRC_SIZE] << 8) |
expected_crc = crc16_add((uint8_t) ((cc1020_rxlen >> 8) & 0xff), cc1020_rxbuf[cc1020_rxlen - CRC_SIZE + 1];
expected_crc); cc1020_rxlen -= CRC_SIZE;
int i;
for(i = HDRSIZE; i < cc1020_rxlen; i++){ expected_crc = crc16_add(cc1020_rxlen & 0xff, expected_crc);
expected_crc = crc16_add(cc1020_rxbuf[i], expected_crc); expected_crc = crc16_add((cc1020_rxlen >> 8) & 0xff, expected_crc);
} expected_crc = crc16_data((char *)&cc1020_rxbuf[HDR_SIZE],
cc1020_rxlen - HDR_SIZE, expected_crc);
if(expected_crc == actual_crc) { if(expected_crc == actual_crc) {
receiver_callback(&cc1020_driver); receiver_callback(&cc1020_driver);
@ -507,13 +503,13 @@ interrupt(UART0RX_VECTOR) cc1020_rxhandler(void)
cc1020_rxlen++; cc1020_rxlen++;
if(cc1020_rxlen == HDRSIZE) { if(cc1020_rxlen == HDR_SIZE) {
pktlen = ((struct cc1020_header *)cc1020_rxbuf)->length; pktlen = ((struct cc1020_header *)cc1020_rxbuf)->length;
if(pktlen == 0 || pktlen > sizeof (cc1020_rxbuf)) { if(pktlen == 0 || pktlen > sizeof (cc1020_rxbuf)) {
cc1020_rxlen = 0; cc1020_rxlen = 0;
CC1020_SET_OPSTATE(CC1020_RX | CC1020_RX_SEARCHING); CC1020_SET_OPSTATE(CC1020_RX | CC1020_RX_SEARCHING);
} }
} else if(cc1020_rxlen > HDRSIZE) { } else if(cc1020_rxlen > HDR_SIZE) {
if(cc1020_rxlen == pktlen) { if(cc1020_rxlen == pktlen) {
/* Disable interrupts while processing the packet. */ /* Disable interrupts while processing the packet. */
DISABLE_RX_IRQ(); DISABLE_RX_IRQ();