Replaced macros with those defined in libbladeRF.h Removed device control lock; this is inherently provided in libbladeRF API calls.