riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/transceiver: refactor un/register

Browse Source 
remove race conditions
make less restrictive (allow double-un/registers)
make loops more readable
This commit is contained in:
Ludwig Ortmann 2014-07-09 15:56:52 +02:00
parent d034cfac29
commit 8e93886d36
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/transceiver/transceiver.c
View File

@ -233,41 +233,37 @@ int transceiver_start(void)
/* Register an upper layer thread */
uint8_t transceiver_register(transceiver_type_t t, int pid)
{
uint8_t i;
/* find pid in registered threads or first unused space */
for (i = 0; ((i < TRANSCEIVER_MAX_REGISTERED) &&
(reg[i].pid != pid) &&
(reg[i].transceivers != TRANSCEIVER_NONE)); i++);
if (i >= TRANSCEIVER_MAX_REGISTERED) {
return 0;
}
else {
reg[i].transceivers |= t;
reg[i].pid = pid;
DEBUG("transceiver: Thread %i registered for %i\n", reg[i].pid, reg[i].transceivers);
return 1;
int result = 0;
int state = disableIRQ();
for (uint8_t i = 0; i < TRANSCEIVER_MAX_REGISTERED; i++) {
if ((reg[i].pid == pid) || (reg[i].transceivers == TRANSCEIVER_NONE)) {
reg[i].transceivers |= t;
reg[i].pid = pid;
DEBUG("transceiver: Thread %i registered for %i\n", reg[i].pid, reg[i].transceivers);
restoreIRQ(state);
result = 1;
break;
}
}
restoreIRQ(state);
return result;
}
/* Unregister an upper layer thread */
uint8_t transceiver_unregister(transceiver_type_t t, int pid)
{
uint8_t i;
/* find pid in unregistered threads or first unused space */
for (i = 0; ((i < TRANSCEIVER_MAX_REGISTERED) &&
(reg[i].pid != pid) &&
(reg[i].transceivers != TRANSCEIVER_NONE)); i++);
if (i >= TRANSCEIVER_MAX_REGISTERED) {
return 0;
int result = 0;
int state = disableIRQ();
for (uint8_t i = 0; i < TRANSCEIVER_MAX_REGISTERED; ++i) {
if (reg[i].pid == pid) {
reg[i].transceivers &= ~t;
restoreIRQ(state);
result = 1;
break;
}
}
else if (reg[i].pid == pid) {
reg[i].transceivers ^= t;
}
return 1;
restoreIRQ(state);
return result;
}
/*------------------------------------------------------------------------------------*/