From 23a57b8c90fdcc717348e1fd67b761c663ec5994 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Wed, 24 Jan 2018 10:42:05 -0800 Subject: [PATCH] nrf24l01: Initialize member variable Initialize a member variable pointer to NULL. Signed-off-by: Noel Eck --- src/nrf24l01/nrf24l01.cxx | 6 +++--- src/nrf24l01/nrf24l01.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nrf24l01/nrf24l01.cxx b/src/nrf24l01/nrf24l01.cxx index bff5af50..fcbe457d 100644 --- a/src/nrf24l01/nrf24l01.cxx +++ b/src/nrf24l01/nrf24l01.cxx @@ -35,7 +35,7 @@ using namespace upm; NRF24L01::NRF24L01 (int cs, int ce) - :m_spi(0), m_csnPinCtx(cs), m_cePinCtx(ce) + : m_callback_obj(NULL), m_spi(0), m_csnPinCtx(cs), m_cePinCtx(ce) { init (cs, ce); } @@ -137,7 +137,7 @@ NRF24L01::setPayload (uint8_t payload) { void NRF24L01::setDataReceivedHandler (Callback *call_obj) { - callback_obj = call_obj; + m_callback_obj = call_obj; dataReceivedHandler = &generic_callback; } @@ -309,7 +309,7 @@ NRF24L01::pollListener() { if (dataReady()) { getData (m_rxBuffer); - dataReceivedHandler (callback_obj); /* let know that data arrived */ + dataReceivedHandler (m_callback_obj); /* let know that data arrived */ } } diff --git a/src/nrf24l01/nrf24l01.hpp b/src/nrf24l01/nrf24l01.hpp index 87dc606e..ea35cd7d 100644 --- a/src/nrf24l01/nrf24l01.hpp +++ b/src/nrf24l01/nrf24l01.hpp @@ -362,7 +362,7 @@ class NRF24L01 { private: /* Callback object to use for setting the handler from Java */ - Callback *callback_obj; + Callback *m_callback_obj; /** Data arrived handler */ funcPtrVoidVoid dataReceivedHandler;