diff --git a/host/libraries/libbladeRF_bindings/matlab/bladeRF_XCVR.m b/host/libraries/libbladeRF_bindings/matlab/bladeRF_XCVR.m index 31742fef..514ebd37 100644 --- a/host/libraries/libbladeRF_bindings/matlab/bladeRF_XCVR.m +++ b/host/libraries/libbladeRF_bindings/matlab/bladeRF_XCVR.m @@ -42,6 +42,7 @@ classdef bladeRF_XCVR < handle vga2 % VGA2 gain. RX range: [0, 30], TX range: [0, 25] lna % RX LNA gain. Values: { 'BYPASS', 'MID', 'MAX' } xb200_filter % XB200 Filter selection. Only valid when an XB200 is attached. Options are: '50M', '144M', '222M', 'AUTO_1DB', 'AUTO_3DB', 'CUSTOM' + mux % FPGA sample FIFO mux mode. Only valid for RX, with options 'BASEBAND_LMS', '12BIT_COUNTER', '32BIT_COUNTER', 'DIGITAL_LOOPBACK' end properties(SetAccess = immutable, Hidden=true) @@ -301,6 +302,38 @@ classdef bladeRF_XCVR < handle filter_val = strrep(filter_val, 'BLADERF_XB200_', ''); end + % Set the RX mux mode setting + function set.mux(obj, mode) + if strcmpi(obj.direction, 'TX') == true + error('FPGA sample mux mode configuration is only applicable to the RX module.'); + end + + mode = upper(mode); + switch mode + case { 'BASEBAND_LMS', '12BIT_COUNTER', '32BIT_COUNTER', 'DIGITAL_LOOPBACK' } + mode = ['BLADERF_RX_MUX_' mode ]; + otherwise + error(['Invalid RX mux mode: ' mode]); + end + + status = calllib('libbladeRF', 'bladerf_set_rx_mux', obj.bladerf.device, mode); + bladeRF.check_status('bladerf_set_rx_mux', status); + end + + % Get the current RX mux mode setting + function mode = get.mux(obj) + if strcmpi(obj.direction, 'TX') == true + error('FPGA sample mux mode configuration is only applicable to the RX module.'); + end + + mode = 'BLADERF_RX_MUX_INVALID'; + + [status, ~, mode] = calllib('libbladeRF', 'bladerf_get_rx_mux', obj.bladerf.device, mode); + bladeRF.check_status('bladerf_get_rx_mux', status); + + mode = strrep(mode, 'BLADERF_RX_MUX_', ''); + end + % Constructor function obj = bladeRF_XCVR(dev, dir, xb) if strcmpi(dir,'RX') == false && strcmpi(dir,'TX') == false diff --git a/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m b/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m index da1bae23..23657dfe 100644 --- a/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m +++ b/host/libraries/libbladeRF_bindings/matlab/libbladeRF_proto.m @@ -102,6 +102,12 @@ fcns.thunkname{fcnNum}='int32voidPtrbladerf_loopbackThunk';fcns.name{fcnNum}='bl % int bladerf_get_loopback ( struct bladerf * dev , bladerf_loopback * l ); fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='bladerf_get_loopback'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'bladerfPtr', 'bladerf_loopbackPtr'};fcnNum=fcnNum+1; +% int bladerf_set_rx_mux ( struct bladerf * dev , bladerf_rx_mux mux ); +fcns.thunkname{fcnNum}='int32voidPtrbladerf_rx_muxThunk';fcns.name{fcnNum}='bladerf_set_rx_mux'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'bladerfPtr', 'bladerf_rx_mux'};fcnNum=fcnNum+1; + +% int bladerf_get_rx_mux ( struct bladerf * dev , bladerf_rx_mux * mux ); +fcns.thunkname{fcnNum}='int32voidPtrvoidPtrThunk';fcns.name{fcnNum}='bladerf_get_rx_mux'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'bladerfPtr', 'bladerf_rx_muxPtr'};fcnNum=fcnNum+1; + % int bladerf_set_sample_rate ( struct bladerf * dev , bladerf_module module , unsigned int rate , unsigned int * actual ); fcns.thunkname{fcnNum}='int32voidPtrbladerf_moduleuint32voidPtrThunk';fcns.name{fcnNum}='bladerf_set_sample_rate'; fcns.calltype{fcnNum}='Thunk'; fcns.LHS{fcnNum}='int32'; fcns.RHS{fcnNum}={'bladerfPtr', 'bladerf_module', 'uint32', 'uint32Ptr'};fcnNum=fcnNum+1; @@ -526,6 +532,12 @@ enuminfo.bladerf_image_type=struct('BLADERF_IMAGE_TYPE_INVALID', -1, ... 'BLADERF_IMAGE_TYPE_RX_IQ_CAL', 7, ... 'BLADERF_IMAGE_TYPE_TX_IQ_CAL', 8); +enuminfo.bladerf_rx_mux=struct('BLADERF_RX_MUX_INVALID', -1, ... + 'BLADERF_RX_MUX_BASEBAND_LMS', 0, ... + 'BLADERF_RX_MUX_12BIT_COUNTER', 1, ... + 'BLADERF_RX_MUX_32BIT_COUNTER', 2, ... + 'BLADERF_RX_MUX_DIGITAL_LOOPBACK', 4); + % Value 3 is reserved for future use %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Output