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

Standardized integer types.

Browse source 
Removed unecessary volatility.

Make sure that the random back-off is only if the channel is busy.
This commit is contained in:
nvt-se 2007-08-16 20:38:40 +00:00
parent defbe1d9ac
commit 96e06d1dde
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,9 +65,9 @@ static int cc1020_setupRX(int);
static void cc1020_setupPD(void); static void cc1020_setupPD(void);
static void cc1020_wakeupTX(int); static void cc1020_wakeupTX(int);
static void cc1020_wakeupRX(int); static void cc1020_wakeupRX(int);
static u8_t cc1020_read_reg(u8_t addr); static uint8_t cc1020_read_reg(uint8_t addr);
static void cc1020_write_reg(u8_t addr, u8_t adata); static void cc1020_write_reg(uint8_t addr, uint8_t adata);
static void cc1020_load_config(const u8_t *); static void cc1020_load_config(const uint8_t *);
static void cc1020_reset(void); static void cc1020_reset(void);
/// selected rx/tx/pd switching algorithm /// selected rx/tx/pd switching algorithm
@ -75,20 +75,20 @@ static enum cc1020_power_mode cc1020_power_mode = CC1020_ALWAYS_ON;
// current mode of cc1020 chip // current mode of cc1020 chip
static enum cc1020_state cc1020_state = CC1020_OFF; static enum cc1020_state cc1020_state = CC1020_OFF;
volatile u8_t cc1020_rxbuf[HDRSIZE + CC1020_BUFFERSIZE]; static volatile uint8_t cc1020_rxbuf[HDRSIZE + CC1020_BUFFERSIZE];
volatile u8_t cc1020_txbuf[PREAMBLESIZE + HDRSIZE + CC1020_BUFFERSIZE + static uint8_t cc1020_txbuf[PREAMBLESIZE + HDRSIZE + CC1020_BUFFERSIZE +
TAILSIZE]; TAILSIZE];
static enum cc1020_rxstate cc1020_rxstate = CC1020_RX_SEARCHING; static enum cc1020_rxstate cc1020_rxstate = CC1020_RX_SEARCHING;
/// number of bytes in receive buffer /// number of bytes in receive and transmit buffers respectively.
static unsigned short cc1020_rxlen = 0; static uint16_t cc1020_rxlen;
static uint16_t cc1020_txlen;
/// received signal strength indicator reading for last received packet /// received signal strength indicator reading for last received packet
static volatile unsigned char rssi; static volatile uint8_t rssi;
/// callback when a packet has been received /// callback when a packet has been received
static unsigned char cc1020_pa_power = PA_POWER; static uint8_t cc1020_pa_power = PA_POWER;
static unsigned short cc1020_txlen = 0;
static void (*receiver_callback)(void); static void (*receiver_callback)(void);
@ -104,7 +104,7 @@ const struct radio_driver cc1020_driver =
PROCESS(cc1020_sender_process, "CC1020 sender"); PROCESS(cc1020_sender_process, "CC1020 sender");
void void
cc1020_init(const u8_t *config) cc1020_init(const uint8_t *config)
{ {
cc1020_setupPD(); cc1020_setupPD();
cc1020_reset(); cc1020_reset();
@ -229,13 +229,13 @@ cc1020_set_power_mode(enum cc1020_power_mode mode)
} }
void void
cc1020_set_power(u8_t pa_power) cc1020_set_power(uint8_t pa_power)
{ {
cc1020_pa_power = pa_power; cc1020_pa_power = pa_power;
} }
unsigned int unsigned int
cc1020_read(u8_t *buf, unsigned int bufsize) cc1020_read(uint8_t *buf, unsigned int bufsize)
{ {
unsigned len; unsigned len;
@ -254,14 +254,14 @@ cc1020_read(u8_t *buf, unsigned int bufsize)
return 0; return 0;
} }
u8_t uint8_t
cc1020_get_rssi(void) cc1020_get_rssi(void)
{ {
return rssi; return rssi;
} }
unsigned unsigned
cc1020_send(u8_t *buf, unsigned int len) cc1020_send(uint8_t *buf, unsigned int len)
{ {
if (len > CC1020_BUFFERSIZE) if (len > CC1020_BUFFERSIZE)
return 0; return 0;
@ -294,10 +294,10 @@ interrupt(UART0RX_VECTOR) cc1020_rxhandler(void)
static signed char syncbs; static signed char syncbs;
static union { static union {
struct { struct {
u8_t b2; uint8_t b2;
u8_t b1; uint8_t b1;
u8_t b4; uint8_t b4;
u8_t b3; uint8_t b3;
}; };
struct { struct {
uint16_t i1; uint16_t i1;
@ -397,11 +397,13 @@ PROCESS_THREAD(cc1020_sender_process, ev, data)
if (cc1020_state == CC1020_OFF) if (cc1020_state == CC1020_OFF)
cc1020_set_rx(); cc1020_set_rx();
// Wait until the receiver is idle. if (cc1020_rxstate != CC1020_RX_SEARCHING) {
PROCESS_WAIT_UNTIL(cc1020_rxstate == CC1020_RX_SEARCHING); // Wait until the receiver is idle.
PROCESS_WAIT_UNTIL(cc1020_rxstate == CC1020_RX_SEARCHING);
// Wait for a short pseudo-random time before sending. // Wait for a short pseudo-random time before sending.
clock_delay(1 + 10 * (random_rand() & 0xff)); clock_delay(1 + 10 * (random_rand() & 0xff));
}
// Switch to transceive mode. // Switch to transceive mode.
cc1020_set_tx(); cc1020_set_tx();
@ -421,7 +423,7 @@ PROCESS_THREAD(cc1020_sender_process, ev, data)
} }
static void static void
cc1020_write_reg(u8_t addr, u8_t adata) cc1020_write_reg(uint8_t addr, uint8_t adata)
{ {
unsigned i; unsigned i;
unsigned char data; unsigned char data;
@ -474,8 +476,8 @@ cc1020_write_reg(u8_t addr, u8_t adata)
PSEL_OFF; PSEL_OFF;
} }
static u8_t static uint8_t
cc1020_read_reg(u8_t addr) cc1020_read_reg(uint8_t addr)
{ {
unsigned i; unsigned i;
unsigned char data = 0; unsigned char data = 0;
@ -527,7 +529,7 @@ cc1020_read_reg(u8_t addr)
} }
static void static void
cc1020_load_config(const u8_t * config) cc1020_load_config(const uint8_t * config)
{ {
int i; int i;

2
platform/msb430/dev/cc1020.h
View file

@ -94,6 +94,4 @@ extern const struct radio_driver cc1020_driver;
PROCESS_NAME(cc1020_sender_process); PROCESS_NAME(cc1020_sender_process);
extern process_event_t cc1020_event;
#endif #endif