Conflicts: firmware/common/hackrf_core.c
Conflicts: firmware/common/hackrf_core.c firmware/common/hackrf_core.h