From fd26dabf8bae43672dcf1b9cdaff76ae0ebb0ce5 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Fri, 19 Oct 2018 01:33:50 -0400 Subject: [PATCH] hdl: instantiate ADS-B core in bladerf-adsb revision These are the only changes necessary to the top level design to instantiate the ADS-B core. --- .../bladerf-micro/vhdl/bladerf-adsb.vhd | 90 ++++++++++++++++++- .../platforms/bladerf-micro/vhdl/rx-adsb.vhd | 16 ++-- 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-adsb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-adsb.vhd index 3f8de595..f0cb6e25 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-adsb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-adsb.vhd @@ -28,9 +28,12 @@ library work; use work.bladerf; use work.bladerf_p.all; use work.fifo_readwrite_p.all; + use work.adsb_decoder_p.all ; -architecture hosted_bladerf of bladerf is +library altera_mf ; + use altera_mf.altera_mf_components.all ; +architecture adsb_bladerf of bladerf is attribute noprune : boolean; attribute keep : boolean; @@ -121,6 +124,19 @@ architecture hosted_bladerf of bladerf is signal rx_ts_reset : std_logic; signal tx_ts_reset : std_logic; + -- ADSB specific signals + constant NUM_DECODERS : positive := 8 ; + + signal adsb_init : std_logic ; + signal adsb_power : signed(INPUT_POWER_WIDTH-1 downto 0) ; + signal adsb_valid : std_logic ; + + signal msgs : messages_t(NUM_DECODERS-1 downto 0) ; + signal msgs_valid : std_logic_vector(NUM_DECODERS-1 downto 0) ; + + signal fifo_data : std_logic_vector(127 downto 0) ; + signal fifo_valid : std_logic ; + signal rx_trigger_ctl_i : std_logic_vector(7 downto 0); signal rx_trigger_ctl : trigger_t := TRIGGER_T_DEFAULT; alias rx_trigger_line : std_logic is mini_exp1; @@ -588,6 +604,10 @@ begin loopback_fifo_wfull => tx_loopback_fifo.wfull, loopback_fifo_wused => tx_loopback_fifo.wused, + -- ADSB interface + adsb_data => fifo_data, + adsb_valid => fifo_valid, + -- RFFE Interface adc_controls => adc_controls, adc_streams => adc_streams @@ -821,6 +841,74 @@ begin sync => tx_enable ); + -- ======================================================================== + -- ADSB + -- ======================================================================== + -- Front end mixing by -Fs/4, filtering and power calculation + U_adsb_fe : entity work.adsb_fe + port map ( + clock => rx_clock, + reset => rx_reset, + + in_i => adc_streams(0).data_i, --ad9361.ch(0).adc.i.data, + in_q => adc_streams(0).data_q, --ad9361.ch(0).adc.q.data, + in_valid => adc_streams(0).data_v, --ad9361.ch(0).adc.i.valid, + + out_power => adsb_power, + out_valid => adsb_valid + ) ; + + make_init : process(rx_clock, rx_reset) + variable downcount : natural range 0 to 5 := 5 ; + begin + if( rx_reset = '1' ) then + adsb_init <= '1' ; + downcount := 5 ; + elsif( rising_edge(rx_clock) ) then + if( downcount > 0 ) then + downcount := downcount - 1 ; + adsb_init <= '1' ; + else + adsb_init <= '0' ; + end if ; + end if ; + end process ; + + -- Message preamble detector and multiple decoders + U_adsb_decoder : entity work.adsb_decoder + generic map ( + NUM_DECODERS => NUM_DECODERS + ) port map ( + clock => rx_clock, + reset => rx_reset, + + init => adsb_init, + + in_power => adsb_power, + in_valid => adsb_valid, + + debug_rpl => open, + + out_messages => msgs, + out_valid => msgs_valid + ) ; + + -- Aggregate into a single stream + U_message_aggregator : entity work.message_aggregator + generic map ( + MSGS_PER_TIMEOUT => 128, + PACKET_TIMEOUT => 32000000/100, + NUM_DECODERS => NUM_DECODERS + ) port map ( + clock => rx_clock, + reset => rx_reset, + + in_messages => msgs, + in_valid => msgs_valid, + + out_message => fifo_data, + out_valid => fifo_valid + ) ; -- ======================================================================== -- HANDSHAKES diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/rx-adsb.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/rx-adsb.vhd index 68a02bce..43f124ef 100644 --- a/hdl/fpga/platforms/bladerf-micro/vhdl/rx-adsb.vhd +++ b/hdl/fpga/platforms/bladerf-micro/vhdl/rx-adsb.vhd @@ -75,6 +75,10 @@ entity rx is loopback_fifo_wfull : out std_logic; loopback_fifo_wused : out std_logic_vector(LOOPBACK_FIFO_T_DEFAULT.wused'range); + -- ADSB + adsb_data : in std_logic_vector(127 downto 0); + adsb_valid : in std_logic; + -- RFFE Interface adc_controls : in sample_controls_t(0 to NUM_STREAMS-1) := (others => SAMPLE_CONTROL_DISABLE); adc_streams : in sample_streams_t(0 to NUM_STREAMS-1) := (others => ZERO_SAMPLE) @@ -130,14 +134,14 @@ begin end if; end process; + sample_fifo.wdata <= adsb_data; + sample_fifo.wreq <= adsb_valid; -- RX sample FIFO sample_fifo.aclr <= sample_fifo_raclr; sample_fifo.wclock <= rx_clock; - U_rx_sample_fifo : entity work.rx_fifo - generic map ( - LPM_NUMWORDS => 2**(sample_fifo.wused'length) - ) port map ( + U_rx_sample_fifo : entity work.adsbfifo + port map ( aclr => sample_fifo.aclr, wrclk => sample_fifo.wclock, @@ -228,8 +232,8 @@ begin fifo_full => sample_fifo.wfull, fifo_usedw => sample_fifo.wused, - fifo_data => sample_fifo.wdata, - fifo_write => sample_fifo.wreq, + fifo_data => open, + fifo_write => open, meta_fifo_full => meta_fifo.wfull, meta_fifo_usedw => meta_fifo.wused,