ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[IOTCELL-284] Removing NULL checks from Callbacks 

In respose to the radio event callback change from c style callbacks
to Mbed callbacks, we need to remove NULL checks from the driver code
as the callbacks itself are not pointers anymore. However, thanks to
template magic, we can check if callback is assigned or not. If its not
not assigned, it is default constructed to NULL which we can check by boolean
operator.
pull/12741/head
Hasnain Virk 2018-01-03 17:15:29 +02:00
parent 31eeb63bed
commit c882dd6e6e
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SX1272/SX1272_LoRaRadio.cpp
View File

@ -1720,7 +1720,7 @@ void SX1272_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL)
&& (_radio_events->rx_error != NULL)) {
&& (_radio_events->rx_error)) {
_radio_events->rx_error();
}
_rf_settings.fsk_packet_handler.preamble_detected = false;
@ -1763,7 +1763,7 @@ void SX1272_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL) && (_radio_events->rx_done != NULL)) {
if ((_radio_events != NULL) && (_radio_events->rx_done)) {
_radio_events->rx_done(
_data_buffer,
_rf_settings.fsk_packet_handler.size,
@ -1793,7 +1793,7 @@ void SX1272_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL)
&& (_radio_events->rx_error != NULL)) {
&& (_radio_events->rx_error)) {
_radio_events->rx_error();
}
break;
@ -1828,7 +1828,7 @@ void SX1272_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL)
&& (_radio_events->rx_done != NULL)) {
&& (_radio_events->rx_done)) {
_radio_events->rx_done(
_data_buffer,
_rf_settings.lora_packet_handler.size,
@ -1853,7 +1853,7 @@ void SX1272_LoRaRadio::handle_dio0_irq()
default:
_rf_settings.state = RF_IDLE;
if ((_radio_events != NULL)
&& (_radio_events->tx_done != NULL)) {
&& (_radio_events->tx_done)) {
_radio_events->tx_done();
}
break;
@ -1901,7 +1901,7 @@ void SX1272_LoRaRadio::handle_dio1_irq()
// Sync time out
rx_timeout_timer.detach( );
_rf_settings.state = RF_IDLE;
if ((_radio_events != NULL) && (_radio_events->rx_timeout != NULL)) {
if ((_radio_events != NULL) && (_radio_events->rx_timeout)) {
_radio_events->rx_timeout();
}
break;
@ -1969,7 +1969,7 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
// Clear Irq
write_to_register( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL );
if( ( _radio_events != NULL ) && (_radio_events->fhss_change_channel != NULL ) )
if( ( _radio_events != NULL ) && (_radio_events->fhss_change_channel ) )
{
_radio_events->fhss_change_channel((read_register( REG_LR_HOPCHANNEL ) & RFLR_HOPCHANNEL_CHANNEL_MASK ));
}
@ -1990,7 +1990,7 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
// Clear Irq
write_to_register( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL );
if( (_radio_events != NULL ) && ( _radio_events->fhss_change_channel != NULL ) )
if( (_radio_events != NULL ) && ( _radio_events->fhss_change_channel ) )
{
_radio_events->fhss_change_channel((read_register( REG_LR_HOPCHANNEL ) & RFLR_HOPCHANNEL_CHANNEL_MASK ));
}
@ -2016,7 +2016,7 @@ void SX1272_LoRaRadio::handle_dio3_irq( void )
{
// Clear Irq
write_to_register( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDETECTED | RFLR_IRQFLAGS_CADDONE );
if( ( _radio_events != NULL ) && ( _radio_events->cad_done != NULL ) )
if( ( _radio_events != NULL ) && ( _radio_events->cad_done ) )
{
_radio_events->cad_done( true );
}
@ -2025,7 +2025,7 @@ void SX1272_LoRaRadio::handle_dio3_irq( void )
{
// Clear Irq
write_to_register( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDONE );
if( ( _radio_events != NULL ) && ( _radio_events->cad_done != NULL ) )
if( ( _radio_events != NULL ) && ( _radio_events->cad_done ) )
{
_radio_events->cad_done( false );
}
@ -2099,7 +2099,7 @@ void SX1272_LoRaRadio::handle_timeout_irq()
}
}
if((_radio_events != NULL) && (_radio_events->rx_timeout != NULL)) {
if((_radio_events != NULL) && (_radio_events->rx_timeout)) {
_radio_events->rx_timeout();
}
@ -2126,7 +2126,7 @@ void SX1272_LoRaRadio::handle_timeout_irq()
set_public_network(_rf_settings.lora.public_network);
_rf_settings.state = RF_IDLE;
if( ( _radio_events != NULL ) && ( _radio_events->tx_timeout != NULL ) )
if( ( _radio_events != NULL ) && ( _radio_events->tx_timeout ) )
{
_radio_events->tx_timeout( );
}

24
SX1276/SX1276_LoRaRadio.cpp
View File

@ -1860,7 +1860,7 @@ void SX1276_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL)
&& (_radio_events->rx_error != NULL)) {
&& (_radio_events->rx_error)) {
_radio_events->rx_error();
}
_rf_settings.fsk_packet_handler.preamble_detected = false;
@ -1903,7 +1903,7 @@ void SX1276_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL) && (_radio_events->rx_done != NULL)) {
if ((_radio_events != NULL) && (_radio_events->rx_done)) {
_radio_events->rx_done(
_data_buffer,
_rf_settings.fsk_packet_handler.size,
@ -1933,7 +1933,7 @@ void SX1276_LoRaRadio::handle_dio0_irq()
rx_timeout_timer.detach();
if ((_radio_events != NULL)
&& (_radio_events->rx_error != NULL)) {
&& (_radio_events->rx_error)) {
_radio_events->rx_error();
}
break;
@ -1981,7 +1981,7 @@ void SX1276_LoRaRadio::handle_dio0_irq()
}
rx_timeout_timer.detach();
if ((_radio_events != NULL) && (_radio_events->rx_done != NULL)) {
if ((_radio_events != NULL) && (_radio_events->rx_done)) {
_radio_events->rx_done(_data_buffer,
_rf_settings.lora_packet_handler.size,
_rf_settings.lora_packet_handler.rssi_value,
@ -2005,7 +2005,7 @@ void SX1276_LoRaRadio::handle_dio0_irq()
default:
_rf_settings.state = RF_IDLE;
if ((_radio_events != NULL)
&& (_radio_events->tx_done != NULL)) {
&& (_radio_events->tx_done)) {
_radio_events->tx_done();
}
break;
@ -2059,7 +2059,7 @@ void SX1276_LoRaRadio::handle_dio1_irq()
write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_RXTIMEOUT);
_rf_settings.state = RF_IDLE;
if ((_radio_events != NULL)
&& (_radio_events->rx_timeout != NULL)) {
&& (_radio_events->rx_timeout)) {
_radio_events->rx_timeout();
}
break;
@ -2138,7 +2138,7 @@ void SX1276_LoRaRadio::handle_dio2_irq(void)
RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL);
if ((_radio_events != NULL)
&& (_radio_events->fhss_change_channel != NULL)) {
&& (_radio_events->fhss_change_channel)) {
_radio_events->fhss_change_channel(
(read_register(REG_LR_HOPCHANNEL)
& RFLR_HOPCHANNEL_CHANNEL_MASK));
@ -2164,7 +2164,7 @@ void SX1276_LoRaRadio::handle_dio2_irq(void)
RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL);
if ((_radio_events != NULL)
&& (_radio_events->fhss_change_channel != NULL)) {
&& (_radio_events->fhss_change_channel)) {
_radio_events->fhss_change_channel(
(read_register(REG_LR_HOPCHANNEL)
& RFLR_HOPCHANNEL_CHANNEL_MASK));
@ -2192,14 +2192,14 @@ void SX1276_LoRaRadio::handle_dio3_irq(void)
write_to_register(REG_LR_IRQFLAGS,
RFLR_IRQFLAGS_CADDETECTED | RFLR_IRQFLAGS_CADDONE);
if ((_radio_events != NULL)
&& (_radio_events->cad_done != NULL)) {
&& (_radio_events->cad_done)) {
_radio_events->cad_done(true);
}
} else {
// Clear Irq
write_to_register(REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDONE);
if ((_radio_events != NULL)
&& (_radio_events->cad_done != NULL)) {
&& (_radio_events->cad_done)) {
_radio_events->cad_done(false);
}
}
@ -2269,7 +2269,7 @@ void SX1276_LoRaRadio::handle_timeout_irq()
}
if ((_radio_events != NULL)
&& (_radio_events->rx_timeout != NULL)) {
&& (_radio_events->rx_timeout)) {
_radio_events->rx_timeout();
}
@ -2297,7 +2297,7 @@ void SX1276_LoRaRadio::handle_timeout_irq()
_rf_settings.state = RF_IDLE;
if ((_radio_events != NULL)
&& (_radio_events->tx_timeout != NULL)) {
&& (_radio_events->tx_timeout)) {
_radio_events->tx_timeout();
}
break;