kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

cpu/cc2538: Remove superfluous mutex lock

Browse Source
This commit is contained in:
Aaron Sowry 2016-09-03 13:41:43 +12:00
parent 908f5489b6
commit 2ba43d560f
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/cc2538/include/cc2538_rf.h
View File

@ -24,7 +24,6 @@
#include <stdbool.h>
#include "mutex.h"
#include "net/netdev2.h"
#include "net/netdev2/ieee802154.h"
@ -179,7 +178,6 @@ enum {
typedef struct {
netdev2_ieee802154_t netdev; /**< netdev2 parent struct */
uint8_t state; /**< current state of the radio */
mutex_t mutex; /**< device access lock */
} cc2538_rf_t;
/**

2
cpu/cc2538/radio/cc2538_rf.c
View File

@ -174,7 +174,5 @@ void cc2538_setup(cc2538_rf_t *dev)
netdev->driver = &cc2538_rf_driver;
mutex_init(&dev->mutex);
cc2538_init();
}

15
cpu/cc2538/radio/cc2538_rf_netdev.c
View File

@ -257,9 +257,6 @@ static int _send(netdev2_t *netdev, const struct iovec *vector, unsigned count)
{
int pkt_len = 0;
cc2538_rf_t *dev = (cc2538_rf_t *) netdev;
mutex_lock(&dev->mutex);
/* Flush TX FIFO once no transmission in progress */
RFCORE_WAIT_UNTIL(RFCORE->XREG_FSMSTAT1bits.TX_ACTIVE == 0);
RFCORE_SFR_RFST = ISFLUSHTX;
@ -285,20 +282,16 @@ static int _send(netdev2_t *netdev, const struct iovec *vector, unsigned count)
rfcore_poke_tx_fifo(0, pkt_len + CC2538_AUTOCRC_LEN);
RFCORE_SFR_RFST = ISTXON;
mutex_unlock(&dev->mutex);
return pkt_len;
}
static int _recv(netdev2_t *netdev, void *buf, size_t len, void *info)
{
cc2538_rf_t *dev = (cc2538_rf_t *) netdev;
uint8_t corr_val;
int8_t rssi_val;
size_t pkt_len;
mutex_lock(&dev->mutex);
if (buf == NULL) {
/* GNRC wants to know how much data we've got for it */
pkt_len = rfcore_read_byte();
@ -306,7 +299,6 @@ static int _recv(netdev2_t *netdev, void *buf, size_t len, void *info)
/* Make sure pkt_len is sane */
if (pkt_len > CC2538_RF_MAX_DATA_LEN) {
RFCORE_SFR_RFST = ISFLUSHRX;
mutex_unlock(&dev->mutex);
return -EOVERFLOW;
}
@ -314,7 +306,6 @@ static int _recv(netdev2_t *netdev, void *buf, size_t len, void *info)
if (!(rfcore_peek_rx_fifo(pkt_len) & 0x80)) {
/* CRC failed; discard packet */
RFCORE_SFR_RFST = ISFLUSHRX;
mutex_unlock(&dev->mutex);
return -ENODATA;
}
@ -323,7 +314,6 @@ static int _recv(netdev2_t *netdev, void *buf, size_t len, void *info)
RFCORE_SFR_RFST = ISFLUSHRX;
}
mutex_unlock(&dev->mutex);
return pkt_len - IEEE802154_FCS_LEN;
}
else {
@ -359,7 +349,6 @@ static int _recv(netdev2_t *netdev, void *buf, size_t len, void *info)
}
RFCORE_SFR_RFST = ISFLUSHRX;
mutex_unlock(&dev->mutex);
return pkt_len;
}
@ -374,8 +363,6 @@ static int _init(netdev2_t *netdev)
cc2538_rf_t *dev = (cc2538_rf_t *) netdev;
_dev = netdev;
mutex_lock(&dev->mutex);
uint16_t pan = cc2538_get_pan();
uint16_t chan = cc2538_get_chan();
uint16_t addr_short = cc2538_get_addr_short();
@ -400,7 +387,5 @@ static int _init(netdev2_t *netdev)
dev->netdev.proto = GNRC_NETTYPE_UNDEF;
#endif
mutex_unlock(&dev->mutex);
return 0;
}