Compare commits

...
Sign in to create a new pull request.

7 commits

Author SHA1 Message Date
Ryan Thompson
461b584ceb libbladeRF: limit SC16 Q11 packed format to buf sizes of 3*4096*n bytes
This resolves buffer-to-buffer continuity.
2024-09-23 15:38:07 -05:00
Ryan Thompson
e0877517c5 libbladeRF: added BLADERF_SC16Q11_PACKED sample format
libbladeRF ingests SC12 Q11 samples and expands them to SC16 Q11 before
filling the end buffer. The trade-off is CPU cycles for the 12b to 16b
conversion.
2024-09-23 11:06:53 -05:00
Ryan Thompson
0a27b90b92 hdl: add highly packed mode to bladerf-hosted 2024-03-26 16:15:48 -05:00
Ryan Thompson
122d4a283b hdl: highly packed mode zeros out the last 4 dwords in the FX3 GPIF 2024-03-26 15:52:01 -05:00
Ryan Thompson
273ff8d1d5 hdl: added highly packed mode to fifo writer
Iteratively packs 12b'samples across 3 fifo writes. The meta downcount
operation still needs to be confirmed.
2024-09-20 16:14:40 -05:00
Ryan Thompson
c7da4ac769 hdl: added enable signal for highly packed mode 2024-03-20 14:29:55 -05:00
Ryan Thompson
81134b8af8 hdl: init highly packed mode testbench
This is a copy of the 8b meta mode testbench.
2024-03-20 13:02:19 -05:00
15 changed files with 1118 additions and 42 deletions

View file

@ -34,37 +34,38 @@ entity fifo_writer is
META_FIFO_DATA_WIDTH : natural := 128
);
port (
clock : in std_logic;
reset : in std_logic;
enable : in std_logic;
clock : in std_logic;
reset : in std_logic;
enable : in std_logic;
usb_speed : in std_logic;
meta_en : in std_logic;
packet_en : in std_logic;
eight_bit_mode_en : in std_logic := '0';
timestamp : in unsigned(63 downto 0);
mini_exp : in std_logic_vector(1 downto 0);
usb_speed : in std_logic;
meta_en : in std_logic;
packet_en : in std_logic;
eight_bit_mode_en : in std_logic := '0';
highly_packed_mode_en : in std_logic := '0';
timestamp : in unsigned(63 downto 0);
mini_exp : in std_logic_vector(1 downto 0);
in_sample_controls : in sample_controls_t(0 to NUM_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE);
in_samples : in sample_streams_t(0 to NUM_STREAMS-1) := (others => ZERO_SAMPLE);
in_sample_controls : in sample_controls_t(0 to NUM_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE);
in_samples : in sample_streams_t(0 to NUM_STREAMS-1) := (others => ZERO_SAMPLE);
fifo_usedw : in std_logic_vector(FIFO_USEDW_WIDTH-1 downto 0);
fifo_clear : buffer std_logic;
fifo_write : buffer std_logic := '0';
fifo_full : in std_logic;
fifo_data : out std_logic_vector(FIFO_DATA_WIDTH-1 downto 0) := (others => '0');
fifo_usedw : in std_logic_vector(FIFO_USEDW_WIDTH-1 downto 0);
fifo_clear : buffer std_logic;
fifo_write : buffer std_logic := '0';
fifo_full : in std_logic;
fifo_data : out std_logic_vector(FIFO_DATA_WIDTH-1 downto 0) := (others => '0');
packet_control : in packet_control_t;
packet_ready : out std_logic;
packet_control : in packet_control_t;
packet_ready : out std_logic;
meta_fifo_full : in std_logic;
meta_fifo_usedw : in std_logic_vector(META_FIFO_USEDW_WIDTH-1 downto 0);
meta_fifo_data : out std_logic_vector(META_FIFO_DATA_WIDTH-1 downto 0) := (others => '0');
meta_fifo_write : out std_logic := '0';
meta_fifo_full : in std_logic;
meta_fifo_usedw : in std_logic_vector(META_FIFO_USEDW_WIDTH-1 downto 0);
meta_fifo_data : out std_logic_vector(META_FIFO_DATA_WIDTH-1 downto 0) := (others => '0');
meta_fifo_write : out std_logic := '0';
overflow_led : buffer std_logic;
overflow_count : buffer unsigned(63 downto 0);
overflow_duration : in unsigned(15 downto 0)
overflow_led : buffer std_logic;
overflow_count : buffer unsigned(63 downto 0);
overflow_duration : in unsigned(15 downto 0)
);
end entity;
@ -118,6 +119,9 @@ architecture simple of fifo_writer is
fifo_clear : std_logic;
fifo_write : std_logic;
fifo_data : unsigned(fifo_data'range);
fifo_12b_buf : unsigned(95 downto 0);
fifo_data_held : unsigned(47 downto 0);
write_cycle : natural range 0 to 3;
samples_left : natural range 0 to in_sample_controls'length;
in_sample_controls_r: sample_controls_t(0 to NUM_STREAMS-1);
in_samples_r : sample_streams_t(0 to NUM_STREAMS-1);
@ -129,6 +133,9 @@ architecture simple of fifo_writer is
fifo_clear => '1',
fifo_write => '0',
fifo_data => (others => '-'),
fifo_12b_buf => (others => '-'),
fifo_data_held => (others => '-'),
write_cycle => 0,
samples_left => 0,
in_sample_controls_r=> (others => SAMPLE_CONTROL_DISABLE),
in_samples_r => (others => ZERO_SAMPLE),
@ -430,6 +437,23 @@ begin
return rv;
end function;
function pack_sc12( sc : sample_controls_t;
ss : sample_streams_t;
d : unsigned ) return unsigned is
constant IQ_PAIR_LEN : positive := 24;
variable rv : unsigned(d'range) := (others => '0');
begin
rv := d;
for i in sc'range loop
if( (sc(i).enable = '1') and (ss(i).data_v = '1') ) then
rv := unsigned(ss(i).data_q(11 downto 0)) &
unsigned(ss(i).data_i(11 downto 0)) &
rv(rv'high downto rv'low+IQ_PAIR_LEN);
end if;
end loop;
return rv;
end function;
procedure handle_fifo_write(
signal fifo_current : in fifo_fsm_t;
signal meta_current : in meta_fsm_t;
@ -457,11 +481,18 @@ begin
if( write_req = '1' ) then
if( fifo_current.samples_left = 0 ) then
fifo_future.samples_left <= NUM_STREAMS - count_enabled_channels(in_sample_controls);
fifo_future.fifo_write <= write_req;
if( eight_bit_mode_en = '1' ) then
fifo_future.fifo_write <= write_req and fifo_current.eight_bit_delay;
fifo_future.eight_bit_delay <= not fifo_current.eight_bit_delay;
else
fifo_future.fifo_write <= write_req;
end if;
if( highly_packed_mode_en = '1' ) then
fifo_future.write_cycle <= (fifo_current.write_cycle + 1) mod 4;
if fifo_current.write_cycle = 0 then
fifo_future.fifo_write <= '0';
end if;
end if;
else
-- MIMO PACKER: STEP 3 of 3
@ -487,14 +518,33 @@ begin
-- MIMO PACKER: STEP 1 of 3
if( packet_en = '0' ) then
fifo_future.fifo_data <= pack(fifo_current.in_sample_controls_r,
fifo_current.in_samples_r,
fifo_current.fifo_data);
if( highly_packed_mode_en = '1' ) then
fifo_future.fifo_12b_buf <= pack_sc12(
sc => in_sample_controls,
ss => in_samples,
d => fifo_current.fifo_12b_buf
);
if fifo_current.write_cycle = 1 then
fifo_future.fifo_data <= fifo_current.fifo_12b_buf(
fifo_data'length-1 downto fifo_current.fifo_12b_buf'low);
elsif fifo_current.write_cycle = 2 then
fifo_future.fifo_data <= fifo_current.fifo_12b_buf(
fifo_data'length-1+16 downto fifo_current.fifo_12b_buf'low+16);
elsif fifo_current.write_cycle = 3 then
fifo_future.fifo_data <= fifo_current.fifo_12b_buf(
fifo_data'length-1+32 downto fifo_current.fifo_12b_buf'low+32);
end if;
end if;
if( eight_bit_mode_en = '1' ) then
fifo_future.fifo_data <= pack_eight_bit_mode(fifo_current.in_sample_controls_r,
fifo_current.in_samples_r,
fifo_current.fifo_data);
else
fifo_future.fifo_data <= pack(fifo_current.in_sample_controls_r,
fifo_current.in_samples_r,
fifo_current.fifo_data);
end if;
end if;

View file

@ -0,0 +1,12 @@
source ../../../ip/nuand/nuand.do
vcom -work nuand -2008 ../vhdl/rx.vhd
vcom -work nuand -2008 ../vhdl/tx.vhd
vlib rtl_work
vcom -work rtl_work -2008 ../../../ip/altera/fx3_pll/fx3_pll.vhd
compile_nuand ../../../ip/nuand bladerf-micro
vcom -work nuand -2008 ../vhdl/tb/fx3_model.vhd
vcom -work nuand -2008 ../vhdl/tb/fx3_gpif_meta_highly_packed.vhd

View file

@ -93,6 +93,9 @@ architecture hosted_bladerf of bladerf is
signal eightbit_en_tx : std_logic;
signal eightbit_en_rx : std_logic;
signal highly_packed_en_pclk : std_logic;
signal highly_packed_en_rx : std_logic;
signal packet_en_pclk : std_logic;
signal packet_en_tx : std_logic;
signal packet_en_rx : std_logic;
@ -291,6 +294,7 @@ begin
packet_enable => packet_en_pclk,
rx_enable => rx_enable_pclk,
tx_enable => tx_enable_pclk,
highly_packed_mode => highly_packed_en_pclk,
gpif_in => fx3_gpif_in,
gpif_out => fx3_gpif_out,
@ -643,6 +647,7 @@ begin
-- Eightbit mode
eight_bit_mode_en => eightbit_en_rx,
highly_packed_mode_en => highly_packed_en_rx,
-- Packet FIFO
packet_en => packet_en_rx,
@ -859,6 +864,17 @@ begin
sync => eightbit_en_tx
);
U_sync_highly_packed_en_rx : entity work.synchronizer
generic map (
RESET_LEVEL => '0'
)
port map (
reset => '0',
clock => rx_clock,
async => nios_gpio.o.highly_packed_en,
sync => highly_packed_en_rx
);
U_sync_packet_en_pclk : entity work.synchronizer
generic map (
RESET_LEVEL => '0'

View file

@ -307,6 +307,7 @@ package bladerf_p is
type nios_gpo_t is record
xb_mode : std_logic_vector(1 downto 0);
eightbit_en : std_logic;
highly_packed_en: std_logic;
packet_en : std_logic;
si_clock_sel : std_logic;
ufl_clock_oe : std_logic;
@ -518,6 +519,7 @@ package body bladerf_p is
variable rv : std_logic_vector(31 downto 0) := (others => 'U');
begin
rv(31 downto 30) := x.xb_mode;
rv(21) := x.highly_packed_en;
rv(20) := x.eightbit_en;
rv(19) := x.packet_en;
rv(18) := x.si_clock_sel;
@ -597,6 +599,7 @@ package body bladerf_p is
variable rv : nios_gpo_t;
begin
rv.xb_mode := x(31 downto 30);
rv.highly_packed_en:= x(21);
rv.eightbit_en := x(20);
rv.packet_en := x(19);
rv.si_clock_sel := x(18);

View file

@ -51,6 +51,7 @@ entity rx is
-- 8-bit mode
eight_bit_mode_en : in std_logic := '0';
highly_packed_mode_en : in std_logic := '0';
-- Packet to host via FX3
packet_en : in std_logic;
@ -251,6 +252,7 @@ begin
packet_ready => packet_ready,
eight_bit_mode_en => eight_bit_mode_en,
highly_packed_mode_en => highly_packed_mode_en,
meta_fifo_full => meta_fifo.wfull,
meta_fifo_usedw => meta_fifo.wused,

View file

@ -0,0 +1,932 @@
-- Copyright (c) 2024 Nuand LLC
--
-- Permission is hereby granted, free of charge, to any person obtaining a copy
-- of this software and associated documentation files (the "Software"), to deal
-- in the Software without restriction, including without limitation the rights
-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-- copies of the Software, and to permit persons to whom the Software is
-- furnished to do so, subject to the following conditions:
--
-- The above copyright notice and this permission notice shall be included in
-- all copies or substantial portions of the Software.
--
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-- THE SOFTWARE.
library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;
library rtl_work;
library altera_lnsim;
use altera_lnsim.altera_pll;
library nuand;
use nuand.util.all ;
use nuand.fifo_readwrite_p.all;
use nuand.common_dcfifo_p.all;
use nuand.bladerf_p.all;
entity fx3_gpif_meta_highly_packed is
generic (
-- For bladeRF2 (2x2 MIMO):
NUM_MIMO_STREAMS : natural := 2;
FIFO_READER_READ_THROTTLE : natural := 0;
ENABLE_CHANNEL_0 : std_logic := '1';
ENABLE_CHANNEL_1 : std_logic := '0';
EIGHT_BIT_MODE_EN : std_logic := '0';
HIGHLY_PACKED_EN : std_logic := '1'
);
end entity;
architecture arch of fx3_gpif_meta_highly_packed is
-- bladerf-hosted uses ad9361.clock (125 MHz) for rx_clock and tx_clock
constant SYSCLK_HALF_PERIOD : time := 1 sec * (1.0/125.0e6/2.0);
-- For reasons unknown, simulation of this system in ModelSim requires that
-- wrreq and data be asserted shortly before the rising clock edge. Sigh...
constant FIFO_WORKAROUND : time := 1 ps;
type fx3_control_t is record
usb_speed : std_logic;
tx_enable : std_logic;
rx_enable : std_logic;
meta_enable : std_logic;
packet : std_logic;
end record;
type fx3_gpif_t is record
gpif_in : std_logic_vector(31 downto 0);
gpif_out : std_logic_vector(31 downto 0);
gpif_oe : std_logic;
ctl_in : std_logic_vector(12 downto 0);
ctl_out : std_logic_vector(12 downto 0);
ctl_oe : std_logic_vector(12 downto 0);
end record;
signal sys_rst : std_logic := '1';
signal done : boolean := false;
signal fx3_pclk : std_logic := '1';
signal fx3_pclk_pll : std_logic := '1';
signal sys_clk : std_logic := '1';
signal pll_reset : std_logic := '0';
signal pll_locked : std_logic := '0';
signal fx3_control : fx3_control_t;
signal fx3_gpif : fx3_gpif_t;
signal fx3_gpif_i : std_logic_vector(31 downto 0);
signal fx3_ctl_i : std_logic_vector(12 downto 0);
-- Control mapping
alias dma0_rx_ack is fx3_ctl_i( 0);
alias dma1_rx_ack is fx3_ctl_i( 1);
alias dma2_tx_ack is fx3_ctl_i( 2);
alias dma3_tx_ack is fx3_ctl_i( 3);
alias dma_rx_enable is fx3_ctl_i( 4);
alias dma_tx_enable is fx3_ctl_i( 5);
alias dma_idle is fx3_ctl_i( 6);
alias system_reset is fx3_ctl_i( 7);
alias dma0_rx_reqx is fx3_ctl_i( 8);
alias dma1_rx_reqx is fx3_ctl_i(12); -- due to 9 being connected to dclk
alias dma2_tx_reqx is fx3_ctl_i(10);
alias dma3_tx_reqx is fx3_ctl_i(11);
signal loopback_i : signed(15 downto 0) := (others =>'0');
signal loopback_q : signed(15 downto 0) := (others =>'0');
signal loopback_valid : std_logic := '0';
signal loopback_enabled : std_logic := '0';
signal tx_clock : std_logic := '1' ;
signal rx_clock : std_logic := '1' ;
signal rx_sample_fifo : rx_fifo_t := RX_FIFO_T_DEFAULT;
signal tx_sample_fifo : tx_fifo_t := TX_FIFO_T_DEFAULT;
signal loopback_fifo : loopback_fifo_t := LOOPBACK_FIFO_T_DEFAULT;
signal rx_meta_fifo : meta_fifo_rx_t := META_FIFO_RX_T_DEFAULT;
signal tx_meta_fifo : meta_fifo_tx_t := META_FIFO_TX_T_DEFAULT;
signal rx_mux_i : signed(15 downto 0);
signal rx_mux_q : signed(15 downto 0);
signal rx_mux_valid : std_logic;
signal tx_timestamp : unsigned(63 downto 0) := ( others => '0' );
signal rx_timestamp : unsigned(63 downto 0) := ( others => '0' );
constant FX3_HALF_PERIOD : time := 1.0/(100.0e6)/2.0*1 sec ;
constant TX_HALF_PERIOD : time := 1.0/(9.0e6)/2.0*1 sec ;
constant RX_HALF_PERIOD : time := 1.0/(9.0e6)/2.0*1 sec ;
signal dac_controls : sample_controls_t(0 to NUM_MIMO_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE);
signal dac_streams : sample_streams_t(dac_controls'range) := (others => ZERO_SAMPLE);
signal adc_controls : sample_controls_t(0 to NUM_MIMO_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE);
signal adc_streams : sample_streams_t(adc_controls'range) := (others => ZERO_SAMPLE);
signal tx_reset : std_logic := '0';
signal tx_ts_reset : std_logic := '0';
signal rx_reset : std_logic := '0';
signal rx_ts_reset : std_logic := '0';
signal meta_en_tx : std_logic := '0';
signal meta_en_rx : std_logic := '0';
signal rx_packet_control : packet_control_t := PACKET_CONTROL_DEFAULT;
signal tx_packet_control : packet_control_t;
signal trigger_signal_sync_tb : std_logic;
signal adc_stream_val_at_rx_enable : signed(15 downto 0) := ( others => '0' );
function data_gen (count : natural) return std_logic_vector is
variable msw, lsw : std_logic_vector(15 downto 0);
begin
msw := std_logic_vector(to_signed(count, 16));
lsw := std_logic_vector(to_signed(-count, 16));
return (msw & lsw);
end function data_gen;
signal rx_packet_ready : std_logic;
begin
-- ========================================================================
-- Brief summary of data flow
-- ========================================================================
--
-- Simulated samples flow from fx3_model's TX side to its RX side. The
-- validity of the data is checked there.
--
-- entity U_fx3_model FX3 model, TX process
-- signal fx3_gpif_i fx3_gpif.gpif_oe is '0'
-- process register_gpif
-- signal fx3_gpif.gpif_in Demuxed GPIF interface (FX3 -> FPGA)
-- entity U_fx3_gpif GPIF implementation, write side
-- signal tx_sample_fifo.w* TX fifo, write side
-- entity U_tx_sample_fifo
-- signal tx_sample_fifo.r* TX fifo, read side
-- process tx_mux
-- signal loopback_fifo.w* Loopback fifo, write side
-- entity U_rx_loopback_fifo
-- signal loopback_fifo.r* Loopback fifo, read side
-- process loopback_fifo_control
-- signal loopback_{i,q,valid}
-- process rx_mux
-- signal rx_mux_{i,q,valid}
-- entity U_fifo_writer
-- signal rx_sample_fifo.w* RX fifo, write side
-- entity U_rx_sample_fifo
-- signal rx_sample_fifo.r* RX fifo, read side
-- entity U_fx3_gpif GPIF implementation, read side
-- signal fx3_gpif.gpif_out Demuxed GPIF interface (FPGA -> FX3)
-- process register_gpif
-- signal fx3_gpif_i fx3_gpif.gpif_oe is '1'
-- entity U_fx3_model FX3 model, RX process
-- ========================================================================
-- Instantiations
-- ========================================================================
-- Unit under test
-- Clock domain: fx3_pclk_pll
U_fx3_gpif : entity nuand.fx3_gpif
port map (
pclk => fx3_pclk_pll,
reset => sys_rst,
usb_speed => fx3_control.usb_speed,
gpif_in => fx3_gpif.gpif_in,
gpif_out => fx3_gpif.gpif_out,
gpif_oe => fx3_gpif.gpif_oe,
ctl_in => fx3_gpif.ctl_in,
ctl_out => fx3_gpif.ctl_out,
ctl_oe => fx3_gpif.ctl_oe,
tx_enable => fx3_control.tx_enable,
rx_enable => fx3_control.rx_enable,
meta_enable => fx3_control.meta_enable,
packet_enable => fx3_control.packet,
highly_packed_mode => HIGHLY_PACKED_EN,
tx_fifo_write => tx_sample_fifo.wreq,
tx_fifo_full => tx_sample_fifo.wfull,
tx_fifo_empty => tx_sample_fifo.wempty,
tx_fifo_usedw => tx_sample_fifo.wused,
tx_fifo_data => tx_sample_fifo.wdata,
tx_timestamp => tx_timestamp,
tx_meta_fifo_write => tx_meta_fifo.wreq,
tx_meta_fifo_full => tx_meta_fifo.wfull,
tx_meta_fifo_empty => tx_meta_fifo.wempty,
tx_meta_fifo_usedw => tx_meta_fifo.wused,
tx_meta_fifo_data => tx_meta_fifo.wdata,
rx_fifo_read => rx_sample_fifo.rreq,
rx_fifo_full => rx_sample_fifo.rfull,
rx_fifo_empty => rx_sample_fifo.rempty,
rx_fifo_usedw => rx_sample_fifo.rused,
rx_fifo_data => rx_sample_fifo.rdata,
rx_meta_fifo_read => rx_meta_fifo.rreq,
rx_meta_fifo_full => rx_meta_fifo.rfull,
rx_meta_fifo_empty => rx_meta_fifo.rempty,
rx_meta_fifo_usedr => rx_meta_fifo.rused,
rx_meta_fifo_data => rx_meta_fifo.rdata
);
-- Discrete control signals for fx3_gpif
fx3_control.usb_speed <= '0';
fx3_control.meta_enable <= '1';
fx3_control.packet <= '0';
U_pkt_gen : entity nuand.rx_packet_generator
port map(
rx_clock => rx_clock,
rx_reset => rx_reset,
rx_enable => fx3_control.rx_enable,
rx_packet_enable => fx3_control.packet,
rx_packet_ready => rx_packet_ready,
rx_packet_control => rx_packet_control
);
meta_en_tx <= fx3_control.meta_enable;
meta_en_rx <= fx3_control.meta_enable;
increment_tx_ts : process(tx_clock)
variable ping : boolean := true ;
begin
if( rising_edge(tx_clock) ) then
ping := not ping ;
if( ping = true ) then
tx_timestamp <= tx_timestamp + 1 ;
end if ;
end if ;
end process ;
increment_rx_ts : process(rx_clock)
variable ping : boolean := true ;
begin
if( rising_edge(rx_clock) ) then
ping := not ping ;
if( ping = true ) then
rx_timestamp <= rx_timestamp + 1 ;
end if ;
end if ;
end process ;
-- Model of FX3's GPIF interface
-- Clock domain: fx3_pclk (source)
U_fx3_model : entity nuand.fx3_model(micro_dma)
port map (
fx3_pclk => fx3_pclk,
fx3_gpif => fx3_gpif_i,
fx3_ctl => fx3_ctl_i,
fx3_uart_rxd => '0',
fx3_uart_txd => open,
fx3_uart_cts => open,
fx3_rx_en => '1',
fx3_rx_meta_en => meta_en_rx,
fx3_tx_en => '1',
fx3_tx_meta_en => meta_en_tx,
EIGHT_BIT_MODE_EN => EIGHT_BIT_MODE_EN,
done => done
);
-- Generate phase-shifted PLL clock
U_fx3_pll : entity rtl_work.fx3_pll
port map (
inclk0 => fx3_pclk,
areset => pll_reset,
c0 => fx3_pclk_pll,
locked => pll_locked
);
tx_clock <= not tx_clock after TX_HALF_PERIOD ;
rx_clock <= not rx_clock after RX_HALF_PERIOD ;
-- Reset handler
sys_rst <= '0' after 100 ns;
-- Generate system clock
sys_clk <= not sys_clk after SYSCLK_HALF_PERIOD when not done else '0';
tx_reset <= sys_rst;
tx_ts_reset <= sys_rst;
rx_reset <= sys_rst;
rx_ts_reset <= sys_rst;
meta_en_tx <= fx3_control.meta_enable;
meta_en_rx <= fx3_control.meta_enable;
-- TX Submodule
U_tx : entity work.tx
generic map (
NUM_STREAMS => dac_controls'length
)
port map (
tx_reset => tx_reset,
tx_clock => tx_clock,
tx_enable => fx3_control.tx_enable,
meta_en => meta_en_tx,
timestamp_reset => tx_ts_reset,
usb_speed => fx3_control.usb_speed,
tx_underflow_led => open,
tx_timestamp => tx_timestamp,
-- Triggering
trigger_arm => '0',
trigger_fire => '0',
trigger_master => '0',
trigger_line => open,
-- Packet FIFO
packet_en => fx3_control.packet,
packet_empty => open,
packet_control => tx_packet_control,
packet_ready => '1',
-- 8-bit mode
EIGHT_BIT_MODE_EN => EIGHT_BIT_MODE_EN,
-- Samples from host via FX3
sample_fifo_wclock => fx3_pclk_pll,
sample_fifo_wreq => tx_sample_fifo.wreq,
sample_fifo_wdata => tx_sample_fifo.wdata,
sample_fifo_wempty => tx_sample_fifo.wempty,
sample_fifo_wfull => tx_sample_fifo.wfull,
sample_fifo_wused => tx_sample_fifo.wused,
-- Metadata from host via FX3
meta_fifo_wclock => fx3_pclk_pll,
meta_fifo_wreq => tx_meta_fifo.wreq,
meta_fifo_wdata => tx_meta_fifo.wdata,
meta_fifo_wempty => tx_meta_fifo.wempty,
meta_fifo_wfull => tx_meta_fifo.wfull,
meta_fifo_wused => tx_meta_fifo.wused,
-- Digital Loopback Interface
loopback_enabled => '0',
loopback_fifo_wdata => loopback_fifo.wdata,
loopback_fifo_wreq => loopback_fifo.wreq,
loopback_fifo_wfull => loopback_fifo.wfull,
loopback_fifo_wused => loopback_fifo.wused,
-- RFFE Interface
dac_controls => dac_controls,
dac_streams => dac_streams
);
-- RX Submodule
U_rx : entity work.rx
generic map (
NUM_STREAMS => adc_controls'length
)
port map (
rx_reset => rx_reset,
rx_clock => rx_clock,
rx_enable => fx3_control.rx_enable,
meta_en => meta_en_rx,
timestamp_reset => rx_ts_reset,
usb_speed => fx3_control.usb_speed,
rx_mux_sel => to_unsigned(0, 3),
rx_overflow_led => open,
rx_timestamp => rx_timestamp,
-- Triggering
trigger_arm => '0',
trigger_fire => '0',
trigger_master => '0',
trigger_line => open,
trigger_signal_sync_tb => trigger_signal_sync_tb,
-- Packet FIFO
packet_en => fx3_control.packet,
packet_control => rx_packet_control,
packet_ready => rx_packet_ready,
-- 8-bit mode
EIGHT_BIT_MODE_EN => EIGHT_BIT_MODE_EN,
highly_packed_mode_en => HIGHLY_PACKED_EN,
-- Samples to host via FX3
sample_fifo_rclock => fx3_pclk_pll,
sample_fifo_raclr => not fx3_control.rx_enable,
sample_fifo_rreq => rx_sample_fifo.rreq,
sample_fifo_rdata => rx_sample_fifo.rdata,
sample_fifo_rempty => rx_sample_fifo.rempty,
sample_fifo_rfull => rx_sample_fifo.rfull,
sample_fifo_rused => rx_sample_fifo.rused,
-- Mini expansion signals
mini_exp => "00",
-- Metadata to host via FX3
meta_fifo_rclock => fx3_pclk_pll,
meta_fifo_raclr => not fx3_control.rx_enable,
meta_fifo_rreq => rx_meta_fifo.rreq,
meta_fifo_rdata => rx_meta_fifo.rdata,
meta_fifo_rempty => rx_meta_fifo.rempty,
meta_fifo_rfull => rx_meta_fifo.rfull,
meta_fifo_rused => rx_meta_fifo.rused,
-- Digital Loopback Interface
loopback_fifo_wenabled => open,
loopback_fifo_wreset => tx_reset,
loopback_fifo_wclock => tx_clock,
loopback_fifo_wdata => loopback_fifo.wdata,
loopback_fifo_wreq => loopback_fifo.wreq,
loopback_fifo_wfull => loopback_fifo.wfull,
loopback_fifo_wused => loopback_fifo.wused,
-- RFFE Interface
adc_controls => adc_controls,
adc_streams => adc_streams
);
-- ========================================================================
-- Data converters
-- ========================================================================
gen_dac_controls : if( NUM_MIMO_STREAMS > 1 ) generate
-- The TX side of the AD9361 HDL is a FIFO pull interface
-- that expects a readahead FIFO. It toggles the data request
-- signal every other cycle. This behavior is mimicked here.
process( tx_clock, sys_rst )
begin
if( sys_rst = '1' ) then
dac_controls <= (
0 => (enable => ENABLE_CHANNEL_0, data_req => '1'),
1 => (enable => ENABLE_CHANNEL_1, data_req => '1')
);
elsif( rising_edge(tx_clock) ) then
for i in dac_controls'range loop
dac_controls(i) <= (
enable => dac_controls(i).enable,
data_req => not dac_controls(i).data_req );
end loop;
end if;
end process;
else generate
dac_controls <= (others => SAMPLE_CONTROL_ENABLE);
end generate;
gen_adc_controls : if( NUM_MIMO_STREAMS > 1 ) generate
process( rx_clock, sys_rst )
constant SIGMA_DELTA_BITS : signed (3 downto 0) := "0000";
constant COUNT_RESET : integer := 0;
variable count : integer range -2047 to 2047 := COUNT_RESET;
begin
if( sys_rst = '1' ) then
count := COUNT_RESET;
adc_controls <= (
0 => (enable => ENABLE_CHANNEL_0, data_req => '1'),
1 => (enable => ENABLE_CHANNEL_1, data_req => '1')
);
elsif( rising_edge(rx_clock) ) then
for i in adc_controls'range loop
adc_controls(i) <= (
enable => adc_controls(i).enable,
data_req => not adc_controls(i).data_req );
if( adc_controls(i).enable = '1') then
if( adc_streams(i).data_v = '1' ) then
if( EIGHT_BIT_MODE_EN = '1' ) then
adc_streams(i).data_i <= "0000" & to_signed(count, 8) & SIGMA_DELTA_BITS;
adc_streams(i).data_q <= "0000" & to_signed(-count, 8) & SIGMA_DELTA_BITS;
count := (count + 1) mod 128;
else
adc_streams(i).data_i <= to_signed(count, 16);
adc_streams(i).data_q <= to_signed(-count, 16);
count := (count + 1) mod 2048;
end if;
end if;
end if;
adc_streams(i).data_v <= not adc_streams(i).data_v;
end loop;
end if;
end process;
else generate
adc_controls <= (others => SAMPLE_CONTROL_ENABLE);
end generate;
-- ========================================================================
-- Processes
-- ========================================================================
-- FX3 GPIF bidirectional signal control
-- Adapted from same process in bladerf-hosted.vhd
register_gpif : process(sys_rst, fx3_pclk_pll)
begin
if( sys_rst = '1' ) then
fx3_gpif_i <= (others => 'Z');
fx3_gpif.gpif_in <= (others => 'Z');
elsif( rising_edge(fx3_pclk_pll) ) then
fx3_gpif.gpif_in <= fx3_gpif_i;
if( fx3_gpif.gpif_oe = '1' ) then
fx3_gpif_i <= fx3_gpif.gpif_out;
else
fx3_gpif_i <= (others =>'Z');
end if;
end if;
end process;
-- FX3 CTL bidirectional signals
-- Adapted from same generator in bladerf-hosted.vhd
generate_ctl : for i in fx3_ctl_i'range generate
fx3_ctl_i(i) <= fx3_gpif.ctl_out(i) when fx3_gpif.ctl_oe(i) = '1' else 'Z';
end generate;
fx3_gpif.ctl_in <= fx3_ctl_i;
-- Controller for loopback FIFO
-- Stripped-down version of same process from rx.vhd
loopback_fifo_control : process( sys_rst, loopback_fifo.rclock )
begin
if( sys_rst = '1' ) then
loopback_enabled <= '0';
loopback_fifo.rreq <= '0';
loopback_i <= (others => '0');
loopback_q <= (others => '0');
loopback_valid <= '0';
elsif( rising_edge(loopback_fifo.rclock) ) then
loopback_enabled <= '0';
loopback_fifo.rreq <= '0';
loopback_i <= loopback_i;
loopback_q <= loopback_q;
loopback_valid <= '0';
-- Is loopback enabled?
loopback_enabled <= fx3_control.rx_enable;
-- Do the loopback
loopback_i <= resize(signed(loopback_fifo.rdata(15 downto 0)), loopback_i'length);
loopback_q <= resize(signed(loopback_fifo.rdata(31 downto 16)), loopback_q'length);
loopback_valid <= loopback_fifo.rreq and not loopback_fifo.rempty;
-- Read from the FIFO if req'd
loopback_fifo.rreq <= loopback_enabled and (not loopback_fifo.rempty);
end if;
end process;
-- RX multiplexer
-- Stripped-down version of same process from rx.vhd
rx_mux : process(sys_rst, sys_clk)
begin
if( sys_rst = '1' ) then
rx_mux_i <= (others =>'0');
rx_mux_q <= (others =>'0');
rx_mux_valid <= '0';
elsif( rising_edge(sys_clk) ) then
rx_mux_i <= loopback_i;
rx_mux_q <= loopback_q;
rx_mux_valid <= loopback_valid;
end if;
end process;
-- TX multiplexer
-- Stripped-down version of mimo_channel_sel_mux from tx.vhd
--tx_mux : process( sys_clk )
--begin
-- if( rising_edge(sys_clk) ) then
-- tx_sample_fifo.rreq <= not tx_sample_fifo.rempty;
-- loopback_fifo.wdata <= tx_sample_fifo.rdata;
-- loopback_fifo.wreq <= tx_sample_fifo.rreq and not tx_sample_fifo.rempty;
-- end if;
--end process;
-- ========================================================================
-- Verification
-- ========================================================================
--
-- Check for metavalues
-- We should never see metavalues written to the FIFOs
--
check_fifo_write : process(fx3_pclk_pll) is
begin
if( rising_edge(fx3_pclk_pll) ) then
if( tx_sample_fifo.wreq = '1' and fx3_control.meta_enable = '0' ) then
for i in tx_sample_fifo.wdata'range loop
assert tx_sample_fifo.wdata(i) = '0' or tx_sample_fifo.wdata(i) = '1'
severity failure;
end loop;
end if;
end if;
end process;
check_fifo_read : process(fx3_pclk_pll) is
begin
if( rising_edge(fx3_pclk_pll) ) then
if( rx_sample_fifo.rreq = '1' ) then
for i in rx_sample_fifo.rdata'range loop
assert rx_sample_fifo.rdata(i) = '0' or rx_sample_fifo.rdata(i) = '1'
severity failure;
end loop;
end if;
end if;
end process check_fifo_read;
--
-- Check for fullness on FIFOs
--
assert(rx_sample_fifo.wfull = '0') report "rx_sample_fifo full (write)" severity warning;
assert(tx_sample_fifo.wfull = '0') report "tx_sample_fifo full (write)" severity warning;
assert(loopback_fifo.wfull = '0') report "loopback_fifo full (write)" severity warning;
--
-- Tx Sample Check
--
tx_sample_start_check: process
type time_state_t is (
WAIT_FOR_HEADER_TIMESTAMP,
WAIT_FOR_SAMPLE
);
variable state : time_state_t := WAIT_FOR_HEADER_TIMESTAMP;
variable timestamp_in_header : unsigned (31 downto 0) := (others => '0');
begin
case state is
when WAIT_FOR_HEADER_TIMESTAMP =>
wait until rising_edge(dma3_tx_reqx);
if( fx3_control.meta_enable = '1' ) then
wait until rising_edge(fx3_pclk);
wait until rising_edge(fx3_pclk);
report "Timestamp: 0x" & to_hstring(fx3_gpif_i);
timestamp_in_header := unsigned(fx3_gpif_i);
report "Timestamp Saved: " & to_string(to_integer(timestamp_in_header));
end if;
state := WAIT_FOR_SAMPLE;
when WAIT_FOR_SAMPLE =>
while( timestamp_in_header /= tx_timestamp ) loop
assert(tx_timestamp < timestamp_in_header)
report "Header timestamp is in the past. Samples " &
"usually ignored but considered a failure in tb."
severity failure;
for i in dac_controls'range loop
assert(dac_streams(i).data_v = '0')
report "Dac_stream("&to_string(i)&") data being transmitted before expected tx_timestamp."
severity failure;
end loop;
wait until rising_edge(tx_clock);
end loop;
report "TX TIMESTAMP = META TIMESTAMP";
wait until rising_edge(tx_clock);
for i in dac_controls'range loop
if( dac_controls(i).enable = '1') then
assert(dac_streams(i).data_v = '1')
report "Dac_stream("&to_string(i)&") sample not seen at expected tx_timestamp."
severity failure;
end if;
end loop;
state := WAIT_FOR_HEADER_TIMESTAMP;
end case;
end process tx_sample_start_check;
look_for_dropped_tx_samples : process(tx_clock) is
constant MESSAGES_PER_ITERATION : natural := 3; --Provided in fx3_model
constant SIGMA_DELTA_BITS : signed (3 downto 0) := "0000";
variable dac_stream_back_to_0 : natural := 0;
variable current_message_count : natural := 1;
variable iq_value : signed (15 downto 0) := x"0000";
variable expected_sample_i : signed (15 downto 0);
variable expected_sample_q : signed (15 downto 0);
variable failure_count : natural := 0;
begin
for i in dac_controls'range loop
if( rising_edge(tx_clock)
and dac_controls(i).enable = '1'
and dac_streams(i).data_v = '1'
and fx3_control.tx_enable = '1' )
then
if( EIGHT_BIT_MODE_EN = '1' ) then
expected_sample_i := iq_value (11 downto 0) & SIGMA_DELTA_BITS;
expected_sample_q := iq_value (11 downto 0) + 1 & SIGMA_DELTA_BITS;
assert ( dac_streams(i).data_i = expected_sample_i )
report "dac_streams("&to_string(i)&").data_i: " & to_hstring(dac_streams(i).data_i) & " | " &
"expected_sample_i: " & to_hstring(expected_sample_i)
severity warning;
assert ( dac_streams(i).data_q = expected_sample_q )
report "dac_streams("&to_string(i)&").data_q: " & to_hstring(dac_streams(i).data_q) & " | " &
"expected_sample_q: " & to_hstring(expected_sample_q)
severity warning;
if ( dac_streams(i).data_i /= expected_sample_i or dac_streams(i).data_q /= expected_sample_q ) then
failure_count := failure_count + 1;
if ( failure_count >= 6 ) then
report "tx fail count tolerance exceeded" severity failure;
end if;
end if;
dac_stream_back_to_0 := dac_stream_back_to_0 + 1 when iq_value = 0;
iq_value := (iq_value + 2) mod 128 when dac_stream_back_to_0 mod 16 /= 0 else
(iq_value + 2) mod 112;
else
expected_sample_i := iq_value;
expected_sample_q := to_signed(current_message_count, 8) & (iq_value(7 downto 0) + 1);
assert(dac_streams(i).data_i = expected_sample_i)
report "dac_streams("&to_string(i)&").data_i: " & to_hstring(dac_streams(i).data_i) & " | " &
"expected_sample_i: " & to_hstring(expected_sample_i)
severity failure;
assert(dac_streams(i).data_q = expected_sample_q)
report "dac_streams("&to_string(i)&").data_q: " & to_hstring(dac_streams(i).data_q) & " | " &
"expected_sample_q: " & to_hstring(expected_sample_q)
severity failure;
-- Set iq values based on blocks received
-- See tx_sample_stream's encoding scheme in fx3_model.vhd
if( iq_value = x"03F6" ) then
iq_value := x"0000";
if( current_message_count < MESSAGES_PER_ITERATION ) then
current_message_count := current_message_count + 1;
else
current_message_count := 1;
end if;
else
iq_value := (iq_value + 2) mod 2048;
end if;
end if;
end if;
end loop;
end process look_for_dropped_tx_samples;
--
-- Rx Sample Check
--
first_rx_val_at_mux: process
-- Catches and saves the first sample of
-- each rx enabled burst seen by the mux
begin
for i in adc_controls'range loop
if( adc_controls(i).enable = '1') then
if( ENABLE_CHANNEL_0 = '1' and ENABLE_CHANNEL_1 = '1' ) then
adc_stream_val_at_rx_enable <= adc_streams(i).data_i - 1;
else
adc_stream_val_at_rx_enable <= adc_streams(i).data_i;
end if;
end if;
end loop;
wait until rising_edge(trigger_signal_sync_tb);
end process first_rx_val_at_mux;
look_for_dropped_rx_samples: process(fx3_pclk_pll)
constant HEADER_LEN : integer := 4; -- In clk cycles
variable header_downcount : integer := HEADER_LEN;
variable rx_val : integer := 0;
variable q_expected : std_logic_vector (15 downto 0);
variable i_expected : std_logic_vector (15 downto 0);
variable q_out : std_logic_vector (15 downto 0);
variable i_out : std_logic_vector (15 downto 0);
variable q0_expected_eight_bit_mode : std_logic_vector (7 downto 0);
variable i0_expected_eight_bit_mode : std_logic_vector (7 downto 0);
variable q1_expected_eight_bit_mode : std_logic_vector (7 downto 0);
variable i1_expected_eight_bit_mode : std_logic_vector (7 downto 0);
variable q0_out_eight_bit_mode : std_logic_vector (7 downto 0);
variable i0_out_eight_bit_mode : std_logic_vector (7 downto 0);
variable q1_out_eight_bit_mode : std_logic_vector (7 downto 0);
variable i1_out_eight_bit_mode : std_logic_vector (7 downto 0);
variable previous_adc_stream_val_at_rx_enable : signed (15 downto 0) := ( others => '0');
variable fail_count: natural := 0;
variable both_channels_en : std_logic;
begin
if( previous_adc_stream_val_at_rx_enable /= adc_stream_val_at_rx_enable ) then
rx_val := to_integer(adc_stream_val_at_rx_enable (15 downto 4));
previous_adc_stream_val_at_rx_enable := adc_stream_val_at_rx_enable;
end if;
if( rising_edge(fx3_pclk_pll)
and fx3_gpif.gpif_oe = '1'
and fx3_control.rx_enable = '1' ) then
if( fx3_control.meta_enable = '1' and header_downcount /= 0 ) then
header_downcount := header_downcount - 1;
else
if( EIGHT_BIT_MODE_EN = '1' ) then
-- The +-1 ch1 offset in SISO mode will not reach 128
both_channels_en := ENABLE_CHANNEL_0 and ENABLE_CHANNEL_1;
q1_expected_eight_bit_mode := std_logic_vector(to_signed(-rx_val - 1, 8)) when both_channels_en else
std_logic_vector(to_signed(-((rx_val + 1) mod 128), 8));
i1_expected_eight_bit_mode := std_logic_vector(to_signed(rx_val + 1, 8)) when both_channels_en else
std_logic_vector(to_signed((rx_val + 1) mod 128, 8));
q0_expected_eight_bit_mode := std_logic_vector(to_signed(-rx_val, 8));
i0_expected_eight_bit_mode := std_logic_vector(to_signed(rx_val, 8));
q1_out_eight_bit_mode := fx3_gpif.gpif_out(31 downto 24);
i1_out_eight_bit_mode := fx3_gpif.gpif_out(23 downto 16);
q0_out_eight_bit_mode := fx3_gpif.gpif_out(15 downto 8);
i0_out_eight_bit_mode := fx3_gpif.gpif_out(7 downto 0);
if( q1_out_eight_bit_mode /= q1_expected_eight_bit_mode or
i1_out_eight_bit_mode /= i1_expected_eight_bit_mode or
q0_out_eight_bit_mode /= q0_expected_eight_bit_mode or
i0_out_eight_bit_mode /= i0_expected_eight_bit_mode) then
fail_count := fail_count + 1;
report "-----------------------------";
if( fail_count > 3 ) then
report "rx fail count tolerance exceeded" severity failure;
end if;
end if;
assert ( q1_out_eight_bit_mode = q1_expected_eight_bit_mode )
report "data_q1: " & to_hstring(q1_out_eight_bit_mode) & " | " &
"expected: " & to_hstring(q1_expected_eight_bit_mode)
severity warning;
assert ( i1_out_eight_bit_mode = i1_expected_eight_bit_mode )
report "data_i1: " & to_hstring(i1_out_eight_bit_mode) & " | " &
"expected: " & to_hstring(i1_expected_eight_bit_mode)
severity warning;
assert ( q0_out_eight_bit_mode = q0_expected_eight_bit_mode )
report "data_q0: " & to_hstring(q0_out_eight_bit_mode) & " | " &
"expected: " & to_hstring(q0_expected_eight_bit_mode)
severity warning;
assert ( i0_out_eight_bit_mode = i0_expected_eight_bit_mode )
report "data_i0: " & to_hstring(i0_out_eight_bit_mode) & " | " &
"expected: " & to_hstring(i0_expected_eight_bit_mode)
severity warning;
-- 128 limit set by gen_adc_controls above
rx_val := (rx_val + 2) mod 128;
else
q_expected := std_logic_vector(to_signed(-rx_val, 16));
i_expected := std_logic_vector(to_signed(rx_val, 16));
q_out := fx3_gpif.gpif_out(31 downto 16);
i_out := fx3_gpif.gpif_out(15 downto 0);
assert(q_out = q_expected)
report "data_q: " & to_hstring(q_out) & " | " &
"expected: " & to_hstring(q_expected)
severity failure;
assert(i_out = i_expected)
report "data_i: " & to_hstring(i_out) & " | " &
"expected: " & to_hstring(i_expected)
severity failure;
-- 2047 limit set by gen_adc_controls above
rx_val := (rx_val + 1) mod 2048;
end if;
end if;
header_downcount := HEADER_LEN;
end if;
end process look_for_dropped_rx_samples;
meta_spacing: process
procedure wait_for_gpif_ts( signal clk: in std_logic; signal en: in std_logic ) is
begin
wait until rising_edge(en);
wait until rising_edge(clk);
wait until rising_edge(clk);
end;
variable ts_increment : integer := 0;
variable last_ts : unsigned (31 downto 0) := 32x"BB"; -- First timestamp
variable iteration : natural := 1;
begin
wait_for_gpif_ts(fx3_pclk, fx3_gpif.gpif_oe);
assert fx3_gpif.gpif_out = std_logic_vector(last_ts + ts_increment)
report LF&
"Unexpected ts: " & to_hstring(fx3_gpif.gpif_out) &LF&
"Expected ts: " & to_hstring(last_ts + ts_increment)
severity failure;
last_ts := unsigned(fx3_gpif.gpif_out);
-- Allows a 0 increment for the first ts assertion
if( ENABLE_CHANNEL_0 = '1' and ENABLE_CHANNEL_1 = '1') then
ts_increment := 254 when EIGHT_BIT_MODE_EN = '0'
else 508;
else
ts_increment := 508 when EIGHT_BIT_MODE_EN = '0'
else 1016;
end if;
iteration := iteration + 1;
if (iteration > 3) then
wait_for_gpif_ts(fx3_pclk, fx3_gpif.gpif_oe);
last_ts := unsigned(fx3_gpif.gpif_out);
iteration := 2;
end if;
end process meta_spacing;
end architecture;

View file

@ -44,6 +44,7 @@ entity fx3_gpif is
rx_enable : out std_logic;
meta_enable : in std_logic;
packet_enable : in std_logic;
highly_packed_mode : in std_logic := '0';
-- TX FIFO
tx_fifo_write : out std_logic;
@ -499,6 +500,11 @@ begin
-- as part of RX metadata.
future.underrun_clr <= '1';
if (highly_packed_mode = '1' and current.dma_downcount < 4) then
future.gpif_mode <= RX_IGNORE;
future.rx_fifo_rd <= '0';
end if;
if (packet_enable = '1' and current.dma_downcount = 0 and current.meta_dword(0) = '1') then
future.gpif_mode <= IDLE;
end if;

View file

@ -1376,6 +1376,11 @@ int CALL_CONV bladerf_calibrate_dc(struct bladerf *dev,
*/
#define BLADERF_GPIO_8BIT_MODE (1 << 20)
/**
* Enable highly packed mode
*/
#define BLADERF_GPIO_HIGHLY_PACKED_MODE (1 << 21)
/**
* AGC enable control bit
*

View file

@ -2140,6 +2140,13 @@ typedef enum {
*/
BLADERF_FORMAT_SC16_Q11,
/**
* @brief int12_t sample format
*
* TODO: Add description
*/
BLADERF_FORMAT_SC16_Q11_PACKED,
/**
* This format is the same as the ::BLADERF_FORMAT_SC16_Q11 format, except
* the first 4 samples in every <i>block*</i> of samples are replaced with

View file

@ -54,6 +54,7 @@ static inline int requires_timestamps(bladerf_format format, bool *required)
case BLADERF_FORMAT_SC8_Q7:
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_PACKED:
*required = false;
break;
@ -123,6 +124,12 @@ int perform_format_config(struct bladerf *dev,
gpio_val &= ~BLADERF_GPIO_8BIT_MODE;
}
if (format == BLADERF_FORMAT_SC16_Q11_PACKED) {
gpio_val |= BLADERF_GPIO_HIGHLY_PACKED_MODE;
} else {
gpio_val &= ~BLADERF_GPIO_HIGHLY_PACKED_MODE;
}
CHECK_STATUS(dev->backend->config_gpio_write(dev, gpio_val));
board_data->module_format[dir] = format;

View file

@ -46,6 +46,7 @@ size_t _interleave_calc_bytes_per_sample(bladerf_format format)
case BLADERF_FORMAT_SC8_Q7_META:
return 2;
case BLADERF_FORMAT_SC16_Q11_PACKED:
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_META:
case BLADERF_FORMAT_PACKET_META:
@ -63,6 +64,7 @@ size_t _interleave_calc_metadata_bytes(bladerf_format format)
case BLADERF_FORMAT_PACKET_META:
return 0x10;
case BLADERF_FORMAT_SC8_Q7:
case BLADERF_FORMAT_SC16_Q11_PACKED:
case BLADERF_FORMAT_SC16_Q11:
return 0;
}

View file

@ -115,6 +115,10 @@ int async_init_stream(struct bladerf_stream **stream,
buffer_size_bytes = sc8q7_to_bytes(samples_per_buffer);
break;
case BLADERF_FORMAT_SC16_Q11_PACKED:
buffer_size_bytes = sc16q11_to_bytes(samples_per_buffer);
break;
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_META:
buffer_size_bytes = sc16q11_to_bytes(samples_per_buffer);

View file

@ -72,6 +72,7 @@ static inline size_t samples_to_bytes(bladerf_format format, size_t n)
case BLADERF_FORMAT_SC8_Q7_META:
return sc8q7_to_bytes(n);
case BLADERF_FORMAT_SC16_Q11_PACKED:
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_META:
return sc16q11_to_bytes(n);
@ -93,6 +94,7 @@ static inline size_t bytes_to_samples(bladerf_format format, size_t n)
case BLADERF_FORMAT_SC8_Q7_META:
return bytes_to_sc8q7(n);
case BLADERF_FORMAT_SC16_Q11_PACKED:
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_META:
return bytes_to_sc16q11(n);

View file

@ -174,6 +174,10 @@ int sync_init(struct bladerf_sync *sync,
bytes_per_sample = 2;
break;
case BLADERF_FORMAT_SC16_Q11_PACKED:
bytes_per_sample = 3;
break;
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_META:
case BLADERF_FORMAT_PACKET_META:
@ -191,6 +195,11 @@ int sync_init(struct bladerf_sync *sync,
return BLADERF_ERR_INVAL;
}
if (format == BLADERF_FORMAT_SC16_Q11_PACKED && (buffer_size/3) % 4096 != 0) {
assert(!"Invalid buffer size for SC16Q11_PACKED format. Must be a 3x multiple of 1024 samples per buffer.");
return BLADERF_ERR_INVAL;
}
/* Deinitialize sync handle if it's initialized */
sync_deinit(sync);
@ -539,6 +548,7 @@ int sync_rx(struct bladerf_sync *s, void *samples, unsigned num_samples,
switch (s->stream_config.format) {
case BLADERF_FORMAT_SC16_Q11:
case BLADERF_FORMAT_SC16_Q11_PACKED:
case BLADERF_FORMAT_SC8_Q7:
s->state = SYNC_STATE_USING_BUFFER;
break;
@ -570,9 +580,24 @@ int sync_rx(struct bladerf_sync *s, void *samples, unsigned num_samples,
samples_to_copy = uint_min(num_samples - samples_returned,
samples_per_buffer - b->partial_off);
memcpy(samples_dest + samples2bytes(s, samples_returned),
buf_src + samples2bytes(s, b->partial_off),
samples2bytes(s, samples_to_copy));
if (s->stream_config.format == BLADERF_FORMAT_SC16_Q11_PACKED) {
// Unpack SC12Q11 samples to SC16Q11 directly into destination buffer
size_t zz, jj;
uint8_t *meta_sample_ptr = buf_src + samples2bytes(s, b->partial_off);
int16_t *dest_ptr = (int16_t*)(samples_dest + (4*samples_returned));
for (zz = 0, jj = 0; zz < 2*samples_to_copy; zz+=4, jj+=3) {
dest_ptr[zz+0] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+0] & 0x0FFF) << 4) >> 4;
dest_ptr[zz+1] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+1] & 0x00FF) << 8) >> 4
| ((((uint16_t*)(meta_sample_ptr))[jj+0] & 0xF000) >> 12);
dest_ptr[zz+2] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+2] & 0x000F) << 12) >> 4
| ((((uint16_t*)(meta_sample_ptr))[jj+1] & 0xFF00)) >> 8;
dest_ptr[zz+3] = (int16_t)((((uint16_t*)(meta_sample_ptr))[jj+2] & 0xFFF0)) >> 4;
}
} else {
memcpy(samples_dest + samples2bytes(s, samples_returned),
buf_src + samples2bytes(s, b->partial_off),
samples2bytes(s, samples_to_copy));
}
b->partial_off += samples_to_copy;
samples_returned += samples_to_copy;

View file

@ -35,7 +35,7 @@
#include "conversions.h"
/* TODO Make these configurable */
#define BUFFER_SIZE 4096
#define BUFFER_SIZE 4096*3
#define NUM_BUFFERS 128
#define NUM_XFERS 31
#define TIMEOUT_MS 2500
@ -80,9 +80,10 @@ static void print_usage(const char *argv0)
printf("libbladerf_test_discont: Test for discontinuities.\n");
printf("\n");
printf("Options:\n");
printf(" -b, --bitmode <mode> Specify 16bit or 8bit mode\n");
printf(" -b, --bitmode <mode> Specify 16bit, 8bit, or packed mode\n");
printf(" <16bit|16> (default)\n");
printf(" <8bit|8>\n");
printf(" <packed>\n");
printf(" -s, --samplerate <value> Use the specified sample rate.\n");
printf(" -t, --test <test name> Run the specified test.\n");
printf(" -i, --iterations <count> Run the specified number of iterations\n");
@ -148,6 +149,8 @@ int handle_cmdline(int argc, char *argv[], struct app_params *p)
p->fmt = BLADERF_FORMAT_SC16_Q11;
} else if (strcmp(optarg, "8bit") == 0 || strcmp(optarg, "8") == 0) {
p->fmt = BLADERF_FORMAT_SC8_Q7;
} else if (strcmp(optarg, "packed") == 0) {
p->fmt = BLADERF_FORMAT_SC16_Q11_PACKED;
} else {
printf("Unknown bitmode: %s\n", optarg);
return -1;