From de1648ca6b21118eb947cd33e643e93a4c56542e Mon Sep 17 00:00:00 2001 From: Thomas Tsou Date: Tue, 15 Oct 2013 16:18:58 -0400 Subject: Transceiver52M: Deallocate high level resources on shutdown This primarily addresses the error case at initialization. In the event that the transceiver fails to start, we should be able cleanly shutdown and release while providing a useful reason for exiting. After the radio is started and threads launched, there are no thread state variables or shutdown messaging between threads, and the transceiver cannot be consistently shutdown. This issue remains to be solved. Signed-off-by: Thomas Tsou --- Transceiver52M/radioInterfaceResamp.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Transceiver52M/radioInterfaceResamp.cpp') diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp index c3b4396..6c3839a 100644 --- a/Transceiver52M/radioInterfaceResamp.cpp +++ b/Transceiver52M/radioInterfaceResamp.cpp @@ -75,8 +75,6 @@ RadioInterfaceResamp::~RadioInterfaceResamp() void RadioInterfaceResamp::close() { - RadioInterface::close(); - delete innerSendBuffer; delete outerSendBuffer; delete innerRecvBuffer; @@ -89,9 +87,13 @@ void RadioInterfaceResamp::close() outerSendBuffer = NULL; innerRecvBuffer = NULL; outerRecvBuffer = NULL; + sendBuffer = NULL; + recvBuffer = NULL; upsampler = NULL; dnsampler = NULL; + + RadioInterface::close(); } /* Initialize I/O specific objects */ -- cgit v1.2.3