From b5af20d44a518f2c9bb59d07197c5edc95ec8f82 Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Thu, 11 May 2023 16:03:50 +0200 Subject: [PATCH] RTSD-79, fixed merge conflicts 2 --- .../lofar1/RSP/pfb2/src/vhdl/pfb2_unit.vhd | 2 - applications/lofar1/RSP/pfs/src/vhdl/pfs.vhd | 2 +- .../lofar1/RSP/pfs/src/vhdl/pfs_combine.vhd | 2 +- .../lofar1/RSP/pfs/src/vhdl/pfs_fir.vhd | 3 +- .../RSP/pfs/src/vhdl/pfs_fir_coefsbuf.vhd | 3 +- .../lofar1/RSP/pfs/src/vhdl/pfs_fir_ctrl.vhd | 2 +- .../lofar1/RSP/pfs/src/vhdl/pfs_fir_mac.vhd | 2 +- .../RSP/pfs/src/vhdl/pfs_fir_tapsbuf.vhd | 3 +- .../lofar1/RSP/pfs/src/vhdl/pfs_pkg.vhd | 3 +- .../lofar1/RSP/pfs/src/vhdl/pfs_rotate.vhd | 2 +- .../lofar1/RSP/pfs/tb/vhdl/tb_pfs.vhd | 3 +- .../lofar1/RSP/pft2/src/vhdl/pft_bf.vhd | 2 +- .../lofar1/RSP/pft2/src/vhdl/pft_bf_fw.vhd | 2 +- .../lofar1/RSP/pft2/src/vhdl/pft_lfsr.vhd | 2 +- .../lofar1/RSP/pft2/src/vhdl/pft_pkg.vhd | 3 +- .../lofar1/RSP/pft2/src/vhdl/pft_separate.vhd | 6 +- .../lofar1/RSP/pft2/src/vhdl/pft_top.vhd | 2 +- .../lofar1/RSP/pft2/src/vhdl/pft_unswitch.vhd | 2 +- .../lofar1/RSP/pft2/tb/vhdl/tb_pft2.vhd | 2 +- .../lofar2_unb2b_adc_6ch_200MHz.vhd | 4 +- .../lofar2_unb2b_adc_full.vhd | 4 +- .../lofar2_unb2b_adc_one_node.vhd | 4 +- .../src/vhdl/lofar2_unb2b_adc.vhd | 4 +- .../src/vhdl/lofar2_unb2b_adc_pkg.vhd | 2 +- .../src/vhdl/qsys_lofar2_unb2b_adc_pkg.vhd | 2 +- .../lofar2_unb2b_beamformer_one_node.vhd | 4 +- ...ofar2_unb2b_beamformer_one_node_256MHz.vhd | 4 +- .../src/vhdl/lofar2_unb2b_beamformer.vhd | 4 +- .../src/vhdl/lofar2_unb2b_beamformer_pkg.vhd | 2 +- .../vhdl/qsys_lofar2_unb2b_beamformer_pkg.vhd | 2 +- .../tb/vhdl/tb_lofar2_unb2b_beamformer.vhd | 4 +- .../lofar2_unb2b_filterbank_full.vhd | 4 +- .../lofar2_unb2b_filterbank_full_256MHz.vhd | 4 +- .../src/vhdl/lofar2_unb2b_filterbank.vhd | 4 +- .../src/vhdl/lofar2_unb2b_filterbank_pkg.vhd | 2 +- .../vhdl/qsys_lofar2_unb2b_filterbank_pkg.vhd | 2 +- .../lofar2_unb2b_ring_full.vhd | 8 +- .../lofar2_unb2b_ring_one.vhd | 8 +- .../src/vhdl/lofar2_unb2b_ring.vhd | 8 +- .../src/vhdl/lofar2_unb2b_ring_pkg.vhd | 2 +- .../src/vhdl/qsys_lofar2_unb2b_ring_pkg.vhd | 2 +- .../disturb2_unb2b_sdp_station_full.vhd | 8 +- .../disturb2_unb2b_sdp_station_full_wg.vhd | 8 +- .../lofar2_unb2b_sdp_station_adc.vhd | 4 +- .../lofar2_unb2b_sdp_station_bf.vhd | 4 +- .../tb_lofar2_unb2b_sdp_station_bf.vhd | 4 +- .../lofar2_unb2b_sdp_station_fsub.vhd | 4 +- .../lofar2_unb2b_sdp_station_full.vhd | 8 +- .../lofar2_unb2b_sdp_station_full_wg.vhd | 8 +- .../lofar2_unb2b_sdp_station_xsub_one.vhd | 4 +- .../lofar2_unb2b_sdp_station_xsub_ring.vhd | 8 +- .../src/vhdl/lofar2_unb2b_sdp_station.vhd | 8 +- .../src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd | 2 +- .../qsys_lofar2_unb2b_sdp_station_pkg.vhd | 2 +- .../src/vhdl/lofar2_unb2c_ddrctrl.vhd | 8 +- .../lofar2_unb2c_filterbank_full.vhd | 4 +- .../lofar2_unb2c_filterbank_full_256MHz.vhd | 4 +- .../src/vhdl/lofar2_unb2c_filterbank.vhd | 4 +- .../src/vhdl/lofar2_unb2c_filterbank_pkg.vhd | 2 +- .../vhdl/qsys_lofar2_unb2c_filterbank_pkg.vhd | 2 +- .../lofar2_unb2c_ring_full.vhd | 8 +- .../lofar2_unb2c_ring_one.vhd | 8 +- .../src/vhdl/lofar2_unb2c_ring.vhd | 8 +- .../src/vhdl/lofar2_unb2c_ring_pkg.vhd | 2 +- .../src/vhdl/qsys_lofar2_unb2c_ring_pkg.vhd | 2 +- .../disturb2_unb2c_sdp_station_full.vhd | 8 +- .../disturb2_unb2c_sdp_station_full_wg.vhd | 8 +- .../lofar2_unb2c_sdp_station_adc.vhd | 4 +- .../lofar2_unb2c_sdp_station_bf.vhd | 4 +- .../lofar2_unb2c_sdp_station_bf_ring.vhd | 8 +- .../lofar2_unb2c_sdp_station_fsub.vhd | 4 +- .../lofar2_unb2c_sdp_station_full.vhd | 8 +- .../lofar2_unb2c_sdp_station_full_wg.vhd | 8 +- .../lofar2_unb2c_sdp_station_xsub_one.vhd | 4 +- .../lofar2_unb2c_sdp_station_xsub_ring.vhd | 8 +- .../src/vhdl/lofar2_unb2c_sdp_station.vhd | 8 +- .../src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd | 2 +- .../qsys_lofar2_unb2c_sdp_station_pkg.vhd | 2 +- .../lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd | 44 +- .../libraries/sdp/src/vhdl/sdp_station.vhd | 4 +- .../hardware/lofar2_unb2b_ring_bsp/top.vhd | 10 +- .../top_components_pkg.vhd | 3 +- .../ta2/bsp/hardware/ta2_unb2b_bsp/top.vhd | 12 +- .../ta2_unb2b_bsp/top_components_pkg.vhd | 3 +- .../ta2_channel_cross/ta2_channel_cross.vhd | 6 +- .../ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.vhd | 2 +- .../ta2/ip/ta2_unb2b_1GbE/ta2_unb2b_1GbE.vhd | 2 +- .../ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.vhd | 2 +- .../ta2/ip/ta2_unb2b_ddr/ta2_unb2b_ddr.vhd | 6 +- .../ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd | 2 +- .../ta2_unb2b_jesd204b_ip_wrapper.vhd | 2 +- .../ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.vhd | 2 +- .../ip/ta2_unb2b_mm_io/tb_ta2_unb2b_mm_io.vhd | 2 +- .../src/vhdl/unb1_bn_capture.vhd | 6 +- .../src/vhdl/unb1_bn_capture_mux.vhd | 2 +- .../src/vhdl/unb1_bn_capture_storage.vhd | 2 +- .../src/vhdl/unb1_bn_capture_storage_reg.vhd | 2 +- .../src/vhdl/unb1_bn_terminal_bg.vhd | 6 +- .../tb/vhdl/tb_node_unb1_bn_terminal_bg.vhd | 3 +- .../vhdl/tb_tb_node_unb1_bn_terminal_bg.vhd | 3 +- .../unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd | 5 +- .../unb1_ddr3/src/vhdl/node_unb1_ddr3.vhd | 4 +- .../designs/unb1_ddr3/src/vhdl/unb1_ddr3.vhd | 6 +- .../unb1_ddr3/tb/vhdl/tb_unb1_ddr3.vhd | 2 +- .../unb1_ddr3_reorder_dual_rank.vhd | 8 +- .../unb1_ddr3_reorder_single_rank.vhd | 8 +- .../src/vhdl/mmm_unb1_ddr3_reorder.vhd | 4 +- .../src/vhdl/node_unb1_ddr3_reorder.vhd | 4 +- .../src/vhdl/unb1_ddr3_reorder.vhd | 8 +- .../src/vhdl/mmm_unb1_ddr3_transpose.vhd | 2 +- .../src/vhdl/unb1_ddr3_transpose.vhd | 8 +- .../src/vhdl/mmm_unb1_fn_terminal_db.vhd | 4 +- .../src/vhdl/unb1_fn_terminal_db.vhd | 6 +- .../unb1_heater/src/vhdl/mmm_unb1_heater.vhd | 2 +- .../src/vhdl/qsys_unb1_heater_pkg.vhd | 2 +- .../unb1_heater/src/vhdl/unb1_heater.vhd | 6 +- .../unb1_minimal_mm_arbiter.vhd | 6 +- .../unb1_minimal_qsys/unb1_minimal_qsys.vhd | 6 +- .../mmm_unb1_minimal_qsys_wo_pll.vhd | 2 +- .../unb1_minimal_qsys_wo_pll.vhd | 4 +- .../unb1_minimal_sopc/unb1_minimal_sopc.vhd | 6 +- .../src/vhdl/mmm_unb1_minimal.vhd | 2 +- .../src/vhdl/qsys_unb1_minimal_pkg.vhd | 2 +- .../unb1_minimal/src/vhdl/unb1_minimal.vhd | 10 +- .../src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd | 2 +- .../src/vhdl/unb1_terminal_bg_mesh_db.vhd | 6 +- .../unb1_test_10GbE/unb1_test_10GbE.vhd | 6 +- .../unb1_test_10GbE_tx_only.vhd | 6 +- .../unb1_test_1GbE/unb1_test_1GbE.vhd | 6 +- .../revisions/unb1_test_all/unb1_test_all.vhd | 10 +- .../revisions/unb1_test_ddr/unb1_test_ddr.vhd | 8 +- .../unb1_test_ddr_16g_MB_I.vhd | 8 +- .../unb1_test_ddr_16g_MB_II.vhd | 8 +- .../unb1_test_ddr_16g_MB_I_II.vhd | 10 +- .../unb1_test_ddr_MB_I_II.vhd | 10 +- .../unb1_test/src/vhdl/mmm_unb1_test.vhd | 2 +- .../designs/unb1_test/src/vhdl/udp_stream.vhd | 4 +- .../designs/unb1_test/src/vhdl/unb1_test.vhd | 10 +- .../unb1_test/src/vhdl/unb1_test_pkg.vhd | 4 +- .../unb1_tr_10GbE/src/vhdl/unb1_tr_10GbE.vhd | 6 +- .../unb1_board/src/vhdl/ctrl_unb1_board.vhd | 8 +- .../src/vhdl/mms_unb1_board_sens.vhd | 2 +- .../src/vhdl/mms_unb1_board_system_info.vhd | 4 +- .../src/vhdl/unb1_board_back_io.vhd | 2 - .../src/vhdl/unb1_board_mesh_io.vhd | 2 - .../vhdl/unb1_board_mesh_reorder_bidir.vhd | 2 +- .../src/vhdl/unb1_board_system_info_reg.vhd | 2 +- .../src/vhdl/unb1_board_terminals_mesh.vhd | 2 +- .../src/vhdl/unb1_board_wdi_reg.vhd | 2 +- .../tb/vhdl/tb_mms_unb1_board_sens.vhd | 2 +- .../designs/unb2_led/src/vhdl/unb2_led.vhd | 2 +- .../unb2_minimal/src/vhdl/unb2_minimal.vhd | 6 +- .../unb2_test_10GbE/tb_unb2_test_10GbE.vhd | 2 +- .../unb2_test_10GbE/unb2_test_10GbE.vhd | 4 +- .../unb2_test_1GbE/tb_unb2_test_1GbE.vhd | 2 +- .../unb2_test_1GbE/unb2_test_1GbE.vhd | 4 +- .../unb2_test_all/tb_unb2_test_all.vhd | 2 +- .../revisions/unb2_test_all/unb2_test_all.vhd | 8 +- .../tb_unb2_test_ddr_MB_I.vhd | 2 +- .../unb2_test_ddr_MB_I/unb2_test_ddr_MB_I.vhd | 6 +- .../tb_unb2_test_ddr_MB_II.vhd | 2 +- .../unb2_test_ddr_MB_II.vhd | 6 +- .../tb_unb2_test_ddr_MB_I_II.vhd | 2 +- .../unb2_test_ddr_MB_I_II.vhd | 8 +- .../unb2_test/src/vhdl/qsys_unb2_test_pkg.vhd | 2 +- .../designs/unb2_test/src/vhdl/udp_stream.vhd | 2 +- .../designs/unb2_test/src/vhdl/unb2_test.vhd | 16 +- .../unb2_test/src/vhdl/unb2_test_pkg.vhd | 6 +- .../unb2_board/src/vhdl/ctrl_unb2_board.vhd | 4 +- .../src/vhdl/mms_unb2_board_sens.vhd | 2 +- .../src/vhdl/mms_unb2_board_system_info.vhd | 4 +- .../src/vhdl/mms_unb2_fpga_sens.vhd | 2 +- .../src/vhdl/unb2_board_ring_io.vhd | 2 +- .../src/vhdl/unb2_board_system_info_reg.vhd | 2 +- .../src/vhdl/unb2_board_wdi_reg.vhd | 2 +- .../tb/vhdl/tb_mms_unb2_board_sens.vhd | 2 +- .../ddr4_micron46_mbIIskew_inst.vhd | 2 +- .../ddr4_micron46_mbIskew_inst.vhd | 2 +- .../unb2a_heater/src/vhdl/unb2a_heater.vhd | 6 +- .../designs/unb2a_led/src/vhdl/unb2a_led.vhd | 2 +- .../unb2a_minimal/src/vhdl/unb2a_minimal.vhd | 6 +- .../unb2a_test_10GbE/tb_unb2a_test_10GbE.vhd | 2 +- .../unb2a_test_10GbE/unb2a_test_10GbE.vhd | 4 +- .../unb2a_test_1GbE/tb_unb2a_test_1GbE.vhd | 2 +- .../unb2a_test_1GbE/unb2a_test_1GbE.vhd | 4 +- .../unb2a_test_all/tb_unb2a_test_all.vhd | 2 +- .../unb2a_test_all/unb2a_test_all.vhd | 8 +- .../tb_unb2a_test_ddr_MB_I.vhd | 2 +- .../unb2a_test_ddr_MB_I.vhd | 6 +- .../tb_unb2a_test_ddr_MB_II.vhd | 2 +- .../unb2a_test_ddr_MB_II.vhd | 6 +- .../tb_unb2a_test_ddr_MB_I_II.vhd | 2 +- .../unb2a_test_ddr_MB_I_II.vhd | 8 +- .../src/vhdl/qsys_unb2a_test_pkg.vhd | 2 +- .../unb2a_test/src/vhdl/udp_stream.vhd | 2 +- .../unb2a_test/src/vhdl/unb2a_test.vhd | 16 +- .../unb2a_test/src/vhdl/unb2a_test_pkg.vhd | 6 +- .../unb2a_board/src/vhdl/ctrl_unb2_board.vhd | 4 +- .../src/vhdl/mms_unb2_board_sens.vhd | 2 +- .../src/vhdl/mms_unb2_board_system_info.vhd | 4 +- .../src/vhdl/mms_unb2_fpga_sens.vhd | 2 +- .../src/vhdl/unb2_board_ring_io.vhd | 2 +- .../src/vhdl/unb2_board_system_info_reg.vhd | 2 +- .../src/vhdl/unb2_board_wdi_reg.vhd | 2 +- .../tb/vhdl/tb_mms_unb2_board_sens.vhd | 2 +- .../src/vhdl/unb2b_arp_ping.vhd | 6 +- .../unb2b_heater/src/vhdl/unb2b_heater.vhd | 6 +- .../altjesd_ss_RX_corepll_inst.vhd | 2 +- .../altjesd_ss_RX_frame_reset_inst.vhd | 2 +- .../altjesd_ss_RX_link_reset_inst.vhd | 2 +- .../altjesd_ss_RX_reset_seq_inst.vhd | 2 +- .../altjesd_ss_RX_xcvr_reset_control_inst.vhd | 2 +- .../device_clk/device_clk_inst.vhd | 2 +- .../frame_clk/frame_clk_inst.vhd | 2 +- .../ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd | 2 +- .../link_clk/link_clk_inst.vhd | 2 +- ...sys_unb2b_minimal_avs_common_mm_0_inst.vhd | 2 +- ...sys_unb2b_minimal_avs_common_mm_1_inst.vhd | 2 +- .../avs2_eth_coe_10/sim/common_pkg.vhd | 50 +- .../avs2_eth_coe_10/sim/dp_stream_pkg.vhd | 68 +- .../avs2_eth_coe_10/sim/eth_pkg.vhd | 4 +- .../avs2_eth_coe_10/synth/common_pkg.vhd | 50 +- .../avs2_eth_coe_10/synth/dp_stream_pkg.vhd | 68 +- .../avs2_eth_coe_10/synth/eth_pkg.vhd | 4 +- .../qsys_unb2b_minimal_avs_eth_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_clk_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_cpu_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_jesd204_inst.vhd | 2 +- ..._0_altera_avalon_jtag_uart_180_tj65noi.vhd | 2 +- .../qsys_unb2b_minimal_jtag_uart_0_inst.vhd | 2 +- ...tera_avalon_onchip_memory2_180_lo46q2y.vhd | 2 +- ...ys_unb2b_minimal_onchip_memory2_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_pio_pps_inst.vhd | 2 +- ...sys_unb2b_minimal_pio_system_info_inst.vhd | 2 +- ..._pio_wdi_altera_avalon_pio_180_2botkdq.vhd | 2 +- .../qsys_unb2b_minimal_pio_wdi_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_dpmm_data_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_epcs_inst.vhd | 2 +- ..._unb2b_minimal_reg_fpga_temp_sens_inst.vhd | 2 +- ...b2b_minimal_reg_fpga_voltage_sens_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_mmdp_data_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_remu_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_unb_sens_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_wdi_inst.vhd | 2 +- ...sys_unb2b_minimal_rom_system_info_inst.vhd | 2 +- ...imer_0_altera_avalon_timer_180_5qqtsby.vhd | 4 +- .../qsys_unb2b_minimal_timer_0_inst.vhd | 2 +- .../unb2b_jesd_node0/unb2b_jesd_node0.vhd | 6 +- .../altjesd_ss_RX_corepll_inst.vhd | 2 +- .../altjesd_ss_RX_frame_reset_inst.vhd | 2 +- .../altjesd_ss_RX_link_reset_inst.vhd | 2 +- .../altjesd_ss_RX_reset_seq_inst.vhd | 2 +- .../altjesd_ss_RX_xcvr_reset_control_inst.vhd | 2 +- .../device_clk/device_clk_inst.vhd | 2 +- .../frame_clk/frame_clk_inst.vhd | 2 +- .../ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd | 2 +- .../link_clk/link_clk_inst.vhd | 2 +- ...sys_unb2b_minimal_avs_common_mm_0_inst.vhd | 2 +- ...sys_unb2b_minimal_avs_common_mm_1_inst.vhd | 2 +- .../avs2_eth_coe_10/sim/common_pkg.vhd | 50 +- .../avs2_eth_coe_10/sim/dp_stream_pkg.vhd | 68 +- .../avs2_eth_coe_10/sim/eth_pkg.vhd | 4 +- .../avs2_eth_coe_10/synth/common_pkg.vhd | 50 +- .../avs2_eth_coe_10/synth/dp_stream_pkg.vhd | 68 +- .../avs2_eth_coe_10/synth/eth_pkg.vhd | 4 +- .../qsys_unb2b_minimal_avs_eth_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_clk_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_cpu_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_jesd204_inst.vhd | 2 +- ..._0_altera_avalon_jtag_uart_180_tj65noi.vhd | 2 +- .../qsys_unb2b_minimal_jtag_uart_0_inst.vhd | 2 +- ...tera_avalon_onchip_memory2_180_lo46q2y.vhd | 2 +- ...ys_unb2b_minimal_onchip_memory2_0_inst.vhd | 2 +- .../qsys_unb2b_minimal_pio_pps_inst.vhd | 2 +- ...sys_unb2b_minimal_pio_system_info_inst.vhd | 2 +- ..._pio_wdi_altera_avalon_pio_180_2botkdq.vhd | 2 +- .../qsys_unb2b_minimal_pio_wdi_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_dpmm_data_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_epcs_inst.vhd | 2 +- ..._unb2b_minimal_reg_fpga_temp_sens_inst.vhd | 2 +- ...b2b_minimal_reg_fpga_voltage_sens_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_mmdp_data_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_remu_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_unb_sens_inst.vhd | 2 +- .../qsys_unb2b_minimal_reg_wdi_inst.vhd | 2 +- ...sys_unb2b_minimal_rom_system_info_inst.vhd | 2 +- ...imer_0_altera_avalon_timer_180_5qqtsby.vhd | 4 +- .../qsys_unb2b_minimal_timer_0_inst.vhd | 2 +- .../unb2b_jesd_node3/unb2b_jesd_node3.vhd | 6 +- .../unb2b_jesd/src/vhdl/unb2b_jesd.vhd | 6 +- .../unb2b_minimal_125m/unb2b_minimal_125m.vhd | 4 +- .../unb2b_minimal/src/vhdl/unb2b_minimal.vhd | 8 +- .../unb2b_test_10GbE/tb_unb2b_test_10GbE.vhd | 2 +- .../unb2b_test_10GbE/unb2b_test_10GbE.vhd | 4 +- .../tb_unb2b_test_ddr_MB_I_II.vhd | 2 +- .../unb2b_test_ddr_MB_I_II.vhd | 8 +- .../src/vhdl/qsys_unb2b_test_pkg.vhd | 2 +- .../unb2b_test/src/vhdl/udp_stream.vhd | 2 +- .../unb2b_test/src/vhdl/unb2b_test.vhd | 16 +- .../unb2b_test/src/vhdl/unb2b_test_pkg.vhd | 6 +- .../unb2b_board/src/vhdl/ctrl_unb2b_board.vhd | 4 +- .../src/vhdl/mms_unb2b_board_sens.vhd | 2 +- .../src/vhdl/mms_unb2b_board_system_info.vhd | 4 +- .../src/vhdl/mms_unb2b_fpga_sens.vhd | 2 +- .../src/vhdl/unb2b_board_ring_io.vhd | 2 +- .../src/vhdl/unb2b_board_system_info_reg.vhd | 2 +- .../src/vhdl/unb2b_board_wdi_reg.vhd | 2 +- .../tb/vhdl/tb_mms_unb2b_board_sens.vhd | 2 +- .../designs/unb2c_led/src/vhdl/unb2c_led.vhd | 2 +- .../unb2c_minimal/src/vhdl/unb2c_minimal.vhd | 6 +- .../unb2c_test_10GbE/tb_unb2c_test_10GbE.vhd | 2 +- .../unb2c_test_10GbE/unb2c_test_10GbE.vhd | 8 +- .../tb_unb2c_test_1GbE_I.vhd | 2 +- .../unb2c_test_1GbE_I/unb2c_test_1GbE_I.vhd | 4 +- .../tb_unb2c_test_1GbE_II.vhd | 2 +- .../unb2c_test_1GbE_II/unb2c_test_1GbE_II.vhd | 4 +- .../unb2c_test_ddr/tb_unb2c_test_ddr.vhd | 2 +- .../unb2c_test_ddr/unb2c_test_ddr.vhd | 8 +- .../tb_unb2c_test_ddr_16G.vhd | 2 +- .../unb2c_test_ddr_16G/unb2c_test_ddr_16G.vhd | 8 +- .../tb_unb2c_test_heater.vhd | 2 +- .../unb2c_test_heater/unb2c_test_heater.vhd | 4 +- .../tb_unb2c_test_jesd204b.vhd | 2 +- .../unb2c_test_jesd204b.vhd | 4 +- .../unb2c_test_minimal/unb2c_test_minimal.vhd | 4 +- .../src/vhdl/qsys_unb2c_test_pkg.vhd | 2 +- .../unb2c_test/src/vhdl/udp_stream.vhd | 2 +- .../unb2c_test/src/vhdl/unb2c_test.vhd | 12 +- .../unb2c_test/src/vhdl/unb2c_test_pkg.vhd | 4 +- .../unb2c_board/src/vhdl/ctrl_unb2c_board.vhd | 4 +- .../src/vhdl/mms_unb2c_board_system_info.vhd | 4 +- .../src/vhdl/mms_unb2c_fpga_sens.vhd | 2 +- .../src/vhdl/unb2c_board_ring_io.vhd | 2 +- .../src/vhdl/unb2c_board_system_info_reg.vhd | 2 +- .../src/vhdl/unb2c_board_wdi_reg.vhd | 2 +- .../axi4/src/vhdl/axi4_lite_mm_bridge.vhd | 4 +- .../base/axi4/src/vhdl/axi4_lite_pkg.vhd | 175 +-- .../axi4/src/vhdl/axi4_stream_dp_bridge.vhd | 2 +- .../base/axi4/src/vhdl/axi4_stream_pkg.vhd | 18 +- .../axi4/tb/vhdl/tb_axi4_stream_dp_bridge.vhd | 4 +- .../common/src/vhdl/common_accumulate.vhd | 4 +- .../base/common/src/vhdl/common_add_sub.vhd | 2 +- .../vhdl/common_adder_tree_a_recursive.vhd | 2 +- .../src/vhdl/common_adder_tree_a_str.vhd | 2 +- .../base/common/src/vhdl/common_async.vhd | 2 +- .../base/common/src/vhdl/common_clip.vhd | 2 +- .../base/common/src/vhdl/common_debounce.vhd | 8 +- .../common/src/vhdl/common_duty_cycle.vhd | 2 +- libraries/base/common/src/vhdl/common_evt.vhd | 6 +- .../base/common/src/vhdl/common_field_pkg.vhd | 10 +- .../common/src/vhdl/common_flank_to_pulse.vhd | 3 +- .../src/vhdl/common_interface_layers_pkg.vhd | 2 +- .../base/common/src/vhdl/common_math_pkg.vhd | 2 +- .../base/common/src/vhdl/common_mem_pkg.vhd | 4 +- .../base/common/src/vhdl/common_operation.vhd | 20 +- .../src/vhdl/common_paged_ram_crw_crw.vhd | 12 +- .../src/vhdl/common_paged_ram_ww_rr.vhd | 24 +- .../base/common/src/vhdl/common_pipeline.vhd | 2 +- .../src/vhdl/common_pipeline_integer.vhd | 4 +- libraries/base/common/src/vhdl/common_pkg.vhd | 70 +- .../src/vhdl/common_pulse_delay_reg.vhd | 2 +- .../common/src/vhdl/common_pulse_extend.vhd | 2 +- .../base/common/src/vhdl/common_ram_r_w.vhd | 2 +- .../src/vhdl/common_reg_cross_domain.vhd | 2 +- .../common/src/vhdl/common_requantize.vhd | 2 +- .../base/common/src/vhdl/common_resize.vhd | 8 +- .../base/common/src/vhdl/common_round.vhd | 8 +- .../base/common/src/vhdl/common_spulse.vhd | 4 +- .../base/common/src/vhdl/common_str_pkg.vhd | 12 +- .../src/vhdl/common_wideband_data_scope.vhd | 2 +- .../src/vhdl/mms_common_pulse_delay.vhd | 2 +- .../base/common/src/vhdl/mms_common_reg.vhd | 2 +- .../src/vhdl/mms_common_stable_monitor.vhd | 2 +- .../base/common/tb/vhdl/tb_common_add_sub.vhd | 8 +- .../common/tb/vhdl/tb_common_adder_tree.vhd | 2 +- .../base/common/tb/vhdl/tb_common_counter.vhd | 3 +- .../common/tb/vhdl/tb_common_multiplexer.vhd | 4 +- .../tb/vhdl/tb_common_operation_tree.vhd | 22 +- .../base/common/tb/vhdl/tb_common_pkg.vhd | 6 +- .../common/tb/vhdl/tb_common_pulse_delay.vhd | 2 +- .../base/common/tb/vhdl/tb_common_switch.vhd | 2 +- .../tb/vhdl/tb_common_variable_delay.vhd | 3 +- .../base/common/tb/vhdl/tb_common_zip.vhd | 2 +- .../tb/vhdl/tb_mms_common_variable_delay.vhd | 2 +- .../src/vhdl/common_complex_mult_add.vhd | 2 +- .../tb/vhdl/tb_common_mult_add2.vhd | 4 +- .../base/diag/src/vhdl/diag_data_buffer.vhd | 2 +- .../diag/src/vhdl/diag_data_buffer_dev.vhd | 3 +- libraries/base/diag/src/vhdl/diag_rx_seq.vhd | 2 +- .../base/diag/src/vhdl/diag_wg_wideband.vhd | 8 +- .../base/diag/src/vhdl/mms_diag_rx_seq.vhd | 3 - .../base/diag/src/vhdl/mms_diag_tx_seq.vhd | 3 - .../base/diag/tb/vhdl/tb_diag_block_gen.vhd | 2 +- .../diag/tb/vhdl/tb_diag_frm_generator.vhd | 2 +- .../base/diag/tb/vhdl/tb_diag_frm_monitor.vhd | 2 +- libraries/base/diag/tb/vhdl/tb_diag_pkg.vhd | 4 +- .../base/diag/tb/vhdl/tb_diag_rx_seq.vhd | 2 +- .../base/diag/tb/vhdl/tb_diag_tx_frm.vhd | 2 +- .../base/diag/tb/vhdl/tb_diag_tx_seq.vhd | 2 +- libraries/base/diag/tb/vhdl/tb_diag_wg.vhd | 2 +- .../base/diag/tb/vhdl/tb_diag_wg_wideband.vhd | 8 +- .../base/diagnostics/src/vhdl/diagnostics.vhd | 2 +- .../diagnostics/src/vhdl/mm_rx_logger.vhd | 3 +- .../diagnostics/src/vhdl/mm_rx_logger_reg.vhd | 2 +- .../src/vhdl/mm_rx_logger_trig.vhd | 2 +- .../diagnostics/src/vhdl/mm_tx_framer.vhd | 2 +- .../diagnostics/src/vhdl/mm_tx_framer_reg.vhd | 2 +- .../diagnostics/src/vhdl/mms_diagnostics.vhd | 2 +- .../diagnostics/tb/vhdl/tb_diagnostics.vhd | 3 +- .../diagnostics/tb/vhdl/tb_mm_tx_framer.vhd | 2 +- .../src/vhdl/mmm_unb1_dp_offload.vhd | 2 +- .../src/vhdl/unb1_dp_offload.vhd | 8 +- .../base/dp/src/vhdl/dp_bsn_align_reg.vhd | 2 +- libraries/base/dp/src/vhdl/dp_bsn_delay.vhd | 6 +- libraries/base/dp/src/vhdl/dp_bsn_monitor.vhd | 4 +- .../base/dp/src/vhdl/dp_bsn_monitor_v2.vhd | 4 +- .../base/dp/src/vhdl/dp_bsn_scheduler.vhd | 2 +- libraries/base/dp/src/vhdl/dp_bsn_source.vhd | 3 +- .../dp/src/vhdl/dp_bsn_sync_scheduler.vhd | 3 +- .../base/dp/src/vhdl/dp_components_pkg.vhd | 2 +- .../dp/src/vhdl/dp_counter_func_single.vhd | 2 +- libraries/base/dp/src/vhdl/dp_demux.vhd | 4 +- .../base/dp/src/vhdl/dp_dummy_source.vhd | 2 +- .../base/dp/src/vhdl/dp_fifo_fill_reg.vhd | 2 +- .../base/dp/src/vhdl/dp_fifo_from_mm_reg.vhd | 2 +- .../base/dp/src/vhdl/dp_fifo_monitor.vhd | 2 +- .../base/dp/src/vhdl/dp_fifo_monitor_arr.vhd | 2 +- .../base/dp/src/vhdl/dp_fifo_to_mm_reg.vhd | 2 +- libraries/base/dp/src/vhdl/dp_flush.vhd | 4 +- libraries/base/dp/src/vhdl/dp_folder.vhd | 2 +- libraries/base/dp/src/vhdl/dp_gap.vhd | 2 +- libraries/base/dp/src/vhdl/dp_mon.vhd | 2 +- libraries/base/dp/src/vhdl/dp_mux.vhd | 10 +- .../base/dp/src/vhdl/dp_offload_tx_legacy.vhd | 2 +- libraries/base/dp/src/vhdl/dp_packet_dec.vhd | 2 +- .../dp/src/vhdl/dp_packet_dec_channel_lo.vhd | 4 +- libraries/base/dp/src/vhdl/dp_packet_enc.vhd | 2 +- .../dp/src/vhdl/dp_packet_enc_channel_lo.vhd | 2 +- libraries/base/dp/src/vhdl/dp_packet_pkg.vhd | 2 +- .../base/dp/src/vhdl/dp_packetizing_pkg.vhd | 2 +- libraries/base/dp/src/vhdl/dp_ram_from_mm.vhd | 2 +- .../base/dp/src/vhdl/dp_ram_from_mm_reg.vhd | 2 +- libraries/base/dp/src/vhdl/dp_ram_to_mm.vhd | 2 +- libraries/base/dp/src/vhdl/dp_ready.vhd | 2 +- libraries/base/dp/src/vhdl/dp_repack_data.vhd | 4 +- libraries/base/dp/src/vhdl/dp_requantize.vhd | 2 +- libraries/base/dp/src/vhdl/dp_stream_pkg.vhd | 76 +- .../base/dp/src/vhdl/dp_sync_checker.vhd | 3 +- libraries/base/dp/src/vhdl/dp_throttle.vhd | 2 +- .../base/dp/src/vhdl/dp_throttle_sop.vhd | 2 +- .../base/dp/src/vhdl/dp_throttle_xon.vhd | 2 +- libraries/base/dp/src/vhdl/dp_unfolder.vhd | 2 +- .../dp/src/vhdl/dp_wideband_sp_arr_scope.vhd | 2 +- .../dp/src/vhdl/dp_wideband_wb_arr_scope.vhd | 2 +- .../base/dp/src/vhdl/mmp_dp_bsn_align_v2.vhd | 2 +- .../dp/src/vhdl/mmp_dp_bsn_sync_scheduler.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_block_select.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_bsn_align.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_bsn_monitor.vhd | 2 +- .../dp/src/vhdl/mms_dp_bsn_monitor_v2.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_bsn_scheduler.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_bsn_source.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_bsn_source_v2.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_fifo_from_mm.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_fifo_to_mm.vhd | 2 +- .../src/vhdl/mms_dp_force_data_parallel.vhd | 2 +- .../vhdl/mms_dp_force_data_parallel_arr.vhd | 2 +- .../dp/src/vhdl/mms_dp_force_data_serial.vhd | 2 +- .../src/vhdl/mms_dp_force_data_serial_arr.vhd | 2 +- libraries/base/dp/src/vhdl/mms_dp_gain.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_gain_arr.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_gain_serial.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_packet_merge.vhd | 2 +- libraries/base/dp/src/vhdl/mms_dp_split.vhd | 2 +- .../base/dp/src/vhdl/mms_dp_sync_checker.vhd | 3 +- .../dp/src/vhdl/mms_dp_sync_checker_arr.vhd | 3 +- .../base/dp/src/vhdl/mms_dp_throttle.vhd | 2 +- libraries/base/dp/src/vhdl/mms_dp_xonoff.vhd | 3 +- libraries/base/dp/tb/vhdl/tb2_dp_mux.vhd | 2 +- libraries/base/dp/tb/vhdl/tb3_dp_demux.vhd | 2 +- libraries/base/dp/tb/vhdl/tb3_dp_mux.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_block_gen.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_bsn_align.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_bsn_monitor.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_bsn_monitor_v2.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_concat.vhd | 4 +- .../dp/tb/vhdl/tb_dp_concat_field_blk.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_demux.vhd | 32 +- .../base/dp/tb/vhdl/tb_dp_distribute.vhd | 20 +- libraries/base/dp/tb/vhdl/tb_dp_fifo_dc.vhd | 4 +- .../base/dp/tb/vhdl/tb_dp_fifo_dc_arr.vhd | 4 +- .../dp/tb/vhdl/tb_dp_fifo_dc_mixed_widths.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_fifo_fill.vhd | 4 +- .../base/dp/tb/vhdl/tb_dp_fifo_fill_eop.vhd | 4 +- .../base/dp/tb/vhdl/tb_dp_fifo_fill_sc.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_fifo_info.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_fifo_sc.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_flush.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_folder.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_frame_rd.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_frame_scheduler.vhd | 4 +- .../dp/tb/vhdl/tb_dp_hdr_insert_remove.vhd | 4 +- .../base/dp/tb/vhdl/tb_dp_latency_adapter.vhd | 4 +- .../base/dp/tb/vhdl/tb_dp_latency_fifo.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_mux.vhd | 36 +- .../dp/tb/vhdl/tb_dp_offload_rx_filter.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_offload_tx_v3.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_packet.vhd | 4 +- .../dp/tb/vhdl/tb_dp_pad_insert_remove.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_pipeline.vhd | 4 +- .../base/dp/tb/vhdl/tb_dp_pipeline_ready.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_pkg.vhd | 30 +- .../base/dp/tb/vhdl/tb_dp_selector_arr.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_shiftram.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_dp_shiftreg.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_split.vhd | 4 +- libraries/base/dp/tb/vhdl/tb_dp_switch.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_sync_checker.vhd | 3 +- .../base/dp/tb/vhdl/tb_dp_sync_insert.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_sync_insert_v2.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_sync_recover.vhd | 2 +- .../base/dp/tb/vhdl/tb_dp_tail_remove.vhd | 2 +- .../base/dp/tb/vhdl/tb_mms_dp_bsn_align.vhd | 2 +- .../base/dp/tb/vhdl/tb_mms_dp_bsn_source.vhd | 2 +- .../dp/tb/vhdl/tb_mms_dp_bsn_source_v2.vhd | 2 +- .../base/dp/tb/vhdl/tb_mms_dp_gain_arr.vhd | 2 +- .../dp/tb/vhdl/tb_mms_dp_sync_checker.vhd | 3 +- .../base/dp/tb/vhdl/tb_mms_dp_xonoff.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_tb2_dp_demux.vhd | 2 +- .../dp/tb/vhdl/tb_tb_dp_block_from_mm.vhd | 2 +- .../dp/tb/vhdl/tb_tb_dp_bsn_source_v2.vhd | 2 +- .../tb/vhdl/tb_tb_dp_bsn_sync_scheduler.vhd | 2 +- libraries/base/dp/tb/vhdl/tb_tb_dp_flush.vhd | 2 +- .../base/dp/tb/vhdl/tb_tb_dp_rsn_source.vhd | 2 +- libraries/base/mm/tb/vhdl/mm_file.vhd | 2 +- libraries/base/mm/tb/vhdl/mm_file_pkg.vhd | 36 +- libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd | 2 +- libraries/base/mm/tb/vhdl/tb_mm_file.vhd | 2 +- .../base/reorder/src/vhdl/reorder_col.vhd | 2 +- .../reorder/src/vhdl/reorder_col_select.vhd | 6 +- .../reorder/src/vhdl/reorder_col_wide.vhd | 4 +- .../src/vhdl/reorder_col_wide_select.vhd | 2 +- .../base/reorder/src/vhdl/reorder_matrix.vhd | 2 +- .../base/reorder/src/vhdl/reorder_pkg.vhd | 2 +- .../reorder/src/vhdl/reorder_retreive.vhd | 4 +- .../reorder/src/vhdl/reorder_rewire_reg.vhd | 2 +- .../base/reorder/src/vhdl/reorder_row.vhd | 2 +- .../reorder/src/vhdl/reorder_row_select.vhd | 2 +- .../reorder/src/vhdl/reorder_sequencer.vhd | 2 +- .../reorder/src/vhdl/reorder_transpose.vhd | 3 +- .../reorder/tb/vhdl/tb_mms_reorder_rewire.vhd | 2 +- .../reorder/tb/vhdl/tb_reorder_transpose.vhd | 2 +- libraries/base/ring/src/vhdl/ring_info.vhd | 3 - libraries/base/ring/src/vhdl/ring_pkg.vhd | 4 +- libraries/base/sens/tb/vhdl/tb_sens.vhd | 4 +- libraries/base/ss/src/vhdl/ss.vhd | 2 +- libraries/base/ss/src/vhdl/ss_parallel.vhd | 2 +- libraries/base/ss/src/vhdl/ss_reorder.vhd | 2 +- libraries/base/ss/src/vhdl/ss_retrieve.vhd | 4 +- libraries/base/ss/src/vhdl/ss_wide.vhd | 4 +- libraries/base/uth/src/vhdl/uth_pkg.vhd | 2 +- libraries/base/uth/src/vhdl/uth_rx.vhd | 2 +- libraries/base/uth/tb/vhdl/tb_uth.vhd | 10 +- .../base/uth/tb/vhdl/tb_uth_dp_packet.vhd | 2 +- .../base/uth/tb/vhdl/tb_uth_terminals.vhd | 2 +- .../base/util/src/vhdl/util_heater_pkg.vhd | 2 +- libraries/base/util/src/vhdl/util_logic.vhd | 2 +- .../dsp/beamformer/src/vhdl/beamformer.vhd | 2 +- .../dsp/beamformer/tb/vhdl/tb_beamformer.vhd | 5 +- .../unb1_fn_bf/src/vhdl/mmm_unb1_fn_bf.vhd | 5 +- .../unb1_fn_bf/src/vhdl/unb1_fn_bf.vhd | 7 +- libraries/dsp/bf/src/vhdl/bf.vhd | 2 +- libraries/dsp/bf/src/vhdl/bf_pkg.vhd | 2 +- .../src/vhdl/mmm_unb1_correlator.vhd | 2 +- .../src/vhdl/unb1_correlator.vhd | 6 +- .../dsp/correlator/src/vhdl/corr_folder.vhd | 2 +- .../src/vhdl/corr_folder_2arr_2.vhd | 2 +- .../src/vhdl/corr_output_framer.vhd | 2 +- .../correlator/src/vhdl/corr_permutor_pkg.vhd | 4 +- .../dsp/correlator/src/vhdl/corr_unfolder.vhd | 2 +- libraries/dsp/fft/src/vhdl/fft_lfsr.vhd | 2 +- libraries/dsp/fft/src/vhdl/fft_pkg.vhd | 2 +- libraries/dsp/fft/src/vhdl/fft_r2_pipe.vhd | 2 +- .../fft/src/vhdl/fft_reorder_sepa_pipe.vhd | 3 +- libraries/dsp/fft/src/vhdl/fft_sepa.vhd | 3 +- libraries/dsp/fft/src/vhdl/fft_sepa_wide.vhd | 7 +- libraries/dsp/fft/src/vhdl/fft_wide_unit.vhd | 3 +- .../fft/src/vhdl/fft_wide_unit_control.vhd | 3 +- .../dsp/fft/tb/vhdl/tb_fft_functions.vhd | 2 +- libraries/dsp/fft/tb/vhdl/tb_fft_pkg.vhd | 2 +- libraries/dsp/fft/tb/vhdl/tb_fft_sepa.vhd | 4 +- libraries/dsp/fft/tb/vhdl/tb_fft_switch.vhd | 2 +- .../dsp/fft/tb/vhdl/tb_fft_wide_unit.vhd | 18 +- libraries/dsp/filter/src/vhdl/fil_pkg.vhd | 2 +- .../dsp/filter/src/vhdl/fil_ppf_filter.vhd | 2 +- .../dsp/filter/src/vhdl/fil_ppf_wide.vhd | 4 +- .../dsp/filter/tb/vhdl/tb_fil_ppf_single.vhd | 2 +- .../dsp/filter/tb/vhdl/tb_fil_ppf_wide.vhd | 6 +- .../tb/vhdl/tb_fil_ppf_wide_file_data.vhd | 6 +- .../fringe_stop/src/vhdl/fringe_stop_unit.vhd | 3 - .../tb/vhdl/tb_fringe_stop_unit.vhd | 8 +- .../tb/vhdl/tb_mmf_fringe_stop_unit.vhd | 4 +- .../tb/vhdl/tb_tb_fringe_stop_unit.vhd | 4 +- .../tb/vhdl/tb_tb_mmf_fringe_stop_unit.vhd | 4 +- libraries/dsp/iquv/src/vhdl/iquv_iab.vhd | 2 +- libraries/dsp/iquv/tb/vhdl/tb_iquv.vhd | 18 +- libraries/dsp/iquv/tb/vhdl/tb_iquv_iab.vhd | 4 +- libraries/dsp/rTwoSDF/src/vhdl/rTwoSDFPkg.vhd | 2 +- libraries/dsp/rTwoSDF/src/vhdl/rTwoWMul.vhd | 2 +- libraries/dsp/si/tb/vhdl/tb_si.vhd | 2 +- .../dsp/st/src/vhdl/mmp_st_histogram.vhd | 2 +- libraries/dsp/st/src/vhdl/st_ctrl.vhd | 6 +- libraries/dsp/st/src/vhdl/st_histogram.vhd | 4 +- libraries/dsp/st/tb/vhdl/tb_st_histogram.vhd | 12 +- .../dsp/verify_pfb/tb_verify_pfb_response.vhd | 8 +- libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd | 20 +- libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd | 2 +- libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd | 4 +- libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd | 4 +- .../dsp/wpfb/tb/vhdl/tb_wpfb_unit_wide.vhd | 2 +- libraries/io/aduh/src/vhdl/aduh_quad.vhd | 4 +- libraries/io/aduh/src/vhdl/aduh_quad_reg.vhd | 2 +- libraries/io/aduh/src/vhdl/aduh_verify.vhd | 10 +- .../io/aduh/src/vhdl/aduh_verify_bit.vhd | 10 +- .../io/aduh/src/vhdl/lvdsh_dd_phs4_align.vhd | 2 +- libraries/io/aduh/src/vhdl/lvdsh_dd_wb4.vhd | 16 +- libraries/io/aduh/src/vhdl/mms_aduh_quad.vhd | 4 +- libraries/io/aduh/tb/vhdl/tb_aduh_dd.vhd | 6 +- libraries/io/aduh/tb/vhdl/tb_aduh_pll.vhd | 6 +- libraries/io/ddr/src/vhdl/io_ddr.vhd | 8 +- libraries/io/ddr/src/vhdl/io_ddr_driver.vhd | 2 +- .../ddr/src/vhdl/io_ddr_driver_flush_ctrl.vhd | 14 +- libraries/io/ddr/src/vhdl/io_ddr_reg.vhd | 2 +- libraries/io/ddr/src/vhdl/mms_io_ddr.vhd | 2 +- libraries/io/ddr/tb/vhdl/tb_io_ddr.vhd | 15 +- libraries/io/ddr/tb/vhdl/tb_tb_io_ddr.vhd | 4 +- libraries/io/ddr3/src/vhdl/ddr3.vhd | 2 +- libraries/io/ddr3/src/vhdl/ddr3_driver.vhd | 2 +- .../io/ddr3/src/vhdl/ddr3_flush_ctrl.vhd | 2 +- libraries/io/ddr3/src/vhdl/ddr3_pkg.vhd | 2 +- libraries/io/ddr3/src/vhdl/ddr3_reg.vhd | 2 +- libraries/io/ddr3/src/vhdl/ddr3_seq.vhd | 2 +- libraries/io/ddr3/src/vhdl/ddr3_transpose.vhd | 3 +- libraries/io/ddr3/src/vhdl/mms_ddr3.vhd | 2 +- .../io/ddr3/src/vhdl/mms_ddr3_capture.vhd | 2 +- libraries/io/ddr3/src/vhdl/seq_ddr3.vhd | 2 +- libraries/io/ddr3/tb/vhdl/tb_ddr3.vhd | 3 +- libraries/io/epcs/src/vhdl/epcs_reg.vhd | 2 +- libraries/io/epcs/src/vhdl/mms_epcs.vhd | 2 +- libraries/io/epcs/tb/vhdl/tb_mms_epcs.vhd | 2 +- .../src/vhdl/mmm_unb1_eth_10g.vhd | 2 +- .../unb1_eth_10g/src/vhdl/unb1_eth_10g.vhd | 11 +- libraries/io/eth/src/vhdl/eth_control.vhd | 4 +- libraries/io/eth/src/vhdl/eth_hdr.vhd | 8 +- libraries/io/eth/src/vhdl/eth_hdr_status.vhd | 4 +- libraries/io/eth/src/vhdl/eth_hdr_store.vhd | 4 +- libraries/io/eth/src/vhdl/eth_pkg.vhd | 4 +- .../eth/src/vhdl/eth_tester_axi4_wrapper.vhd | 1224 ++++++++--------- libraries/io/eth/src/vhdl/eth_tester_pkg.vhd | 6 +- libraries/io/eth/tb/vhdl/tb_eth_crc_ctrl.vhd | 4 +- libraries/io/eth/tb/vhdl/tb_eth_hdr.vhd | 4 +- .../io/eth/tb/vhdl/tb_eth_tester_pkg.vhd | 2 +- .../io/eth/tb/vhdl/tb_eth_udp_offload.vhd | 2 +- libraries/io/eth1g/src/vhdl/eth1g_master.vhd | 4 +- libraries/io/i2c/src/vhdl/avs_i2c_master.vhd | 2 +- libraries/io/i2c/src/vhdl/i2c_bit.vhd | 2 +- .../io/i2c/src/vhdl/i2c_bit_scl_sense.vhd | 2 +- libraries/io/i2c/src/vhdl/i2c_byte.vhd | 2 +- libraries/io/i2c/src/vhdl/i2c_smbus.vhd | 2 +- libraries/io/i2c/src/vhdl/i2c_smbus_pkg.vhd | 4 +- libraries/io/i2c/src/vhdl/i2cslave.vhd | 10 +- libraries/io/i2c/tb/vhdl/i2c_slv_device.vhd | 4 +- .../io/i2c/tb/vhdl/tb_avs_i2c_master.vhd | 2 +- libraries/io/i2c/tb/vhdl/tb_i2c_commander.vhd | 52 +- .../tb/vhdl/tb_i2c_commander_unb2_pmbus.vhd | 4 +- .../tb/vhdl/tb_i2c_commander_unb2_sens.vhd | 4 +- libraries/io/i2c/tb/vhdl/tb_i2c_master.vhd | 2 +- libraries/io/i2c/tb/vhdl/tb_i2cslave.vhd | 12 +- libraries/io/mac_10g/io_mac_10g.vhd | 2 +- libraries/io/mdio/src/vhdl/avs_mdio.vhd | 2 +- libraries/io/mdio/src/vhdl/mdio_ctlr.vhd | 2 +- libraries/io/mdio/src/vhdl/mdio_phy.vhd | 2 +- libraries/io/mdio/src/vhdl/mdio_phy_reg.vhd | 2 +- libraries/io/mdio/tb/vhdl/mmd_slave.vhd | 8 +- libraries/io/nw_10GbE/tb/vhdl/tb_nw_10GbE.vhd | 2 +- libraries/io/ppsh/src/vhdl/mm_ppsh.vhd | 2 +- libraries/io/ppsh/src/vhdl/mms_ppsh.vhd | 2 +- libraries/io/ppsh/src/vhdl/ppsh.vhd | 2 +- libraries/io/ppsh/src/vhdl/ppsh_reg.vhd | 2 +- libraries/io/remu/src/vhdl/mms_remu.vhd | 2 +- libraries/io/remu/src/vhdl/remu_reg.vhd | 2 +- libraries/io/tr_10GbE/tb/vhdl/tb_tr_10GbE.vhd | 2 +- .../io/tr_nonbonded/src/vhdl/tr_nonbonded.vhd | 2 +- .../src/vhdl/tr_nonbonded_reg.vhd | 2 +- .../tr_nonbonded/tb/vhdl/tb_tr_nonbonded.vhd | 3 +- libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd | 2 +- libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd | 2 +- .../io/tr_xaui/src/vhdl/tr_xaui_deframer.vhd | 3 +- .../io/tr_xaui/src/vhdl/tr_xaui_framer.vhd | 3 +- .../io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd | 2 +- libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd | 3 +- .../technology/10gbase_r/sim_10gbase_r.vhd | 2 +- .../technology/10gbase_r/tech_10gbase_r.vhd | 2 +- libraries/technology/clkbuf/tech_clkbuf.vhd | 8 +- .../clkbuf/tech_clkbuf_component_pkg.vhd | 2 +- libraries/technology/ddr/sim_ddr.vhd | 2 +- libraries/technology/ddr/tech_ddr.vhd | 2 +- libraries/technology/ddr/tech_ddr_arria10.vhd | 4 +- .../technology/ddr/tech_ddr_arria10_e1sg.vhd | 8 +- .../technology/ddr/tech_ddr_arria10_e2sg.vhd | 8 +- .../ddr/tech_ddr_arria10_e3sge3.vhd | 6 +- .../technology/ddr/tech_ddr_mem_model.vhd | 6 +- libraries/technology/ddr/tech_ddr_pkg.vhd | 8 +- .../technology/ddr/tech_ddr_stratixiv.vhd | 10 +- .../fifo/tech_fifo_component_pkg.vhd | 487 +------ libraries/technology/fifo/tech_fifo_dc.vhd | 111 +- .../fifo/tech_fifo_dc_mixed_widths.vhd | 111 +- libraries/technology/fifo/tech_fifo_sc.vhd | 109 +- .../tech_fpga_temp_sens_component_pkg.vhd | 2 +- .../tech_fpga_voltage_sens_component_pkg.vhd | 2 +- .../tech_fractional_pll_clk200.vhd | 2 +- .../tech_fractional_pll_component_pkg.vhd | 2 +- .../ip_arria10/eth_10g/ip_arria10_eth_10g.vhd | 8 +- .../ip_arria10/mult/ip_arria10_mult_rtl.vhd | 2 +- .../ram/ip_arria10_ram_crwk_crw.vhd | 2 +- ...ia10_simple_dual_port_ram_single_clock.vhd | 2 +- ...tera_avalon_onchip_memory2_170_yroldmy.vhd | 2 +- ...tera_avalon_onchip_memory2_180_xymx6za.vhd | 2 +- .../ip_arria10_e1sg_ddr4_8g_2400_inst.vhd | 2 +- .../eth_10g/ip_arria10_e1sg_eth_10g.vhd | 4 +- .../jesd204b/ip_arria10_e1sg_jesd204b.vhd | 3 +- .../ram/ip_arria10_e1sg_ram_crwk_crw.vhd | 2 +- .../ip_arria10_e1sg_ram_crwk_crw_inst.vhd | 2 +- ...1sg_ram_crwk_crw_ram_2port_170_qaianri.vhd | 2 +- ...e1sg_simple_dual_port_ram_single_clock.vhd | 2 +- ...sg_transceiver_reset_controller_3_inst.vhd | 2 +- .../ip_arria10_e2sg_ddr4_8g_1600_inst.vhd | 2 +- .../eth_10g/ip_arria10_e2sg_eth_10g.vhd | 4 +- .../jesd204b/ip_arria10_e2sg_jesd204b.vhd | 3 +- .../ip_arria10_e2sg_ram_crw_crw_inst.vhd | 2 +- ...2sg_ram_crw_crw_ram_2port_2000_zxnv4ey.vhd | 2 +- .../ram/ip_arria10_e2sg_ram_crwk_crw.vhd | 2 +- ...e2sg_simple_dual_port_ram_single_clock.vhd | 2 +- .../eth_10g/ip_arria10_e3sge3_eth_10g.vhd | 8 +- .../ram/ip_arria10_e3sge3_ram_crwk_crw.vhd | 2 +- ...sge3_simple_dual_port_ram_single_clock.vhd | 2 +- .../eth_10g/ip_stratixiv_eth_10g.vhd | 14 +- .../mult/ip_stratixiv_mult_rtl.vhd | 2 +- .../phy_xaui/tb_ip_stratixiv_phy_xaui.vhd | 2 +- .../ip_stratixiv_gxb_reconfig_v101.vhd | 2 +- .../ip_stratixiv_gxb_reconfig_v111.vhd | 2 +- .../ip_stratixiv_gxb_reconfig_v91.vhd | 2 +- .../fifo/ip_ultrascale_fifo_dc.vhd | 352 ++--- .../ip_ultrascale_fifo_dc_mixed_widths.vhd | 356 ++--- .../fifo/ip_ultrascale_fifo_sc.vhd | 342 ++--- .../ram/ip_ultrascale_ram_cr_cw.vhd | 66 +- .../ram/ip_ultrascale_ram_crw_crw.vhd | 80 +- .../technology/jesd204b/tb_tech_jesd204b.vhd | 2 +- libraries/technology/mac_10g/tech_mac_10g.vhd | 2 +- .../memory/tech_memory_component_pkg.vhd | 620 +-------- .../memory/tech_memory_ram_cr_cw.vhd | 30 +- .../memory/tech_memory_ram_crw_crw.vhd | 119 +- .../technology/mult/tech_complex_mult.vhd | 20 +- libraries/technology/mult/tech_mult.vhd | 12 +- libraries/technology/mult/tech_mult_add2.vhd | 8 +- libraries/technology/mult/tech_mult_add4.vhd | 10 +- .../technology/pll/tech_pll_component_pkg.vhd | 2 +- libraries/technology/technology_pkg.vhd | 141 +- .../transceiver/sim_transceiver_gx.vhd | 2 +- .../transceiver/tech_transceiver_gx.vhd | 2 +- .../tech_transceiver_gx_stratixiv.vhd | 2 +- .../transceiver/tech_transceiver_rx_align.vhd | 2 +- .../transceiver/tech_transceiver_rx_rst.vhd | 2 +- .../transceiver/tech_transceiver_tx_align.vhd | 2 +- .../transceiver/tech_transceiver_tx_rst.vhd | 2 +- libraries/technology/xaui/sim_xaui.vhd | 2 +- libraries/technology/xaui/tech_xaui.vhd | 2 +- .../technology/xaui/tech_xaui_align_dly.vhd | 2 +- .../technology/xaui/tech_xaui_stratixiv.vhd | 2 +- vhdl_style_fix.py | 9 +- 786 files changed, 3144 insertions(+), 4814 deletions(-) diff --git a/applications/lofar1/RSP/pfb2/src/vhdl/pfb2_unit.vhd b/applications/lofar1/RSP/pfb2/src/vhdl/pfb2_unit.vhd index a002861e69..3987733ec4 100644 --- a/applications/lofar1/RSP/pfb2/src/vhdl/pfb2_unit.vhd +++ b/applications/lofar1/RSP/pfb2/src/vhdl/pfb2_unit.vhd @@ -152,5 +152,3 @@ begin out_sosi_arr <= pft_sosi_arr; end str; - - diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs.vhd index e4c4083c81..053c933c24 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs.vhd @@ -175,4 +175,4 @@ begin rst => rst ); -end str; +end str; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_combine.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_combine.vhd index 977091fac6..d2e2984170 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_combine.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_combine.vhd @@ -19,4 +19,4 @@ entity pfs_combine is clk : in std_logic; rst : in std_logic ); -end pfs_combine; +end pfs_combine; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir.vhd index 2d7e1b58f3..b3877c1b40 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir.vhd @@ -27,5 +27,4 @@ entity pfs_fir is res_val : out std_logic; res_sync : out std_logic ); -end pfs_fir; - +end pfs_fir; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_coefsbuf.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_coefsbuf.vhd index 2d2d65c5b5..b132444374 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_coefsbuf.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_coefsbuf.vhd @@ -16,5 +16,4 @@ entity pfs_fir_coefsbuf is clk : in std_logic; rst : in std_logic ); -end pfs_fir_coefsbuf; - +end pfs_fir_coefsbuf; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_ctrl.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_ctrl.vhd index 589cb8987f..2bbd1fa9eb 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_ctrl.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_ctrl.vhd @@ -29,4 +29,4 @@ entity pfs_fir_ctrl is result_val : out std_logic; result_sync : out std_logic ); -end pfs_fir_ctrl; +end pfs_fir_ctrl; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_mac.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_mac.vhd index e4e7eaf9b6..f0c46f25c5 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_mac.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_mac.vhd @@ -20,4 +20,4 @@ entity pfs_fir_mac is rst : in std_logic; result : out std_logic_vector (g_out_w - 1 downto 0) ); -end pfs_fir_mac; +end pfs_fir_mac; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_tapsbuf.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_tapsbuf.vhd index fd4fefee1e..a5bc5988b5 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_tapsbuf.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_tapsbuf.vhd @@ -18,5 +18,4 @@ entity pfs_fir_tapsbuf is clk : in std_logic; rst : in std_logic ); -end pfs_fir_tapsbuf; - +end pfs_fir_tapsbuf; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_pkg.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_pkg.vhd index 9c85c2190d..47618c080e 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_pkg.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_pkg.vhd @@ -36,5 +36,4 @@ end pfs_pkg; package body pfs_pkg is -end pfs_pkg; - +end pfs_pkg; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/src/vhdl/pfs_rotate.vhd b/applications/lofar1/RSP/pfs/src/vhdl/pfs_rotate.vhd index df310d7b22..d34df26e41 100644 --- a/applications/lofar1/RSP/pfs/src/vhdl/pfs_rotate.vhd +++ b/applications/lofar1/RSP/pfs/src/vhdl/pfs_rotate.vhd @@ -20,4 +20,4 @@ entity pfs_rotate is out_val : out std_logic_vector(g_nof_fir - 1 downto 0); out_sync : out std_logic ); -end pfs_rotate; +end pfs_rotate; \ No newline at end of file diff --git a/applications/lofar1/RSP/pfs/tb/vhdl/tb_pfs.vhd b/applications/lofar1/RSP/pfs/tb/vhdl/tb_pfs.vhd index db4bd1c3f0..98ce19adce 100644 --- a/applications/lofar1/RSP/pfs/tb/vhdl/tb_pfs.vhd +++ b/applications/lofar1/RSP/pfs/tb/vhdl/tb_pfs.vhd @@ -124,5 +124,4 @@ begin wait; end process; -end tb; - +end tb; \ No newline at end of file diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_bf.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_bf.vhd index aeaeaa20db..3a055461a2 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_bf.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_bf.vhd @@ -142,7 +142,7 @@ begin --wr_im <= wr_dat(wr_im'RANGE); s0 <= cnt(cnt'high - 1); - s1 <= cnt(cnt'high ) when g_bf_name ="bf2 " else '0'; + s1 <= cnt(cnt'high ) when g_bf_name ="bf2 " else '0'; registers : process (clk, rst) begin diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_bf_fw.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_bf_fw.vhd index 1d4105c184..a290eb62f8 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_bf_fw.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_bf_fw.vhd @@ -108,7 +108,7 @@ begin nxt_pipe_sync <= in_sync & pipe_sync(pipe_sync'high downto 1); s0 <= cnt(cnt'high - 1); - s1 <= cnt(cnt'high ) when g_bf_name ="bf2 " else '0'; + s1 <= cnt(cnt'high ) when g_bf_name ="bf2 " else '0'; out_val <= pipe_val(0); out_sync <= pipe_sync(0); diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_lfsr.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_lfsr.vhd index 490a1fdf10..8d27cb04b0 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_lfsr.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_lfsr.vhd @@ -88,4 +88,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_pkg.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_pkg.vhd index a8a2987315..54c2038cb3 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_pkg.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_pkg.vhd @@ -47,5 +47,4 @@ end pft_pkg; package body pft_pkg is -end pft_pkg; - +end pft_pkg; \ No newline at end of file diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_separate.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_separate.vhd index 7ae344bb53..ac53a9c07e 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_separate.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_separate.vhd @@ -72,9 +72,9 @@ architecture rtl of pft_separate is signal rd_cnt : std_logic_vector(g_fft_sz_w - 1 downto 0); signal nxt_rd_cnt : std_logic_vector(rd_cnt'range); - signal page_rdy_dly : std_logic_vector( 0 TO c_tot_delay - 1); - signal rdval_dly : std_logic_vector( 0 TO c_tot_delay - 1); - signal rdsync_dly : std_logic_vector( 0 TO c_tot_delay + 1); + signal page_rdy_dly : std_logic_vector( 0 to c_tot_delay - 1); + signal rdval_dly : std_logic_vector( 0 to c_tot_delay - 1); + signal rdsync_dly : std_logic_vector( 0 to c_tot_delay + 1); signal nxt_rdsync_dly : std_logic_vector(rdsync_dly'range); signal rdsync_reg : std_logic; signal nxt_rdsync_reg : std_logic; diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_top.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_top.vhd index f6d0eeb201..818eebc79c 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_top.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_top.vhd @@ -25,4 +25,4 @@ entity pft_top is clk : in std_logic; rst : in std_logic ); -end pft_top; +end pft_top; \ No newline at end of file diff --git a/applications/lofar1/RSP/pft2/src/vhdl/pft_unswitch.vhd b/applications/lofar1/RSP/pft2/src/vhdl/pft_unswitch.vhd index ea00f4e242..f56d81d503 100644 --- a/applications/lofar1/RSP/pft2/src/vhdl/pft_unswitch.vhd +++ b/applications/lofar1/RSP/pft2/src/vhdl/pft_unswitch.vhd @@ -126,4 +126,4 @@ begin ); -end rtl; +end rtl; \ No newline at end of file diff --git a/applications/lofar1/RSP/pft2/tb/vhdl/tb_pft2.vhd b/applications/lofar1/RSP/pft2/tb/vhdl/tb_pft2.vhd index fab13ed089..50825da7c8 100644 --- a/applications/lofar1/RSP/pft2/tb/vhdl/tb_pft2.vhd +++ b/applications/lofar1/RSP/pft2/tb/vhdl/tb_pft2.vhd @@ -232,7 +232,7 @@ architecture tb of tb_pft2 is begin un := to_unsigned(n, w); for i in 0 to w - 1 loop - ur(i) := un(w - 1 -i); + ur(i) := un(w - 1 - i); end loop; return to_integer(ur); end func_bitrev; diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_6ch_200MHz/lofar2_unb2b_adc_6ch_200MHz.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_6ch_200MHz/lofar2_unb2b_adc_6ch_200MHz.vhd index 8e465e8fab..ebdfbd1490 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_6ch_200MHz/lofar2_unb2b_adc_6ch_200MHz.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_6ch_200MHz/lofar2_unb2b_adc_6ch_200MHz.vhd @@ -70,8 +70,8 @@ entity lofar2_unb2b_adc_6ch_200MHz is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_full/lofar2_unb2b_adc_full.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_full/lofar2_unb2b_adc_full.vhd index 77049fb74c..29625eb5eb 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_full/lofar2_unb2b_adc_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_full/lofar2_unb2b_adc_full.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_adc_full is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_one_node/lofar2_unb2b_adc_one_node.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_one_node/lofar2_unb2b_adc_one_node.vhd index 2d775cab13..a9551b1d78 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_one_node/lofar2_unb2b_adc_one_node.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/revisions/lofar2_unb2b_adc_one_node/lofar2_unb2b_adc_one_node.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_adc_one_node is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd index d607bb85f6..7fc1193fb1 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd @@ -76,8 +76,8 @@ entity lofar2_unb2b_adc is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc_pkg.vhd index 292e1a4438..3184b1c48c 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc_pkg.vhd @@ -59,4 +59,4 @@ package body lofar2_unb2b_adc_pkg is end; -end lofar2_unb2b_adc_pkg; +end lofar2_unb2b_adc_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/qsys_lofar2_unb2b_adc_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/qsys_lofar2_unb2b_adc_pkg.vhd index d8da460697..42f9b46a69 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/qsys_lofar2_unb2b_adc_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/qsys_lofar2_unb2b_adc_pkg.vhd @@ -238,4 +238,4 @@ package qsys_lofar2_unb2b_adc_pkg is rom_system_info_writedata_export : out std_logic_vector(31 downto 0) -- export ); end component qsys_lofar2_unb2b_adc; -end qsys_lofar2_unb2b_adc_pkg; +end qsys_lofar2_unb2b_adc_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd index 9a1ae6dc64..bfcb1be340 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_beamformer_one_node is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd index b80576b5ef..b5351eaaa2 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_beamformer_one_node_256MHz is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd index 3a8dd98e44..802e5215b7 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd @@ -80,8 +80,8 @@ entity lofar2_unb2b_beamformer is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd index 0058df4429..ed72bf2d62 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd @@ -60,4 +60,4 @@ package body lofar2_unb2b_beamformer_pkg is end; -end lofar2_unb2b_beamformer_pkg; +end lofar2_unb2b_beamformer_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/qsys_lofar2_unb2b_beamformer_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/qsys_lofar2_unb2b_beamformer_pkg.vhd index 390724e6c9..1130805b9e 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/qsys_lofar2_unb2b_beamformer_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/qsys_lofar2_unb2b_beamformer_pkg.vhd @@ -346,4 +346,4 @@ package qsys_lofar2_unb2b_beamformer_pkg is rom_system_info_writedata_export : out std_logic_vector(31 downto 0) -- export ); end component qsys_lofar2_unb2b_beamformer; -end qsys_lofar2_unb2b_beamformer_pkg; +end qsys_lofar2_unb2b_beamformer_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/tb/vhdl/tb_lofar2_unb2b_beamformer.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/tb/vhdl/tb_lofar2_unb2b_beamformer.vhd index 582f19a70f..501b47a642 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/tb/vhdl/tb_lofar2_unb2b_beamformer.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/tb/vhdl/tb_lofar2_unb2b_beamformer.vhd @@ -509,8 +509,8 @@ begin -- verify if subband power and beamlet power are the same. This is expected because we only use 1 WG input and the BF weights have unit value. -- the difference should not be larger than 0.5% (+/- 2^13 for low values) - assert v_sp_beamlet_power > 0.995 * v_sp_subband_power - 2.0**13 report "index (" & integer'image(v_S) &", " & integer'image(v_B) &"): Subband power = " & real'image(v_sp_subband_power) &" and Beamlet power = " & real'image(v_sp_beamlet_power) &" are not equal " severity ERROR; - assert v_sp_beamlet_power < 1.005 * v_sp_subband_power + 2.0**13 report "index (" & integer'image(v_S) &", " & integer'image(v_B) &"): Subband power = " & real'image(v_sp_subband_power) &" and Beamlet power = " & real'image(v_sp_beamlet_power) &" are not equal " severity ERROR; + assert v_sp_beamlet_power > 0.995 * v_sp_subband_power - 2.0**13 report "index (" & integer'image(v_S) &", " & integer'image(v_B) &"): Subband power = " & real'image(v_sp_subband_power) &" and Beamlet power = " & real'image(v_sp_beamlet_power) &" are not equal " severity ERROR; + assert v_sp_beamlet_power < 1.005 * v_sp_subband_power + 2.0**13 report "index (" & integer'image(v_S) &", " & integer'image(v_B) &"): Subband power = " & real'image(v_sp_subband_power) &" and Beamlet power = " & real'image(v_sp_beamlet_power) &" are not equal " severity ERROR; end if; end loop; diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full/lofar2_unb2b_filterbank_full.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full/lofar2_unb2b_filterbank_full.vhd index 6039ea6de2..3e20bc30e6 100644 --- a/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full/lofar2_unb2b_filterbank_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full/lofar2_unb2b_filterbank_full.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_filterbank_full is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full_256MHz/lofar2_unb2b_filterbank_full_256MHz.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full_256MHz/lofar2_unb2b_filterbank_full_256MHz.vhd index 4ac5d2c77b..6f03aa7783 100644 --- a/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full_256MHz/lofar2_unb2b_filterbank_full_256MHz.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/revisions/lofar2_unb2b_filterbank_full_256MHz/lofar2_unb2b_filterbank_full_256MHz.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_filterbank_full_256MHz is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd index d4f06f5ab9..8c9831b0df 100644 --- a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd @@ -81,8 +81,8 @@ entity lofar2_unb2b_filterbank is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank_pkg.vhd index 8f87e325ef..d3908c5da8 100644 --- a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank_pkg.vhd @@ -60,4 +60,4 @@ package body lofar2_unb2b_filterbank_pkg is end; -end lofar2_unb2b_filterbank_pkg; +end lofar2_unb2b_filterbank_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/qsys_lofar2_unb2b_filterbank_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/qsys_lofar2_unb2b_filterbank_pkg.vhd index c8c654b6d2..a6f230e893 100644 --- a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/qsys_lofar2_unb2b_filterbank_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/qsys_lofar2_unb2b_filterbank_pkg.vhd @@ -314,4 +314,4 @@ package qsys_lofar2_unb2b_filterbank_pkg is pio_jesd_ctrl_readdata_export : in std_logic_vector(31 downto 0) := (others => 'x') -- export ); end component qsys_lofar2_unb2b_filterbank; -end qsys_lofar2_unb2b_filterbank_pkg; +end qsys_lofar2_unb2b_filterbank_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_full/lofar2_unb2b_ring_full.vhd b/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_full/lofar2_unb2b_ring_full.vhd index d321e455b9..53c030f9f8 100644 --- a/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_full/lofar2_unb2b_ring_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_full/lofar2_unb2b_ring_full.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_ring_full is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -80,9 +80,9 @@ entity lofar2_unb2b_ring_full is QSFP_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_one/lofar2_unb2b_ring_one.vhd b/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_one/lofar2_unb2b_ring_one.vhd index 384a7c43f6..69515f1c3e 100644 --- a/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_one/lofar2_unb2b_ring_one.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_ring/revisions/lofar2_unb2b_ring_one/lofar2_unb2b_ring_one.vhd @@ -72,8 +72,8 @@ entity lofar2_unb2b_ring_one is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -83,9 +83,9 @@ entity lofar2_unb2b_ring_one is QSFP_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd index f0c5ae315c..605abc5918 100644 --- a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd @@ -81,8 +81,8 @@ entity lofar2_unb2b_ring is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -91,9 +91,9 @@ entity lofar2_unb2b_ring is QSFP_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring_pkg.vhd index 63a06f190e..6412b56044 100644 --- a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring_pkg.vhd @@ -55,4 +55,4 @@ package body lofar2_unb2b_ring_pkg is end; -end lofar2_unb2b_ring_pkg; +end lofar2_unb2b_ring_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/qsys_lofar2_unb2b_ring_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/qsys_lofar2_unb2b_ring_pkg.vhd index 6a531df96d..e25347ffdd 100644 --- a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/qsys_lofar2_unb2b_ring_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/qsys_lofar2_unb2b_ring_pkg.vhd @@ -242,4 +242,4 @@ package qsys_lofar2_unb2b_ring_pkg is rom_system_info_writedata_export : out std_logic_vector(31 downto 0) -- export ); end component qsys_lofar2_unb2b_ring; -end qsys_lofar2_unb2b_ring_pkg; +end qsys_lofar2_unb2b_ring_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full/disturb2_unb2b_sdp_station_full.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full/disturb2_unb2b_sdp_station_full.vhd index a1055756ee..2dcfa51e44 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full/disturb2_unb2b_sdp_station_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full/disturb2_unb2b_sdp_station_full.vhd @@ -69,8 +69,8 @@ entity disturb2_unb2b_sdp_station_full is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -86,9 +86,9 @@ entity disturb2_unb2b_sdp_station_full is QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (note only 6 are used in unb2b) diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd index 5a4fa25243..602eb5680a 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/disturb2_unb2b_sdp_station_full_wg/disturb2_unb2b_sdp_station_full_wg.vhd @@ -74,8 +74,8 @@ entity disturb2_unb2b_sdp_station_full_wg is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -92,9 +92,9 @@ entity disturb2_unb2b_sdp_station_full_wg is QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) ); end disturb2_unb2b_sdp_station_full_wg; diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_adc/lofar2_unb2b_sdp_station_adc.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_adc/lofar2_unb2b_sdp_station_adc.vhd index 684bd60005..88e3f0565d 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_adc/lofar2_unb2b_sdp_station_adc.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_adc/lofar2_unb2b_sdp_station_adc.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_adc is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/lofar2_unb2b_sdp_station_bf.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/lofar2_unb2b_sdp_station_bf.vhd index fb906fb147..aed4669641 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/lofar2_unb2b_sdp_station_bf.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/lofar2_unb2b_sdp_station_bf.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_bf is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd index a3c5873fc7..2af60e7192 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_bf/tb_lofar2_unb2b_sdp_station_bf.vhd @@ -993,8 +993,8 @@ begin -- g_sp = Y --> w_yy --> beamlet Y = c_exp_beamlet_bst -- for u in 0 to c_sdp_N_beamsets - 1 loop - assert pol_beamlet_bst_x_arr(u) > c_stat_lo_factor * c_exp_beamlet_bst report "Wrong beamlet power for X in beamset " & natural'image(u) severity ERROR; - assert pol_beamlet_bst_x_arr(u) < c_stat_hi_factor * c_exp_beamlet_bst report "Wrong beamlet power for X in beamset " & natural'image(u) severity ERROR; + assert pol_beamlet_bst_x_arr(u) > c_stat_lo_factor * c_exp_beamlet_bst report "Wrong beamlet power for x in beamset " & natural'image(u) severity ERROR; + assert pol_beamlet_bst_x_arr(u) < c_stat_hi_factor * c_exp_beamlet_bst report "Wrong beamlet power for x in beamset " & natural'image(u) severity ERROR; assert pol_beamlet_bst_Y_arr(u) > c_stat_lo_factor * c_exp_beamlet_bst report "Wrong beamlet power for Y in beamset " & natural'image(u) severity ERROR; assert pol_beamlet_bst_Y_arr(u) < c_stat_hi_factor * c_exp_beamlet_bst report "Wrong beamlet power for Y in beamset " & natural'image(u) severity ERROR; end loop; diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_fsub/lofar2_unb2b_sdp_station_fsub.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_fsub/lofar2_unb2b_sdp_station_fsub.vhd index a753496769..c137ccaf1c 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_fsub/lofar2_unb2b_sdp_station_fsub.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_fsub/lofar2_unb2b_sdp_station_fsub.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_fsub is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full/lofar2_unb2b_sdp_station_full.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full/lofar2_unb2b_sdp_station_full.vhd index bef8ee9624..1ea8c68722 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full/lofar2_unb2b_sdp_station_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full/lofar2_unb2b_sdp_station_full.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_full is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -86,9 +86,9 @@ entity lofar2_unb2b_sdp_station_full is QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (note only 6 are used in unb2b) diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full_wg/lofar2_unb2b_sdp_station_full_wg.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full_wg/lofar2_unb2b_sdp_station_full_wg.vhd index 2006e0b249..2f25575b4f 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full_wg/lofar2_unb2b_sdp_station_full_wg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_full_wg/lofar2_unb2b_sdp_station_full_wg.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_full_wg is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -87,9 +87,9 @@ entity lofar2_unb2b_sdp_station_full_wg is QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) ); end lofar2_unb2b_sdp_station_full_wg; diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/lofar2_unb2b_sdp_station_xsub_one.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/lofar2_unb2b_sdp_station_xsub_one.vhd index 017b951451..273254fdcd 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/lofar2_unb2b_sdp_station_xsub_one.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/lofar2_unb2b_sdp_station_xsub_one.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_xsub_one is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_ring/lofar2_unb2b_sdp_station_xsub_ring.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_ring/lofar2_unb2b_sdp_station_xsub_ring.vhd index 31ec29b755..682b463781 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_ring/lofar2_unb2b_sdp_station_xsub_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_ring/lofar2_unb2b_sdp_station_xsub_ring.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2b_sdp_station_xsub_ring is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -86,9 +86,9 @@ entity lofar2_unb2b_sdp_station_xsub_ring is QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (note only 6 are used in unb2b) diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd index 3c1235a785..0e51d9af3d 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd @@ -83,8 +83,8 @@ entity lofar2_unb2b_sdp_station is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -100,9 +100,9 @@ entity lofar2_unb2b_sdp_station is QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (Note: numbered from 0) diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd index 8860c96234..504a287931 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station_pkg.vhd @@ -78,4 +78,4 @@ package body lofar2_unb2b_sdp_station_pkg is end; -end lofar2_unb2b_sdp_station_pkg; +end lofar2_unb2b_sdp_station_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/qsys_lofar2_unb2b_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/qsys_lofar2_unb2b_sdp_station_pkg.vhd index 3c85d590cc..97a07112a4 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/qsys_lofar2_unb2b_sdp_station_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/qsys_lofar2_unb2b_sdp_station_pkg.vhd @@ -577,4 +577,4 @@ package qsys_lofar2_unb2b_sdp_station_pkg is rom_system_info_writedata_export : out std_logic_vector(31 downto 0) -- export ); end component qsys_lofar2_unb2b_sdp_station; -end qsys_lofar2_unb2b_sdp_station_pkg; +end qsys_lofar2_unb2b_sdp_station_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_ddrctrl/src/vhdl/lofar2_unb2c_ddrctrl.vhd b/applications/lofar2/designs/lofar2_unb2c_ddrctrl/src/vhdl/lofar2_unb2c_ddrctrl.vhd index d95e2b16b2..99e0601a72 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ddrctrl/src/vhdl/lofar2_unb2c_ddrctrl.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ddrctrl/src/vhdl/lofar2_unb2c_ddrctrl.vhd @@ -63,8 +63,8 @@ entity lofar2_unb2c_ddrctrl is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); @@ -73,7 +73,7 @@ entity lofar2_unb2c_ddrctrl is --MB_II_REF_CLK : IN STD_LOGIC := '0'; -- Reference clock for MB_II -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_I_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou @@ -760,4 +760,4 @@ begin QSFP_LED => QSFP_LED ); -end str; +end str; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full/lofar2_unb2c_filterbank_full.vhd b/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full/lofar2_unb2c_filterbank_full.vhd index ae74c3c55d..aace61a91f 100644 --- a/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full/lofar2_unb2c_filterbank_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full/lofar2_unb2c_filterbank_full.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2c_filterbank_full is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); - ETH_SGout : OUT std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); + ETH_SGin : in std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); + ETH_SGout : out std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full_256MHz/lofar2_unb2c_filterbank_full_256MHz.vhd b/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full_256MHz/lofar2_unb2c_filterbank_full_256MHz.vhd index a7c322eb62..f2ceb9c9bb 100644 --- a/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full_256MHz/lofar2_unb2c_filterbank_full_256MHz.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_filterbank/revisions/lofar2_unb2c_filterbank_full_256MHz/lofar2_unb2c_filterbank_full_256MHz.vhd @@ -69,8 +69,8 @@ entity lofar2_unb2c_filterbank_full_256MHz is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; --_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); - ETH_SGout : OUT std_logic; --_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); + ETH_SGin : in std_logic; --_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); + ETH_SGout : out std_logic; --_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd index cc451c9bd4..2eb5e37049 100644 --- a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd @@ -79,8 +79,8 @@ entity lofar2_unb2c_filterbank is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); - ETH_SGout : OUT std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); + ETH_SGin : in std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); + ETH_SGout : out std_logic; --STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank_pkg.vhd index ed782862d3..8fb31e760c 100644 --- a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank_pkg.vhd @@ -60,4 +60,4 @@ package body lofar2_unb2c_filterbank_pkg is end; -end lofar2_unb2c_filterbank_pkg; +end lofar2_unb2c_filterbank_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/qsys_lofar2_unb2c_filterbank_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/qsys_lofar2_unb2c_filterbank_pkg.vhd index 8907d2e3d0..d835425fe3 100644 --- a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/qsys_lofar2_unb2c_filterbank_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/qsys_lofar2_unb2c_filterbank_pkg.vhd @@ -283,4 +283,4 @@ package qsys_lofar2_unb2c_filterbank_pkg is rom_system_info_writedata_export : out std_logic_vector(31 downto 0) -- export ); end component qsys_lofar2_unb2c_filterbank; -end qsys_lofar2_unb2c_filterbank_pkg; +end qsys_lofar2_unb2c_filterbank_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_full/lofar2_unb2c_ring_full.vhd b/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_full/lofar2_unb2c_ring_full.vhd index de4a2c9adc..7acefe5385 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_full/lofar2_unb2c_ring_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_full/lofar2_unb2c_ring_full.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_ring_full is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -72,9 +72,9 @@ entity lofar2_unb2c_ring_full is QSFP_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_one/lofar2_unb2c_ring_one.vhd b/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_one/lofar2_unb2c_ring_one.vhd index baf1916783..276f10568b 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_one/lofar2_unb2c_ring_one.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ring/revisions/lofar2_unb2c_ring_one/lofar2_unb2c_ring_one.vhd @@ -64,8 +64,8 @@ entity lofar2_unb2c_ring_one is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -75,9 +75,9 @@ entity lofar2_unb2c_ring_one is QSFP_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd index e04b0c5dd6..ed47f2b098 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd @@ -73,8 +73,8 @@ entity lofar2_unb2c_ring is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -83,9 +83,9 @@ entity lofar2_unb2c_ring is QSFP_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring_pkg.vhd index 8aef3ccd31..4a6cfe862a 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring_pkg.vhd @@ -56,4 +56,4 @@ package body lofar2_unb2c_ring_pkg is end; -end lofar2_unb2c_ring_pkg; +end lofar2_unb2c_ring_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/qsys_lofar2_unb2c_ring_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/qsys_lofar2_unb2c_ring_pkg.vhd index 030a05126f..51e1e18aba 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/qsys_lofar2_unb2c_ring_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/qsys_lofar2_unb2c_ring_pkg.vhd @@ -228,4 +228,4 @@ package qsys_lofar2_unb2c_ring_pkg is rom_system_info_writedata_export : out std_logic_vector(31 downto 0) -- export ); end component qsys_lofar2_unb2c_ring; -end qsys_lofar2_unb2c_ring_pkg; +end qsys_lofar2_unb2c_ring_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full/disturb2_unb2c_sdp_station_full.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full/disturb2_unb2c_sdp_station_full.vhd index aac114f9e3..f8e441e5da 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full/disturb2_unb2c_sdp_station_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full/disturb2_unb2c_sdp_station_full.vhd @@ -61,8 +61,8 @@ entity disturb2_unb2c_sdp_station_full is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -78,9 +78,9 @@ entity disturb2_unb2c_sdp_station_full is QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (note only 12 are used in unb2c) diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full_wg/disturb2_unb2c_sdp_station_full_wg.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full_wg/disturb2_unb2c_sdp_station_full_wg.vhd index 13574e50d1..59d8bc66e0 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full_wg/disturb2_unb2c_sdp_station_full_wg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/disturb2_unb2c_sdp_station_full_wg/disturb2_unb2c_sdp_station_full_wg.vhd @@ -61,8 +61,8 @@ entity disturb2_unb2c_sdp_station_full_wg is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -78,9 +78,9 @@ entity disturb2_unb2c_sdp_station_full_wg is QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) ); end disturb2_unb2c_sdp_station_full_wg; diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_adc/lofar2_unb2c_sdp_station_adc.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_adc/lofar2_unb2c_sdp_station_adc.vhd index 57ae9b3a60..56ab74b8ea 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_adc/lofar2_unb2c_sdp_station_adc.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_adc/lofar2_unb2c_sdp_station_adc.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_adc is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/lofar2_unb2c_sdp_station_bf.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/lofar2_unb2c_sdp_station_bf.vhd index 0c40049edf..8b224926a5 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/lofar2_unb2c_sdp_station_bf.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf/lofar2_unb2c_sdp_station_bf.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_bf is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/lofar2_unb2c_sdp_station_bf_ring.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/lofar2_unb2c_sdp_station_bf_ring.vhd index d9d847fc3d..4d435fb0d3 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/lofar2_unb2c_sdp_station_bf_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_bf_ring/lofar2_unb2c_sdp_station_bf_ring.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_bf is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -80,9 +80,9 @@ entity lofar2_unb2c_sdp_station_bf is QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_fsub/lofar2_unb2c_sdp_station_fsub.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_fsub/lofar2_unb2c_sdp_station_fsub.vhd index 652c5b8bfe..50debd5f1e 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_fsub/lofar2_unb2c_sdp_station_fsub.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_fsub/lofar2_unb2c_sdp_station_fsub.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_fsub is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full/lofar2_unb2c_sdp_station_full.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full/lofar2_unb2c_sdp_station_full.vhd index 9eb7f05947..1fc1aea0cf 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full/lofar2_unb2c_sdp_station_full.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full/lofar2_unb2c_sdp_station_full.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_full is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -78,9 +78,9 @@ entity lofar2_unb2c_sdp_station_full is QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (note only 12 are used in unb2c) diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full_wg/lofar2_unb2c_sdp_station_full_wg.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full_wg/lofar2_unb2c_sdp_station_full_wg.vhd index 9c87d6ec61..112f7fd157 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full_wg/lofar2_unb2c_sdp_station_full_wg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_full_wg/lofar2_unb2c_sdp_station_full_wg.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_full_wg is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -78,9 +78,9 @@ entity lofar2_unb2c_sdp_station_full_wg is QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) ); end lofar2_unb2c_sdp_station_full_wg; diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_one/lofar2_unb2c_sdp_station_xsub_one.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_one/lofar2_unb2c_sdp_station_xsub_one.vhd index c4e17b7ddc..d1f73f8176 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_one/lofar2_unb2c_sdp_station_xsub_one.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_one/lofar2_unb2c_sdp_station_xsub_one.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_xsub_one is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- LEDs QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_ring/lofar2_unb2c_sdp_station_xsub_ring.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_ring/lofar2_unb2c_sdp_station_xsub_ring.vhd index a8b39e86ca..076135ab24 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_ring/lofar2_unb2c_sdp_station_xsub_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/revisions/lofar2_unb2c_sdp_station_xsub_ring/lofar2_unb2c_sdp_station_xsub_ring.vhd @@ -61,8 +61,8 @@ entity lofar2_unb2c_sdp_station_xsub_ring is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -78,9 +78,9 @@ entity lofar2_unb2c_sdp_station_xsub_ring is QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- back transceivers (note only 12 are used in unb2c) diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd index ff4b73b290..b4c19309e4 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd @@ -74,8 +74,8 @@ entity lofar2_unb2c_sdp_station is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -89,9 +89,9 @@ entity lofar2_unb2c_sdp_station is QSFP_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd index d34840b772..193fb753ed 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd @@ -78,4 +78,4 @@ package body lofar2_unb2c_sdp_station_pkg is end; -end lofar2_unb2c_sdp_station_pkg; +end lofar2_unb2c_sdp_station_pkg; \ No newline at end of file diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/qsys_lofar2_unb2c_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/qsys_lofar2_unb2c_sdp_station_pkg.vhd index a1bc5e5a37..50c338f2b7 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/qsys_lofar2_unb2c_sdp_station_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/qsys_lofar2_unb2c_sdp_station_pkg.vhd @@ -563,4 +563,4 @@ package qsys_lofar2_unb2c_sdp_station_pkg is ram_equalizer_gains_cross_readdata_export : in std_logic_vector(31 downto 0) := (others => 'x') -- export ); end component qsys_lofar2_unb2c_sdp_station; -end qsys_lofar2_unb2c_sdp_station_pkg; +end qsys_lofar2_unb2c_sdp_station_pkg; \ No newline at end of file diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd index 21d1566665..3b39a07fdc 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd @@ -284,7 +284,7 @@ package sdp_pkg is -- hdr_fields_in_arr with all 0. Hence e.g. udp_checksum = 0 can be achieve via data path -- and default hdr_fields_in_arr = 0 or via MM controlled and field_default(0). -- eth ip udp app - constant c_sdp_stat_hdr_field_sel : std_logic_vector(c_sdp_stat_nof_hdr_fields - 1 downto 0) := "1" &"101 " &"111011111001 " &"0100 " &"0100 " &"00000000 " &"1000000 " &"0 "; -- current + constant c_sdp_stat_hdr_field_sel : std_logic_vector(c_sdp_stat_nof_hdr_fields - 1 downto 0) := "1" &"101 " &"111011111001 " &"0100 " &"0100 " &"00000000 " &"1000000 " &"0 "; -- current --CONSTANT c_sdp_stat_hdr_field_sel : STD_LOGIC_VECTOR(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := "1"&"101"&"111011111001"&"0101"&"0100"&"00000000"&"0000100"&"0"; -- previous 26 nov 2021 --CONSTANT c_sdp_stat_hdr_field_sel : STD_LOGIC_VECTOR(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := "0"&"100"&"000000010001"&"0100"&"0100"&"00000000"&"1000000"&"0"; -- initial @@ -410,14 +410,14 @@ package sdp_pkg is constant c_sdp_cep_payload_nof_longwords : natural := c_sdp_cep_nof_blocks_per_packet * c_sdp_cep_nof_beamlets_per_block / c_sdp_cep_nof_beamlets_per_longword; -- = 976 constant c_sdp_cep_packet_nof_longwords : natural := ceil_div(c_sdp_cep_header_len, c_longword_sz) + c_sdp_cep_payload_nof_longwords; -- without tail CRC, the CRC is applied by 10GbE MAC - constant c_sdp_cep_nof_hdr_fields : natural := 3 +12 + 4 + 4 + 9 + 6 + 1; -- c_sdp_cep_header_len / c_longword_sz = 74 / 8 = 9.25 64b words = 592b + constant c_sdp_cep_nof_hdr_fields : natural := 3 + 12 + 4 + 4 + 9 + 6 + 1; -- c_sdp_cep_header_len / c_longword_sz = 74 / 8 = 9.25 64b words = 592b -- hdr_field_sel bit selects where the hdr_field value is set: -- . 0 = data path controlled, value is set in sdp_beamformer_output.vhd, so field_default() is not used. -- . 1 = MM controlled, value is set via MM or by the field_default(), so any data path setting in -- sdp_beamformer_output.vhd is not used. -- Remarks: see remarks at c_sdp_stat_nof_hdr_fields. -- eth ip udp app - constant c_sdp_cep_hdr_field_sel : std_logic_vector(c_sdp_cep_nof_hdr_fields - 1 downto 0) := "111" &"111111111011 " &"1110 " &"1100 " &"100000010 " &"100110 " &"0 "; -- current + constant c_sdp_cep_hdr_field_sel : std_logic_vector(c_sdp_cep_nof_hdr_fields - 1 downto 0) := "111" &"111111111011 " &"1110 " &"1100 " &"100000010 " &"100110 " &"0 "; -- current --CONSTANT c_sdp_cep_hdr_field_sel : STD_LOGIC_VECTOR(c_sdp_cep_nof_hdr_fields-1 DOWNTO 0) := "101"&"111111111001"&"0111"&"1100"&"100000010"&"000110"&"0"; -- previous 27 sep 2022 --CONSTANT c_sdp_cep_hdr_field_sel : STD_LOGIC_VECTOR(c_sdp_cep_nof_hdr_fields-1 DOWNTO 0) := "100"&"000000010001"&"0100"&"0100"&"100000000"&"101000"&"0"; -- initial @@ -718,53 +718,53 @@ package body sdp_pkg is constant c_marker_bst : natural := 66; -- = 0x42 = 'B' constant c_marker_xst : natural := 88; -- = 0x58 = 'X' begin - return sel_a_b(g_statistics_type ="BST ", c_marker_bst, - sel_a_b(g_statistics_type ="XST ", c_marker_xst, + return sel_a_b(g_statistics_type ="BST ", c_marker_bst, + sel_a_b(g_statistics_type ="XST ", c_marker_xst, c_marker_sst)); -- SST, SST_OS end func_sdp_get_stat_marker; function func_sdp_get_stat_nof_signal_inputs(g_statistics_type : string) return natural is begin - return sel_a_b(g_statistics_type ="BST ", 0, -- not applicable for BST, so use 0, - sel_a_b(g_statistics_type ="XST ", c_sdp_S_pn, + return sel_a_b(g_statistics_type ="BST ", 0, -- not applicable for BST, so use 0, + sel_a_b(g_statistics_type ="XST ", c_sdp_S_pn, 1)); -- SST, SST_OS end func_sdp_get_stat_nof_signal_inputs; function func_sdp_get_stat_from_mm_user_size(g_statistics_type : string) return natural is -- see sdp_statistics_offload.vhd for description begin - return sel_a_b(g_statistics_type ="BST ", c_sdp_W_statistic_sz, -- = 2, so preserve X, Y order - sel_a_b(g_statistics_type ="XST ", c_sdp_W_statistic_sz, -- = 2, so preserve Re, Im order + return sel_a_b(g_statistics_type ="BST ", c_sdp_W_statistic_sz, -- = 2, so preserve X, Y order + sel_a_b(g_statistics_type ="XST ", c_sdp_W_statistic_sz, -- = 2, so preserve Re, Im order c_sdp_W_statistic_sz)); -- = 2, SST, SST_OS end func_sdp_get_stat_from_mm_user_size; function func_sdp_get_stat_from_mm_data_size(g_statistics_type : string) return natural is begin - return sel_a_b(g_statistics_type ="BST ", c_sdp_N_pol_bf * c_sdp_W_statistic_sz, -- = 4 - sel_a_b(g_statistics_type ="XST ", c_nof_complex * c_sdp_W_statistic_sz, -- = 4 + return sel_a_b(g_statistics_type ="BST ", c_sdp_N_pol_bf * c_sdp_W_statistic_sz, -- = 4 + sel_a_b(g_statistics_type ="XST ", c_nof_complex * c_sdp_W_statistic_sz, -- = 4 c_sdp_W_statistic_sz)); -- = 2, SST, SST_OS end func_sdp_get_stat_from_mm_data_size; function func_sdp_get_stat_from_mm_step_size(g_statistics_type : string) return natural is constant c_data_size : natural := func_sdp_get_stat_from_mm_data_size(g_statistics_type); begin - return sel_a_b(g_statistics_type ="BST ", c_data_size, -- = 4 - sel_a_b(g_statistics_type ="XST ", c_data_size, -- = 4 + return sel_a_b(g_statistics_type ="BST ", c_data_size, -- = 4 + sel_a_b(g_statistics_type ="XST ", c_data_size, -- = 4 c_data_size * c_sdp_Q_fft)); -- = 4, SST, SST_OS end func_sdp_get_stat_from_mm_step_size; function func_sdp_get_stat_from_mm_nof_data(g_statistics_type : string) return natural is begin - return sel_a_b(g_statistics_type ="BST ", c_sdp_S_sub_bf, -- = 488 - sel_a_b(g_statistics_type ="XST ", c_sdp_X_sq, -- = 144 + return sel_a_b(g_statistics_type ="BST ", c_sdp_S_sub_bf, -- = 488 + sel_a_b(g_statistics_type ="XST ", c_sdp_X_sq, -- = 144 c_sdp_N_sub)); -- = 512, SST, SST_OS end func_sdp_get_stat_from_mm_nof_data; -- nof_statistics_per_packet = mm_nof_data * mm_data_size / c_sdp_W_statistic_sz function func_sdp_get_stat_nof_statistics_per_packet(g_statistics_type : string) return natural is begin - return sel_a_b(g_statistics_type ="BST ", c_sdp_S_sub_bf * c_sdp_N_pol_bf, -- = 976 - sel_a_b(g_statistics_type ="XST ", c_sdp_X_sq * c_nof_complex, -- = 288 + return sel_a_b(g_statistics_type ="BST ", c_sdp_S_sub_bf * c_sdp_N_pol_bf, -- = 976 + sel_a_b(g_statistics_type ="XST ", c_sdp_X_sq * c_nof_complex, -- = 288 c_sdp_N_sub)); -- = 512, SST, SST_OS end func_sdp_get_stat_nof_statistics_per_packet; @@ -801,16 +801,16 @@ package body sdp_pkg is function func_sdp_get_stat_udp_src_port(g_statistics_type : string; gn_index : natural) return std_logic_vector is constant c_gn_index : std_logic_vector(7 downto 0) := to_uvec(gn_index, 8); begin - return sel_a_b(g_statistics_type ="BST ", c_sdp_bst_udp_src_port_15_8 & c_gn_index, -- BST = 0xD1 & gn_index - sel_a_b(g_statistics_type ="XST ", c_sdp_xst_udp_src_port_15_8 & c_gn_index, -- XST = 0xD2 & gn_index + return sel_a_b(g_statistics_type ="BST ", c_sdp_bst_udp_src_port_15_8 & c_gn_index, -- BST = 0xD1 & gn_index + sel_a_b(g_statistics_type ="XST ", c_sdp_xst_udp_src_port_15_8 & c_gn_index, -- XST = 0xD2 & gn_index c_sdp_sst_udp_src_port_15_8 & c_gn_index)); -- SST = 0xD0 & gn_index, SST_OS end func_sdp_get_stat_udp_src_port; function func_sdp_get_stat_nof_packets(g_statistics_type : string; S_pn, P_sq, N_crosslets : natural) return natural is begin - return sel_a_b(g_statistics_type ="BST ", 1, - sel_a_b(g_statistics_type ="XST ", P_sq * N_crosslets, - sel_a_b(g_statistics_type ="SST ", S_pn, + return sel_a_b(g_statistics_type ="BST ", 1, + sel_a_b(g_statistics_type ="XST ", P_sq * N_crosslets, + sel_a_b(g_statistics_type ="SST ", S_pn, c_sdp_R_os * S_pn))); -- SST_OS end func_sdp_get_stat_nof_packets; diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd index 0b31b2cce8..64dd15a78c 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd @@ -353,11 +353,11 @@ entity sdp_station is -- RING_0 serial RING_0_TX : out std_logic_vector(c_quad - 1 downto 0) := (others => '0'); - RinG_0_RX : IN std_logic_vector(c_quad - 1 downto 0) := (others => '0'); + RinG_0_RX : in std_logic_vector(c_quad - 1 downto 0) := (others => '0'); -- RING_1 serial RING_1_TX : out std_logic_vector(c_quad - 1 downto 0) := (others => '0'); - RinG_1_RX : IN std_logic_vector(c_quad - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_quad - 1 downto 0) := (others => '0'); ---------------------------------------------- -- nw 10 GbE for beamlet output diff --git a/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top.vhd b/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top.vhd index 65bc69fb54..1c70e2514e 100644 --- a/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top.vhd +++ b/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top.vhd @@ -85,8 +85,8 @@ entity top is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -96,9 +96,9 @@ entity top is QSFP_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); -- Using qsfp bus width also for ring interfaces RING_0_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- LEDs @@ -1522,4 +1522,4 @@ begin reg_ta2_unb2b_mm_io_waitrequest_export => reg_ta2_unb2b_mm_io_miso.waitrequest ); end generate; -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top_components_pkg.vhd b/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top_components_pkg.vhd index 831efdd931..cb65f2ef18 100644 --- a/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top_components_pkg.vhd +++ b/applications/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/top_components_pkg.vhd @@ -468,5 +468,4 @@ package top_components_pkg is ); end component freeze_wrapper; -end top_components_pkg; - +end top_components_pkg; \ No newline at end of file diff --git a/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top.vhd b/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top.vhd index 61abaf7b2d..25a59aff30 100644 --- a/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top.vhd +++ b/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top.vhd @@ -82,8 +82,8 @@ entity top is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -99,9 +99,9 @@ entity top is QSFP_1_TX : out std_logic_vector(c_unb2b_board_tr_qsfp.bus_w - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2b_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); + RinG_0_RX : in std_logic_vector(c_unb2b_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); RING_0_TX : out std_logic_vector(c_unb2b_board_tr_ring.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2b_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2b_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2b_board_tr_ring.bus_w - 1 downto 0); -- back transceivers @@ -113,7 +113,7 @@ entity top is JESD204B_SYNC : out std_logic_vector(0 downto 0); -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_I_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; @@ -1046,4 +1046,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top_components_pkg.vhd b/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top_components_pkg.vhd index b4b415bc16..8a51bc1197 100644 --- a/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top_components_pkg.vhd +++ b/applications/ta2/bsp/hardware/ta2_unb2b_bsp/top_components_pkg.vhd @@ -304,5 +304,4 @@ package top_components_pkg is ); end component freeze_wrapper; -end top_components_pkg; - +end top_components_pkg; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_channel_cross/ta2_channel_cross.vhd b/applications/ta2/ip/ta2_channel_cross/ta2_channel_cross.vhd index 75990e9c18..49b752b3c1 100644 --- a/applications/ta2/ip/ta2_channel_cross/ta2_channel_cross.vhd +++ b/applications/ta2/ip/ta2_channel_cross/ta2_channel_cross.vhd @@ -188,7 +188,7 @@ begin -- Reverse byte order gen_reverse_rx_bytes : if g_reverse_bytes generate gen_rx_bytes : for I in 0 to g_nof_bytes - 1 generate - kernel_src_out_arr(stream).data(c_byte_w * (g_nof_bytes - I) - 1 downto c_byte_w * (g_nof_bytes - 1 -I)) <= dp_latency_adapter_tx_src_out_arr(stream).data(c_byte_w*(I+1)-1 downto c_byte_w*I); + kernel_src_out_arr(stream).data(c_byte_w * (g_nof_bytes - I) - 1 downto c_byte_w * (g_nof_bytes - 1 - I)) <= dp_latency_adapter_tx_src_out_arr(stream).data(c_byte_w * (I + 1) - 1 downto c_byte_w * I); end generate; end generate; gen_no_reverse_rx_bytes : if not g_reverse_bytes generate @@ -224,7 +224,7 @@ begin -- Reverse byte order to correct for endianess gen_reverse_tx_bytes : if g_reverse_bytes generate gen_tx_bytes : for I in 0 to g_nof_bytes - 1 generate - dp_latency_adapter_rx_snk_in_arr(stream).data(c_byte_w * (g_nof_bytes - I) - 1 downto c_byte_w * (g_nof_bytes - 1 -I)) <= kernel_snk_in_arr(stream).data(c_byte_w*(I+1) -1 downto c_byte_w*I); + dp_latency_adapter_rx_snk_in_arr(stream).data(c_byte_w * (g_nof_bytes - I) - 1 downto c_byte_w * (g_nof_bytes - 1 - I)) <= kernel_snk_in_arr(stream).data(c_byte_w * (I + 1) - 1 downto c_byte_w * I); end generate; end generate; gen_no_reverse_tx_bytes : if not g_reverse_bytes generate @@ -303,4 +303,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.vhd b/applications/ta2/ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.vhd index 379add9714..7e6d313423 100644 --- a/applications/ta2/ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.vhd +++ b/applications/ta2/ip/ta2_unb2b_10GbE/ta2_unb2b_10GbE.vhd @@ -374,4 +374,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_1GbE/ta2_unb2b_1GbE.vhd b/applications/ta2/ip/ta2_unb2b_1GbE/ta2_unb2b_1GbE.vhd index 93b0eca3cc..1704ba015d 100644 --- a/applications/ta2/ip/ta2_unb2b_1GbE/ta2_unb2b_1GbE.vhd +++ b/applications/ta2/ip/ta2_unb2b_1GbE/ta2_unb2b_1GbE.vhd @@ -244,4 +244,4 @@ begin dp_latency_adapter_rx_src_in.xon <= '1'; -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.vhd b/applications/ta2/ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.vhd index 7e9a94cbeb..fcc99b8025 100644 --- a/applications/ta2/ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.vhd +++ b/applications/ta2/ip/ta2_unb2b_40GbE/ta2_unb2b_40GbE.vhd @@ -589,4 +589,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_ddr/ta2_unb2b_ddr.vhd b/applications/ta2/ip/ta2_unb2b_ddr/ta2_unb2b_ddr.vhd index 6d0ee5e241..688f2fe7fa 100644 --- a/applications/ta2/ip/ta2_unb2b_ddr/ta2_unb2b_ddr.vhd +++ b/applications/ta2/ip/ta2_unb2b_ddr/ta2_unb2b_ddr.vhd @@ -366,7 +366,7 @@ begin mb_I_emif_usr_reset <= not mb_I_emif_usr_reset_n; mb_I_ref_rst_n <= not mb_I_ref_rst; - gen_I_ip_arria10_e1sg_ddr4_8g_1600 : if g_ddr_MB_I.name ="DDR4 " and c_gigabytes_MB_I = 8 and g_ddr_MB_I.mts = 1600 generate + gen_I_ip_arria10_e1sg_ddr4_8g_1600 : if g_ddr_MB_I.name ="DDR4 " and c_gigabytes_MB_I = 8 and g_ddr_MB_I.mts = 1600 generate u_ip_arria10_e1sg_ddr4_8g_1600 : ip_arria10_e1sg_ddr4_8g_1600 port map ( @@ -498,7 +498,7 @@ begin mb_II_emif_usr_reset <= not mb_II_emif_usr_reset_n; mb_II_ref_rst_n <= not mb_II_ref_rst; - gen_II_ip_arria10_e1sg_ddr4_8g_1600 : if g_ddr_MB_II.name ="DDR4 " and c_gigabytes_MB_II = 8 and g_ddr_MB_II.mts = 1600 generate + gen_II_ip_arria10_e1sg_ddr4_8g_1600 : if g_ddr_MB_II.name ="DDR4 " and c_gigabytes_MB_II = 8 and g_ddr_MB_II.mts = 1600 generate u_ip_arria10_e1sg_ddr4_8g_1600 : ip_arria10_e1sg_ddr4_8g_1600 port map ( @@ -543,4 +543,4 @@ begin -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd b/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd index 0b2b1ddb67..5aa84f26ea 100644 --- a/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd +++ b/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b.vhd @@ -203,4 +203,4 @@ begin dp_latency_adapter_rx_src_in_arr(stream).xon <= '1'; end generate; -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b_ip_wrapper.vhd b/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b_ip_wrapper.vhd index bfc993a6e2..7ab3560c82 100644 --- a/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b_ip_wrapper.vhd +++ b/applications/ta2/ip/ta2_unb2b_jesd204b/ta2_unb2b_jesd204b_ip_wrapper.vhd @@ -116,4 +116,4 @@ begin kernel_src_ready => kernel_src_ready ); -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.vhd b/applications/ta2/ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.vhd index e6f0b5068e..714b21fb5b 100644 --- a/applications/ta2/ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.vhd +++ b/applications/ta2/ip/ta2_unb2b_mm_io/ta2_unb2b_mm_io.vhd @@ -260,4 +260,4 @@ gen_opencl : if g_use_opencl generate end generate; -end str; +end str; \ No newline at end of file diff --git a/applications/ta2/ip/ta2_unb2b_mm_io/tb_ta2_unb2b_mm_io.vhd b/applications/ta2/ip/ta2_unb2b_mm_io/tb_ta2_unb2b_mm_io.vhd index 6ac1f5c599..2b9350bb85 100644 --- a/applications/ta2/ip/ta2_unb2b_mm_io/tb_ta2_unb2b_mm_io.vhd +++ b/applications/ta2/ip/ta2_unb2b_mm_io/tb_ta2_unb2b_mm_io.vhd @@ -175,4 +175,4 @@ begin -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture.vhd b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture.vhd index f77e41b170..695438230d 100644 --- a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture.vhd +++ b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture.vhd @@ -66,8 +66,8 @@ entity unb1_bn_capture is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- ADC Interface ADC_BI_A : in std_logic_vector(c_aduh_dd_ai.port_w - 1 downto 0); @@ -742,4 +742,4 @@ begin ADC_CD_SDA => ADC_CD_SDA ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_mux.vhd b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_mux.vhd index 733326a668..22865a07db 100644 --- a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_mux.vhd +++ b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_mux.vhd @@ -112,4 +112,4 @@ begin src_out => mux_wide_sosi ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage.vhd b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage.vhd index 0b3059ccef..541838e2ed 100644 --- a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage.vhd +++ b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage.vhd @@ -253,4 +253,4 @@ begin mm_rd_usedw => mm_rd_usedw ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage_reg.vhd b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage_reg.vhd index 98c741fd94..c977058a06 100644 --- a/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage_reg.vhd +++ b/boards/uniboard1/designs/unb1_bn_capture/src/vhdl/unb1_bn_capture_storage_reg.vhd @@ -257,4 +257,4 @@ begin ); -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_bn_terminal_bg/src/vhdl/unb1_bn_terminal_bg.vhd b/boards/uniboard1/designs/unb1_bn_terminal_bg/src/vhdl/unb1_bn_terminal_bg.vhd index 72d73a8611..3d63d939f9 100644 --- a/boards/uniboard1/designs/unb1_bn_terminal_bg/src/vhdl/unb1_bn_terminal_bg.vhd +++ b/boards/uniboard1/designs/unb1_bn_terminal_bg/src/vhdl/unb1_bn_terminal_bg.vhd @@ -58,8 +58,8 @@ entity unb1_bn_terminal_bg is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic := '0'; -- TR clock BN-BI (backplane) @@ -570,5 +570,3 @@ end; - - diff --git a/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_node_unb1_bn_terminal_bg.vhd b/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_node_unb1_bn_terminal_bg.vhd index 71213db6d8..b86735063a 100644 --- a/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_node_unb1_bn_terminal_bg.vhd +++ b/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_node_unb1_bn_terminal_bg.vhd @@ -352,5 +352,4 @@ begin back_rx_serial_2arr => back_rx_serial_2arr ); -end tb; - +end tb; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_tb_node_unb1_bn_terminal_bg.vhd b/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_tb_node_unb1_bn_terminal_bg.vhd index 2cf29d4dd4..346afc9013 100644 --- a/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_tb_node_unb1_bn_terminal_bg.vhd +++ b/boards/uniboard1/designs/unb1_bn_terminal_bg/tb/vhdl/tb_tb_node_unb1_bn_terminal_bg.vhd @@ -118,5 +118,4 @@ begin assert not(NOW > 0 ps and tb_end = '1') report "Note: TB end" severity FAILURE; -- need to use FAILURE to stop the simulation, apparently resetting the tr_nonbonded is not enough -end tb; - +end tb; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd index c7c63dcee1..2ca9ea30a9 100644 --- a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd +++ b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd @@ -130,7 +130,7 @@ architecture str of mmm_unb1_ddr3 is constant c_cal_clk_period : time := 25 ns; constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); -- PIOs signal pout_debug_wave : std_logic_vector(c_word_w - 1 downto 0); @@ -398,5 +398,4 @@ begin coe_writedata_export_from_the_reg_diag_tx_seq => reg_diag_tx_seq_mosi.wrdata(c_word_w - 1 downto 0) ); end generate; -end str; - +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/node_unb1_ddr3.vhd b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/node_unb1_ddr3.vhd index 744b076722..307312a922 100644 --- a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/node_unb1_ddr3.vhd +++ b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/node_unb1_ddr3.vhd @@ -81,7 +81,7 @@ entity node_unb1_ddr3 is reg_diag_rx_seq_miso : out t_mem_miso; -- SO-DIMM Memory Bank I = ddr3_I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -188,4 +188,4 @@ begin reg_rx_seq_mosi => reg_diag_rx_seq_mosi, reg_rx_seq_miso => reg_diag_rx_seq_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/unb1_ddr3.vhd b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/unb1_ddr3.vhd index fc0aafbb28..44b8bfdec3 100644 --- a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/unb1_ddr3.vhd +++ b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/unb1_ddr3.vhd @@ -61,11 +61,11 @@ entity unb1_ddr3 is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); diff --git a/boards/uniboard1/designs/unb1_ddr3/tb/vhdl/tb_unb1_ddr3.vhd b/boards/uniboard1/designs/unb1_ddr3/tb/vhdl/tb_unb1_ddr3.vhd index 655331a823..cec9f6ec68 100644 --- a/boards/uniboard1/designs/unb1_ddr3/tb/vhdl/tb_unb1_ddr3.vhd +++ b/boards/uniboard1/designs/unb1_ddr3/tb/vhdl/tb_unb1_ddr3.vhd @@ -175,4 +175,4 @@ begin mem3_ou => MB_I_in ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/unb1_ddr3_reorder_dual_rank.vhd b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/unb1_ddr3_reorder_dual_rank.vhd index 928c5f91c3..eafdc3f594 100644 --- a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/unb1_ddr3_reorder_dual_rank.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_dual_rank/unb1_ddr3_reorder_dual_rank.vhd @@ -60,11 +60,11 @@ entity unb1_ddr3_reorder_dual_rank is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -109,5 +109,3 @@ begin end str; - - diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/unb1_ddr3_reorder_single_rank.vhd b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/unb1_ddr3_reorder_single_rank.vhd index cde8e2b35a..697049652a 100644 --- a/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/unb1_ddr3_reorder_single_rank.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_reorder/revisions/unb1_ddr3_reorder_single_rank/unb1_ddr3_reorder_single_rank.vhd @@ -60,11 +60,11 @@ entity unb1_ddr3_reorder_single_rank is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -109,5 +109,3 @@ begin end str; - - diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd index 7e1ac52a3d..211ccbffeb 100644 --- a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd @@ -140,7 +140,7 @@ architecture str of mmm_unb1_ddr3_reorder is constant c_cal_clk_period : time := 25 ns; constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); -- PIOs signal pout_debug_wave : std_logic_vector(c_word_w - 1 downto 0); @@ -429,4 +429,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/node_unb1_ddr3_reorder.vhd b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/node_unb1_ddr3_reorder.vhd index ae51f05bde..7e35fcbb93 100644 --- a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/node_unb1_ddr3_reorder.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/node_unb1_ddr3_reorder.vhd @@ -95,7 +95,7 @@ port ( reg_diag_rx_seq_miso : out t_mem_miso; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -354,4 +354,4 @@ begin in_sosi_arr => db_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/unb1_ddr3_reorder.vhd b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/unb1_ddr3_reorder.vhd index 8b5eb36907..3abea63f15 100644 --- a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/unb1_ddr3_reorder.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/unb1_ddr3_reorder.vhd @@ -67,11 +67,11 @@ entity unb1_ddr3_reorder is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -456,4 +456,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd b/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd index 2ca2ec7da9..7a7aac7634 100644 --- a/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd @@ -124,7 +124,7 @@ architecture str of mmm_unb_ddr3_transpose is constant c_mm_clk_period : time := 100 ps; constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); signal i_mm_clk : std_logic := '1'; diff --git a/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/unb1_ddr3_transpose.vhd b/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/unb1_ddr3_transpose.vhd index 1c01ca31cd..2f6d5ed359 100644 --- a/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/unb1_ddr3_transpose.vhd +++ b/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/unb1_ddr3_transpose.vhd @@ -64,11 +64,11 @@ entity unb1_ddr3_transpose is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; + MB_I_in : in t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -552,4 +552,4 @@ begin in_sosi_arr => out_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd b/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd index d8847b085f..3784a74362 100644 --- a/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd +++ b/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd @@ -113,7 +113,7 @@ architecture str of mmm_unb1_fn_terminal_db is constant c_tse_clk_period : time := 8 ns; constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); signal i_mm_clk : std_logic := '1'; signal i_tse_clk : std_logic := '1'; @@ -378,5 +378,3 @@ end; - - diff --git a/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/unb1_fn_terminal_db.vhd b/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/unb1_fn_terminal_db.vhd index f5cdec6bef..1ed8766411 100644 --- a/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/unb1_fn_terminal_db.vhd +++ b/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/unb1_fn_terminal_db.vhd @@ -65,8 +65,8 @@ entity unb1_fn_terminal_db is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks --SA_CLK : IN STD_LOGIC := '0'; -- TR clock BN-BI (backplane) @@ -413,5 +413,3 @@ end; - - diff --git a/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd b/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd index 59270e496b..66cf60f5da 100644 --- a/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd +++ b/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd @@ -110,7 +110,7 @@ architecture str of mmm_unb1_heater is constant c_epcs_clk_period : time := 50 ns; -- 20 MHz constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); signal i_mm_clk : std_logic := '1'; signal i_epcs_clk : std_logic := '1'; diff --git a/boards/uniboard1/designs/unb1_heater/src/vhdl/qsys_unb1_heater_pkg.vhd b/boards/uniboard1/designs/unb1_heater/src/vhdl/qsys_unb1_heater_pkg.vhd index 72e8f11c16..56722c8122 100644 --- a/boards/uniboard1/designs/unb1_heater/src/vhdl/qsys_unb1_heater_pkg.vhd +++ b/boards/uniboard1/designs/unb1_heater/src/vhdl/qsys_unb1_heater_pkg.vhd @@ -146,4 +146,4 @@ package qsys_unb1_heater_pkg is ); end component qsys_unb1_heater; -end qsys_unb1_heater_pkg; +end qsys_unb1_heater_pkg; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_heater/src/vhdl/unb1_heater.vhd b/boards/uniboard1/designs/unb1_heater/src/vhdl/unb1_heater.vhd index 17c1cbae7f..4545433857 100644 --- a/boards/uniboard1/designs/unb1_heater/src/vhdl/unb1_heater.vhd +++ b/boards/uniboard1/designs/unb1_heater/src/vhdl/unb1_heater.vhd @@ -60,8 +60,8 @@ entity unb1_heater is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_heater; @@ -349,4 +349,4 @@ begin sla_in => reg_heater_mosi, sla_out => reg_heater_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/unb1_minimal_mm_arbiter.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/unb1_minimal_mm_arbiter.vhd index 81f6486f51..ee97a4bbb8 100644 --- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/unb1_minimal_mm_arbiter.vhd +++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_mm_arbiter/unb1_minimal_mm_arbiter.vhd @@ -54,8 +54,8 @@ entity unb1_minimal_mm_arbiter is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_minimal_mm_arbiter; @@ -98,4 +98,4 @@ begin ETH_SGOUT => ETH_SGOUT ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd index 7834418b2c..cb7c83c3d4 100644 --- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd +++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/unb1_minimal_qsys.vhd @@ -54,8 +54,8 @@ entity unb1_minimal_qsys is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_minimal_qsys; @@ -98,4 +98,4 @@ begin ETH_SGOUT => ETH_SGOUT ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd index 651b64a5ca..3c7c648c97 100644 --- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd +++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd @@ -106,7 +106,7 @@ end mmm_unb1_minimal_qsys_wo_pll; architecture str of mmm_unb1_minimal_qsys_wo_pll is constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); constant c_sim_eth_src_mac : std_logic_vector(c_network_eth_mac_slv'range) := x"00228608" & to_uvec(g_sim_unb_nr, c_byte_w) & to_uvec(g_sim_node_nr, c_byte_w); constant c_sim_eth_control_rx_en : natural := 2 ** c_eth_mm_reg_control_bi.rx_en; diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/unb1_minimal_qsys_wo_pll.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/unb1_minimal_qsys_wo_pll.vhd index 76a13c389b..a4bb0d9a77 100644 --- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/unb1_minimal_qsys_wo_pll.vhd +++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/unb1_minimal_qsys_wo_pll.vhd @@ -57,8 +57,8 @@ entity unb1_minimal_qsys_wo_pll is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_minimal_qsys_wo_pll; diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd index 146686e2f7..1ba8070dfc 100644 --- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd +++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.vhd @@ -54,8 +54,8 @@ entity unb1_minimal_sopc is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_minimal_sopc; @@ -97,4 +97,4 @@ begin ETH_SGOUT => ETH_SGOUT ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd b/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd index 2b8bee1eb3..961c399786 100644 --- a/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd +++ b/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd @@ -108,7 +108,7 @@ architecture str of mmm_unb1_minimal is constant c_epcs_clk_period : time := 50 ns; -- 20 MHz constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); signal i_mm_clk : std_logic := '1'; signal i_epcs_clk : std_logic := '1'; diff --git a/boards/uniboard1/designs/unb1_minimal/src/vhdl/qsys_unb1_minimal_pkg.vhd b/boards/uniboard1/designs/unb1_minimal/src/vhdl/qsys_unb1_minimal_pkg.vhd index 8b09026719..588a92f4c2 100644 --- a/boards/uniboard1/designs/unb1_minimal/src/vhdl/qsys_unb1_minimal_pkg.vhd +++ b/boards/uniboard1/designs/unb1_minimal/src/vhdl/qsys_unb1_minimal_pkg.vhd @@ -190,4 +190,4 @@ package qsys_unb1_minimal_pkg is ); end component qsys_unb1_minimal_mm_arbiter; -end qsys_unb1_minimal_pkg; +end qsys_unb1_minimal_pkg; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd b/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd index f710d7054c..0b7323141a 100644 --- a/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd +++ b/boards/uniboard1/designs/unb1_minimal/src/vhdl/unb1_minimal.vhd @@ -57,8 +57,8 @@ entity unb1_minimal is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_minimal; @@ -73,8 +73,8 @@ architecture str of unb1_minimal is -- Not simulating the 1GbE MAC+PHY speeds up simulation of unb1_minimal by a factor ~1.4. constant c_use_phy : t_c_unb1_board_use_phy := (sel_a_b(g_sim, 0, 1), 0, 0, 0, 0, 0, 0, 1); - constant c_use_qsys : boolean := g_design_name ="unb1_minimal_qsys "; - constant c_use_sopc : boolean := g_design_name ="unb1_minimal_sopc "; + constant c_use_qsys : boolean := g_design_name ="unb1_minimal_qsys "; + constant c_use_sopc : boolean := g_design_name ="unb1_minimal_sopc "; -- System signal cs_sim : std_logic; @@ -334,4 +334,4 @@ begin ----------------------------------------------------------------------------- -- Insert node_[design_name] here -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd index 18d0dc936c..d0e98e2448 100644 --- a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd +++ b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd @@ -134,7 +134,7 @@ end entity mmm_unb1_terminal_bg_mesh_db; architecture str of mmm_unb1_terminal_bg_mesh_db is constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); constant c_sim_eth_src_mac : std_logic_vector(c_network_eth_mac_slv'range) := x"00228608" & to_uvec(g_sim_unb_nr, c_byte_w) & to_uvec(g_sim_node_nr, c_byte_w); constant c_sim_eth_control_rx_en : natural := 2 ** c_eth_mm_reg_control_bi.rx_en; diff --git a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/unb1_terminal_bg_mesh_db.vhd b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/unb1_terminal_bg_mesh_db.vhd index e7bee761d1..bb50d429bf 100644 --- a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/unb1_terminal_bg_mesh_db.vhd +++ b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/unb1_terminal_bg_mesh_db.vhd @@ -65,8 +65,8 @@ entity unb1_terminal_bg_mesh_db is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SB_CLK : in std_logic := '0'; -- TR clock FN-BN (mesh) @@ -487,5 +487,3 @@ end; - - diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/unb1_test_10GbE.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/unb1_test_10GbE.vhd index 200f0e1e2f..c205c084e3 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/unb1_test_10GbE.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/unb1_test_10GbE.vhd @@ -56,8 +56,8 @@ entity unb1_test_10GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic; -- SerDes Clock BN-BI / SI_FN @@ -156,4 +156,4 @@ begin BN_BI_3_RX => BN_BI_3_RX ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/unb1_test_10GbE_tx_only.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/unb1_test_10GbE_tx_only.vhd index d577c493b1..0d5e90da7f 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/unb1_test_10GbE_tx_only.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE_tx_only/unb1_test_10GbE_tx_only.vhd @@ -56,8 +56,8 @@ entity unb1_test_10GbE_tx_only is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic; -- SerDes Clock BN-BI / SI_FN @@ -139,4 +139,4 @@ begin SI_FN_RSTN => SI_FN_RSTN ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/unb1_test_1GbE.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/unb1_test_1GbE.vhd index b402a1a145..f389a07fc1 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/unb1_test_1GbE.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_1GbE/unb1_test_1GbE.vhd @@ -56,8 +56,8 @@ entity unb1_test_1GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_test_1GbE; @@ -100,4 +100,4 @@ begin ETH_SGOUT => ETH_SGOUT ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/unb1_test_all.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/unb1_test_all.vhd index 202dceab3a..619bbb621c 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/unb1_test_all.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_all/unb1_test_all.vhd @@ -57,8 +57,8 @@ entity unb1_test_all is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic; -- SerDes Clock BN-BI / SI_FN @@ -89,12 +89,12 @@ entity unb1_test_all is BN_BI_3_RX : in std_logic_vector(c_unb1_board_ci.tr.bus_w - 1 downto 0); -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr3_phy_in; + MB_II_in : in t_tech_ddr3_phy_in; MB_II_IO : inout t_tech_ddr3_phy_io; MB_II_OU : out t_tech_ddr3_phy_ou ); @@ -175,4 +175,4 @@ begin MB_II_OU => MB_II_OU ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/unb1_test_ddr.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/unb1_test_ddr.vhd index 6670cd962c..0b1cf0a3b8 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/unb1_test_ddr.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr/unb1_test_ddr.vhd @@ -57,11 +57,11 @@ entity unb1_test_ddr is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -114,4 +114,4 @@ begin -- MB_II_OU => MB_II_OU ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/unb1_test_ddr_16g_MB_I.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/unb1_test_ddr_16g_MB_I.vhd index 858b0ff2d3..415404a36f 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/unb1_test_ddr_16g_MB_I.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I/unb1_test_ddr_16g_MB_I.vhd @@ -57,11 +57,11 @@ entity unb1_test_ddr_16g_MB_I is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou ); @@ -111,4 +111,4 @@ begin MB_I_OU => MB_I_OU ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/unb1_test_ddr_16g_MB_II.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/unb1_test_ddr_16g_MB_II.vhd index 027cb2e52d..86f2f6fd1b 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/unb1_test_ddr_16g_MB_II.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_II/unb1_test_ddr_16g_MB_II.vhd @@ -57,11 +57,11 @@ entity unb1_test_ddr_16g_MB_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr3_phy_in; + MB_II_in : in t_tech_ddr3_phy_in; MB_II_IO : inout t_tech_ddr3_phy_io; MB_II_OU : out t_tech_ddr3_phy_ou ); @@ -111,4 +111,4 @@ begin MB_II_OU => MB_II_OU ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/unb1_test_ddr_16g_MB_I_II.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/unb1_test_ddr_16g_MB_I_II.vhd index 24b09371a5..01299802c9 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/unb1_test_ddr_16g_MB_I_II.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_16g_MB_I_II/unb1_test_ddr_16g_MB_I_II.vhd @@ -57,16 +57,16 @@ entity unb1_test_ddr_16g_MB_I_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr3_phy_in; + MB_II_in : in t_tech_ddr3_phy_in; MB_II_IO : inout t_tech_ddr3_phy_io; MB_II_OU : out t_tech_ddr3_phy_ou ); @@ -121,4 +121,4 @@ begin MB_II_OU => MB_II_OU ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/unb1_test_ddr_MB_I_II.vhd b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/unb1_test_ddr_MB_I_II.vhd index 7bbbb5171b..8704f5b248 100644 --- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/unb1_test_ddr_MB_I_II.vhd +++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_ddr_MB_I_II/unb1_test_ddr_MB_I_II.vhd @@ -57,16 +57,16 @@ entity unb1_test_ddr_MB_I_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in; + MB_I_in : in t_tech_ddr3_phy_in; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr3_phy_in; + MB_II_in : in t_tech_ddr3_phy_in; MB_II_IO : inout t_tech_ddr3_phy_io; MB_II_OU : out t_tech_ddr3_phy_ou ); @@ -121,4 +121,4 @@ begin MB_II_OU => MB_II_OU ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd index cfbce35ae8..73428e9f95 100644 --- a/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd +++ b/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd @@ -241,7 +241,7 @@ architecture str of mmm_unb1_test is -- Simulation constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); constant c_sim_eth_src_mac : std_logic_vector(c_network_eth_mac_slv'range) := x"00228608" & to_uvec(g_sim_unb_nr, c_byte_w) & to_uvec(g_sim_node_nr, c_byte_w); constant c_sim_eth_control_rx_en : natural := 2 ** c_eth_mm_reg_control_bi.rx_en; diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/udp_stream.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/udp_stream.vhd index c8d16c761c..22b3a4ac2e 100644 --- a/boards/uniboard1/designs/unb1_test/src/vhdl/udp_stream.vhd +++ b/boards/uniboard1/designs/unb1_test/src/vhdl/udp_stream.vhd @@ -113,7 +113,7 @@ architecture str of udp_stream is to_uvec( 0, c_diag_bg_bsn_init_w)); - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "1001" &"111011111100 " &"0001 " &"101111111 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "1001" &"111011111100 " &"0001 " &"101111111 "; constant c_nof_crc_words : natural := 1; constant c_max_nof_words_per_block : natural := g_bg_block_size; constant c_min_nof_words_per_block : natural := 1; @@ -348,4 +348,4 @@ begin in_sosi_arr => diag_data_buf_snk_in_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd index dc20be05ab..030fc77bdc 100644 --- a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd +++ b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd @@ -68,8 +68,8 @@ entity unb1_test is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic := '0'; -- SerDes Clock BN-BI / SI_FN @@ -100,12 +100,12 @@ entity unb1_test is BN_BI_3_RX : in std_logic_vector(c_unb1_board_ci.tr.bus_w - 1 downto 0) := (others => '0'); -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; + MB_I_in : in t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; MB_I_IO : inout t_tech_ddr3_phy_io; MB_I_OU : out t_tech_ddr3_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; + MB_II_in : in t_tech_ddr3_phy_in := c_tech_ddr3_phy_in_x; MB_II_IO : inout t_tech_ddr3_phy_io; MB_II_OU : out t_tech_ddr3_phy_ou ); @@ -986,4 +986,4 @@ gen_mms_io_ddr_diag_MB_II : if c_revision_select.use_ddr_MB_II = 1 generate end generate; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd index 21acbfa5c1..a5d6c17234 100644 --- a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd +++ b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test_pkg.vhd @@ -42,7 +42,7 @@ package unb1_test_pkg is end record; -- dp_offload_tx - constant c_nof_hdr_fields : natural := 4 +12 + 4 + 9; -- Total header bits = 512 + constant c_nof_hdr_fields : natural := 4 + 12 + 4 + 9; -- Total header bits = 512 constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( ( field_name_pad("eth_word_align" ), " ", 16, field_default(0) ), ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), @@ -105,4 +105,4 @@ package body unb1_test_pkg is end if; end; -end unb1_test_pkg; +end unb1_test_pkg; \ No newline at end of file diff --git a/boards/uniboard1/designs/unb1_tr_10GbE/src/vhdl/unb1_tr_10GbE.vhd b/boards/uniboard1/designs/unb1_tr_10GbE/src/vhdl/unb1_tr_10GbE.vhd index ffe4f29f50..3d83920523 100644 --- a/boards/uniboard1/designs/unb1_tr_10GbE/src/vhdl/unb1_tr_10GbE.vhd +++ b/boards/uniboard1/designs/unb1_tr_10GbE/src/vhdl/unb1_tr_10GbE.vhd @@ -66,8 +66,8 @@ entity unb1_tr_10GbE is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic; -- SerDes Clock BN-BI / SI_FN @@ -531,4 +531,4 @@ begin reg_mdio_1_miso <= reg_mdio_miso_arr(1); reg_mdio_2_miso <= reg_mdio_miso_arr(2); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd index 5655c807ba..a45cfda643 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/ctrl_unb1_board.vhd @@ -261,8 +261,8 @@ entity ctrl_unb1_board is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end ctrl_unb1_board; @@ -527,8 +527,8 @@ begin ------------------------------------------------------------------------------ -- Toggle red LED when unb1_minimal is running, green LED for other designs. ------------------------------------------------------------------------------ - led_toggle_red <= sel_a_b(g_design_name(1 to 8) ="unb1_min ", led_toggle, '0'); - led_toggle_green <= sel_a_b(g_design_name(1 to 8) /="unb1_min ", led_toggle, '0'); + led_toggle_red <= sel_a_b(g_design_name(1 to 8) ="unb1_min ", led_toggle, '0'); + led_toggle_green <= sel_a_b(g_design_name(1 to 8) /="unb1_min ", led_toggle, '0'); u_toggle : entity common_lib.common_toggle port map ( diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_sens.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_sens.vhd index 6d30c98088..b877d713a7 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_sens.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_sens.vhd @@ -114,4 +114,4 @@ begin -- temp_high is 7 bits, preceded by a '0' to allow only positive temps to be set. temp_alarm <= '1' when (signed(sens_data(0)) > signed('0' & temp_high)) else '0'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd index 6e7baad578..b476da9657 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/mms_unb1_board_system_info.vhd @@ -73,7 +73,7 @@ architecture str of mms_unb1_board_system_info is -- No longer supporting MIF files in sim as non-$UNB (e.g. $AARTFAAC) designs will cause path error. -- CONSTANT c_mif_name : STRING := sel_a_b((g_design_name="UNUSED"), g_design_name, c_path_prefix & g_design_name & ".mif"); - constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); + constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); constant c_rom_addr_w : natural := 10; -- 2^10 = 1024 addresses * 32 bits = 4 kiB @@ -138,4 +138,4 @@ begin rd_val => rom_miso.rdval ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_back_io.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_back_io.vhd index 9f03e76308..0882c57358 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_back_io.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_back_io.vhd @@ -73,5 +73,3 @@ end; - - diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_io.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_io.vhd index 4f8dba193f..c2c220b9df 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_io.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_io.vhd @@ -71,5 +71,3 @@ end; - - diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_reorder_bidir.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_reorder_bidir.vhd index c0533a463f..39ccd42c88 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_reorder_bidir.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_mesh_reorder_bidir.vhd @@ -196,4 +196,4 @@ begin tx_usr_siso_2arr => tx_usr_siso_2arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd index 9655b84f5d..731ddfc6b3 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_system_info_reg.vhd @@ -148,4 +148,4 @@ begin end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_terminals_mesh.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_terminals_mesh.vhd index 5afc55efaa..cf57fcaf6f 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_terminals_mesh.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_terminals_mesh.vhd @@ -410,4 +410,4 @@ begin diagnostics_mm_miso => reg_diagnostics_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_wdi_reg.vhd b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_wdi_reg.vhd index 421d7f54ec..58661bc80c 100644 --- a/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_wdi_reg.vhd +++ b/boards/uniboard1/libraries/unb1_board/src/vhdl/unb1_board_wdi_reg.vhd @@ -86,4 +86,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard1/libraries/unb1_board/tb/vhdl/tb_mms_unb1_board_sens.vhd b/boards/uniboard1/libraries/unb1_board/tb/vhdl/tb_mms_unb1_board_sens.vhd index 476306be78..04d79f128d 100644 --- a/boards/uniboard1/libraries/unb1_board/tb/vhdl/tb_mms_unb1_board_sens.vhd +++ b/boards/uniboard1/libraries/unb1_board/tb/vhdl/tb_mms_unb1_board_sens.vhd @@ -208,4 +208,4 @@ begin ana_volt_adin => c_uniboard_adin ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_led/src/vhdl/unb2_led.vhd b/boards/uniboard2/designs/unb2_led/src/vhdl/unb2_led.vhd index 6f1107d852..149ed772eb 100644 --- a/boards/uniboard2/designs/unb2_led/src/vhdl/unb2_led.vhd +++ b/boards/uniboard2/designs/unb2_led/src/vhdl/unb2_led.vhd @@ -228,4 +228,4 @@ begin QSFP_LED(5) <= '1'; QSFP_LED(9) <= '1'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_minimal/src/vhdl/unb2_minimal.vhd b/boards/uniboard2/designs/unb2_minimal/src/vhdl/unb2_minimal.vhd index 18bdad40de..1eb64ac881 100644 --- a/boards/uniboard2/designs/unb2_minimal/src/vhdl/unb2_minimal.vhd +++ b/boards/uniboard2/designs/unb2_minimal/src/vhdl/unb2_minimal.vhd @@ -64,8 +64,8 @@ entity unb2_minimal is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -376,4 +376,4 @@ begin -- QSFP_LED => QSFP_LED -- ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/tb_unb2_test_10GbE.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/tb_unb2_test_10GbE.vhd index 5fef21e3c5..36f660a61d 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/tb_unb2_test_10GbE.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/tb_unb2_test_10GbE.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2_test_10GbE" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd index e7d912cb38..905e6a838f 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd @@ -58,8 +58,8 @@ entity unb2_test_10GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic; -- Clock 10GbE front (qsfp) and ring lines diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/tb_unb2_test_1GbE.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/tb_unb2_test_1GbE.vhd index 4dc5b230a9..c94f78265e 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/tb_unb2_test_1GbE.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/tb_unb2_test_1GbE.vhd @@ -36,4 +36,4 @@ begin generic map ( g_design_name => "unb2_test_1GbE" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/unb2_test_1GbE.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/unb2_test_1GbE.vhd index cbfe190080..073d3f47bd 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/unb2_test_1GbE.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_1GbE/unb2_test_1GbE.vhd @@ -62,8 +62,8 @@ entity unb2_test_1GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/tb_unb2_test_all.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/tb_unb2_test_all.vhd index b38c8fa5a9..f40a0c0445 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/tb_unb2_test_all.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/tb_unb2_test_all.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2_test_all", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/unb2_test_all.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/unb2_test_all.vhd index 749820d360..0e6a262d23 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/unb2_test_all.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_all/unb2_test_all.vhd @@ -59,8 +59,8 @@ entity unb2_test_all is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic; -- Clock 10GbE front (qsfp) and ring lines @@ -105,12 +105,12 @@ entity unb2_test_all is QSFP_SCL : inout std_logic_vector(c_unb2_board_tr_qsfp.i2c_w - 1 downto 0); -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/tb_unb2_test_ddr_MB_I.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/tb_unb2_test_ddr_MB_I.vhd index 29ad5a0978..8843d959b4 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/tb_unb2_test_ddr_MB_I.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/tb_unb2_test_ddr_MB_I.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2_test_ddr_MB_I", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/unb2_test_ddr_MB_I.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/unb2_test_ddr_MB_I.vhd index ddcf3523c2..5fa7a8c45f 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/unb2_test_ddr_MB_I.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I/unb2_test_ddr_MB_I.vhd @@ -63,14 +63,14 @@ entity unb2_test_ddr_MB_I is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/tb_unb2_test_ddr_MB_II.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/tb_unb2_test_ddr_MB_II.vhd index 6331c074eb..ace8ec86bf 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/tb_unb2_test_ddr_MB_II.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/tb_unb2_test_ddr_MB_II.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2_test_ddr_MB_II", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/unb2_test_ddr_MB_II.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/unb2_test_ddr_MB_II.vhd index eb22e47227..80780d95f3 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/unb2_test_ddr_MB_II.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_II/unb2_test_ddr_MB_II.vhd @@ -63,14 +63,14 @@ entity unb2_test_ddr_MB_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/tb_unb2_test_ddr_MB_I_II.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/tb_unb2_test_ddr_MB_I_II.vhd index c239c3dfea..884e1d3cac 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/tb_unb2_test_ddr_MB_I_II.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/tb_unb2_test_ddr_MB_I_II.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2_test_ddr_MB_I_II", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/unb2_test_ddr_MB_I_II.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/unb2_test_ddr_MB_I_II.vhd index 5c2708b999..154863e8e7 100644 --- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/unb2_test_ddr_MB_I_II.vhd +++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_ddr_MB_I_II/unb2_test_ddr_MB_I_II.vhd @@ -63,20 +63,20 @@ entity unb2_test_ddr_MB_I_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2/designs/unb2_test/src/vhdl/qsys_unb2_test_pkg.vhd b/boards/uniboard2/designs/unb2_test/src/vhdl/qsys_unb2_test_pkg.vhd index 15068ec809..fc88857415 100644 --- a/boards/uniboard2/designs/unb2_test/src/vhdl/qsys_unb2_test_pkg.vhd +++ b/boards/uniboard2/designs/unb2_test/src/vhdl/qsys_unb2_test_pkg.vhd @@ -379,4 +379,4 @@ package qsys_unb2_test_pkg is ); end component qsys_unb2_test; -end qsys_unb2_test_pkg; +end qsys_unb2_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/src/vhdl/udp_stream.vhd b/boards/uniboard2/designs/unb2_test/src/vhdl/udp_stream.vhd index 472bd3f0af..997700c1e6 100644 --- a/boards/uniboard2/designs/unb2_test/src/vhdl/udp_stream.vhd +++ b/boards/uniboard2/designs/unb2_test/src/vhdl/udp_stream.vhd @@ -353,4 +353,4 @@ begin in_sosi_arr => diag_data_buf_snk_in_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd b/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd index 99c9829140..d11df01149 100644 --- a/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd +++ b/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd @@ -71,8 +71,8 @@ entity unb2_test is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -123,12 +123,12 @@ entity unb2_test is QSFP_RST : inout std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_I_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_II_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; @@ -146,13 +146,13 @@ architecture str of unb2_test is -- Revision controlled constants constant c_use_1GbE : boolean := FALSE; --g_design_name="unb2_test_1GbE" OR g_design_name="unb2_test_10GbE" OR g_design_name="unb2_test_all"; - constant c_use_10GbE : boolean := g_design_name ="unb2_test_10GbE " or g_design_name ="unb2_test_all "; + constant c_use_10GbE : boolean := g_design_name ="unb2_test_10GbE " or g_design_name ="unb2_test_all "; constant c_use_10GbE_qsfp : boolean := c_use_10GbE; constant c_use_10GbE_ring : boolean := FALSE; --c_use_10GbE; constant c_use_10GbE_back0 : boolean := FALSE; --c_use_10GbE; constant c_use_10GbE_back1 : boolean := FALSE; --c_use_10GbE; - constant c_use_MB_I : boolean := g_design_name ="unb2_test_ddr_MB_I " or g_design_name ="unb2_test_ddr_MB_I_II " or g_design_name ="unb2_test_all "; - constant c_use_MB_II : boolean := g_design_name ="unb2_test_ddr_MB_II " or g_design_name ="unb2_test_ddr_MB_I_II " or g_design_name ="unb2_test_all "; + constant c_use_MB_I : boolean := g_design_name ="unb2_test_ddr_MB_I " or g_design_name ="unb2_test_ddr_MB_I_II " or g_design_name ="unb2_test_all "; + constant c_use_MB_II : boolean := g_design_name ="unb2_test_ddr_MB_II " or g_design_name ="unb2_test_ddr_MB_I_II " or g_design_name ="unb2_test_all "; -- transceivers constant c_nof_qsfp : natural := c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w; @@ -1253,4 +1253,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test_pkg.vhd b/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test_pkg.vhd index 0594e2a468..2a38cf9fc9 100644 --- a/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test_pkg.vhd +++ b/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test_pkg.vhd @@ -29,7 +29,7 @@ package unb2_test_pkg is -- dp_offload_tx --CONSTANT c_nof_hdr_fields : NATURAL := 1+3+12+4+2; -- Total header bits = 384 = 6 64b words - constant c_nof_hdr_fields : natural := 3 +12 + 4 + 2; -- Total header bits = 384 = 6 64b words + constant c_nof_hdr_fields : natural := 3 + 12 + 4 + 2; -- Total header bits = 384 = 6 64b words constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( --( field_name_pad("align" ), " ", 16, field_default(0) ), ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), @@ -54,6 +54,6 @@ package unb2_test_pkg is ( field_name_pad("usr_bsn" ), " ", 47, field_default(0) )); --CONSTANT c_hdr_field_ovr_init : STD_LOGIC_VECTOR(c_nof_hdr_fields-1 DOWNTO 0) := "1001"&"111111111100"&"0011"&"00"; - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; -end unb2_test_pkg; +end unb2_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/ctrl_unb2_board.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/ctrl_unb2_board.vhd index 08eeb77e58..b7230d6bfd 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/ctrl_unb2_board.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/ctrl_unb2_board.vhd @@ -241,8 +241,8 @@ entity ctrl_unb2_board is -- 1GbE Control Interface ETH_CLK : in std_logic; -- 125 MHz - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) := (others => '0'); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) := (others => '0'); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) ); end ctrl_unb2_board; diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_sens.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_sens.vhd index 93bb820092..504e5e957c 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_sens.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_sens.vhd @@ -116,4 +116,4 @@ begin -- temp_high is 7 bits, preceded by a '0' to allow only positive temps to be set. temp_alarm <= '1' when (signed(sens_data(0)) > signed('0' & temp_high)) else '0'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_system_info.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_system_info.vhd index cd4cefeee1..7d19de3788 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_system_info.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_board_system_info.vhd @@ -72,7 +72,7 @@ architecture str of mms_unb2_board_system_info is -- No longer supporting MIF files in sim as non-$UNB (e.g. $AARTFAAC) designs will cause path error. -- CONSTANT c_mif_name : STRING := sel_a_b((g_design_name="UNUSED"), g_design_name, c_path_prefix & g_design_name & ".mif"); - constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); + constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); constant c_rom_addr_w : natural := 10; -- 2^10 = 1024 addresses * 32 bits = 4 kiB @@ -137,4 +137,4 @@ begin rd_val => rom_miso.rdval ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_fpga_sens.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_fpga_sens.vhd index 2389544a8e..ebeb1fe337 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_fpga_sens.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/mms_unb2_fpga_sens.vhd @@ -118,4 +118,4 @@ begin -- temp_high is 7 bits, preceded by a '0' to allow only positive temps to be set. temp_alarm <= '0'; --<= '1' WHEN (SIGNED(sens_data(0)) > SIGNED('0' & temp_high)) ELSE '0'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_ring_io.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_ring_io.vhd index 86b629682f..2ac09a27ce 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_ring_io.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_ring_io.vhd @@ -32,7 +32,7 @@ entity unb2_board_ring_io is serial_tx_arr : in std_logic_vector(g_nof_ring_bus * c_unb2_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); serial_rx_arr : out std_logic_vector(g_nof_ring_bus * c_unb2_board_tr_ring.bus_w - 1 downto 0); - RinG_RX : IN t_unb2_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); + RinG_RX : in t_unb2_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); RING_TX : out t_unb2_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) ); end unb2_board_ring_io; diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd index 57bbeb8b6f..805540631a 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd @@ -140,4 +140,4 @@ begin end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_wdi_reg.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_wdi_reg.vhd index ecf702091a..3b03b7f01a 100644 --- a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_wdi_reg.vhd +++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_wdi_reg.vhd @@ -86,4 +86,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2/libraries/unb2_board/tb/vhdl/tb_mms_unb2_board_sens.vhd b/boards/uniboard2/libraries/unb2_board/tb/vhdl/tb_mms_unb2_board_sens.vhd index 5ba0bfa64f..b325058125 100644 --- a/boards/uniboard2/libraries/unb2_board/tb/vhdl/tb_mms_unb2_board_sens.vhd +++ b/boards/uniboard2/libraries/unb2_board/tb/vhdl/tb_mms_unb2_board_sens.vhd @@ -208,4 +208,4 @@ begin ana_volt_adin => c_uniboard_adin ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew_inst.vhd b/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew_inst.vhd index f28d7d7ec8..078acc2f6e 100644 --- a/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew_inst.vhd +++ b/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew/ddr4_micron46_mbIIskew_inst.vhd @@ -87,4 +87,4 @@ pll_ref_clk => CONNECTED_TO_pll_ref_clk, -- pll_ref_clk.clk local_cal_success => CONNECTED_TO_local_cal_success, -- status.local_cal_success local_cal_fail => CONNECTED_TO_local_cal_fail -- .local_cal_fail - ); + ); \ No newline at end of file diff --git a/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew_inst.vhd b/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew_inst.vhd index bc2c6c638c..3b0322e0e3 100644 --- a/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew_inst.vhd +++ b/boards/uniboard2a/designs/altera_ref_designs/ddr4/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew/ddr4_micron46_mbIskew_inst.vhd @@ -87,4 +87,4 @@ pll_ref_clk => CONNECTED_TO_pll_ref_clk, -- pll_ref_clk.clk local_cal_success => CONNECTED_TO_local_cal_success, -- status.local_cal_success local_cal_fail => CONNECTED_TO_local_cal_fail -- .local_cal_fail - ); + ); \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_heater/src/vhdl/unb2a_heater.vhd b/boards/uniboard2a/designs/unb2a_heater/src/vhdl/unb2a_heater.vhd index 1bec7004a1..7ec5cf8326 100644 --- a/boards/uniboard2a/designs/unb2a_heater/src/vhdl/unb2a_heater.vhd +++ b/boards/uniboard2a/designs/unb2a_heater/src/vhdl/unb2a_heater.vhd @@ -65,8 +65,8 @@ entity unb2a_heater is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -402,4 +402,4 @@ begin sla_in => reg_heater_mosi, sla_out => reg_heater_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_led/src/vhdl/unb2a_led.vhd b/boards/uniboard2a/designs/unb2a_led/src/vhdl/unb2a_led.vhd index ec0e7bbda5..bee3d20f09 100644 --- a/boards/uniboard2a/designs/unb2a_led/src/vhdl/unb2a_led.vhd +++ b/boards/uniboard2a/designs/unb2a_led/src/vhdl/unb2a_led.vhd @@ -228,4 +228,4 @@ begin QSFP_LED(5) <= '1'; QSFP_LED(9) <= '1'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_minimal/src/vhdl/unb2a_minimal.vhd b/boards/uniboard2a/designs/unb2a_minimal/src/vhdl/unb2a_minimal.vhd index d8412c5266..4d8716ead2 100644 --- a/boards/uniboard2a/designs/unb2a_minimal/src/vhdl/unb2a_minimal.vhd +++ b/boards/uniboard2a/designs/unb2a_minimal/src/vhdl/unb2a_minimal.vhd @@ -64,8 +64,8 @@ entity unb2a_minimal is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -374,4 +374,4 @@ begin QSFP_LED => QSFP_LED ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/tb_unb2a_test_10GbE.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/tb_unb2a_test_10GbE.vhd index 8d227982d4..c05fbd5a35 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/tb_unb2a_test_10GbE.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/tb_unb2a_test_10GbE.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2a_test_10GbE" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/unb2a_test_10GbE.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/unb2a_test_10GbE.vhd index 32d7a17a69..d3bca5910d 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/unb2a_test_10GbE.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_10GbE/unb2a_test_10GbE.vhd @@ -58,8 +58,8 @@ entity unb2a_test_10GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic; -- Clock 10GbE front (qsfp) and ring lines diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/tb_unb2a_test_1GbE.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/tb_unb2a_test_1GbE.vhd index d2e6bc62a9..4785c3f427 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/tb_unb2a_test_1GbE.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/tb_unb2a_test_1GbE.vhd @@ -36,4 +36,4 @@ begin generic map ( g_design_name => "unb2a_test_1GbE" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/unb2a_test_1GbE.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/unb2a_test_1GbE.vhd index 4ff06caea1..e2768c56ce 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/unb2a_test_1GbE.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_1GbE/unb2a_test_1GbE.vhd @@ -62,8 +62,8 @@ entity unb2a_test_1GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/tb_unb2a_test_all.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/tb_unb2a_test_all.vhd index 4410231db7..0f64bfcff5 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/tb_unb2a_test_all.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/tb_unb2a_test_all.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2a_test_all", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/unb2a_test_all.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/unb2a_test_all.vhd index 2b40ce695c..e683a3b7b5 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/unb2a_test_all.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_all/unb2a_test_all.vhd @@ -59,8 +59,8 @@ entity unb2a_test_all is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic; -- Clock 10GbE front (qsfp) and ring lines @@ -105,12 +105,12 @@ entity unb2a_test_all is QSFP_SCL : inout std_logic_vector(c_unb2_board_tr_qsfp.i2c_w - 1 downto 0); -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/tb_unb2a_test_ddr_MB_I.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/tb_unb2a_test_ddr_MB_I.vhd index ae93d7884f..fde2a27b0b 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/tb_unb2a_test_ddr_MB_I.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/tb_unb2a_test_ddr_MB_I.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2a_test_ddr_MB_I", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/unb2a_test_ddr_MB_I.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/unb2a_test_ddr_MB_I.vhd index 70a061a6a8..29ebc518bf 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/unb2a_test_ddr_MB_I.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I/unb2a_test_ddr_MB_I.vhd @@ -63,14 +63,14 @@ entity unb2a_test_ddr_MB_I is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/tb_unb2a_test_ddr_MB_II.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/tb_unb2a_test_ddr_MB_II.vhd index a90a597a77..2da5c6ca55 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/tb_unb2a_test_ddr_MB_II.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/tb_unb2a_test_ddr_MB_II.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2a_test_ddr_MB_II", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/unb2a_test_ddr_MB_II.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/unb2a_test_ddr_MB_II.vhd index 1ca8a1d3bc..b53ea7bf0b 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/unb2a_test_ddr_MB_II.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_II/unb2a_test_ddr_MB_II.vhd @@ -63,14 +63,14 @@ entity unb2a_test_ddr_MB_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/tb_unb2a_test_ddr_MB_I_II.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/tb_unb2a_test_ddr_MB_I_II.vhd index 977ca07ad5..eb27399e15 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/tb_unb2a_test_ddr_MB_I_II.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/tb_unb2a_test_ddr_MB_I_II.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2a_test_ddr_MB_I_II", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/unb2a_test_ddr_MB_I_II.vhd b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/unb2a_test_ddr_MB_I_II.vhd index e4c6aa8dc6..e7aae74976 100644 --- a/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/unb2a_test_ddr_MB_I_II.vhd +++ b/boards/uniboard2a/designs/unb2a_test/revisions/unb2a_test_ddr_MB_I_II/unb2a_test_ddr_MB_I_II.vhd @@ -63,20 +63,20 @@ entity unb2a_test_ddr_MB_I_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2a/designs/unb2a_test/src/vhdl/qsys_unb2a_test_pkg.vhd b/boards/uniboard2a/designs/unb2a_test/src/vhdl/qsys_unb2a_test_pkg.vhd index e8e2abb601..1ac78b3774 100644 --- a/boards/uniboard2a/designs/unb2a_test/src/vhdl/qsys_unb2a_test_pkg.vhd +++ b/boards/uniboard2a/designs/unb2a_test/src/vhdl/qsys_unb2a_test_pkg.vhd @@ -396,4 +396,4 @@ package qsys_unb2a_test_pkg is -end qsys_unb2a_test_pkg; +end qsys_unb2a_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/src/vhdl/udp_stream.vhd b/boards/uniboard2a/designs/unb2a_test/src/vhdl/udp_stream.vhd index 997c9b7f7b..a165a9131e 100644 --- a/boards/uniboard2a/designs/unb2a_test/src/vhdl/udp_stream.vhd +++ b/boards/uniboard2a/designs/unb2a_test/src/vhdl/udp_stream.vhd @@ -354,4 +354,4 @@ begin in_sosi_arr => diag_data_buf_snk_in_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test.vhd b/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test.vhd index bbe99d15d8..8f213eb6c1 100644 --- a/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test.vhd +++ b/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test.vhd @@ -71,8 +71,8 @@ entity unb2a_test is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -123,12 +123,12 @@ entity unb2a_test is QSFP_RST : inout std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_I_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_II_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; @@ -148,13 +148,13 @@ architecture str of unb2a_test is -- Revision controlled constants constant c_use_1GbE : boolean := FALSE; --g_design_name="unb2a_test_1GbE" OR g_design_name="unb2a_test_10GbE" OR g_design_name="unb2a_test_all"; - constant c_use_10GbE : boolean := g_design_name ="unb2a_test_10GbE " or g_design_name ="unb2a_test_all "; + constant c_use_10GbE : boolean := g_design_name ="unb2a_test_10GbE " or g_design_name ="unb2a_test_all "; constant c_use_10GbE_qsfp : boolean := c_use_10GbE; constant c_use_10GbE_ring : boolean := FALSE; --c_use_10GbE; constant c_use_10GbE_back0 : boolean := FALSE; --c_use_10GbE; constant c_use_10GbE_back1 : boolean := FALSE; --c_use_10GbE; - constant c_use_MB_I : boolean := g_design_name ="unb2a_test_ddr_MB_I " or g_design_name ="unb2a_test_ddr_MB_I_II " or g_design_name ="unb2a_test_all "; - constant c_use_MB_II : boolean := g_design_name ="unb2a_test_ddr_MB_II " or g_design_name ="unb2a_test_ddr_MB_I_II " or g_design_name ="unb2a_test_all "; + constant c_use_MB_I : boolean := g_design_name ="unb2a_test_ddr_MB_I " or g_design_name ="unb2a_test_ddr_MB_I_II " or g_design_name ="unb2a_test_all "; + constant c_use_MB_II : boolean := g_design_name ="unb2a_test_ddr_MB_II " or g_design_name ="unb2a_test_ddr_MB_I_II " or g_design_name ="unb2a_test_all "; -- transceivers constant c_nof_qsfp : natural := c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w; @@ -1269,4 +1269,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test_pkg.vhd b/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test_pkg.vhd index 1aed2beb13..6b7df99fcf 100644 --- a/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test_pkg.vhd +++ b/boards/uniboard2a/designs/unb2a_test/src/vhdl/unb2a_test_pkg.vhd @@ -29,7 +29,7 @@ package unb2a_test_pkg is -- dp_offload_tx --CONSTANT c_nof_hdr_fields : NATURAL := 1+3+12+4+2; -- Total header bits = 384 = 6 64b words - constant c_nof_hdr_fields : natural := 3 +12 + 4 + 2; -- Total header bits = 384 = 6 64b words + constant c_nof_hdr_fields : natural := 3 + 12 + 4 + 2; -- Total header bits = 384 = 6 64b words constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( --( field_name_pad("align" ), " ", 16, field_default(0) ), ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), @@ -54,6 +54,6 @@ package unb2a_test_pkg is ( field_name_pad("usr_bsn" ), " ", 47, field_default(0) )); --CONSTANT c_hdr_field_ovr_init : STD_LOGIC_VECTOR(c_nof_hdr_fields-1 DOWNTO 0) := "1001"&"111111111100"&"0011"&"00"; - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; -end unb2a_test_pkg; +end unb2a_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/ctrl_unb2_board.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/ctrl_unb2_board.vhd index 18e00ad126..b66a3ead41 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/ctrl_unb2_board.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/ctrl_unb2_board.vhd @@ -243,8 +243,8 @@ entity ctrl_unb2_board is -- 1GbE Control Interface ETH_CLK : in std_logic; -- 125 MHz - ETH_SGin : IN std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) := (others => '0'); - ETH_SGout : OUT std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) + ETH_SGin : in std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) := (others => '0'); + ETH_SGout : out std_logic_vector(c_unb2_board_nof_eth - 1 downto 0) ); end ctrl_unb2_board; diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_sens.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_sens.vhd index 52011c0095..cb4b8bbc7f 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_sens.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_sens.vhd @@ -118,4 +118,4 @@ begin -- temp_high is 7 bits, preceded by a '0' to allow only positive temps to be set. temp_alarm <= '1' when (signed(sens_data(0)) > signed('0' & temp_high)) else '0'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_system_info.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_system_info.vhd index cd4cefeee1..7d19de3788 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_system_info.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_board_system_info.vhd @@ -72,7 +72,7 @@ architecture str of mms_unb2_board_system_info is -- No longer supporting MIF files in sim as non-$UNB (e.g. $AARTFAAC) designs will cause path error. -- CONSTANT c_mif_name : STRING := sel_a_b((g_design_name="UNUSED"), g_design_name, c_path_prefix & g_design_name & ".mif"); - constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); + constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); constant c_rom_addr_w : natural := 10; -- 2^10 = 1024 addresses * 32 bits = 4 kiB @@ -137,4 +137,4 @@ begin rd_val => rom_miso.rdval ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_fpga_sens.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_fpga_sens.vhd index 2389544a8e..ebeb1fe337 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_fpga_sens.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/mms_unb2_fpga_sens.vhd @@ -118,4 +118,4 @@ begin -- temp_high is 7 bits, preceded by a '0' to allow only positive temps to be set. temp_alarm <= '0'; --<= '1' WHEN (SIGNED(sens_data(0)) > SIGNED('0' & temp_high)) ELSE '0'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_ring_io.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_ring_io.vhd index 86b629682f..2ac09a27ce 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_ring_io.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_ring_io.vhd @@ -32,7 +32,7 @@ entity unb2_board_ring_io is serial_tx_arr : in std_logic_vector(g_nof_ring_bus * c_unb2_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); serial_rx_arr : out std_logic_vector(g_nof_ring_bus * c_unb2_board_tr_ring.bus_w - 1 downto 0); - RinG_RX : IN t_unb2_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); + RinG_RX : in t_unb2_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); RING_TX : out t_unb2_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) ); end unb2_board_ring_io; diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd index 57bbeb8b6f..805540631a 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd @@ -140,4 +140,4 @@ begin end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_wdi_reg.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_wdi_reg.vhd index ecf702091a..3b03b7f01a 100644 --- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_wdi_reg.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_wdi_reg.vhd @@ -86,4 +86,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2a/libraries/unb2a_board/tb/vhdl/tb_mms_unb2_board_sens.vhd b/boards/uniboard2a/libraries/unb2a_board/tb/vhdl/tb_mms_unb2_board_sens.vhd index 2f6e79a242..36f4d812c5 100644 --- a/boards/uniboard2a/libraries/unb2a_board/tb/vhdl/tb_mms_unb2_board_sens.vhd +++ b/boards/uniboard2a/libraries/unb2a_board/tb/vhdl/tb_mms_unb2_board_sens.vhd @@ -211,4 +211,4 @@ begin ana_volt_adin => c_uniboard_adin ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_arp_ping/src/vhdl/unb2b_arp_ping.vhd b/boards/uniboard2b/designs/unb2b_arp_ping/src/vhdl/unb2b_arp_ping.vhd index 84e75f919e..a74f800be1 100644 --- a/boards/uniboard2b/designs/unb2b_arp_ping/src/vhdl/unb2b_arp_ping.vhd +++ b/boards/uniboard2b/designs/unb2b_arp_ping/src/vhdl/unb2b_arp_ping.vhd @@ -74,8 +74,8 @@ entity unb2b_arp_ping is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -387,4 +387,4 @@ begin QSFP_LED => QSFP_LED ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_heater/src/vhdl/unb2b_heater.vhd b/boards/uniboard2b/designs/unb2b_heater/src/vhdl/unb2b_heater.vhd index af54c7cc4a..2cedfb9701 100644 --- a/boards/uniboard2b/designs/unb2b_heater/src/vhdl/unb2b_heater.vhd +++ b/boards/uniboard2b/designs/unb2b_heater/src/vhdl/unb2b_heater.vhd @@ -65,8 +65,8 @@ entity unb2b_heater is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -406,4 +406,4 @@ begin sla_in => reg_heater_mosi, sla_out => reg_heater_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd index b7b0b9421b..cd51286875 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd @@ -15,4 +15,4 @@ outclk_1 => CONNECTED_TO_outclk_1, -- outclk1.clk refclk => CONNECTED_TO_refclk, -- refclk.clk rst => CONNECTED_TO_rst -- reset.reset - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd index 0464262396..0a668a0c8a 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd @@ -11,4 +11,4 @@ clk => CONNECTED_TO_clk, -- clk.clk in_reset_n => CONNECTED_TO_in_reset_n, -- in_reset.reset_n out_reset_n => CONNECTED_TO_out_reset_n -- out_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd index 425df4f7db..fe390e7550 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd @@ -11,4 +11,4 @@ clk => CONNECTED_TO_clk, -- clk.clk in_reset_n => CONNECTED_TO_in_reset_n, -- in_reset.reset_n out_reset_n => CONNECTED_TO_out_reset_n -- out_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd index 213f6db903..8e147e66f0 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd @@ -159,4 +159,4 @@ reset_out5 => CONNECTED_TO_reset_out5, -- reset_out5.reset reset_out6 => CONNECTED_TO_reset_out6, -- reset_out6.reset reset_out7 => CONNECTED_TO_reset_out7 -- reset_out7.reset - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd index 4aa7f3aec3..4a4dd5d437 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd @@ -21,4 +21,4 @@ rx_digitalreset => CONNECTED_TO_rx_digitalreset, -- rx_digitalreset.rx_digitalreset rx_is_lockedtodata => CONNECTED_TO_rx_is_lockedtodata, -- rx_is_lockedtodata.rx_is_lockedtodata rx_ready => CONNECTED_TO_rx_ready -- rx_ready.rx_ready - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd index b3899a24db..a5796f3aaa 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd index 5df9fb0a9a..c135dff113 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd index 2f3daf6856..6b5b96f4f2 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd @@ -97,4 +97,4 @@ sof => CONNECTED_TO_sof, -- sof.export somf => CONNECTED_TO_somf, -- somf.export sysref => CONNECTED_TO_sysref -- sysref.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd index 4d98d38812..4c240b329f 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd index e9f2adf7d6..327b8730c7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd index a6ccb8cfd2..3ee82d53fc 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd index c4db7d7c3f..a7a03b2b98 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd @@ -673,18 +673,18 @@ package body common_pkg is variable v_result : std_logic := '0'; begin -- default any unused, the stage results will be kept in the LSBits and the last result in bit 0 - if operation ="and " then v_stage_arr := (others => (others => '1')); - elsif operation ="or " then v_stage_arr := (others => (others => '0')); - elsif operation ="xor " then v_stage_arr := (others => (others => '0')); + if operation ="and " then v_stage_arr := (others => (others => '1')); + elsif operation ="or " then v_stage_arr := (others => (others => '0')); + elsif operation ="xor " then v_stage_arr := (others => (others => '0')); else assert TRUE report "common_pkg: Unsupported vector_tree operation" severity FAILURE; end if; v_stage_arr(-1)(c_slv_w - 1 downto 0) := slv; -- any unused input c_w : c_slv_w bits have void default value for J in 0 to c_nof_stages - 1 loop for I in 0 to c_w / (2 ** (J + 1)) - 1 loop - if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); + if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); end if; end loop; end loop; @@ -853,7 +853,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) + vR(I); @@ -866,7 +866,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) + R; end loop; @@ -884,7 +884,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -898,7 +898,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_integer_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -911,7 +911,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) - R; end loop; @@ -936,7 +936,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) * vR(I); @@ -949,7 +949,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) * R; end loop; @@ -967,7 +967,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) / vR(I); @@ -980,7 +980,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) / R; end loop; @@ -1278,7 +1278,7 @@ package body common_pkg is function sel_n(sel : natural; a, b, c, d, e, f, g, h, i, j : string) return string is begin if sel < 9 then return sel_n(sel, a, b, c, d, e, f, g, h, i); else return j; end if; end; function array_init(init : std_logic; nof : natural) return std_logic_vector is - variable v_arr : std_logic_vector(0 TO nof - 1); + variable v_arr : std_logic_vector(0 to nof - 1); begin for I in v_arr'range loop v_arr(I) := init; @@ -2023,7 +2023,7 @@ package body common_pkg is variable v_b : std_logic_vector(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2038,7 +2038,7 @@ package body common_pkg is variable v_b : t_slv_32_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2048,7 +2048,7 @@ package body common_pkg is variable v_b : t_integer_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2058,7 +2058,7 @@ package body common_pkg is variable v_b : t_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2068,7 +2068,7 @@ package body common_pkg is variable v_b : t_nat_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2128,7 +2128,7 @@ package body common_pkg is function slice_up(str : string; width : natural; i : natural; pad_char : character) return string is variable padded_str : string(1 to width) := (others => '0'); begin - padded_str := pad(str(i * width + 1 to (i +1) * width), width, '0'); + padded_str := pad(str(i * width + 1 to (i + 1) * width), width, '0'); return padded_str; end; @@ -2225,7 +2225,7 @@ package body common_pkg is -- Get the index K in the select setting array for the reorder2 cell on stage I and row J in a reorder network with N stages function func_common_reorder2_get_select_index(I, J, N : natural) return integer is - constant c_nof_reorder2_per_odd_stage : natural := N /2; + constant c_nof_reorder2_per_odd_stage : natural := N / 2; constant c_nof_reorder2_per_even_stage : natural := (N - 1) / 2; variable v_nof_odd_stages : natural; variable v_nof_even_stages : natural; @@ -2347,7 +2347,7 @@ package body common_pkg is -- Create Pfactor SCLK periods within this DCLK period SCLK <= '0'; if Pfactor > 1 then - for I in 0 to 2 * Pfactor - 1 -2 loop + for I in 0 to 2 * Pfactor - 1 - 2 loop wait for v_speriod / 2; SCLK <= not SCLK; end loop; @@ -2359,4 +2359,4 @@ package body common_pkg is wait; end proc_common_dclk_generate_sclk; -end common_pkg; +end common_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd index a9d8a6610c..f75f3e2cc9 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd @@ -265,7 +265,7 @@ package dp_stream_pkg is function REPLICATE_DP_DATA( seq : std_logic_vector ) return std_logic_vector; -- replicate seq as often as fits in c_dp_stream_data_w function UNREPLICATE_DP_DATA(data : std_logic_vector; seq_w : natural) return std_logic_vector; -- unreplicate data to width seq_w, return low seq_w bits and set mismatch MSbits bits to '1' - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned; + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned; -- Keep part of head data and combine part of tail data, use the other sosi from head_sosi function func_dp_data_shift_first(head_sosi, tail_sosi : t_dp_sosi; symbol_w, nof_symbols_per_data, nof_symbols_from_tail : natural) return t_dp_sosi; @@ -590,7 +590,7 @@ package body dp_stream_pkg is return v_vec(c_data_w - 1 downto 0); end UNREPLICATE_DP_DATA; - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned is + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned is variable v_sosi_unsigned : t_dp_sosi_unsigned; begin v_sosi_unsigned.sync := sync; @@ -737,8 +737,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_and for t_dp_siso_arr"; end if; end if; @@ -759,10 +759,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_and for t_dp_sosi_arr"; end if; end if; @@ -795,8 +795,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_or for t_dp_siso_arr"; end if; end if; @@ -817,10 +817,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_or for t_dp_sosi_arr"; end if; end if; @@ -852,8 +852,8 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="READY " then v_dp(I).ready := v_slv(I); - elsif str ="XON " then v_dp(I).xon := v_slv(I); + if str ="READY " then v_dp(I).ready := v_slv(I); + elsif str ="XON " then v_dp(I).xon := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_siso_arr"; end if; end loop; @@ -865,10 +865,10 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="VALID " then v_dp(I).valid := v_slv(I); - elsif str ="SOP " then v_dp(I).sop := v_slv(I); - elsif str ="EOP " then v_dp(I).eop := v_slv(I); - elsif str ="SYNC " then v_dp(I).sync := v_slv(I); + if str ="VALID " then v_dp(I).valid := v_slv(I); + elsif str ="SOP " then v_dp(I).sop := v_slv(I); + elsif str ="EOP " then v_dp(I).eop := v_slv(I); + elsif str ="SYNC " then v_dp(I).sync := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_sosi_arr"; end if; end loop; @@ -891,8 +891,8 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="READY " then v_ctrl(I) := dp(I).ready; - elsif str ="XON " then v_ctrl(I) := dp(I).xon; + if str ="READY " then v_ctrl(I) := dp(I).ready; + elsif str ="XON " then v_ctrl(I) := dp(I).xon; else report "Error in func_dp_stream_arr_get for t_dp_siso_arr"; end if; end loop; @@ -903,10 +903,10 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="VALID " then v_ctrl(I) := dp(I).valid; - elsif str ="SOP " then v_ctrl(I) := dp(I).sop; - elsif str ="EOP " then v_ctrl(I) := dp(I).eop; - elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; + if str ="VALID " then v_ctrl(I) := dp(I).valid; + elsif str ="SOP " then v_ctrl(I) := dp(I).sop; + elsif str ="EOP " then v_ctrl(I) := dp(I).eop; + elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; else report "Error in func_dp_stream_arr_get for t_dp_sosi_arr"; end if; end loop; @@ -1245,12 +1245,12 @@ package body dp_stream_pkg is function func_dp_stream_set_data(dp : t_dp_sosi; slv : std_logic_vector; str : string) return t_dp_sosi is variable v_dp : t_dp_sosi := dp; begin - if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); - elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); - elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); + elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); else report "Error in func_dp_stream_set_data for t_dp_sosi"; @@ -1420,10 +1420,10 @@ package body dp_stream_pkg is v_src_out.im := (others => '0'); for i in 0 to nof_data - 1 loop v_in_data := snk_in.data((i + 1) * in_w - 1 downto i * in_w); - if data_representation ="unsigned " then -- treat data as unsigned + if data_representation ="unsigned " then -- treat data as unsigned v_out_data := RESIZE_UVEC(v_in_data, out_w); else - if data_representation ="signed " then -- treat data as signed + if data_representation ="signed " then -- treat data as signed v_out_data := RESIZE_SVEC(v_in_data, out_w); else -- treat data as complex @@ -1486,4 +1486,4 @@ package body dp_stream_pkg is return src_out_arr(0); end; -end dp_stream_pkg; +end dp_stream_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd index 3ca37696f6..74e8f2b1e6 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd @@ -106,7 +106,7 @@ package eth_pkg is -- . write/read back registers type t_eth_demux_ports_arr is array(1 to c_eth_nof_udp_ports) of std_logic_vector(c_network_udp_port_w - 1 downto 0); type t_eth_mm_reg_demux is record - udp_ports_en : std_logic_vector(1 TO c_eth_nof_udp_ports); -- [16] + udp_ports_en : std_logic_vector(1 to c_eth_nof_udp_ports); -- [16] udp_ports : t_eth_demux_ports_arr; -- [15:0] end record; @@ -349,4 +349,4 @@ package body eth_pkg is return v_reg; end func_eth_mm_reg_status; -end eth_pkg; +end eth_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd index c4db7d7c3f..a7a03b2b98 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd @@ -673,18 +673,18 @@ package body common_pkg is variable v_result : std_logic := '0'; begin -- default any unused, the stage results will be kept in the LSBits and the last result in bit 0 - if operation ="and " then v_stage_arr := (others => (others => '1')); - elsif operation ="or " then v_stage_arr := (others => (others => '0')); - elsif operation ="xor " then v_stage_arr := (others => (others => '0')); + if operation ="and " then v_stage_arr := (others => (others => '1')); + elsif operation ="or " then v_stage_arr := (others => (others => '0')); + elsif operation ="xor " then v_stage_arr := (others => (others => '0')); else assert TRUE report "common_pkg: Unsupported vector_tree operation" severity FAILURE; end if; v_stage_arr(-1)(c_slv_w - 1 downto 0) := slv; -- any unused input c_w : c_slv_w bits have void default value for J in 0 to c_nof_stages - 1 loop for I in 0 to c_w / (2 ** (J + 1)) - 1 loop - if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); + if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); end if; end loop; end loop; @@ -853,7 +853,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) + vR(I); @@ -866,7 +866,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) + R; end loop; @@ -884,7 +884,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -898,7 +898,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_integer_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -911,7 +911,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) - R; end loop; @@ -936,7 +936,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) * vR(I); @@ -949,7 +949,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) * R; end loop; @@ -967,7 +967,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) / vR(I); @@ -980,7 +980,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) / R; end loop; @@ -1278,7 +1278,7 @@ package body common_pkg is function sel_n(sel : natural; a, b, c, d, e, f, g, h, i, j : string) return string is begin if sel < 9 then return sel_n(sel, a, b, c, d, e, f, g, h, i); else return j; end if; end; function array_init(init : std_logic; nof : natural) return std_logic_vector is - variable v_arr : std_logic_vector(0 TO nof - 1); + variable v_arr : std_logic_vector(0 to nof - 1); begin for I in v_arr'range loop v_arr(I) := init; @@ -2023,7 +2023,7 @@ package body common_pkg is variable v_b : std_logic_vector(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2038,7 +2038,7 @@ package body common_pkg is variable v_b : t_slv_32_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2048,7 +2048,7 @@ package body common_pkg is variable v_b : t_integer_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2058,7 +2058,7 @@ package body common_pkg is variable v_b : t_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2068,7 +2068,7 @@ package body common_pkg is variable v_b : t_nat_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2128,7 +2128,7 @@ package body common_pkg is function slice_up(str : string; width : natural; i : natural; pad_char : character) return string is variable padded_str : string(1 to width) := (others => '0'); begin - padded_str := pad(str(i * width + 1 to (i +1) * width), width, '0'); + padded_str := pad(str(i * width + 1 to (i + 1) * width), width, '0'); return padded_str; end; @@ -2225,7 +2225,7 @@ package body common_pkg is -- Get the index K in the select setting array for the reorder2 cell on stage I and row J in a reorder network with N stages function func_common_reorder2_get_select_index(I, J, N : natural) return integer is - constant c_nof_reorder2_per_odd_stage : natural := N /2; + constant c_nof_reorder2_per_odd_stage : natural := N / 2; constant c_nof_reorder2_per_even_stage : natural := (N - 1) / 2; variable v_nof_odd_stages : natural; variable v_nof_even_stages : natural; @@ -2347,7 +2347,7 @@ package body common_pkg is -- Create Pfactor SCLK periods within this DCLK period SCLK <= '0'; if Pfactor > 1 then - for I in 0 to 2 * Pfactor - 1 -2 loop + for I in 0 to 2 * Pfactor - 1 - 2 loop wait for v_speriod / 2; SCLK <= not SCLK; end loop; @@ -2359,4 +2359,4 @@ package body common_pkg is wait; end proc_common_dclk_generate_sclk; -end common_pkg; +end common_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd index a9d8a6610c..f75f3e2cc9 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd @@ -265,7 +265,7 @@ package dp_stream_pkg is function REPLICATE_DP_DATA( seq : std_logic_vector ) return std_logic_vector; -- replicate seq as often as fits in c_dp_stream_data_w function UNREPLICATE_DP_DATA(data : std_logic_vector; seq_w : natural) return std_logic_vector; -- unreplicate data to width seq_w, return low seq_w bits and set mismatch MSbits bits to '1' - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned; + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned; -- Keep part of head data and combine part of tail data, use the other sosi from head_sosi function func_dp_data_shift_first(head_sosi, tail_sosi : t_dp_sosi; symbol_w, nof_symbols_per_data, nof_symbols_from_tail : natural) return t_dp_sosi; @@ -590,7 +590,7 @@ package body dp_stream_pkg is return v_vec(c_data_w - 1 downto 0); end UNREPLICATE_DP_DATA; - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned is + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned is variable v_sosi_unsigned : t_dp_sosi_unsigned; begin v_sosi_unsigned.sync := sync; @@ -737,8 +737,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_and for t_dp_siso_arr"; end if; end if; @@ -759,10 +759,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_and for t_dp_sosi_arr"; end if; end if; @@ -795,8 +795,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_or for t_dp_siso_arr"; end if; end if; @@ -817,10 +817,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_or for t_dp_sosi_arr"; end if; end if; @@ -852,8 +852,8 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="READY " then v_dp(I).ready := v_slv(I); - elsif str ="XON " then v_dp(I).xon := v_slv(I); + if str ="READY " then v_dp(I).ready := v_slv(I); + elsif str ="XON " then v_dp(I).xon := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_siso_arr"; end if; end loop; @@ -865,10 +865,10 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="VALID " then v_dp(I).valid := v_slv(I); - elsif str ="SOP " then v_dp(I).sop := v_slv(I); - elsif str ="EOP " then v_dp(I).eop := v_slv(I); - elsif str ="SYNC " then v_dp(I).sync := v_slv(I); + if str ="VALID " then v_dp(I).valid := v_slv(I); + elsif str ="SOP " then v_dp(I).sop := v_slv(I); + elsif str ="EOP " then v_dp(I).eop := v_slv(I); + elsif str ="SYNC " then v_dp(I).sync := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_sosi_arr"; end if; end loop; @@ -891,8 +891,8 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="READY " then v_ctrl(I) := dp(I).ready; - elsif str ="XON " then v_ctrl(I) := dp(I).xon; + if str ="READY " then v_ctrl(I) := dp(I).ready; + elsif str ="XON " then v_ctrl(I) := dp(I).xon; else report "Error in func_dp_stream_arr_get for t_dp_siso_arr"; end if; end loop; @@ -903,10 +903,10 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="VALID " then v_ctrl(I) := dp(I).valid; - elsif str ="SOP " then v_ctrl(I) := dp(I).sop; - elsif str ="EOP " then v_ctrl(I) := dp(I).eop; - elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; + if str ="VALID " then v_ctrl(I) := dp(I).valid; + elsif str ="SOP " then v_ctrl(I) := dp(I).sop; + elsif str ="EOP " then v_ctrl(I) := dp(I).eop; + elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; else report "Error in func_dp_stream_arr_get for t_dp_sosi_arr"; end if; end loop; @@ -1245,12 +1245,12 @@ package body dp_stream_pkg is function func_dp_stream_set_data(dp : t_dp_sosi; slv : std_logic_vector; str : string) return t_dp_sosi is variable v_dp : t_dp_sosi := dp; begin - if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); - elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); - elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); + elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); else report "Error in func_dp_stream_set_data for t_dp_sosi"; @@ -1420,10 +1420,10 @@ package body dp_stream_pkg is v_src_out.im := (others => '0'); for i in 0 to nof_data - 1 loop v_in_data := snk_in.data((i + 1) * in_w - 1 downto i * in_w); - if data_representation ="unsigned " then -- treat data as unsigned + if data_representation ="unsigned " then -- treat data as unsigned v_out_data := RESIZE_UVEC(v_in_data, out_w); else - if data_representation ="signed " then -- treat data as signed + if data_representation ="signed " then -- treat data as signed v_out_data := RESIZE_SVEC(v_in_data, out_w); else -- treat data as complex @@ -1486,4 +1486,4 @@ package body dp_stream_pkg is return src_out_arr(0); end; -end dp_stream_pkg; +end dp_stream_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd index 3ca37696f6..74e8f2b1e6 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd @@ -106,7 +106,7 @@ package eth_pkg is -- . write/read back registers type t_eth_demux_ports_arr is array(1 to c_eth_nof_udp_ports) of std_logic_vector(c_network_udp_port_w - 1 downto 0); type t_eth_mm_reg_demux is record - udp_ports_en : std_logic_vector(1 TO c_eth_nof_udp_ports); -- [16] + udp_ports_en : std_logic_vector(1 to c_eth_nof_udp_ports); -- [16] udp_ports : t_eth_demux_ports_arr; -- [15:0] end record; @@ -349,4 +349,4 @@ package body eth_pkg is return v_reg; end func_eth_mm_reg_status; -end eth_pkg; +end eth_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd index c25f4d4776..705524fb12 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd @@ -81,4 +81,4 @@ coe_tse_waitrequest_export => CONNECTED_TO_coe_tse_waitrequest_export, -- tse_waitrequest.export coe_tse_write_export => CONNECTED_TO_coe_tse_write_export, -- tse_write.export coe_tse_writedata_export => CONNECTED_TO_coe_tse_writedata_export -- tse_writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd index c7ca333408..7bc86549a5 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd index 3e5eaafd86..26d93a9ea3 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd @@ -57,4 +57,4 @@ irq => CONNECTED_TO_irq, -- irq.irq reset_n => CONNECTED_TO_reset_n, -- reset.reset_n reset_req => CONNECTED_TO_reset_req -- .reset_req - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd index c08fcff0ab..c2abb9e91f 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd @@ -97,4 +97,4 @@ sof => CONNECTED_TO_sof, -- sof.export somf => CONNECTED_TO_somf, -- somf.export sysref => CONNECTED_TO_sysref -- sysref.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd index c649161846..b4173dc058 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd @@ -757,4 +757,4 @@ begin -- --synthesis read_comments_as_HDL off -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd index da3c2aa018..c9c479a863 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd @@ -25,4 +25,4 @@ clk => CONNECTED_TO_clk, -- clk.clk av_irq => CONNECTED_TO_av_irq, -- irq.irq rst_n => CONNECTED_TO_rst_n -- reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd index 19adb8c437..1949dd0fa4 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd @@ -115,4 +115,4 @@ begin --vhdl renameroo for output signals readdata <= internal_readdata; -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd index 6ad2b21a32..ecb1268599 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd @@ -25,4 +25,4 @@ readdata => CONNECTED_TO_readdata, -- .readdata writedata => CONNECTED_TO_writedata, -- .writedata byteenable => CONNECTED_TO_byteenable -- .byteenable - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd index 9e07f4b8fe..ec3101547f 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd index d3e5d94238..0794de5258 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd index 12348df1d3..07d15bd0f7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd @@ -68,4 +68,4 @@ begin readdata <= std_logic_vector'("00000000000000000000000000000000") or (std_logic_vector'("0000000000000000000000000000000") & (A_TOSTDLOGICVECTOR(read_mux_out))); out_port <= data_out; -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd index 159b52690b..c63d9306e7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd @@ -21,4 +21,4 @@ writedata => CONNECTED_TO_writedata, -- .writedata chipselect => CONNECTED_TO_chipselect, -- .chipselect readdata => CONNECTED_TO_readdata -- .readdata - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd index dfa2f39fe1..ca70a8648e 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd index 789342aa93..24610ced4a 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd index 7cdf6ac161..81ba1431b7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd index 952f9fa07a..a12984f10b 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd index 4e82d31b6b..d283f75c59 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd index fc8e712955..3eb5fb91db 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd index 8f1fa9306f..a15759ed5c 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd index 6c55e1250f..e349d2f690 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd index e1eab33208..0a6189d1f8 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd index ad6aca5ecc..060d8f43d7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd index d021b96883..7aa35c9574 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd index 84e748f11e..3156e1f711 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd index e965bdbf56..fa95d5ce0a 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd @@ -146,7 +146,7 @@ begin irq <= timeout_occurred and control_interrupt_enable; --s1, which is an e_avalon_slave - read_mux_out <= ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000001")))), 16) and (std_logic_vector'("000000000000000") & (A_TOSTDLOGICVECTor(control_register))))) OR ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000000")))), 16) and (std_logic_vector'("00000000000000") & (std_logic_vector'(A_ToStdLogicVector(counter_is_running) & A_ToStdLogicVector(timeout_occurred)))))); + read_mux_out <= ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000001")))), 16) and (std_logic_vector'("000000000000000") & (A_TOSTDLOGICVECTor(control_register))))) or ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000000")))), 16) and (std_logic_vector'("00000000000000") & (std_logic_vector'(A_ToStdLogicVector(counter_is_running) & A_ToStdLogicVector(timeout_occurred)))))); process (clk, reset_n) begin if reset_n = '0' then @@ -177,4 +177,4 @@ begin control_interrupt_enable <= control_register; status_wr_strobe <= (chipselect and not write_n) and to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000000")))); -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd index 89bce420fd..5dc19007e0 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd @@ -21,4 +21,4 @@ readdata => CONNECTED_TO_readdata, -- .readdata chipselect => CONNECTED_TO_chipselect, -- .chipselect write_n => CONNECTED_TO_write_n -- .write_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/unb2b_jesd_node0.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/unb2b_jesd_node0.vhd index e3344b13ba..f9e990ff59 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/unb2b_jesd_node0.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node0/unb2b_jesd_node0.vhd @@ -66,8 +66,8 @@ entity unb2b_jesd_node0 is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); @@ -131,4 +131,4 @@ begin jesd204_device_clk => jesd204_device_clk ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd index b7b0b9421b..cd51286875 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_corepll/altjesd_ss_RX_corepll_inst.vhd @@ -15,4 +15,4 @@ outclk_1 => CONNECTED_TO_outclk_1, -- outclk1.clk refclk => CONNECTED_TO_refclk, -- refclk.clk rst => CONNECTED_TO_rst -- reset.reset - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd index 0464262396..0a668a0c8a 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_frame_reset/altjesd_ss_RX_frame_reset_inst.vhd @@ -11,4 +11,4 @@ clk => CONNECTED_TO_clk, -- clk.clk in_reset_n => CONNECTED_TO_in_reset_n, -- in_reset.reset_n out_reset_n => CONNECTED_TO_out_reset_n -- out_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd index 425df4f7db..fe390e7550 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_link_reset/altjesd_ss_RX_link_reset_inst.vhd @@ -11,4 +11,4 @@ clk => CONNECTED_TO_clk, -- clk.clk in_reset_n => CONNECTED_TO_in_reset_n, -- in_reset.reset_n out_reset_n => CONNECTED_TO_out_reset_n -- out_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd index 213f6db903..8e147e66f0 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_reset_seq/altjesd_ss_RX_reset_seq_inst.vhd @@ -159,4 +159,4 @@ reset_out5 => CONNECTED_TO_reset_out5, -- reset_out5.reset reset_out6 => CONNECTED_TO_reset_out6, -- reset_out6.reset reset_out7 => CONNECTED_TO_reset_out7 -- reset_out7.reset - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd index 4aa7f3aec3..4a4dd5d437 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/altjesd_ss_RX_xcvr_reset_control/altjesd_ss_RX_xcvr_reset_control_inst.vhd @@ -21,4 +21,4 @@ rx_digitalreset => CONNECTED_TO_rx_digitalreset, -- rx_digitalreset.rx_digitalreset rx_is_lockedtodata => CONNECTED_TO_rx_is_lockedtodata, -- rx_is_lockedtodata.rx_is_lockedtodata rx_ready => CONNECTED_TO_rx_ready -- rx_ready.rx_ready - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd index b3899a24db..a5796f3aaa 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/device_clk/device_clk_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd index 5df9fb0a9a..c135dff113 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/frame_clk/frame_clk_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd index 2f3daf6856..6b5b96f4f2 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/jesd/jesd_inst.vhd @@ -97,4 +97,4 @@ sof => CONNECTED_TO_sof, -- sof.export somf => CONNECTED_TO_somf, -- somf.export sysref => CONNECTED_TO_sysref -- sysref.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd index 4d98d38812..4c240b329f 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/link_clk/link_clk_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd index e9f2adf7d6..327b8730c7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_0/qsys_unb2b_minimal_avs_common_mm_0_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd index a6ccb8cfd2..3ee82d53fc 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_common_mm_1/qsys_unb2b_minimal_avs_common_mm_1_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd index c4db7d7c3f..a7a03b2b98 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/common_pkg.vhd @@ -673,18 +673,18 @@ package body common_pkg is variable v_result : std_logic := '0'; begin -- default any unused, the stage results will be kept in the LSBits and the last result in bit 0 - if operation ="and " then v_stage_arr := (others => (others => '1')); - elsif operation ="or " then v_stage_arr := (others => (others => '0')); - elsif operation ="xor " then v_stage_arr := (others => (others => '0')); + if operation ="and " then v_stage_arr := (others => (others => '1')); + elsif operation ="or " then v_stage_arr := (others => (others => '0')); + elsif operation ="xor " then v_stage_arr := (others => (others => '0')); else assert TRUE report "common_pkg: Unsupported vector_tree operation" severity FAILURE; end if; v_stage_arr(-1)(c_slv_w - 1 downto 0) := slv; -- any unused input c_w : c_slv_w bits have void default value for J in 0 to c_nof_stages - 1 loop for I in 0 to c_w / (2 ** (J + 1)) - 1 loop - if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); + if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); end if; end loop; end loop; @@ -853,7 +853,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) + vR(I); @@ -866,7 +866,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) + R; end loop; @@ -884,7 +884,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -898,7 +898,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_integer_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -911,7 +911,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) - R; end loop; @@ -936,7 +936,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) * vR(I); @@ -949,7 +949,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) * R; end loop; @@ -967,7 +967,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) / vR(I); @@ -980,7 +980,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) / R; end loop; @@ -1278,7 +1278,7 @@ package body common_pkg is function sel_n(sel : natural; a, b, c, d, e, f, g, h, i, j : string) return string is begin if sel < 9 then return sel_n(sel, a, b, c, d, e, f, g, h, i); else return j; end if; end; function array_init(init : std_logic; nof : natural) return std_logic_vector is - variable v_arr : std_logic_vector(0 TO nof - 1); + variable v_arr : std_logic_vector(0 to nof - 1); begin for I in v_arr'range loop v_arr(I) := init; @@ -2023,7 +2023,7 @@ package body common_pkg is variable v_b : std_logic_vector(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2038,7 +2038,7 @@ package body common_pkg is variable v_b : t_slv_32_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2048,7 +2048,7 @@ package body common_pkg is variable v_b : t_integer_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2058,7 +2058,7 @@ package body common_pkg is variable v_b : t_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2068,7 +2068,7 @@ package body common_pkg is variable v_b : t_nat_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2128,7 +2128,7 @@ package body common_pkg is function slice_up(str : string; width : natural; i : natural; pad_char : character) return string is variable padded_str : string(1 to width) := (others => '0'); begin - padded_str := pad(str(i * width + 1 to (i +1) * width), width, '0'); + padded_str := pad(str(i * width + 1 to (i + 1) * width), width, '0'); return padded_str; end; @@ -2225,7 +2225,7 @@ package body common_pkg is -- Get the index K in the select setting array for the reorder2 cell on stage I and row J in a reorder network with N stages function func_common_reorder2_get_select_index(I, J, N : natural) return integer is - constant c_nof_reorder2_per_odd_stage : natural := N /2; + constant c_nof_reorder2_per_odd_stage : natural := N / 2; constant c_nof_reorder2_per_even_stage : natural := (N - 1) / 2; variable v_nof_odd_stages : natural; variable v_nof_even_stages : natural; @@ -2347,7 +2347,7 @@ package body common_pkg is -- Create Pfactor SCLK periods within this DCLK period SCLK <= '0'; if Pfactor > 1 then - for I in 0 to 2 * Pfactor - 1 -2 loop + for I in 0 to 2 * Pfactor - 1 - 2 loop wait for v_speriod / 2; SCLK <= not SCLK; end loop; @@ -2359,4 +2359,4 @@ package body common_pkg is wait; end proc_common_dclk_generate_sclk; -end common_pkg; +end common_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd index a9d8a6610c..f75f3e2cc9 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/dp_stream_pkg.vhd @@ -265,7 +265,7 @@ package dp_stream_pkg is function REPLICATE_DP_DATA( seq : std_logic_vector ) return std_logic_vector; -- replicate seq as often as fits in c_dp_stream_data_w function UNREPLICATE_DP_DATA(data : std_logic_vector; seq_w : natural) return std_logic_vector; -- unreplicate data to width seq_w, return low seq_w bits and set mismatch MSbits bits to '1' - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned; + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned; -- Keep part of head data and combine part of tail data, use the other sosi from head_sosi function func_dp_data_shift_first(head_sosi, tail_sosi : t_dp_sosi; symbol_w, nof_symbols_per_data, nof_symbols_from_tail : natural) return t_dp_sosi; @@ -590,7 +590,7 @@ package body dp_stream_pkg is return v_vec(c_data_w - 1 downto 0); end UNREPLICATE_DP_DATA; - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned is + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned is variable v_sosi_unsigned : t_dp_sosi_unsigned; begin v_sosi_unsigned.sync := sync; @@ -737,8 +737,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_and for t_dp_siso_arr"; end if; end if; @@ -759,10 +759,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_and for t_dp_sosi_arr"; end if; end if; @@ -795,8 +795,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_or for t_dp_siso_arr"; end if; end if; @@ -817,10 +817,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_or for t_dp_sosi_arr"; end if; end if; @@ -852,8 +852,8 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="READY " then v_dp(I).ready := v_slv(I); - elsif str ="XON " then v_dp(I).xon := v_slv(I); + if str ="READY " then v_dp(I).ready := v_slv(I); + elsif str ="XON " then v_dp(I).xon := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_siso_arr"; end if; end loop; @@ -865,10 +865,10 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="VALID " then v_dp(I).valid := v_slv(I); - elsif str ="SOP " then v_dp(I).sop := v_slv(I); - elsif str ="EOP " then v_dp(I).eop := v_slv(I); - elsif str ="SYNC " then v_dp(I).sync := v_slv(I); + if str ="VALID " then v_dp(I).valid := v_slv(I); + elsif str ="SOP " then v_dp(I).sop := v_slv(I); + elsif str ="EOP " then v_dp(I).eop := v_slv(I); + elsif str ="SYNC " then v_dp(I).sync := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_sosi_arr"; end if; end loop; @@ -891,8 +891,8 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="READY " then v_ctrl(I) := dp(I).ready; - elsif str ="XON " then v_ctrl(I) := dp(I).xon; + if str ="READY " then v_ctrl(I) := dp(I).ready; + elsif str ="XON " then v_ctrl(I) := dp(I).xon; else report "Error in func_dp_stream_arr_get for t_dp_siso_arr"; end if; end loop; @@ -903,10 +903,10 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="VALID " then v_ctrl(I) := dp(I).valid; - elsif str ="SOP " then v_ctrl(I) := dp(I).sop; - elsif str ="EOP " then v_ctrl(I) := dp(I).eop; - elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; + if str ="VALID " then v_ctrl(I) := dp(I).valid; + elsif str ="SOP " then v_ctrl(I) := dp(I).sop; + elsif str ="EOP " then v_ctrl(I) := dp(I).eop; + elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; else report "Error in func_dp_stream_arr_get for t_dp_sosi_arr"; end if; end loop; @@ -1245,12 +1245,12 @@ package body dp_stream_pkg is function func_dp_stream_set_data(dp : t_dp_sosi; slv : std_logic_vector; str : string) return t_dp_sosi is variable v_dp : t_dp_sosi := dp; begin - if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); - elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); - elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); + elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); else report "Error in func_dp_stream_set_data for t_dp_sosi"; @@ -1420,10 +1420,10 @@ package body dp_stream_pkg is v_src_out.im := (others => '0'); for i in 0 to nof_data - 1 loop v_in_data := snk_in.data((i + 1) * in_w - 1 downto i * in_w); - if data_representation ="unsigned " then -- treat data as unsigned + if data_representation ="unsigned " then -- treat data as unsigned v_out_data := RESIZE_UVEC(v_in_data, out_w); else - if data_representation ="signed " then -- treat data as signed + if data_representation ="signed " then -- treat data as signed v_out_data := RESIZE_SVEC(v_in_data, out_w); else -- treat data as complex @@ -1486,4 +1486,4 @@ package body dp_stream_pkg is return src_out_arr(0); end; -end dp_stream_pkg; +end dp_stream_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd index 3ca37696f6..74e8f2b1e6 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/sim/eth_pkg.vhd @@ -106,7 +106,7 @@ package eth_pkg is -- . write/read back registers type t_eth_demux_ports_arr is array(1 to c_eth_nof_udp_ports) of std_logic_vector(c_network_udp_port_w - 1 downto 0); type t_eth_mm_reg_demux is record - udp_ports_en : std_logic_vector(1 TO c_eth_nof_udp_ports); -- [16] + udp_ports_en : std_logic_vector(1 to c_eth_nof_udp_ports); -- [16] udp_ports : t_eth_demux_ports_arr; -- [15:0] end record; @@ -349,4 +349,4 @@ package body eth_pkg is return v_reg; end func_eth_mm_reg_status; -end eth_pkg; +end eth_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd index c4db7d7c3f..a7a03b2b98 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/common_pkg.vhd @@ -673,18 +673,18 @@ package body common_pkg is variable v_result : std_logic := '0'; begin -- default any unused, the stage results will be kept in the LSBits and the last result in bit 0 - if operation ="and " then v_stage_arr := (others => (others => '1')); - elsif operation ="or " then v_stage_arr := (others => (others => '0')); - elsif operation ="xor " then v_stage_arr := (others => (others => '0')); + if operation ="and " then v_stage_arr := (others => (others => '1')); + elsif operation ="or " then v_stage_arr := (others => (others => '0')); + elsif operation ="xor " then v_stage_arr := (others => (others => '0')); else assert TRUE report "common_pkg: Unsupported vector_tree operation" severity FAILURE; end if; v_stage_arr(-1)(c_slv_w - 1 downto 0) := slv; -- any unused input c_w : c_slv_w bits have void default value for J in 0 to c_nof_stages - 1 loop for I in 0 to c_w / (2 ** (J + 1)) - 1 loop - if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); + if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); end if; end loop; end loop; @@ -853,7 +853,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) + vR(I); @@ -866,7 +866,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) + R; end loop; @@ -884,7 +884,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -898,7 +898,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_integer_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -911,7 +911,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) - R; end loop; @@ -936,7 +936,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) * vR(I); @@ -949,7 +949,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) * R; end loop; @@ -967,7 +967,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) / vR(I); @@ -980,7 +980,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) / R; end loop; @@ -1278,7 +1278,7 @@ package body common_pkg is function sel_n(sel : natural; a, b, c, d, e, f, g, h, i, j : string) return string is begin if sel < 9 then return sel_n(sel, a, b, c, d, e, f, g, h, i); else return j; end if; end; function array_init(init : std_logic; nof : natural) return std_logic_vector is - variable v_arr : std_logic_vector(0 TO nof - 1); + variable v_arr : std_logic_vector(0 to nof - 1); begin for I in v_arr'range loop v_arr(I) := init; @@ -2023,7 +2023,7 @@ package body common_pkg is variable v_b : std_logic_vector(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2038,7 +2038,7 @@ package body common_pkg is variable v_b : t_slv_32_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2048,7 +2048,7 @@ package body common_pkg is variable v_b : t_integer_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2058,7 +2058,7 @@ package body common_pkg is variable v_b : t_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2068,7 +2068,7 @@ package body common_pkg is variable v_b : t_nat_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2128,7 +2128,7 @@ package body common_pkg is function slice_up(str : string; width : natural; i : natural; pad_char : character) return string is variable padded_str : string(1 to width) := (others => '0'); begin - padded_str := pad(str(i * width + 1 to (i +1) * width), width, '0'); + padded_str := pad(str(i * width + 1 to (i + 1) * width), width, '0'); return padded_str; end; @@ -2225,7 +2225,7 @@ package body common_pkg is -- Get the index K in the select setting array for the reorder2 cell on stage I and row J in a reorder network with N stages function func_common_reorder2_get_select_index(I, J, N : natural) return integer is - constant c_nof_reorder2_per_odd_stage : natural := N /2; + constant c_nof_reorder2_per_odd_stage : natural := N / 2; constant c_nof_reorder2_per_even_stage : natural := (N - 1) / 2; variable v_nof_odd_stages : natural; variable v_nof_even_stages : natural; @@ -2347,7 +2347,7 @@ package body common_pkg is -- Create Pfactor SCLK periods within this DCLK period SCLK <= '0'; if Pfactor > 1 then - for I in 0 to 2 * Pfactor - 1 -2 loop + for I in 0 to 2 * Pfactor - 1 - 2 loop wait for v_speriod / 2; SCLK <= not SCLK; end loop; @@ -2359,4 +2359,4 @@ package body common_pkg is wait; end proc_common_dclk_generate_sclk; -end common_pkg; +end common_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd index a9d8a6610c..f75f3e2cc9 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/dp_stream_pkg.vhd @@ -265,7 +265,7 @@ package dp_stream_pkg is function REPLICATE_DP_DATA( seq : std_logic_vector ) return std_logic_vector; -- replicate seq as often as fits in c_dp_stream_data_w function UNREPLICATE_DP_DATA(data : std_logic_vector; seq_w : natural) return std_logic_vector; -- unreplicate data to width seq_w, return low seq_w bits and set mismatch MSbits bits to '1' - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned; + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned; -- Keep part of head data and combine part of tail data, use the other sosi from head_sosi function func_dp_data_shift_first(head_sosi, tail_sosi : t_dp_sosi; symbol_w, nof_symbols_per_data, nof_symbols_from_tail : natural) return t_dp_sosi; @@ -590,7 +590,7 @@ package body dp_stream_pkg is return v_vec(c_data_w - 1 downto 0); end UNREPLICATE_DP_DATA; - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned is + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned is variable v_sosi_unsigned : t_dp_sosi_unsigned; begin v_sosi_unsigned.sync := sync; @@ -737,8 +737,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_and for t_dp_siso_arr"; end if; end if; @@ -759,10 +759,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_and for t_dp_sosi_arr"; end if; end if; @@ -795,8 +795,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_or for t_dp_siso_arr"; end if; end if; @@ -817,10 +817,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_or for t_dp_sosi_arr"; end if; end if; @@ -852,8 +852,8 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="READY " then v_dp(I).ready := v_slv(I); - elsif str ="XON " then v_dp(I).xon := v_slv(I); + if str ="READY " then v_dp(I).ready := v_slv(I); + elsif str ="XON " then v_dp(I).xon := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_siso_arr"; end if; end loop; @@ -865,10 +865,10 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="VALID " then v_dp(I).valid := v_slv(I); - elsif str ="SOP " then v_dp(I).sop := v_slv(I); - elsif str ="EOP " then v_dp(I).eop := v_slv(I); - elsif str ="SYNC " then v_dp(I).sync := v_slv(I); + if str ="VALID " then v_dp(I).valid := v_slv(I); + elsif str ="SOP " then v_dp(I).sop := v_slv(I); + elsif str ="EOP " then v_dp(I).eop := v_slv(I); + elsif str ="SYNC " then v_dp(I).sync := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_sosi_arr"; end if; end loop; @@ -891,8 +891,8 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="READY " then v_ctrl(I) := dp(I).ready; - elsif str ="XON " then v_ctrl(I) := dp(I).xon; + if str ="READY " then v_ctrl(I) := dp(I).ready; + elsif str ="XON " then v_ctrl(I) := dp(I).xon; else report "Error in func_dp_stream_arr_get for t_dp_siso_arr"; end if; end loop; @@ -903,10 +903,10 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="VALID " then v_ctrl(I) := dp(I).valid; - elsif str ="SOP " then v_ctrl(I) := dp(I).sop; - elsif str ="EOP " then v_ctrl(I) := dp(I).eop; - elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; + if str ="VALID " then v_ctrl(I) := dp(I).valid; + elsif str ="SOP " then v_ctrl(I) := dp(I).sop; + elsif str ="EOP " then v_ctrl(I) := dp(I).eop; + elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; else report "Error in func_dp_stream_arr_get for t_dp_sosi_arr"; end if; end loop; @@ -1245,12 +1245,12 @@ package body dp_stream_pkg is function func_dp_stream_set_data(dp : t_dp_sosi; slv : std_logic_vector; str : string) return t_dp_sosi is variable v_dp : t_dp_sosi := dp; begin - if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); - elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); - elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); + elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); else report "Error in func_dp_stream_set_data for t_dp_sosi"; @@ -1420,10 +1420,10 @@ package body dp_stream_pkg is v_src_out.im := (others => '0'); for i in 0 to nof_data - 1 loop v_in_data := snk_in.data((i + 1) * in_w - 1 downto i * in_w); - if data_representation ="unsigned " then -- treat data as unsigned + if data_representation ="unsigned " then -- treat data as unsigned v_out_data := RESIZE_UVEC(v_in_data, out_w); else - if data_representation ="signed " then -- treat data as signed + if data_representation ="signed " then -- treat data as signed v_out_data := RESIZE_SVEC(v_in_data, out_w); else -- treat data as complex @@ -1486,4 +1486,4 @@ package body dp_stream_pkg is return src_out_arr(0); end; -end dp_stream_pkg; +end dp_stream_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd index 3ca37696f6..74e8f2b1e6 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/avs2_eth_coe_10/synth/eth_pkg.vhd @@ -106,7 +106,7 @@ package eth_pkg is -- . write/read back registers type t_eth_demux_ports_arr is array(1 to c_eth_nof_udp_ports) of std_logic_vector(c_network_udp_port_w - 1 downto 0); type t_eth_mm_reg_demux is record - udp_ports_en : std_logic_vector(1 TO c_eth_nof_udp_ports); -- [16] + udp_ports_en : std_logic_vector(1 to c_eth_nof_udp_ports); -- [16] udp_ports : t_eth_demux_ports_arr; -- [15:0] end record; @@ -349,4 +349,4 @@ package body eth_pkg is return v_reg; end func_eth_mm_reg_status; -end eth_pkg; +end eth_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd index c25f4d4776..705524fb12 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_avs_eth_0/qsys_unb2b_minimal_avs_eth_0_inst.vhd @@ -81,4 +81,4 @@ coe_tse_waitrequest_export => CONNECTED_TO_coe_tse_waitrequest_export, -- tse_waitrequest.export coe_tse_write_export => CONNECTED_TO_coe_tse_write_export, -- tse_write.export coe_tse_writedata_export => CONNECTED_TO_coe_tse_writedata_export -- tse_writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd index c7ca333408..7bc86549a5 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_clk_0/qsys_unb2b_minimal_clk_0_inst.vhd @@ -13,4 +13,4 @@ in_clk => CONNECTED_TO_in_clk, -- clk_in.clk reset_n => CONNECTED_TO_reset_n, -- clk_in_reset.reset_n reset_n_out => CONNECTED_TO_reset_n_out -- clk_reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd index 3e5eaafd86..26d93a9ea3 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_cpu_0/qsys_unb2b_minimal_cpu_0_inst.vhd @@ -57,4 +57,4 @@ irq => CONNECTED_TO_irq, -- irq.irq reset_n => CONNECTED_TO_reset_n, -- reset.reset_n reset_req => CONNECTED_TO_reset_req -- .reset_req - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd index c08fcff0ab..c2abb9e91f 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jesd204/qsys_unb2b_minimal_jesd204_inst.vhd @@ -97,4 +97,4 @@ sof => CONNECTED_TO_sof, -- sof.export somf => CONNECTED_TO_somf, -- somf.export sysref => CONNECTED_TO_sysref -- sysref.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd index c649161846..b4173dc058 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/altera_avalon_jtag_uart_180/sim/qsys_unb2b_minimal_jtag_uart_0_altera_avalon_jtag_uart_180_tj65noi.vhd @@ -757,4 +757,4 @@ begin -- --synthesis read_comments_as_HDL off -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd index da3c2aa018..c9c479a863 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_jtag_uart_0/qsys_unb2b_minimal_jtag_uart_0_inst.vhd @@ -25,4 +25,4 @@ clk => CONNECTED_TO_clk, -- clk.clk av_irq => CONNECTED_TO_av_irq, -- irq.irq rst_n => CONNECTED_TO_rst_n -- reset.reset_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd index 19adb8c437..1949dd0fa4 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/altera_avalon_onchip_memory2_180/sim/qsys_unb2b_minimal_onchip_memory2_0_altera_avalon_onchip_memory2_180_lo46q2y.vhd @@ -115,4 +115,4 @@ begin --vhdl renameroo for output signals readdata <= internal_readdata; -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd index 6ad2b21a32..ecb1268599 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_onchip_memory2_0/qsys_unb2b_minimal_onchip_memory2_0_inst.vhd @@ -25,4 +25,4 @@ readdata => CONNECTED_TO_readdata, -- .readdata writedata => CONNECTED_TO_writedata, -- .writedata byteenable => CONNECTED_TO_byteenable -- .byteenable - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd index 9e07f4b8fe..ec3101547f 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_pps/qsys_unb2b_minimal_pio_pps_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd index d3e5d94238..0794de5258 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_system_info/qsys_unb2b_minimal_pio_system_info_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd index 12348df1d3..07d15bd0f7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/altera_avalon_pio_180/sim/qsys_unb2b_minimal_pio_wdi_altera_avalon_pio_180_2botkdq.vhd @@ -68,4 +68,4 @@ begin readdata <= std_logic_vector'("00000000000000000000000000000000") or (std_logic_vector'("0000000000000000000000000000000") & (A_TOSTDLOGICVECTOR(read_mux_out))); out_port <= data_out; -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd index 159b52690b..c63d9306e7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_pio_wdi/qsys_unb2b_minimal_pio_wdi_inst.vhd @@ -21,4 +21,4 @@ writedata => CONNECTED_TO_writedata, -- .writedata chipselect => CONNECTED_TO_chipselect, -- .chipselect readdata => CONNECTED_TO_readdata -- .readdata - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd index dfa2f39fe1..ca70a8648e 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_ctrl/qsys_unb2b_minimal_reg_dpmm_ctrl_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd index 789342aa93..24610ced4a 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_dpmm_data/qsys_unb2b_minimal_reg_dpmm_data_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd index 7cdf6ac161..81ba1431b7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_epcs/qsys_unb2b_minimal_reg_epcs_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd index 952f9fa07a..a12984f10b 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_temp_sens/qsys_unb2b_minimal_reg_fpga_temp_sens_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd index 4e82d31b6b..d283f75c59 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_fpga_voltage_sens/qsys_unb2b_minimal_reg_fpga_voltage_sens_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd index fc8e712955..3eb5fb91db 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_ctrl/qsys_unb2b_minimal_reg_mmdp_ctrl_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd index 8f1fa9306f..a15759ed5c 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_mmdp_data/qsys_unb2b_minimal_reg_mmdp_data_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd index 6c55e1250f..e349d2f690 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_remu/qsys_unb2b_minimal_reg_remu_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd index e1eab33208..0a6189d1f8 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_pmbus/qsys_unb2b_minimal_reg_unb_pmbus_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd index ad6aca5ecc..060d8f43d7 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_unb_sens/qsys_unb2b_minimal_reg_unb_sens_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd index d021b96883..7aa35c9574 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_reg_wdi/qsys_unb2b_minimal_reg_wdi_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd index 84e748f11e..3156e1f711 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_rom_system_info/qsys_unb2b_minimal_rom_system_info_inst.vhd @@ -41,4 +41,4 @@ csi_system_reset => CONNECTED_TO_csi_system_reset, -- system_reset.reset coe_write_export => CONNECTED_TO_coe_write_export, -- write.export coe_writedata_export => CONNECTED_TO_coe_writedata_export -- writedata.export - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd index e965bdbf56..fa95d5ce0a 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/altera_avalon_timer_180/sim/qsys_unb2b_minimal_timer_0_altera_avalon_timer_180_5qqtsby.vhd @@ -146,7 +146,7 @@ begin irq <= timeout_occurred and control_interrupt_enable; --s1, which is an e_avalon_slave - read_mux_out <= ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000001")))), 16) and (std_logic_vector'("000000000000000") & (A_TOSTDLOGICVECTor(control_register))))) OR ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000000")))), 16) and (std_logic_vector'("00000000000000") & (std_logic_vector'(A_ToStdLogicVector(counter_is_running) & A_ToStdLogicVector(timeout_occurred)))))); + read_mux_out <= ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000001")))), 16) and (std_logic_vector'("000000000000000") & (A_TOSTDLOGICVECTor(control_register))))) or ((A_REP(to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000000")))), 16) and (std_logic_vector'("00000000000000") & (std_logic_vector'(A_ToStdLogicVector(counter_is_running) & A_ToStdLogicVector(timeout_occurred)))))); process (clk, reset_n) begin if reset_n = '0' then @@ -177,4 +177,4 @@ begin control_interrupt_enable <= control_register; status_wr_strobe <= (chipselect and not write_n) and to_std_logic((((std_logic_vector'("00000000000000000000000000000") & (address)) = std_logic_vector'("00000000000000000000000000000000")))); -end europa; +end europa; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd index 89bce420fd..5dc19007e0 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/quartus/ip/qsys_unb2b_minimal/qsys_unb2b_minimal_timer_0/qsys_unb2b_minimal_timer_0_inst.vhd @@ -21,4 +21,4 @@ readdata => CONNECTED_TO_readdata, -- .readdata chipselect => CONNECTED_TO_chipselect, -- .chipselect write_n => CONNECTED_TO_write_n -- .write_n - ); + ); \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/unb2b_jesd_node3.vhd b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/unb2b_jesd_node3.vhd index 63ad9d9a69..9ff7cd4312 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/unb2b_jesd_node3.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/revisions/unb2b_jesd_node3/unb2b_jesd_node3.vhd @@ -66,8 +66,8 @@ entity unb2b_jesd_node3 is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); @@ -131,4 +131,4 @@ begin jesd204_device_clk => jesd204_device_clk ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_jesd/src/vhdl/unb2b_jesd.vhd b/boards/uniboard2b/designs/unb2b_jesd/src/vhdl/unb2b_jesd.vhd index a35cf837a5..ed56980eb1 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/src/vhdl/unb2b_jesd.vhd +++ b/boards/uniboard2b/designs/unb2b_jesd/src/vhdl/unb2b_jesd.vhd @@ -67,8 +67,8 @@ entity unb2b_jesd is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0); @@ -432,4 +432,4 @@ begin in_sync => st_pps ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_minimal/revisions/unb2b_minimal_125m/unb2b_minimal_125m.vhd b/boards/uniboard2b/designs/unb2b_minimal/revisions/unb2b_minimal_125m/unb2b_minimal_125m.vhd index 5dac4afb37..2290b579a1 100644 --- a/boards/uniboard2b/designs/unb2b_minimal/revisions/unb2b_minimal_125m/unb2b_minimal_125m.vhd +++ b/boards/uniboard2b/designs/unb2b_minimal/revisions/unb2b_minimal_125m/unb2b_minimal_125m.vhd @@ -65,8 +65,8 @@ entity unb2b_minimal_125m is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2b/designs/unb2b_minimal/src/vhdl/unb2b_minimal.vhd b/boards/uniboard2b/designs/unb2b_minimal/src/vhdl/unb2b_minimal.vhd index 48448b9faa..298a993f61 100644 --- a/boards/uniboard2b/designs/unb2b_minimal/src/vhdl/unb2b_minimal.vhd +++ b/boards/uniboard2b/designs/unb2b_minimal/src/vhdl/unb2b_minimal.vhd @@ -65,8 +65,8 @@ entity unb2b_minimal is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2b_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -78,7 +78,7 @@ architecture str of unb2b_minimal is -- Firmware version x.y -- If x >= 2, rom_info starts on 0x10000 and max size = 0x8192 words constant c_fw_version : t_unb2b_board_fw_version := (2, 0); - constant c_use_125m : boolean := g_design_name ="unb2b_minimal_125m "; + constant c_use_125m : boolean := g_design_name ="unb2b_minimal_125m "; constant c_mm_clk_freq : natural := sel_a_b(c_use_125m, c_unb2b_board_mm_clk_freq_125M, c_unb2b_board_mm_clk_freq_50M); -- System @@ -390,4 +390,4 @@ begin QSFP_LED => QSFP_LED ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/tb_unb2b_test_10GbE.vhd b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/tb_unb2b_test_10GbE.vhd index e65f0a6da3..bf61b65bbf 100644 --- a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/tb_unb2b_test_10GbE.vhd +++ b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/tb_unb2b_test_10GbE.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2b_test_10GbE" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/unb2b_test_10GbE.vhd b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/unb2b_test_10GbE.vhd index 4fc72d123d..c270a715a3 100644 --- a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/unb2b_test_10GbE.vhd +++ b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_10GbE/unb2b_test_10GbE.vhd @@ -58,8 +58,8 @@ entity unb2b_test_10GbE is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic; -- Clock 10GbE front (qsfp) and ring lines diff --git a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/tb_unb2b_test_ddr_MB_I_II.vhd b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/tb_unb2b_test_ddr_MB_I_II.vhd index 418f563b11..a4cb9c852c 100644 --- a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/tb_unb2b_test_ddr_MB_I_II.vhd +++ b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/tb_unb2b_test_ddr_MB_I_II.vhd @@ -37,4 +37,4 @@ begin g_design_name => "unb2b_test_ddr_MB_I_II", g_sim_model_ddr => FALSE ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/unb2b_test_ddr_MB_I_II.vhd b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/unb2b_test_ddr_MB_I_II.vhd index b2ee169f52..cd053632c6 100644 --- a/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/unb2b_test_ddr_MB_I_II.vhd +++ b/boards/uniboard2b/designs/unb2b_test/revisions/unb2b_test_ddr_MB_I_II/unb2b_test_ddr_MB_I_II.vhd @@ -63,20 +63,20 @@ entity unb2b_test_ddr_MB_I_II is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2b/designs/unb2b_test/src/vhdl/qsys_unb2b_test_pkg.vhd b/boards/uniboard2b/designs/unb2b_test/src/vhdl/qsys_unb2b_test_pkg.vhd index dc1476517c..1fbf269895 100644 --- a/boards/uniboard2b/designs/unb2b_test/src/vhdl/qsys_unb2b_test_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_test/src/vhdl/qsys_unb2b_test_pkg.vhd @@ -388,4 +388,4 @@ package qsys_unb2b_test_pkg is -end qsys_unb2b_test_pkg; +end qsys_unb2b_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_test/src/vhdl/udp_stream.vhd b/boards/uniboard2b/designs/unb2b_test/src/vhdl/udp_stream.vhd index 23b35ae35f..a1697d7b7c 100644 --- a/boards/uniboard2b/designs/unb2b_test/src/vhdl/udp_stream.vhd +++ b/boards/uniboard2b/designs/unb2b_test/src/vhdl/udp_stream.vhd @@ -354,4 +354,4 @@ begin in_sosi_arr => diag_data_buf_snk_in_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test.vhd b/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test.vhd index 0e940e6990..897865a404 100644 --- a/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test.vhd +++ b/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test.vhd @@ -71,8 +71,8 @@ entity unb2b_test is -- 1GbE Control Interface ETH_CLK : in std_logic; - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -123,12 +123,12 @@ entity unb2b_test is QSFP_RST : inout std_logic; -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_I_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_II_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; @@ -148,13 +148,13 @@ architecture str of unb2b_test is -- Revision controlled constants constant c_use_1GbE : boolean := FALSE; --g_design_name="unb2b_test_1GbE" OR g_design_name="unb2b_test_10GbE" OR g_design_name="unb2b_test_all"; - constant c_use_10GbE : boolean := g_design_name ="unb2b_test_10GbE " or g_design_name ="unb2b_test_all "; + constant c_use_10GbE : boolean := g_design_name ="unb2b_test_10GbE " or g_design_name ="unb2b_test_all "; constant c_use_10GbE_qsfp : boolean := c_use_10GbE; constant c_use_10GbE_ring : boolean := FALSE; --c_use_10GbE; constant c_use_10GbE_back0 : boolean := FALSE; --c_use_10GbE; constant c_use_10GbE_back1 : boolean := FALSE; --c_use_10GbE; - constant c_use_MB_I : boolean := g_design_name ="unb2b_test_ddr_MB_I " or g_design_name ="unb2b_test_ddr_MB_I_II " or g_design_name ="unb2b_test_all "; - constant c_use_MB_II : boolean := g_design_name ="unb2b_test_ddr_MB_II " or g_design_name ="unb2b_test_ddr_MB_I_II " or g_design_name ="unb2b_test_all "; + constant c_use_MB_I : boolean := g_design_name ="unb2b_test_ddr_MB_I " or g_design_name ="unb2b_test_ddr_MB_I_II " or g_design_name ="unb2b_test_all "; + constant c_use_MB_II : boolean := g_design_name ="unb2b_test_ddr_MB_II " or g_design_name ="unb2b_test_ddr_MB_I_II " or g_design_name ="unb2b_test_all "; -- transceivers constant c_nof_qsfp : natural := c_unb2b_board_tr_qsfp.nof_bus * c_unb2b_board_tr_qsfp.bus_w; @@ -1261,4 +1261,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test_pkg.vhd b/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test_pkg.vhd index f4aaac280d..3b1dae7d19 100644 --- a/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test_pkg.vhd +++ b/boards/uniboard2b/designs/unb2b_test/src/vhdl/unb2b_test_pkg.vhd @@ -29,7 +29,7 @@ package unb2b_test_pkg is -- dp_offload_tx --CONSTANT c_nof_hdr_fields : NATURAL := 1+3+12+4+2; -- Total header bits = 384 = 6 64b words - constant c_nof_hdr_fields : natural := 3 +12 + 4 + 2; -- Total header bits = 384 = 6 64b words + constant c_nof_hdr_fields : natural := 3 + 12 + 4 + 2; -- Total header bits = 384 = 6 64b words constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( --( field_name_pad("align" ), " ", 16, field_default(0) ), ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), @@ -54,6 +54,6 @@ package unb2b_test_pkg is ( field_name_pad("usr_bsn" ), " ", 47, field_default(0) )); --CONSTANT c_hdr_field_ovr_init : STD_LOGIC_VECTOR(c_nof_hdr_fields-1 DOWNTO 0) := "1001"&"111111111100"&"0011"&"00"; - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; -end unb2b_test_pkg; +end unb2b_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/ctrl_unb2b_board.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/ctrl_unb2b_board.vhd index ee4a5d6a88..8970689946 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/ctrl_unb2b_board.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/ctrl_unb2b_board.vhd @@ -250,8 +250,8 @@ entity ctrl_unb2b_board is -- 1GbE Control Interface ETH_CLK : in std_logic; -- 125 MHz - ETH_SGin : IN std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0) := (others => '0'); - ETH_SGout : OUT std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0) + ETH_SGin : in std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0) := (others => '0'); + ETH_SGout : out std_logic_vector(c_unb2b_board_nof_eth - 1 downto 0) ); end ctrl_unb2b_board; diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_sens.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_sens.vhd index 3b6a50dfbc..a9720b7758 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_sens.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_sens.vhd @@ -118,4 +118,4 @@ begin -- temp_high is 7 bits, preceded by a '0' to allow only positive temps to be set. temp_alarm <= '1' when (signed(sens_data(0)) > signed('0' & temp_high)) else '0'; -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_system_info.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_system_info.vhd index 9320a5023a..e2764d43e1 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_system_info.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_board_system_info.vhd @@ -72,7 +72,7 @@ architecture str of mms_unb2b_board_system_info is -- No longer supporting MIF files in sim as non-$UNB (e.g. $AARTFAAC) designs will cause path error. -- CONSTANT c_mif_name : STRING := sel_a_b((g_design_name="UNUSED"), g_design_name, c_path_prefix & g_design_name & ".mif"); - constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); + constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); constant c_rom_addr_w : natural := 13; -- 2^13 = 8192 addresses * 32 bits = 32 kiB @@ -137,4 +137,4 @@ begin rd_val => rom_miso.rdval ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_fpga_sens.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_fpga_sens.vhd index e4ef196556..15af6cb78b 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_fpga_sens.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/mms_unb2b_fpga_sens.vhd @@ -78,4 +78,4 @@ begin reg_voltage_store_miso => reg_voltage_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_ring_io.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_ring_io.vhd index 62df93bea3..7a965e9d7e 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_ring_io.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_ring_io.vhd @@ -32,7 +32,7 @@ entity unb2b_board_ring_io is serial_tx_arr : in std_logic_vector(g_nof_ring_bus * c_unb2b_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); serial_rx_arr : out std_logic_vector(g_nof_ring_bus * c_unb2b_board_tr_ring.bus_w - 1 downto 0); - RinG_RX : IN t_unb2b_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); + RinG_RX : in t_unb2b_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); RING_TX : out t_unb2b_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) ); end unb2b_board_ring_io; diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_system_info_reg.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_system_info_reg.vhd index 6696033d8b..03c19edb6b 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_system_info_reg.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_system_info_reg.vhd @@ -151,4 +151,4 @@ begin end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_wdi_reg.vhd b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_wdi_reg.vhd index 80e1717c3a..9221d701d5 100644 --- a/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_wdi_reg.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/src/vhdl/unb2b_board_wdi_reg.vhd @@ -86,4 +86,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2b/libraries/unb2b_board/tb/vhdl/tb_mms_unb2b_board_sens.vhd b/boards/uniboard2b/libraries/unb2b_board/tb/vhdl/tb_mms_unb2b_board_sens.vhd index d074d2deb6..49264f6037 100644 --- a/boards/uniboard2b/libraries/unb2b_board/tb/vhdl/tb_mms_unb2b_board_sens.vhd +++ b/boards/uniboard2b/libraries/unb2b_board/tb/vhdl/tb_mms_unb2b_board_sens.vhd @@ -211,4 +211,4 @@ begin ana_volt_adin => c_uniboard_adin ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_led/src/vhdl/unb2c_led.vhd b/boards/uniboard2c/designs/unb2c_led/src/vhdl/unb2c_led.vhd index b442c9e59b..e63f299e81 100644 --- a/boards/uniboard2c/designs/unb2c_led/src/vhdl/unb2c_led.vhd +++ b/boards/uniboard2c/designs/unb2c_led/src/vhdl/unb2c_led.vhd @@ -247,4 +247,4 @@ begin QSFP_LED(5) <= ETH_CLK(0); QSFP_LED(9) <= ETH_CLK(1); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_minimal/src/vhdl/unb2c_minimal.vhd b/boards/uniboard2c/designs/unb2c_minimal/src/vhdl/unb2c_minimal.vhd index 510dd2dd8b..6d03df6459 100644 --- a/boards/uniboard2c/designs/unb2c_minimal/src/vhdl/unb2c_minimal.vhd +++ b/boards/uniboard2c/designs/unb2c_minimal/src/vhdl/unb2c_minimal.vhd @@ -57,8 +57,8 @@ entity unb2c_minimal is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0) ); @@ -356,4 +356,4 @@ begin QSFP_LED => QSFP_LED ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/tb_unb2c_test_10GbE.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/tb_unb2c_test_10GbE.vhd index 76dc43cc5a..7f219e6e4c 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/tb_unb2c_test_10GbE.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/tb_unb2c_test_10GbE.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2c_test_10GbE" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/unb2c_test_10GbE.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/unb2c_test_10GbE.vhd index a6474c97b3..a7647a12ca 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/unb2c_test_10GbE.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_10GbE/unb2c_test_10GbE.vhd @@ -55,8 +55,8 @@ entity unb2c_test_10GbE is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic; -- Clock 10GbE front (qsfp) and ring lines @@ -68,9 +68,9 @@ entity unb2c_test_10GbE is --BCK_TX : OUT STD_LOGIC_VECTOR((c_unb2c_board_tr_back.bus_w * c_unb2c_board_tr_back.nof_bus)-1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); RING_0_TX : out std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); -- front transceivers diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/tb_unb2c_test_1GbE_I.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/tb_unb2c_test_1GbE_I.vhd index b13c20863b..21751a5ae2 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/tb_unb2c_test_1GbE_I.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/tb_unb2c_test_1GbE_I.vhd @@ -95,4 +95,4 @@ begin QSFP_LED => open ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/unb2c_test_1GbE_I.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/unb2c_test_1GbE_I.vhd index 37fd0b06f7..b9b0f586a8 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/unb2c_test_1GbE_I.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_I/unb2c_test_1GbE_I.vhd @@ -59,8 +59,8 @@ entity unb2c_test_1GbE_I is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/tb_unb2c_test_1GbE_II.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/tb_unb2c_test_1GbE_II.vhd index 5fd77ad14f..07d84c26d8 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/tb_unb2c_test_1GbE_II.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/tb_unb2c_test_1GbE_II.vhd @@ -98,4 +98,4 @@ begin QSFP_LED => open ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/unb2c_test_1GbE_II.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/unb2c_test_1GbE_II.vhd index 9fdff96fcb..e1a0198716 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/unb2c_test_1GbE_II.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_1GbE_II/unb2c_test_1GbE_II.vhd @@ -59,8 +59,8 @@ entity unb2c_test_1GbE_II is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/tb_unb2c_test_ddr.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/tb_unb2c_test_ddr.vhd index 0fc29fe4c9..d874b5f98c 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/tb_unb2c_test_ddr.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/tb_unb2c_test_ddr.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2c_test_ddr" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/unb2c_test_ddr.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/unb2c_test_ddr.vhd index 51b5b1b528..6973347515 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/unb2c_test_ddr.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr/unb2c_test_ddr.vhd @@ -56,20 +56,20 @@ entity unb2c_test_ddr is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/tb_unb2c_test_ddr_16G.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/tb_unb2c_test_ddr_16G.vhd index c63f189950..706610c210 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/tb_unb2c_test_ddr_16G.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/tb_unb2c_test_ddr_16G.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2c_test_ddr_16G" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/unb2c_test_ddr_16G.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/unb2c_test_ddr_16G.vhd index e04755ae0b..c2cdd01586 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/unb2c_test_ddr_16G.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_ddr_16G/unb2c_test_ddr_16G.vhd @@ -56,20 +56,20 @@ entity unb2c_test_ddr_16G is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- DDR reference clocks MB_I_REF_CLK : in std_logic; -- Reference clock for MB_I MB_II_REF_CLK : in std_logic; -- Reference clock for MB_II -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in; + MB_I_in : in t_tech_ddr4_phy_in; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in; + MB_II_in : in t_tech_ddr4_phy_in; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/tb_unb2c_test_heater.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/tb_unb2c_test_heater.vhd index a321178bf9..3ce7215ba8 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/tb_unb2c_test_heater.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/tb_unb2c_test_heater.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2c_test_heater" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/unb2c_test_heater.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/unb2c_test_heater.vhd index 11663ce146..442c1e2c3c 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/unb2c_test_heater.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_heater/unb2c_test_heater.vhd @@ -55,8 +55,8 @@ entity unb2c_test_heater is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/tb_unb2c_test_jesd204b.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/tb_unb2c_test_jesd204b.vhd index 965114b740..4074cb96b4 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/tb_unb2c_test_jesd204b.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/tb_unb2c_test_jesd204b.vhd @@ -34,4 +34,4 @@ begin generic map ( g_design_name => "unb2c_test_jesd204b" ); -end tb; +end tb; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/unb2c_test_jesd204b.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/unb2c_test_jesd204b.vhd index 7a930cb1b9..600ac43c1d 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/unb2c_test_jesd204b.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_jesd204b/unb2c_test_jesd204b.vhd @@ -54,8 +54,8 @@ entity unb2c_test_jesd204b is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- jesd204b BCK_REF_CLK : in std_logic; -- Clock 10GbE back. From external reference. To be used for JESD204B_REFCLK diff --git a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_minimal/unb2c_test_minimal.vhd b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_minimal/unb2c_test_minimal.vhd index 76a491885b..a0d6f82089 100644 --- a/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_minimal/unb2c_test_minimal.vhd +++ b/boards/uniboard2c/designs/unb2c_test/revisions/unb2c_test_minimal/unb2c_test_minimal.vhd @@ -55,8 +55,8 @@ entity unb2c_test_minimal is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); QSFP_LED : out std_logic_vector(c_unb2c_board_tr_qsfp_nof_leds - 1 downto 0) ); diff --git a/boards/uniboard2c/designs/unb2c_test/src/vhdl/qsys_unb2c_test_pkg.vhd b/boards/uniboard2c/designs/unb2c_test/src/vhdl/qsys_unb2c_test_pkg.vhd index d0a3da9dc9..a9e1735f14 100644 --- a/boards/uniboard2c/designs/unb2c_test/src/vhdl/qsys_unb2c_test_pkg.vhd +++ b/boards/uniboard2c/designs/unb2c_test/src/vhdl/qsys_unb2c_test_pkg.vhd @@ -465,4 +465,4 @@ package qsys_unb2c_test_pkg is ); end component qsys_unb2c_test; -end qsys_unb2c_test_pkg; +end qsys_unb2c_test_pkg; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/src/vhdl/udp_stream.vhd b/boards/uniboard2c/designs/unb2c_test/src/vhdl/udp_stream.vhd index f0c507112f..576ba85848 100644 --- a/boards/uniboard2c/designs/unb2c_test/src/vhdl/udp_stream.vhd +++ b/boards/uniboard2c/designs/unb2c_test/src/vhdl/udp_stream.vhd @@ -354,4 +354,4 @@ begin in_sosi_arr => diag_data_buf_snk_in_arr ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test.vhd b/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test.vhd index d2408d1d3e..eab316a241 100644 --- a/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test.vhd +++ b/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test.vhd @@ -69,8 +69,8 @@ entity unb2c_test is -- 1GbE Control Interface ETH_CLK : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGin : IN std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); - ETH_SGout : OUT std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGin : in std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); + ETH_SGout : out std_logic_vector(c_unb2c_board_nof_eth - 1 downto 0); -- Transceiver clocks SA_CLK : in std_logic := '0'; -- Clock 10GbE front (qsfp) and ring lines @@ -91,9 +91,9 @@ entity unb2c_test is JESD204B_SYNC : out std_logic_vector(c_unb2c_board_nof_sync_jesd204b - 1 downto 0); -- ring transceivers - RinG_0_RX : IN std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); + RinG_0_RX : in std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); RING_0_TX : out std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); - RinG_1_RX : IN std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); + RinG_1_RX : in std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); RING_1_TX : out std_logic_vector(c_unb2c_board_tr_ring.bus_w - 1 downto 0); -- front transceivers @@ -111,12 +111,12 @@ entity unb2c_test is QSFP_5_TX : out std_logic_vector(c_unb2c_board_tr_qsfp.bus_w - 1 downto 0); -- SO-DIMM Memory Bank I - MB_I_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_I_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_I_IO : inout t_tech_ddr4_phy_io; MB_I_OU : out t_tech_ddr4_phy_ou; -- SO-DIMM Memory Bank II - MB_II_in : IN t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; + MB_II_in : in t_tech_ddr4_phy_in := c_tech_ddr4_phy_in_x; MB_II_IO : inout t_tech_ddr4_phy_io; MB_II_OU : out t_tech_ddr4_phy_ou; diff --git a/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test_pkg.vhd b/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test_pkg.vhd index a3d44bfacc..8ad028c173 100644 --- a/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test_pkg.vhd +++ b/boards/uniboard2c/designs/unb2c_test/src/vhdl/unb2c_test_pkg.vhd @@ -32,7 +32,7 @@ package unb2c_test_pkg is -- dp_offload_tx (carried over from unb2a_test_pkg --CONSTANT c_nof_hdr_fields : NATURAL := 1+3+12+4+2; -- Total header bits = 384 = 6 64b words - constant c_nof_hdr_fields : natural := 3 +12 + 4 + 2; -- Total header bits = 384 = 6 64b words + constant c_nof_hdr_fields : natural := 3 + 12 + 4 + 2; -- Total header bits = 384 = 6 64b words constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( --( field_name_pad("align" ), " ", 16, field_default(0) ), ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), @@ -57,7 +57,7 @@ package unb2c_test_pkg is ( field_name_pad("usr_bsn" ), " ", 47, field_default(0) )); --CONSTANT c_hdr_field_ovr_init : STD_LOGIC_VECTOR(c_nof_hdr_fields-1 DOWNTO 0) := "1001"&"111111111100"&"0011"&"00"; - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "001" &"111111111100 " &"0011 " &"00 "; ----------------------------------------------------------------------------- -- Revision control ----------------------------------------------------------------------------- diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd index d9b51b1692..196feb597a 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/ctrl_unb2c_board.vhd @@ -233,8 +233,8 @@ entity ctrl_unb2c_board is -- 1GbE Control Interface ETH_CLK : in std_logic; -- 125 MHz - ETH_SGin : IN std_logic; -- _VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0) := (OTHERS=>'0'); - ETH_SGout : OUT std_logic -- _VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0) + ETH_SGin : in std_logic; -- _VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0) := (OTHERS=>'0'); + ETH_SGout : out std_logic -- _VECTOR(c_unb2c_board_nof_eth-1 DOWNTO 0) ); end ctrl_unb2c_board; diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd index 20b99ac05d..46d57818dc 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_board_system_info.vhd @@ -72,7 +72,7 @@ architecture str of mms_unb2c_board_system_info is -- No longer supporting MIF files in sim as non-$UNB (e.g. $AARTFAAC) designs will cause path error. -- CONSTANT c_mif_name : STRING := sel_a_b((g_design_name="UNUSED"), g_design_name, c_path_prefix & g_design_name & ".mif"); - constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); + constant c_mif_name : string := sel_a_b(g_sim, "UNUSED", sel_a_b((g_design_name ="UNUSED "), g_design_name, c_path_prefix & g_design_name & ".mif")); constant c_rom_addr_w : natural := 13; -- 2^13 = 8192 addresses * 32 bits = 32 kiB @@ -137,4 +137,4 @@ begin rd_val => rom_miso.rdval ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_fpga_sens.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_fpga_sens.vhd index d7cf5df679..94371f7c55 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_fpga_sens.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/mms_unb2c_fpga_sens.vhd @@ -78,4 +78,4 @@ begin reg_voltage_store_miso => reg_voltage_miso ); -end str; +end str; \ No newline at end of file diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_ring_io.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_ring_io.vhd index b34e30223b..2afffa2067 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_ring_io.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_ring_io.vhd @@ -32,7 +32,7 @@ entity unb2c_board_ring_io is serial_tx_arr : in std_logic_vector(g_nof_ring_bus * c_unb2c_board_tr_ring.bus_w - 1 downto 0) := (others => '0'); serial_rx_arr : out std_logic_vector(g_nof_ring_bus * c_unb2c_board_tr_ring.bus_w - 1 downto 0); - RinG_RX : IN t_unb2c_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); + RinG_RX : in t_unb2c_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) := (others => (others => '0')); RING_TX : out t_unb2c_board_ring_bus_2arr(g_nof_ring_bus - 1 downto 0) ); end unb2c_board_ring_io; diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_system_info_reg.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_system_info_reg.vhd index 35a27efeac..94926fa428 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_system_info_reg.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_system_info_reg.vhd @@ -151,4 +151,4 @@ begin end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_wdi_reg.vhd b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_wdi_reg.vhd index a2d1867325..204120473c 100644 --- a/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_wdi_reg.vhd +++ b/boards/uniboard2c/libraries/unb2c_board/src/vhdl/unb2c_board_wdi_reg.vhd @@ -86,4 +86,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd b/libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd index 0c9c427460..4bf9fec2a8 100644 --- a/libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd +++ b/libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd @@ -31,7 +31,7 @@ -- . The read latency is not adapted. Ensure that the Controller and Peripheral use the same -- read-latency. -- . Both AXI4-lite and MM use ready latency = 0 for waitrequest/ready. --- . AXI4-lite is assumed to use byte addressed registers while MM uses word addressed +-- . AXI4-lite is assumed to use byte addressed registers while MM uses word addressed -- registers. library IEEE, common_lib; @@ -115,4 +115,4 @@ begin d_bvalid <= '0'; end if; end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd b/libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd index 17446d08a9..5989261eab 100644 --- a/libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd +++ b/libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright 2023 @@ -110,9 +109,9 @@ package body axi4_lite_pkg is variable v_mm_copi : t_mem_copi := c_mem_copi_rst; begin if axi4_copi.awvalid = '1' then - v_mm_copi.address := axi4_copi.awaddr; + v_mm_copi.address := "00" & axi4_copi.awaddr(c_axi4_lite_address_w - 1 downto 2); -- convert byte addressed to word addressed. else - v_mm_copi.address := axi4_copi.araddr; + v_mm_copi.address := "00" & axi4_copi.araddr(c_axi4_lite_address_w - 1 downto 2); -- convert byte addressed to word addressed. end if; v_mm_copi.wrdata(c_axi4_lite_data_w - 1 downto 0) := axi4_copi.wdata; v_mm_copi.wr := axi4_copi.awvalid; @@ -132,14 +131,14 @@ package body axi4_lite_pkg is function func_axi4_lite_from_mm_copi(mm_copi : t_mem_copi) return t_axi4_lite_copi is variable v_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; begin - v_axi4_copi.awaddr := mm_copi.address; + v_axi4_copi.awaddr := mm_copi.address(c_axi4_lite_address_w - 3 downto 0) & "00"; -- convert word addressed to byte addressed. v_axi4_copi.awprot := (others => '0'); v_axi4_copi.awvalid := mm_copi.wr; v_axi4_copi.wdata := mm_copi.wrdata(c_axi4_lite_data_w - 1 downto 0); v_axi4_copi.wstrb := (others => '1'); -- Either ignored or all bytes selected. v_axi4_copi.wvalid := mm_copi.wr; v_axi4_copi.bready := '1'; -- Unsupported by MM, assuming always ready. - v_axi4_copi.araddr := mm_copi.address; + v_axi4_copi.araddr := mm_copi.address(c_axi4_lite_address_w - 3 downto 0) & "00"; -- convert word addressed to byte addressed. v_axi4_copi.arprot := (others => '0'); v_axi4_copi.arvalid := mm_copi.rd; v_axi4_copi.rready := '1'; -- Unsupported by MM, assuming always ready. @@ -160,168 +159,4 @@ package body axi4_lite_pkg is return v_axi4_cipo; end; -end axi4_lite_pkg; -======= -------------------------------------------------------------------------------- --- --- Copyright 2023 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- -------------------------------------------------------------------------------- - -------------------------------------------------------------------------------- --- Author : R vd Walle --- Purpose: --- Package containing usefull definitions for working with AXI4-Lite --- Description: --- Ported from: --- https://git.astron.nl/desp/gemini/-/blob/master/libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd -------------------------------------------------------------------------------- - -LIBRARY IEEE, common_lib; -USE IEEE.STD_LOGIC_1164.ALL; -USE IEEE.NUMERIC_STD.ALL; -USE std.textio.ALL; -USE IEEE.STD_LOGIC_TEXTIO.ALL; -USE common_lib.common_pkg.ALL; -USE common_lib.common_mem_pkg.ALL; - -PACKAGE axi4_lite_pkg IS - - ------------------------------------------------------------------------------ - -- Simple AXI4 lite memory access (for MM control interface) - ------------------------------------------------------------------------------ - CONSTANT c_axi4_lite_address_w : NATURAL := 32; - CONSTANT c_axi4_lite_data_w : NATURAL := 32; - CONSTANT c_axi4_lite_prot_w : NATURAL := 3; - CONSTANT c_axi4_lite_resp_w : NATURAL := 2; - - - TYPE t_axi4_lite_copi IS RECORD -- Controller Out Peripheral In - -- write address channel - awaddr : std_logic_vector(c_axi4_lite_address_w-1 downto 0); -- write address - awprot : std_logic_vector(c_axi4_lite_prot_w-1 downto 0); -- access permission for write - awvalid : std_logic; -- write address valid - -- write data channel - wdata : std_logic_vector(c_axi4_lite_data_w-1 downto 0); -- write data - wstrb : std_logic_vector((c_axi4_lite_data_w/c_byte_w)-1 downto 0); -- write strobes - wvalid : std_logic; -- write valid - -- write response channel - bready : std_logic; -- response ready - -- read address channel - araddr : std_logic_vector(c_axi4_lite_address_w-1 downto 0); -- read address - arprot : std_logic_vector(c_axi4_lite_prot_w-1 downto 0); -- access permission for read - arvalid : std_logic; -- read address valid - -- read data channel - rready : std_logic; -- read ready - END RECORD; - - TYPE t_axi4_lite_cipo IS RECORD -- Controller In Peripheral Out - -- write_address channel - awready : std_logic; -- write address ready - -- write data channel - wready : std_logic; -- write ready - -- write response channel - bresp : std_logic_vector(c_axi4_lite_resp_w-1 downto 0); -- write response - bvalid : std_logic; -- write response valid - -- read address channel - arready : std_logic; -- read address ready - -- read data channel - rdata : std_logic_vector(c_axi4_lite_data_w-1 downto 0); -- read data - rresp : std_logic_vector(c_axi4_lite_resp_w-1 downto 0); -- read response - rvalid : std_logic; -- read valid - END RECORD; - - CONSTANT c_axi4_lite_copi_rst : t_axi4_lite_copi := ((OTHERS=>'0'), (OTHERS=>'0'), '0', (OTHERS=>'0'), (OTHERS=>'0'), '0', '0', (OTHERS=>'0'), (OTHERS=>'0'), '0', '0'); - CONSTANT c_axi4_lite_cipo_rst : t_axi4_lite_cipo := ('0', '0', (OTHERS=>'0'), '0', '0', (OTHERS=>'0'), (OTHERS=>'0'), '0'); - - -- Multi port array for MM records - TYPE t_axi4_lite_cipo_arr IS ARRAY (INTEGER RANGE <>) OF t_axi4_lite_cipo; - TYPE t_axi4_lite_copi_arr IS ARRAY (INTEGER RANGE <>) OF t_axi4_lite_copi; - - CONSTANT c_axi4_lite_resp_okay : STD_LOGIC_VECTOR(c_axi4_lite_resp_w-1 DOWNTO 0) := "00"; -- normal access success - CONSTANT c_axi4_lite_resp_exokay : STD_LOGIC_VECTOR(c_axi4_lite_resp_w-1 DOWNTO 0) := "01"; -- exclusive access okay - CONSTANT c_axi4_lite_resp_slverr : STD_LOGIC_VECTOR(c_axi4_lite_resp_w-1 DOWNTO 0) := "10"; -- peripheral error - CONSTANT c_axi4_lite_resp_decerr : STD_LOGIC_VECTOR(c_axi4_lite_resp_w-1 DOWNTO 0) := "11"; -- decode error - - -- Functions to convert axi4-lite to MM. - FUNCTION func_axi4_lite_to_mm_copi(axi4_copi : t_axi4_lite_copi) RETURN t_mem_copi; - FUNCTION func_axi4_lite_to_mm_cipo(axi4_cipo : t_axi4_lite_cipo) RETURN t_mem_cipo; - - -- Functions to convert MM to axi4-lite. - FUNCTION func_axi4_lite_from_mm_copi(mm_copi : t_mem_copi) RETURN t_axi4_lite_copi; - FUNCTION func_axi4_lite_from_mm_cipo(mm_cipo : t_mem_cipo; bvalid : STD_LOGIC) RETURN t_axi4_lite_cipo; - -END axi4_lite_pkg; - -PACKAGE BODY axi4_lite_pkg IS - - FUNCTION func_axi4_lite_to_mm_copi(axi4_copi : t_axi4_lite_copi) RETURN t_mem_copi IS - VARIABLE v_mm_copi : t_mem_copi := c_mem_copi_rst; - BEGIN - IF axi4_copi.awvalid = '1' THEN - v_mm_copi.address := "00" & axi4_copi.awaddr(c_axi4_lite_address_w-1 DOWNTO 2); -- convert byte addressed to word addressed. - ELSE - v_mm_copi.address := "00" & axi4_copi.araddr(c_axi4_lite_address_w-1 DOWNTO 2); -- convert byte addressed to word addressed. - END IF; - v_mm_copi.wrdata(c_axi4_lite_data_w-1 DOWNTO 0) := axi4_copi.wdata; - v_mm_copi.wr := axi4_copi.awvalid; - v_mm_copi.rd := axi4_copi.arvalid; - RETURN v_mm_copi; - END; - - FUNCTION func_axi4_lite_to_mm_cipo(axi4_cipo : t_axi4_lite_cipo) RETURN t_mem_cipo IS - VARIABLE v_mm_cipo : t_mem_cipo := c_mem_cipo_rst; - BEGIN - v_mm_cipo.rddata(c_axi4_lite_data_w-1 DOWNTO 0) := axi4_cipo.rdata; - v_mm_cipo.rdval := axi4_cipo.rvalid; - v_mm_cipo.waitrequest := NOT (axi4_cipo.awready AND axi4_cipo.wready AND axi4_cipo.arready); - RETURN v_mm_cipo; - END; - - FUNCTION func_axi4_lite_from_mm_copi(mm_copi : t_mem_copi) RETURN t_axi4_lite_copi IS - VARIABLE v_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - BEGIN - v_axi4_copi.awaddr := mm_copi.address(c_axi4_lite_address_w-3 DOWNTO 0) & "00"; -- convert word addressed to byte addressed. - v_axi4_copi.awprot := (OTHERS => '0'); - v_axi4_copi.awvalid := mm_copi.wr; - v_axi4_copi.wdata := mm_copi.wrdata(c_axi4_lite_data_w-1 DOWNTO 0); - v_axi4_copi.wstrb := (OTHERS => '1'); -- Either ignored or all bytes selected. - v_axi4_copi.wvalid := mm_copi.wr; - v_axi4_copi.bready := '1'; -- Unsupported by MM, assuming always ready. - v_axi4_copi.araddr := mm_copi.address(c_axi4_lite_address_w-3 DOWNTO 0) & "00"; -- convert word addressed to byte addressed. - v_axi4_copi.arprot := (OTHERS => '0'); - v_axi4_copi.arvalid := mm_copi.rd; - v_axi4_copi.rready := '1'; -- Unsupported by MM, assuming always ready. - RETURN v_axi4_copi; - END; - - FUNCTION func_axi4_lite_from_mm_cipo(mm_cipo : t_mem_cipo; bvalid : STD_LOGIC) RETURN t_axi4_lite_cipo IS - VARIABLE v_axi4_cipo : t_axi4_lite_cipo := c_axi4_lite_cipo_rst; - BEGIN - v_axi4_cipo.awready := NOT mm_cipo.waitrequest; - v_axi4_cipo.wready := NOT mm_cipo.waitrequest; - v_axi4_cipo.bresp := c_axi4_lite_resp_okay; - v_axi4_cipo.bvalid := bvalid; - v_axi4_cipo.arready := NOT mm_cipo.waitrequest; - v_axi4_cipo.rdata := mm_cipo.rddata(c_axi4_lite_data_w-1 DOWNTO 0); - v_axi4_cipo.rresp := c_axi4_lite_resp_okay; - v_axi4_cipo.rvalid := mm_cipo.rdval; - RETURN v_axi4_cipo; - END; - -END axi4_lite_pkg; ->>>>>>> master +end axi4_lite_pkg; \ No newline at end of file diff --git a/libraries/base/axi4/src/vhdl/axi4_stream_dp_bridge.vhd b/libraries/base/axi4/src/vhdl/axi4_stream_dp_bridge.vhd index 7c3cd30902..3e7f15ec53 100644 --- a/libraries/base/axi4/src/vhdl/axi4_stream_dp_bridge.vhd +++ b/libraries/base/axi4/src/vhdl/axi4_stream_dp_bridge.vhd @@ -194,4 +194,4 @@ begin src_in => dp_out_siso ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/axi4/src/vhdl/axi4_stream_pkg.vhd b/libraries/base/axi4/src/vhdl/axi4_stream_pkg.vhd index e8dee42daa..b099f46462 100644 --- a/libraries/base/axi4/src/vhdl/axi4_stream_pkg.vhd +++ b/libraries/base/axi4/src/vhdl/axi4_stream_pkg.vhd @@ -384,7 +384,7 @@ package body axi4_stream_pkg is for I in axi4'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := axi4(I).tready; + if str ="READY " then v_vec(I) := axi4(I).tready; else report "Error in func_axi4_stream_arr_and for t_axi4_siso_arr"; end if; end if; @@ -405,7 +405,7 @@ package body axi4_stream_pkg is for I in axi4'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := axi4(I).tvalid; + if str ="VALID " then v_vec(I) := axi4(I).tvalid; else report "Error in func_axi4_stream_arr_and for t_axi4_sosi_arr"; end if; end if; @@ -438,7 +438,7 @@ package body axi4_stream_pkg is for I in axi4'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := axi4(I).tready; + if str ="READY " then v_vec(I) := axi4(I).tready; else report "Error in func_axi4_stream_arr_or for t_axi4_siso_arr"; end if; end if; @@ -459,7 +459,7 @@ package body axi4_stream_pkg is for I in axi4'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := axi4(I).tvalid; + if str ="VALID " then v_vec(I) := axi4(I).tvalid; else report "Error in func_axi4_stream_arr_or for t_axi4_sosi_arr"; end if; end if; @@ -491,7 +491,7 @@ package body axi4_stream_pkg is variable v_slv : std_logic_vector(axi4'range) := slv; -- map to ensure same range as for axi4 begin for I in axi4'range loop - if str ="READY " then v_axi4(I).tready := v_slv(I); + if str ="READY " then v_axi4(I).tready := v_slv(I); else report "Error in func_axi4_stream_arr_set for t_axi4_siso_arr"; end if; end loop; @@ -503,7 +503,7 @@ package body axi4_stream_pkg is variable v_slv : std_logic_vector(axi4'range) := slv; -- map to ensure same range as for axi4 begin for I in axi4'range loop - if str ="VALID " then v_axi4(I).tvalid := v_slv(I); + if str ="VALID " then v_axi4(I).tvalid := v_slv(I); else report "Error in func_axi4_stream_arr_set for t_axi4_sosi_arr"; end if; end loop; @@ -526,7 +526,7 @@ package body axi4_stream_pkg is variable v_ctrl : std_logic_vector(axi4'range); begin for I in axi4'range loop - if str ="READY " then v_ctrl(I) := axi4(I).tready; + if str ="READY " then v_ctrl(I) := axi4(I).tready; else report "Error in func_axi4_stream_arr_get for t_axi4_siso_arr"; end if; end loop; @@ -537,7 +537,7 @@ package body axi4_stream_pkg is variable v_ctrl : std_logic_vector(axi4'range); begin for I in axi4'range loop - if str ="VALID " then v_ctrl(I) := axi4(I).tvalid; + if str ="VALID " then v_ctrl(I) := axi4(I).tvalid; else report "Error in func_axi4_stream_arr_get for t_axi4_sosi_arr"; end if; end loop; @@ -777,4 +777,4 @@ package body axi4_stream_pkg is return(to_uvec(v_count, c_dp_stream_empty_w)); end func_axi4_stream_tkeep_to_dp_empty; -end axi4_stream_pkg; +end axi4_stream_pkg; \ No newline at end of file diff --git a/libraries/base/axi4/tb/vhdl/tb_axi4_stream_dp_bridge.vhd b/libraries/base/axi4/tb/vhdl/tb_axi4_stream_dp_bridge.vhd index 6a064de793..73895d772a 100644 --- a/libraries/base/axi4/tb/vhdl/tb_axi4_stream_dp_bridge.vhd +++ b/libraries/base/axi4/tb/vhdl/tb_axi4_stream_dp_bridge.vhd @@ -75,7 +75,7 @@ architecture tb of tb_axi4_stream_dp_bridge is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to g_dp_rl + c_tx_void); - signal tx_val : std_logic_vector(0 TO g_dp_rl + c_tx_void); + signal tx_val : std_logic_vector(0 to g_dp_rl + c_tx_void); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0); @@ -96,7 +96,7 @@ architecture tb of tb_axi4_stream_dp_bridge is signal dut_out_sosi : t_dp_sosi := c_dp_sosi_rst; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO g_dp_rl); + signal prev_out_ready : std_logic_vector(0 to g_dp_rl); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_empty : std_logic_vector(c_dp_empty_w - 1 downto 0); signal out_channel : std_logic_vector(c_dp_data_w - 1 downto 0); diff --git a/libraries/base/common/src/vhdl/common_accumulate.vhd b/libraries/base/common/src/vhdl/common_accumulate.vhd index b0fbd94d06..86b7a51446 100644 --- a/libraries/base/common/src/vhdl/common_accumulate.vhd +++ b/libraries/base/common/src/vhdl/common_accumulate.vhd @@ -63,14 +63,14 @@ begin if sload = '1' then result <= (others => '0'); if in_val = '1' then - if g_representation ="signed " then + if g_representation ="signed " then result <= RESIZE_SVEC(in_dat, c_acc_w); else result <= RESIZE_UVEC(in_dat, c_acc_w); end if; end if; elsif in_val = '1' then - if g_representation ="signed " then + if g_representation ="signed " then result <= std_logic_vector( signed(result) + signed(RESIZE_SVEC(in_dat, c_acc_w))); else result <= std_logic_vector(unsigned(result) + unsigned(RESIZE_UVEC(in_dat, c_acc_w))); diff --git a/libraries/base/common/src/vhdl/common_add_sub.vhd b/libraries/base/common/src/vhdl/common_add_sub.vhd index 99120e94b5..83bb11742d 100644 --- a/libraries/base/common/src/vhdl/common_add_sub.vhd +++ b/libraries/base/common/src/vhdl/common_add_sub.vhd @@ -56,7 +56,7 @@ architecture str of common_add_sub is begin - in_add <= '1' when g_direction ="ADD " or (g_direction ="BOTH " and sel_add = '1') else '0'; + in_add <= '1' when g_direction ="ADD " or (g_direction ="BOTH " and sel_add = '1') else '0'; no_input_reg : if g_pipeline_input = 0 generate -- wired input in_a_p <= in_a; diff --git a/libraries/base/common/src/vhdl/common_adder_tree_a_recursive.vhd b/libraries/base/common/src/vhdl/common_adder_tree_a_recursive.vhd index b92f0aa939..ff431c5670 100644 --- a/libraries/base/common/src/vhdl/common_adder_tree_a_recursive.vhd +++ b/libraries/base/common/src/vhdl/common_adder_tree_a_recursive.vhd @@ -182,6 +182,6 @@ begin ); end generate; - sum <= RESIZE_SVEC(result, g_sum_w) when g_representation ="signed " else RESIZE_UVEC(result, g_sum_w); + sum <= RESIZE_SVEC(result, g_sum_w) when g_representation ="signed " else RESIZE_UVEC(result, g_sum_w); end recursive; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_adder_tree_a_str.vhd b/libraries/base/common/src/vhdl/common_adder_tree_a_str.vhd index 806295b4a5..6dd32b855e 100644 --- a/libraries/base/common/src/vhdl/common_adder_tree_a_str.vhd +++ b/libraries/base/common/src/vhdl/common_adder_tree_a_str.vhd @@ -131,7 +131,7 @@ begin end generate; -- Map final sum to larger output vector using sign extension or to smaller width output vector preserving the LS part - sum <= RESIZE_SVEC(adds(c_nof_stages - 1)(c_sum_w - 1 downto 0), g_sum_w) when g_representation ="signed " else + sum <= RESIZE_SVEC(adds(c_nof_stages - 1)(c_sum_w - 1 downto 0), g_sum_w) when g_representation ="signed " else RESIZE_UVEC(adds(c_nof_stages - 1)(c_sum_w - 1 downto 0), g_sum_w); end generate; -- gen_tree diff --git a/libraries/base/common/src/vhdl/common_async.vhd b/libraries/base/common/src/vhdl/common_async.vhd index 8043970631..786aff76b4 100644 --- a/libraries/base/common/src/vhdl/common_async.vhd +++ b/libraries/base/common/src/vhdl/common_async.vhd @@ -44,7 +44,7 @@ end; architecture rtl of common_async is - signal din_meta : std_logic_vector(0 TO g_delay_len - 1) := (others => g_rst_level); + signal din_meta : std_logic_vector(0 to g_delay_len - 1) := (others => g_rst_level); -- Synthesis constraint to ensure that register is kept in this instance region attribute preserve : boolean; diff --git a/libraries/base/common/src/vhdl/common_clip.vhd b/libraries/base/common/src/vhdl/common_clip.vhd index 22e45355a5..ad2f4d05a9 100644 --- a/libraries/base/common/src/vhdl/common_clip.vhd +++ b/libraries/base/common/src/vhdl/common_clip.vhd @@ -81,7 +81,7 @@ begin nxt_clip_dat <= in_dat; nxt_clip_ovr <= '0'; if enable = '1' then - if g_representation ="signed " then + if g_representation ="signed " then if signed(in_dat) > c_s_full_scale then nxt_clip_dat <= std_logic_vector(RESIZE_NUM( c_s_full_scale, c_dat_w)); nxt_clip_ovr <= '1'; diff --git a/libraries/base/common/src/vhdl/common_debounce.vhd b/libraries/base/common/src/vhdl/common_debounce.vhd index db0897f635..850ce74fc0 100644 --- a/libraries/base/common/src/vhdl/common_debounce.vhd +++ b/libraries/base/common/src/vhdl/common_debounce.vhd @@ -57,7 +57,7 @@ architecture rtl of common_debounce is signal cnt_en : std_logic; signal stable_d : std_logic; - signal d_dly : std_logic_vector(0 TO g_delay_len - 1) := (others => g_init_level); + signal d_dly : std_logic_vector(0 to g_delay_len - 1) := (others => g_init_level); signal d_reg : std_logic := g_init_level; signal prev_d : std_logic := g_init_level; signal i_q_out : std_logic := g_init_level; @@ -87,17 +87,17 @@ begin stable_d <= '1' when unsigned(cnt) >= g_latency else '0'; cnt_en <= not stable_d; - gen_both : if g_type ="BOTH " generate + gen_both : if g_type ="BOTH " generate cnt_clr <= d_reg xor prev_d; nxt_q_out <= prev_d when stable_d = '1' else i_q_out; end generate; - gen_high : if g_type ="HIGH " generate + gen_high : if g_type ="HIGH " generate cnt_clr <= not d_reg; nxt_q_out <= prev_d when stable_d = '1' else '0'; end generate; - gen_low : if g_type ="LOW " generate + gen_low : if g_type ="LOW " generate cnt_clr <= d_reg; nxt_q_out <= prev_d when stable_d = '1' else '1'; end generate; diff --git a/libraries/base/common/src/vhdl/common_duty_cycle.vhd b/libraries/base/common/src/vhdl/common_duty_cycle.vhd index d305555028..3a6b04dda9 100644 --- a/libraries/base/common/src/vhdl/common_duty_cycle.vhd +++ b/libraries/base/common/src/vhdl/common_duty_cycle.vhd @@ -123,4 +123,4 @@ begin dc_out <= r.dc_pulse when dc_out_en = '1' else g_dis_lvl when rst = '0' else g_rst_lvl; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_evt.vhd b/libraries/base/common/src/vhdl/common_evt.vhd index 40b1e7812a..e13a63f69b 100644 --- a/libraries/base/common/src/vhdl/common_evt.vhd +++ b/libraries/base/common/src/vhdl/common_evt.vhd @@ -60,9 +60,9 @@ begin end process; -- Detect input event - gen_rising : if g_evt_type ="RISING " generate sig_evt <= in_sig and not in_sig_prev; end generate; - gen_falling : if g_evt_type ="FALLING " generate sig_evt <= not in_sig and in_sig_prev; end generate; - gen_both : if g_evt_type ="BOTH " generate sig_evt <= in_sig xor in_sig_prev; end generate; + gen_rising : if g_evt_type ="RISING " generate sig_evt <= in_sig and not in_sig_prev; end generate; + gen_falling : if g_evt_type ="FALLING " generate sig_evt <= not in_sig and in_sig_prev; end generate; + gen_both : if g_evt_type ="BOTH " generate sig_evt <= in_sig xor in_sig_prev; end generate; sig_evt_n <= not sig_evt; diff --git a/libraries/base/common/src/vhdl/common_field_pkg.vhd b/libraries/base/common/src/vhdl/common_field_pkg.vhd index 5a65a9b485..0ff6b9a72c 100644 --- a/libraries/base/common/src/vhdl/common_field_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_field_pkg.vhd @@ -107,7 +107,7 @@ package body common_field_pkg is variable v_slv_out : std_logic_vector(field_slv_out_len(field_arr) - 1 downto 0); begin for f in 0 to field_arr'high loop - if field_arr(f).mode ="RW " then + if field_arr(f).mode ="RW " then v_slv_out( field_hi(field_arr, field_arr(f).name) downto field_lo(field_arr, field_arr(f).name)) := field_arr(f).default(field_arr(f).size - 1 downto 0); end if; end loop; @@ -213,7 +213,7 @@ package body common_field_pkg is variable v_len : natural := 0; begin for f in 0 to field_arr'high loop - if field_arr(f).mode ="RO " then + if field_arr(f).mode ="RO " then v_len := v_len + field_arr(f).size; end if; end loop; @@ -225,7 +225,7 @@ package body common_field_pkg is variable v_len : natural := 0; begin for f in 0 to field_arr'high loop - if field_arr(f).mode ="RW " then + if field_arr(f).mode ="RW " then v_len := v_len + field_arr(f).size; end if; end loop; @@ -271,7 +271,7 @@ package body common_field_pkg is begin for f in 0 to field_arr'high loop -- Only extract the fields that are outputs - if field_arr(f).mode ="RW " then + if field_arr(f).mode ="RW " then -- Extract the field v_slv_out( field_hi(field_arr, field_arr(f).name) downto field_lo(field_arr, field_arr(f).name)) := word_arr( v_word_cnt * word_w + field_arr(f).size - 1 downto v_word_cnt * word_w); end if; @@ -290,7 +290,7 @@ package body common_field_pkg is v_word_arr := word_arr_in; -- Now re-assign the words that need to be read back from word_arr_out for f in 0 to field_arr'high loop - if field_arr(f).mode ="RW " then + if field_arr(f).mode ="RW " then v_word_arr( v_word_cnt * word_w + field_arr(f).size - 1 downto v_word_cnt * word_w) := word_arr_out( v_word_cnt * word_w + field_arr(f).size - 1 downto v_word_cnt * word_w); end if; -- Calculate the correct word offset for the next field diff --git a/libraries/base/common/src/vhdl/common_flank_to_pulse.vhd b/libraries/base/common/src/vhdl/common_flank_to_pulse.vhd index a0d6737630..442e4f1c6a 100644 --- a/libraries/base/common/src/vhdl/common_flank_to_pulse.vhd +++ b/libraries/base/common/src/vhdl/common_flank_to_pulse.vhd @@ -50,5 +50,4 @@ begin pulse_out <= flank_in and not(flank_in_dly); -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_interface_layers_pkg.vhd b/libraries/base/common/src/vhdl/common_interface_layers_pkg.vhd index 06088872c0..0138e26367 100644 --- a/libraries/base/common/src/vhdl/common_interface_layers_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_interface_layers_pkg.vhd @@ -150,4 +150,4 @@ package body common_interface_layers_pkg is return ctrl_out; end; -end common_interface_layers_pkg; +end common_interface_layers_pkg; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_math_pkg.vhd b/libraries/base/common/src/vhdl/common_math_pkg.vhd index a4299a95cd..8b103986b9 100644 --- a/libraries/base/common/src/vhdl/common_math_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_math_pkg.vhd @@ -194,4 +194,4 @@ package body common_math_pkg is end; -end common_math_pkg; +end common_math_pkg; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_mem_pkg.vhd b/libraries/base/common/src/vhdl/common_mem_pkg.vhd index b12f0ccdd1..4de0f8a9a9 100644 --- a/libraries/base/common/src/vhdl/common_mem_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_mem_pkg.vhd @@ -194,7 +194,7 @@ package common_mem_pkg is constant c_mem_reg_rd_latency : natural := 1; constant c_mem_reg : t_c_mem := (c_mem_reg_rd_latency, 1, 32, 1, 'x'); - constant c_mem_reg_init_w : natural := 1 *256 * 32; -- >= largest expected value of dat_w*nof_dat (256 * 32 bit = 1k byte) + constant c_mem_reg_init_w : natural := 1 * 256 * 32; -- >= largest expected value of dat_w*nof_dat (256 * 32 bit = 1k byte) ------------------------------------------------------------------------------ @@ -230,7 +230,7 @@ package body common_mem_pkg is return v_copi_arr; end; - function RESET_MEM_MisO_CTRL(miso : t_mem_miso) return t_mem_miso IS + function RESET_MEM_MisO_CTRL(miso : t_mem_miso) return t_mem_miso is variable v_miso : t_mem_miso := miso; begin v_miso.rdval := '0'; diff --git a/libraries/base/common/src/vhdl/common_operation.vhd b/libraries/base/common/src/vhdl/common_operation.vhd index 03fefd29f0..30f1f2fca0 100644 --- a/libraries/base/common/src/vhdl/common_operation.vhd +++ b/libraries/base/common/src/vhdl/common_operation.vhd @@ -53,12 +53,12 @@ architecture rtl of common_operation is constant c_umax : std_logic_vector(w - 1 downto 0) := c_slv1(w - 1 downto 0); begin -- return don't care default value - if representation ="signed " then - if operation ="MIN " then return c_smax; end if; - if operation ="MAX " then return c_smin; end if; + if representation ="signed " then + if operation ="MIN " then return c_smax; end if; + if operation ="MAX " then return c_smin; end if; else - if operation ="MIN " then return c_umax; end if; - if operation ="MAX " then return c_umin; end if; + if operation ="MIN " then return c_umax; end if; + if operation ="MAX " then return c_umin; end if; end if; assert TRUE report "Operation not supported" severity FAILURE; return c_umin; -- void return statement to avoid compiler warning on missing return @@ -66,12 +66,12 @@ architecture rtl of common_operation is function func_operation(operation, representation : string; a, b : std_logic_vector) return std_logic_vector is begin - if representation ="signed " then - if operation ="MIN " then if signed(a) < signed(b) then return a; else return b; end if; end if; - if operation ="MAX " then if signed(a) > signed(b) then return a; else return b; end if; end if; + if representation ="signed " then + if operation ="MIN " then if signed(a) < signed(b) then return a; else return b; end if; end if; + if operation ="MAX " then if signed(a) > signed(b) then return a; else return b; end if; end if; else - if operation ="MIN " then if unsigned(a) < unsigned(b) then return a; else return b; end if; end if; - if operation ="MAX " then if unsigned(a) > unsigned(b) then return a; else return b; end if; end if; + if operation ="MIN " then if unsigned(a) < unsigned(b) then return a; else return b; end if; end if; + if operation ="MAX " then if unsigned(a) > unsigned(b) then return a; else return b; end if; end if; end if; assert TRUE report "Operation not supported" severity FAILURE; return a; -- void return statement to avoid compiler warning on missing return diff --git a/libraries/base/common/src/vhdl/common_paged_ram_crw_crw.vhd b/libraries/base/common/src/vhdl/common_paged_ram_crw_crw.vhd index b1ca7b2080..4dcbd88c87 100644 --- a/libraries/base/common/src/vhdl/common_paged_ram_crw_crw.vhd +++ b/libraries/base/common/src/vhdl/common_paged_ram_crw_crw.vhd @@ -139,17 +139,17 @@ architecture rtl of common_paged_ram_crw_crw is -- >>> Access control -- g_str = "use_mux" : - signal page_wr_en_a : std_logic_vector(0 TO g_nof_pages - 1); + signal page_wr_en_a : std_logic_vector(0 to g_nof_pages - 1); signal page_wr_dat_a : t_data_arr(0 to g_nof_pages - 1); - signal page_rd_en_a : std_logic_vector(0 TO g_nof_pages - 1); + signal page_rd_en_a : std_logic_vector(0 to g_nof_pages - 1); signal page_rd_dat_a : t_data_arr(0 to g_nof_pages - 1); - signal page_rd_val_a : std_logic_vector(0 TO g_nof_pages - 1); + signal page_rd_val_a : std_logic_vector(0 to g_nof_pages - 1); - signal page_wr_en_b : std_logic_vector(0 TO g_nof_pages - 1); + signal page_wr_en_b : std_logic_vector(0 to g_nof_pages - 1); signal page_wr_dat_b : t_data_arr(0 to g_nof_pages - 1); - signal page_rd_en_b : std_logic_vector(0 TO g_nof_pages - 1); + signal page_rd_en_b : std_logic_vector(0 to g_nof_pages - 1); signal page_rd_dat_b : t_data_arr(0 to g_nof_pages - 1); - signal page_rd_val_b : std_logic_vector(0 TO g_nof_pages - 1); + signal page_rd_val_b : std_logic_vector(0 to g_nof_pages - 1); -- g_str = "use_adr" : signal mem_adr_a : std_logic_vector(c_mem_addr_w - 1 downto 0); diff --git a/libraries/base/common/src/vhdl/common_paged_ram_ww_rr.vhd b/libraries/base/common/src/vhdl/common_paged_ram_ww_rr.vhd index 798b4b6360..aa5cac43a9 100644 --- a/libraries/base/common/src/vhdl/common_paged_ram_ww_rr.vhd +++ b/libraries/base/common/src/vhdl/common_paged_ram_ww_rr.vhd @@ -90,8 +90,8 @@ architecture rtl of common_paged_ram_ww_rr is -- Page select control signal page_sel : std_logic; signal nxt_page_sel : std_logic; - signal page_sel_dly : std_logic_vector(0 TO c_sel_latency - 1); - signal nxt_page_sel_dly : std_logic_vector(0 TO c_sel_latency - 1); + signal page_sel_dly : std_logic_vector(0 to c_sel_latency - 1); + signal nxt_page_sel_dly : std_logic_vector(0 to c_sel_latency - 1); signal page_sel_in : std_logic; signal page_sel_out : std_logic; @@ -101,14 +101,14 @@ architecture rtl of common_paged_ram_ww_rr is signal nxt_page_wr_dat_b : std_logic_vector(g_data_w - 1 downto 0); signal page_wr_dat_a : std_logic_vector(g_data_w - 1 downto 0); signal page_wr_dat_b : std_logic_vector(g_data_w - 1 downto 0); - signal nxt_page_wr_en_a : std_logic_vector(0 TO c_nof_pages - 1); - signal nxt_page_wr_en_b : std_logic_vector(0 TO c_nof_pages - 1); - signal page_wr_en_a : std_logic_vector(0 TO c_nof_pages - 1); - signal page_wr_en_b : std_logic_vector(0 TO c_nof_pages - 1); - signal nxt_page_rd_en_a : std_logic_vector(0 TO c_nof_pages - 1); - signal nxt_page_rd_en_b : std_logic_vector(0 TO c_nof_pages - 1); - signal page_rd_en_a : std_logic_vector(0 TO c_nof_pages - 1); - signal page_rd_en_b : std_logic_vector(0 TO c_nof_pages - 1); + signal nxt_page_wr_en_a : std_logic_vector(0 to c_nof_pages - 1); + signal nxt_page_wr_en_b : std_logic_vector(0 to c_nof_pages - 1); + signal page_wr_en_a : std_logic_vector(0 to c_nof_pages - 1); + signal page_wr_en_b : std_logic_vector(0 to c_nof_pages - 1); + signal nxt_page_rd_en_a : std_logic_vector(0 to c_nof_pages - 1); + signal nxt_page_rd_en_b : std_logic_vector(0 to c_nof_pages - 1); + signal page_rd_en_a : std_logic_vector(0 to c_nof_pages - 1); + signal page_rd_en_b : std_logic_vector(0 to c_nof_pages - 1); signal nxt_page_adr_a : t_addr_arr(0 to c_nof_pages - 1); signal nxt_page_adr_b : t_addr_arr(0 to c_nof_pages - 1); signal page_adr_a : t_addr_arr(0 to c_nof_pages - 1); @@ -116,9 +116,9 @@ architecture rtl of common_paged_ram_ww_rr is -- . output signal page_rd_dat_a : t_data_arr(0 to c_nof_pages - 1); - signal page_rd_val_a : std_logic_vector(0 TO c_nof_pages - 1); + signal page_rd_val_a : std_logic_vector(0 to c_nof_pages - 1); signal page_rd_dat_b : t_data_arr(0 to c_nof_pages - 1); - signal page_rd_val_b : std_logic_vector(0 TO c_nof_pages - 1); + signal page_rd_val_b : std_logic_vector(0 to c_nof_pages - 1); signal nxt_rd_dat_a : std_logic_vector(g_data_w - 1 downto 0); signal nxt_rd_val_a : std_logic; diff --git a/libraries/base/common/src/vhdl/common_pipeline.vhd b/libraries/base/common/src/vhdl/common_pipeline.vhd index edd93455bb..8a441547c1 100644 --- a/libraries/base/common/src/vhdl/common_pipeline.vhd +++ b/libraries/base/common/src/vhdl/common_pipeline.vhd @@ -71,7 +71,7 @@ begin end generate; out_dat_p(0) <= RESIZE_SVEC(in_dat, out_dat'length) when g_representation = "signed" else - RESIZE_UVEC(in_dat, out_dat'length) when g_representation ="unsigned "; + RESIZE_UVEC(in_dat, out_dat'length) when g_representation ="unsigned "; out_dat <= out_dat_p(g_pipeline); diff --git a/libraries/base/common/src/vhdl/common_pipeline_integer.vhd b/libraries/base/common/src/vhdl/common_pipeline_integer.vhd index a02c0ba9b8..ec6b23e3bf 100644 --- a/libraries/base/common/src/vhdl/common_pipeline_integer.vhd +++ b/libraries/base/common/src/vhdl/common_pipeline_integer.vhd @@ -49,8 +49,8 @@ architecture str of common_pipeline_integer is begin - in_dat_slv <= to_svec(in_dat, g_dat_w) when g_representation ="signed " else to_uvec(in_dat, g_dat_w); - out_dat <= to_sint(out_dat_slv) when g_representation ="signed " else to_uint(out_dat_slv); + in_dat_slv <= to_svec(in_dat, g_dat_w) when g_representation ="signed " else to_uvec(in_dat, g_dat_w); + out_dat <= to_sint(out_dat_slv) when g_representation ="signed " else to_uint(out_dat_slv); u_int : entity work.common_pipeline generic map ( diff --git a/libraries/base/common/src/vhdl/common_pkg.vhd b/libraries/base/common/src/vhdl/common_pkg.vhd index e6716dc858..497894d715 100644 --- a/libraries/base/common/src/vhdl/common_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_pkg.vhd @@ -410,10 +410,10 @@ package common_pkg is function to_uvec(udec : real; w, resolution_w : integer) return std_logic_vector; -- REAL >= 0 to unsigned SLV fixed point number function to_svec(sdec : real; w, resolution_w : integer) return std_logic_vector; -- REAL to signed SLV fixed point number - function to_ureal(uvec : std_logic_vector) return REAL; -- convert unsigned slv of any length to REAL, fixed point number with resolution = 1 - function to_sreal(svec : std_logic_vector) return REAL; -- convert signed slv of any length to REAL, fixed point number with resolution = 1 - function to_ureal(uvec : std_logic_vector; resolution_w : integer) return REAL; -- convert unsigned fixed point slv of any length, and with resolution of 2**resolution_w, to REAL - function to_sreal(svec : std_logic_vector; resolution_w : integer) return REAL; -- convert signed fixed point slv of any length, and with resolution of 2**resolution_w, to REAL + function to_ureal(uvec : std_logic_vector) return real; -- convert unsigned slv of any length to REAL, fixed point number with resolution = 1 + function to_sreal(svec : std_logic_vector) return real; -- convert signed slv of any length to REAL, fixed point number with resolution = 1 + function to_ureal(uvec : std_logic_vector; resolution_w : integer) return real; -- convert unsigned fixed point slv of any length, and with resolution of 2**resolution_w, to REAL + function to_sreal(svec : std_logic_vector; resolution_w : integer) return real; -- convert signed fixed point slv of any length, and with resolution of 2**resolution_w, to REAL -- RESIZE_NUM() original description: -- The RESIZE for SIGNED in IEEE.NUMERIC_STD extends the sign bit or it keeps the sign bit and LS part. This @@ -916,18 +916,18 @@ package body common_pkg is variable v_result : std_logic := '0'; begin -- default any unused, the stage results will be kept in the LSBits and the last result in bit 0 - if operation ="and " then v_stage_arr := (others => (others => '1')); - elsif operation ="or " then v_stage_arr := (others => (others => '0')); - elsif operation ="xor " then v_stage_arr := (others => (others => '0')); + if operation ="and " then v_stage_arr := (others => (others => '1')); + elsif operation ="or " then v_stage_arr := (others => (others => '0')); + elsif operation ="xor " then v_stage_arr := (others => (others => '0')); else assert TRUE report "common_pkg: Unsupported vector_tree operation" severity FAILURE; end if; v_stage_arr(-1)(c_slv_w - 1 downto 0) := slv; -- any unused input c_w : c_slv_w bits have void default value for J in 0 to c_nof_stages - 1 loop for I in 0 to c_w / (2 ** (J + 1)) - 1 loop - if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); - elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); + if operation ="and " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) and v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="or " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) or v_stage_arr(J - 1)(2 * I + 1); + elsif operation ="xor " then v_stage_arr(J)(I) := v_stage_arr(J - 1)(2 * I) xor v_stage_arr(J - 1)(2 * I + 1); end if; end loop; end loop; @@ -1150,7 +1150,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) + vR(I); @@ -1163,7 +1163,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) + R; end loop; @@ -1181,7 +1181,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -1195,7 +1195,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_integer_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) - vR(I); @@ -1208,7 +1208,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) - R; end loop; @@ -1233,7 +1233,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) * vR(I); @@ -1246,7 +1246,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) * R; end loop; @@ -1264,7 +1264,7 @@ package body common_pkg is variable vR : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; vR := R; for I in vL'range loop vP(I) := vL(I) / vR(I); @@ -1277,7 +1277,7 @@ package body common_pkg is variable vL : t_natural_arr(w - 1 downto 0); variable vP : t_natural_arr(w - 1 downto 0); begin - vl := L; + vl := l; for I in vL'range loop vP(I) := vL(I) / R; end loop; @@ -1575,7 +1575,7 @@ package body common_pkg is function sel_n(sel : natural; a, b, c, d, e, f, g, h, i, j : string) return string is begin if sel < 9 then return sel_n(sel, a, b, c, d, e, f, g, h, i); else return j; end if; end; function array_init(init : std_logic; nof : natural) return std_logic_vector is - variable v_arr : std_logic_vector(0 TO nof - 1); + variable v_arr : std_logic_vector(0 to nof - 1); begin for I in v_arr'range loop v_arr(I) := init; @@ -2078,7 +2078,7 @@ package body common_pkg is end if; end; - function to_ureal(uvec : std_logic_vector) return REAL is + function to_ureal(uvec : std_logic_vector) return real is constant c_len : natural := uvec'length; constant c_uvec : std_logic_vector(c_len - 1 downto 0) := uvec; variable v_real : real := 0.0; @@ -2092,7 +2092,7 @@ package body common_pkg is return v_real; end; - function to_sreal(svec : std_logic_vector) return REAL is + function to_sreal(svec : std_logic_vector) return real is -- Increase vector length by +1 so the c_uvec can also fit abs() of most negative is -1 * -2**(c_len-1) constant c_len : natural := svec'length + 1; constant c_svec : std_logic_vector(c_len - 1 downto 0) := RESIZE_SVEC(svec, c_len); @@ -2109,14 +2109,14 @@ package body common_pkg is -- Fixed point format -- . https://support.astron.nl/confluence/display/L2M/L3+SDP+Decision%3A+Definition+of+fixed+point+numbers - function to_ureal(uvec : std_logic_vector; resolution_w : integer) return REAL is + function to_ureal(uvec : std_logic_vector; resolution_w : integer) return real is begin -- First convert as unsigned integer, then scale to real. See TO_SREAL() -- for interpretation of resolution_w - return to_ureal(uvec) / 2.0 ** REAL(resolution_w); + return to_ureal(uvec) / 2.0 ** real(resolution_w); end; - function to_sreal(svec : std_logic_vector; resolution_w : integer) return REAL is + function to_sreal(svec : std_logic_vector; resolution_w : integer) return real is begin -- First convert as unsigned integer, then scale to real -- . The resolution_w is the number of bits that LSbit 0 in svec(HIGH-1 DOWNTO 0) is after @@ -2125,7 +2125,7 @@ package body common_pkg is -- . resolution_w = 0 : scale by 2**0 = 1, so no scaling and the value is treated as an integer -- . resolution_w < 0 : scale up -- . resolution_w > 0 : scale down - return to_sreal(svec) / 2.0 ** REAL(resolution_w); + return to_sreal(svec) / 2.0 ** real(resolution_w); end; @@ -2779,7 +2779,7 @@ package body common_pkg is variable v_b : std_logic_vector(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2794,7 +2794,7 @@ package body common_pkg is variable v_b : t_slv_32_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2804,7 +2804,7 @@ package body common_pkg is variable v_b : t_integer_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2814,7 +2814,7 @@ package body common_pkg is variable v_b : t_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2824,7 +2824,7 @@ package body common_pkg is variable v_b : t_nat_natural_arr(a'length - 1 downto 0); begin for I in v_a'range loop - v_b(a'length - 1 -I) := v_a(I); + v_b(a'length - 1 - I) := v_a(I); end loop; return v_b; end; @@ -2884,7 +2884,7 @@ package body common_pkg is function slice_up(str : string; width : natural; i : natural; pad_char : character) return string is variable padded_str : string(1 to width) := (others => '0'); begin - padded_str := pad(str(i * width + 1 to (i +1) * width), width, '0'); + padded_str := pad(str(i * width + 1 to (i + 1) * width), width, '0'); return padded_str; end; @@ -2981,7 +2981,7 @@ package body common_pkg is -- Get the index K in the select setting array for the reorder2 cell on stage I and row J in a reorder network with N stages function func_common_reorder2_get_select_index(I, J, N : natural) return integer is - constant c_nof_reorder2_per_odd_stage : natural := N /2; + constant c_nof_reorder2_per_odd_stage : natural := N / 2; constant c_nof_reorder2_per_even_stage : natural := (N - 1) / 2; variable v_nof_odd_stages : natural; variable v_nof_even_stages : natural; @@ -3103,7 +3103,7 @@ package body common_pkg is -- Create Pfactor SCLK periods within this DCLK period SCLK <= '0'; if Pfactor > 1 then - for I in 0 to 2 * Pfactor - 1 -2 loop + for I in 0 to 2 * Pfactor - 1 - 2 loop wait for v_speriod / 2; SCLK <= not SCLK; end loop; @@ -3115,4 +3115,4 @@ package body common_pkg is wait; end proc_common_dclk_generate_sclk; -end common_pkg; +end common_pkg; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_pulse_delay_reg.vhd b/libraries/base/common/src/vhdl/common_pulse_delay_reg.vhd index dfcc6535ac..89f6c12293 100644 --- a/libraries/base/common/src/vhdl/common_pulse_delay_reg.vhd +++ b/libraries/base/common/src/vhdl/common_pulse_delay_reg.vhd @@ -141,4 +141,4 @@ begin end generate; -- gen_common_reg_cross_domain -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_pulse_extend.vhd b/libraries/base/common/src/vhdl/common_pulse_extend.vhd index 8fb2297fa6..6122bea2b7 100644 --- a/libraries/base/common/src/vhdl/common_pulse_extend.vhd +++ b/libraries/base/common/src/vhdl/common_pulse_extend.vhd @@ -95,4 +95,4 @@ begin end if; end process; -end architecture; +end architecture; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_ram_r_w.vhd b/libraries/base/common/src/vhdl/common_ram_r_w.vhd index 2a562b4015..7f4bdacbf7 100644 --- a/libraries/base/common/src/vhdl/common_ram_r_w.vhd +++ b/libraries/base/common/src/vhdl/common_ram_r_w.vhd @@ -78,4 +78,4 @@ begin rd_val_b => rd_val ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_reg_cross_domain.vhd b/libraries/base/common/src/vhdl/common_reg_cross_domain.vhd index baa2ff26a0..7012cbea09 100644 --- a/libraries/base/common/src/vhdl/common_reg_cross_domain.vhd +++ b/libraries/base/common/src/vhdl/common_reg_cross_domain.vhd @@ -64,7 +64,7 @@ architecture rtl of common_reg_cross_domain is ------------------------------------------------------------------------------ -- in_clk domain ------------------------------------------------------------------------------ - signal reg_new : std_logic_vector(0 TO g_in_new_latency) := (others => '0'); + signal reg_new : std_logic_vector(0 to g_in_new_latency) := (others => '0'); signal nxt_reg_new : std_logic_vector(reg_new'range); signal in_buf : std_logic_vector(c_dat'range) := c_dat; diff --git a/libraries/base/common/src/vhdl/common_requantize.vhd b/libraries/base/common/src/vhdl/common_requantize.vhd index 368f76de13..17db12fb19 100644 --- a/libraries/base/common/src/vhdl/common_requantize.vhd +++ b/libraries/base/common/src/vhdl/common_requantize.vhd @@ -137,6 +137,6 @@ begin -- Output gain gain_dat(g_out_dat_w + c_gain_w - 1 downto c_gain_w) <= res_dat; - out_dat <= RESIZE_SVEC(gain_dat, out_dat'length) when g_representation ="signed " else RESIZE_UVEC(gain_dat, out_dat'length); + out_dat <= RESIZE_SVEC(gain_dat, out_dat'length) when g_representation ="signed " else RESIZE_UVEC(gain_dat, out_dat'length); end str; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_resize.vhd b/libraries/base/common/src/vhdl/common_resize.vhd index 9264e35c44..1ce8d61981 100644 --- a/libraries/base/common/src/vhdl/common_resize.vhd +++ b/libraries/base/common/src/vhdl/common_resize.vhd @@ -84,7 +84,7 @@ begin no_clip : if c_clip = FALSE generate -- Note that g_pipeline_input=0 AND g_clip=FALSE is equivalent to using RESIZE_SVEC or RESIZE_UVEC directly. - gen_s : if g_representation ="signed " generate + gen_s : if g_representation ="signed " generate -- If g_out_dat_w>g_in_dat_w then IEEE resize extends the sign bit, -- else IEEE resize preserves the sign bit and keeps the low part. wrap <= '1' when signed(reg_dat) > c_smax or signed(reg_dat) < c_smin_most else '0'; @@ -92,7 +92,7 @@ begin res_ovr <= wrap; end generate; - gen_u : if g_representation ="unsigned " generate + gen_u : if g_representation ="unsigned " generate -- If g_out_dat_w>g_in_dat_w then IEEE resize sign extends with '0', -- else IEEE resize keeps the low part. wrap <= '1' when unsigned(reg_dat) > c_umax else '0'; @@ -102,14 +102,14 @@ begin end generate; gen_clip : if c_clip = TRUE generate - gen_s_clip : if g_representation ="signed " generate + gen_s_clip : if g_representation ="signed " generate clip <= '1' when signed(reg_dat) > c_smax or signed(reg_dat) < c_smin else '0'; sign <= reg_dat(reg_dat'high); res_dat <= reg_dat(out_dat'range) when clip = '0' else std_logic_vector( c_smax) when sign = '0' else std_logic_vector(c_smin); res_ovr <= clip; end generate; - gen_u_clip : if g_representation ="unsigned " generate + gen_u_clip : if g_representation ="unsigned " generate clip <= '1' when unsigned(reg_dat) > c_umax else '0'; res_dat <= reg_dat(out_dat'range) when clip = '0' else std_logic_vector(c_umax); res_ovr <= clip; diff --git a/libraries/base/common/src/vhdl/common_round.vhd b/libraries/base/common/src/vhdl/common_round.vhd index d97e936113..60b8ec1d5c 100644 --- a/libraries/base/common/src/vhdl/common_round.vhd +++ b/libraries/base/common/src/vhdl/common_round.vhd @@ -82,19 +82,19 @@ begin ); -- Increase to out_dat width - no_s : if c_remove_w <= 0 and g_representation ="signed " generate + no_s : if c_remove_w <= 0 and g_representation ="signed " generate res_dat <= RESIZE_SVEC(reg_dat, g_out_dat_w); end generate; - no_u : if c_remove_w <= 0 and g_representation ="unsigned " generate + no_u : if c_remove_w <= 0 and g_representation ="unsigned " generate res_dat <= RESIZE_UVEC(reg_dat, g_out_dat_w); end generate; -- Decrease to out_dat width by c_remove_w number of LSbits -- . rounding - gen_s : if c_remove_w > 0 and g_round = TRUE and g_representation ="signed " generate + gen_s : if c_remove_w > 0 and g_round = TRUE and g_representation ="signed " generate res_dat <= s_round(reg_dat, c_remove_w, g_round_clip, g_round_even); end generate; - gen_u : if c_remove_w > 0 and g_round = TRUE and g_representation ="unsigned " generate + gen_u : if c_remove_w > 0 and g_round = TRUE and g_representation ="unsigned " generate res_dat <= u_round(reg_dat, c_remove_w, g_round_clip, g_round_even); end generate; -- . truncating diff --git a/libraries/base/common/src/vhdl/common_spulse.vhd b/libraries/base/common/src/vhdl/common_spulse.vhd index c9d4ff971e..8d98c5407a 100644 --- a/libraries/base/common/src/vhdl/common_spulse.vhd +++ b/libraries/base/common/src/vhdl/common_spulse.vhd @@ -54,10 +54,10 @@ end; architecture rtl of common_spulse is signal in_level : std_logic; - signal meta_level : std_logic_vector(0 TO g_delay_len - 1); + signal meta_level : std_logic_vector(0 to g_delay_len - 1); signal out_level : std_logic; signal prev_out_level : std_logic; - signal meta_ack : std_logic_vector(0 TO g_delay_len - 1); + signal meta_ack : std_logic_vector(0 to g_delay_len - 1); signal pulse_ack : std_logic; signal nxt_out_pulse : std_logic; diff --git a/libraries/base/common/src/vhdl/common_str_pkg.vhd b/libraries/base/common/src/vhdl/common_str_pkg.vhd index fdadcc5c62..0fe26a6709 100644 --- a/libraries/base/common/src/vhdl/common_str_pkg.vhd +++ b/libraries/base/common/src/vhdl/common_str_pkg.vhd @@ -111,7 +111,7 @@ package body common_str_pkg is variable v_str : string(1 to c_max_len_bool) := (others => ' '); begin STD.TEXTIO.WRITE(v_line, bool); - v_str(v_line.all'range) := v_line.ALL; + v_str(v_line.all'range) := v_line.all; deallocate(v_line); return v_str; end; @@ -122,7 +122,7 @@ package body common_str_pkg is variable v_str : string(1 to c_max_len_time) := (others => ' '); begin write(v_line, in_time); - v_str(v_line.all'range) := v_line.ALL; + v_str(v_line.all'range) := v_line.all; deallocate(v_line); return v_str; end; @@ -137,7 +137,7 @@ package body common_str_pkg is variable v_str : string(1 to slv'length) := (others => ' '); begin write(v_line, slv); - v_str(v_line.all'range) := v_line.ALL; + v_str(v_line.all'range) := v_line.all; deallocate(v_line); return v_str; end; @@ -235,7 +235,7 @@ package body common_str_pkg is variable v_str : string(1 to nof_digits_int(int)) := (others => ' '); begin STD.TEXTIO.WRITE(v_line, int); - v_str(v_line.all'range) := v_line.ALL; + v_str(v_line.all'range) := v_line.all; deallocate(v_line); return v_str; end; @@ -252,7 +252,7 @@ package body common_str_pkg is variable v_len : natural; begin STD.TEXTIO.WRITE(v_line, re, right, width, digits); - v_str(v_line.all'range) := v_line.ALL; + v_str(v_line.all'range) := v_line.all; v_len := v_line.ALL'length; deallocate(v_line); if width > v_len then @@ -325,4 +325,4 @@ package body common_str_pkg is return r; end; -end common_str_pkg; +end common_str_pkg; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/common_wideband_data_scope.vhd b/libraries/base/common/src/vhdl/common_wideband_data_scope.vhd index d4c6710172..8ffdd32ce1 100644 --- a/libraries/base/common/src/vhdl/common_wideband_data_scope.vhd +++ b/libraries/base/common/src/vhdl/common_wideband_data_scope.vhd @@ -84,7 +84,7 @@ begin begin if rising_edge(SCLKi) then if g_wideband_big_endian = TRUE then - vI := g_wideband_factor - 1 -scope_cnt; + vI := g_wideband_factor - 1 - scope_cnt; else vI := scope_cnt; end if; diff --git a/libraries/base/common/src/vhdl/mms_common_pulse_delay.vhd b/libraries/base/common/src/vhdl/mms_common_pulse_delay.vhd index 3d18bd3691..dd728309f6 100644 --- a/libraries/base/common/src/vhdl/mms_common_pulse_delay.vhd +++ b/libraries/base/common/src/vhdl/mms_common_pulse_delay.vhd @@ -91,4 +91,4 @@ begin sla_out => reg_miso ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/mms_common_reg.vhd b/libraries/base/common/src/vhdl/mms_common_reg.vhd index 9e8c279c6c..6a513a735d 100644 --- a/libraries/base/common/src/vhdl/mms_common_reg.vhd +++ b/libraries/base/common/src/vhdl/mms_common_reg.vhd @@ -90,4 +90,4 @@ begin out_reg => out_reg ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/common/src/vhdl/mms_common_stable_monitor.vhd b/libraries/base/common/src/vhdl/mms_common_stable_monitor.vhd index b495c6d3b5..1d255224f0 100644 --- a/libraries/base/common/src/vhdl/mms_common_stable_monitor.vhd +++ b/libraries/base/common/src/vhdl/mms_common_stable_monitor.vhd @@ -112,4 +112,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/common/tb/vhdl/tb_common_add_sub.vhd b/libraries/base/common/tb/vhdl/tb_common_add_sub.vhd index fa4be690c3..2ad71ee103 100644 --- a/libraries/base/common/tb/vhdl/tb_common_add_sub.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_add_sub.vhd @@ -48,10 +48,10 @@ architecture tb of tb_common_add_sub is -- Calculate expected result v_a := to_sint(in_a); v_b := to_sint(in_b); - if g_direction ="ADD " then v_result := v_a + v_b; end if; - if g_direction ="SUB " then v_result := v_a - v_b; end if; - if g_direction ="BOTH " and g_sel_add = '1' then v_result := v_a + v_b; end if; - if g_direction ="BOTH " and g_sel_add = '0' then v_result := v_a - v_b; end if; + if g_direction ="ADD " then v_result := v_a + v_b; end if; + if g_direction ="SUB " then v_result := v_a - v_b; end if; + if g_direction ="BOTH " and g_sel_add = '1' then v_result := v_a + v_b; end if; + if g_direction ="BOTH " and g_sel_add = '0' then v_result := v_a - v_b; end if; -- Wrap to avoid warning: NUMERIC_STD.TO_SIGNED: vector truncated if v_result > 2 ** (g_out_dat_w - 1) - 1 then v_result := v_result - 2 ** g_out_dat_w; end if; if v_result < - 2 ** (g_out_dat_w - 1) then v_result := v_result + 2 ** g_out_dat_w; end if; diff --git a/libraries/base/common/tb/vhdl/tb_common_adder_tree.vhd b/libraries/base/common/tb/vhdl/tb_common_adder_tree.vhd index a0920315ba..4c118458a2 100644 --- a/libraries/base/common/tb/vhdl/tb_common_adder_tree.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_adder_tree.vhd @@ -74,7 +74,7 @@ architecture tb of tb_common_adder_tree is variable v_result : integer; begin v_result := 0; - if g_representation ="signed " then + if g_representation ="signed " then for I in 0 to g_nof_inputs - 1 loop v_result := v_result + to_sint(data_vec((I + 1) * g_symbol_w - 1 downto I * g_symbol_w)); end loop; diff --git a/libraries/base/common/tb/vhdl/tb_common_counter.vhd b/libraries/base/common/tb/vhdl/tb_common_counter.vhd index b6c54ce1dd..aed20f4311 100644 --- a/libraries/base/common/tb/vhdl/tb_common_counter.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_counter.vhd @@ -106,5 +106,4 @@ begin count => count ); -end tb; - +end tb; \ No newline at end of file diff --git a/libraries/base/common/tb/vhdl/tb_common_multiplexer.vhd b/libraries/base/common/tb/vhdl/tb_common_multiplexer.vhd index 44c55a8e27..bdc169bff8 100644 --- a/libraries/base/common/tb/vhdl/tb_common_multiplexer.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_multiplexer.vhd @@ -89,8 +89,8 @@ architecture tb of tb_common_multiplexer is -- Verify signal prev_out_dat : std_logic_vector(g_dat_w - 1 downto 0); - signal pipe_dat_vec : std_logic_vector(0 TO (c_pipeline_total + 1) * g_dat_w - 1); - signal pipe_val_vec : std_logic_vector(0 TO (c_pipeline_total + 1) * 1 - 1); + signal pipe_dat_vec : std_logic_vector(0 to (c_pipeline_total + 1) * g_dat_w - 1); + signal pipe_val_vec : std_logic_vector(0 to (c_pipeline_total + 1) * 1 - 1); begin diff --git a/libraries/base/common/tb/vhdl/tb_common_operation_tree.vhd b/libraries/base/common/tb/vhdl/tb_common_operation_tree.vhd index bc19bb5eb1..8f6b360bb3 100644 --- a/libraries/base/common/tb/vhdl/tb_common_operation_tree.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_operation_tree.vhd @@ -83,26 +83,26 @@ architecture tb of tb_common_operation_tree is variable v_result : integer := 0; begin -- Init v_result - if representation ="signed " then - if operation ="MIN " then v_result := c_smax; end if; - if operation ="MAX " then v_result := c_smin; end if; + if representation ="signed " then + if operation ="MIN " then v_result := c_smax; end if; + if operation ="MAX " then v_result := c_smin; end if; else - if operation ="MIN " then v_result := c_umax; end if; - if operation ="MAX " then v_result := c_umin; end if; + if operation ="MIN " then v_result := c_umax; end if; + if operation ="MAX " then v_result := c_umin; end if; end if; -- Find v_result for I in 0 to g_nof_inputs - 1 loop v_in := data_vec((I + 1) * c_dat_w - 1 downto I * c_dat_w); - if representation ="signed " then - if operation ="MIN " then if v_result > signed(v_in) then v_result := to_sint(v_in); end if; end if; - if operation ="MAX " then if v_result < signed(v_in) then v_result := to_sint(v_in); end if; end if; + if representation ="signed " then + if operation ="MIN " then if v_result > signed(v_in) then v_result := to_sint(v_in); end if; end if; + if operation ="MAX " then if v_result < signed(v_in) then v_result := to_sint(v_in); end if; end if; else - if operation ="MIN " then if v_result > unsigned(v_in) then v_result := to_uint(v_in); end if; end if; - if operation ="MAX " then if v_result < unsigned(v_in) then v_result := to_uint(v_in); end if; end if; + if operation ="MIN " then if v_result > unsigned(v_in) then v_result := to_uint(v_in); end if; end if; + if operation ="MAX " then if v_result < unsigned(v_in) then v_result := to_uint(v_in); end if; end if; end if; end loop; -- Return v_result - if representation ="signed " then + if representation ="signed " then return to_svec(v_result, c_dat_w); else return to_uvec(v_result, c_dat_w); diff --git a/libraries/base/common/tb/vhdl/tb_common_pkg.vhd b/libraries/base/common/tb/vhdl/tb_common_pkg.vhd index 2b2c1ff190..14a183fc83 100644 --- a/libraries/base/common/tb/vhdl/tb_common_pkg.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_pkg.vhd @@ -1211,7 +1211,7 @@ package body tb_common_pkg is variable v_string : string(1 to 80); variable v_row_arr : t_integer_arr(0 to nof_col - 1); begin - if file_name /="UNUSED " and file_name /="unused " then + if file_name /="UNUSED " and file_name /="unused " then -- Open the file for reading proc_common_open_file(v_file_status, v_in_file, file_name, READ_MODE); -- Read and skip the header @@ -1333,7 +1333,7 @@ package body tb_common_pkg is -- b) IEEE signed resizing preserves the MSbit so b0100000 = +64 becomes b0_00000 = 0 -- c) detect MSbits = "01" to clip max positive to get _b011111 = +63 -- Option a) seems to map best on the FPGA hardware multiplier IP. - if str ="RE " then + if str ="RE " then return std_logic_vector(RESIZE_NUM(v_result_re, g_out_dat_w)); -- conform option a) else return std_logic_vector(RESIZE_NUM(v_result_im, g_out_dat_w)); -- conform option a) @@ -1442,4 +1442,4 @@ package body tb_common_pkg is return(v_found_it); end function func_find_string_in_string; -end tb_common_pkg; +end tb_common_pkg; \ No newline at end of file diff --git a/libraries/base/common/tb/vhdl/tb_common_pulse_delay.vhd b/libraries/base/common/tb/vhdl/tb_common_pulse_delay.vhd index 86a4f28c99..0202e557fe 100644 --- a/libraries/base/common/tb/vhdl/tb_common_pulse_delay.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_pulse_delay.vhd @@ -165,4 +165,4 @@ begin end if; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/common/tb/vhdl/tb_common_switch.vhd b/libraries/base/common/tb/vhdl/tb_common_switch.vhd index 59639c448b..5c133a7699 100644 --- a/libraries/base/common/tb/vhdl/tb_common_switch.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_switch.vhd @@ -76,7 +76,7 @@ architecture tb of tb_common_switch is signal dbg_prio_hi_or : std_logic; signal dbg_prio_hi_or_and : std_logic; - signal out_level : std_logic_vector(0 TO c_nof_dut - 1); + signal out_level : std_logic_vector(0 to c_nof_dut - 1); begin diff --git a/libraries/base/common/tb/vhdl/tb_common_variable_delay.vhd b/libraries/base/common/tb/vhdl/tb_common_variable_delay.vhd index c4cae7c247..2a70f88e12 100644 --- a/libraries/base/common/tb/vhdl/tb_common_variable_delay.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_variable_delay.vhd @@ -119,5 +119,4 @@ begin out_pulse => trigger_dly ); -end tb; - +end tb; \ No newline at end of file diff --git a/libraries/base/common/tb/vhdl/tb_common_zip.vhd b/libraries/base/common/tb/vhdl/tb_common_zip.vhd index 632aabac1c..c5370bafe7 100644 --- a/libraries/base/common/tb/vhdl/tb_common_zip.vhd +++ b/libraries/base/common/tb/vhdl/tb_common_zip.vhd @@ -93,4 +93,4 @@ begin out_dat => out_dat ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/common/tb/vhdl/tb_mms_common_variable_delay.vhd b/libraries/base/common/tb/vhdl/tb_mms_common_variable_delay.vhd index 52d6ed1029..dbf61fdee3 100644 --- a/libraries/base/common/tb/vhdl/tb_mms_common_variable_delay.vhd +++ b/libraries/base/common/tb/vhdl/tb_mms_common_variable_delay.vhd @@ -107,4 +107,4 @@ begin trigger_dly => trigger_dly ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/common_mult/src/vhdl/common_complex_mult_add.vhd b/libraries/base/common_mult/src/vhdl/common_complex_mult_add.vhd index f47451536e..97c25e2d75 100644 --- a/libraries/base/common_mult/src/vhdl/common_complex_mult_add.vhd +++ b/libraries/base/common_mult/src/vhdl/common_complex_mult_add.vhd @@ -193,4 +193,4 @@ begin out_sumr <= std_logic_vector(sumr); out_sumi <= std_logic_vector(sumi); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/common_mult/tb/vhdl/tb_common_mult_add2.vhd b/libraries/base/common_mult/tb/vhdl/tb_common_mult_add2.vhd index 2d776b88cf..c4f9d30892 100644 --- a/libraries/base/common_mult/tb/vhdl/tb_common_mult_add2.vhd +++ b/libraries/base/common_mult/tb/vhdl/tb_common_mult_add2.vhd @@ -76,8 +76,8 @@ architecture tb of tb_common_mult_add2 is v_b0 := RESIZE_NUM(signed(in_b0), c_in_w); v_a1 := RESIZE_NUM(signed(in_a1), c_in_w); v_b1 := RESIZE_NUM(signed(in_b1), c_in_w); - if g_add_sub ="ADD " then v_result := RESIZE_NUM(v_a0 * v_b0, c_res_w) + v_a1 * v_b1; end if; - if g_add_sub ="SUB " then v_result := RESIZE_NUM(v_a0 * v_b0, c_res_w) - v_a1 * v_b1; end if; + if g_add_sub ="ADD " then v_result := RESIZE_NUM(v_a0 * v_b0, c_res_w) + v_a1 * v_b1; end if; + if g_add_sub ="SUB " then v_result := RESIZE_NUM(v_a0 * v_b0, c_res_w) - v_a1 * v_b1; end if; -- Wrap to avoid warning: NUMERIC_STD.TO_SIGNED: vector truncated if v_result > 2 ** (g_out_dat_w - 1) - 1 then v_result := v_result - 2 ** g_out_dat_w; end if; if v_result < - 2 ** (g_out_dat_w - 1) then v_result := v_result + 2 ** g_out_dat_w; end if; diff --git a/libraries/base/diag/src/vhdl/diag_data_buffer.vhd b/libraries/base/diag/src/vhdl/diag_data_buffer.vhd index c50653ad92..c9999b397a 100644 --- a/libraries/base/diag/src/vhdl/diag_data_buffer.vhd +++ b/libraries/base/diag/src/vhdl/diag_data_buffer.vhd @@ -262,4 +262,4 @@ begin count => sync_cnt ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/diag/src/vhdl/diag_data_buffer_dev.vhd b/libraries/base/diag/src/vhdl/diag_data_buffer_dev.vhd index 2ddb68171c..3c8c1cf0cd 100644 --- a/libraries/base/diag/src/vhdl/diag_data_buffer_dev.vhd +++ b/libraries/base/diag/src/vhdl/diag_data_buffer_dev.vhd @@ -373,5 +373,4 @@ begin count => valid_cnt ); -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/base/diag/src/vhdl/diag_rx_seq.vhd b/libraries/base/diag/src/vhdl/diag_rx_seq.vhd index f54744f4cd..b140cd5e9b 100644 --- a/libraries/base/diag/src/vhdl/diag_rx_seq.vhd +++ b/libraries/base/diag/src/vhdl/diag_rx_seq.vhd @@ -162,7 +162,7 @@ architecture rtl of diag_rx_seq is signal in_val_1 : std_logic; signal in_val_act : std_logic; signal in_val_2 : std_logic; - signal in_val_2_dly : std_logic_vector(0 TO c_diag_res_latency - 1) := (others => '0'); + signal in_val_2_dly : std_logic_vector(0 to c_diag_res_latency - 1) := (others => '0'); signal in_val_2_act : std_logic; signal ref_dat : std_logic_vector(in_dat'range); diff --git a/libraries/base/diag/src/vhdl/diag_wg_wideband.vhd b/libraries/base/diag/src/vhdl/diag_wg_wideband.vhd index 46f8aebd63..718e647e11 100644 --- a/libraries/base/diag/src/vhdl/diag_wg_wideband.vhd +++ b/libraries/base/diag/src/vhdl/diag_wg_wideband.vhd @@ -93,17 +93,17 @@ architecture str of diag_wg_wideband is signal st_mon_ctrl_arr : t_diag_wg_arr(0 to g_wideband_factor - 1); -- Use same address and data widths for both MM side and ST side memory ports - signal buf_rdval : std_logic_vector(0 TO g_wideband_factor - 1); + signal buf_rdval : std_logic_vector(0 to g_wideband_factor - 1); signal buf_rddata : t_buf_dat_arr(0 to g_wideband_factor - 1); signal st_address : t_buf_adr_arr(0 to g_wideband_factor - 1); - signal st_rd : std_logic_vector(0 TO g_wideband_factor - 1); - signal st_rdval : std_logic_vector(0 TO g_wideband_factor - 1); + signal st_rd : std_logic_vector(0 to g_wideband_factor - 1); + signal st_rdval : std_logic_vector(0 to g_wideband_factor - 1); signal st_rddata : t_buf_dat_arr(0 to g_wideband_factor - 1); begin - assert c_buf_file /="UNUSED " report "diag_wg_wideband : no buffer waveform file available" severity FAILURE; + assert c_buf_file /="UNUSED " report "diag_wg_wideband : no buffer waveform file available" severity FAILURE; -- MM write same to all g_wideband_factor waveform buffers -- MM read only from waveform buffer 0 diff --git a/libraries/base/diag/src/vhdl/mms_diag_rx_seq.vhd b/libraries/base/diag/src/vhdl/mms_diag_rx_seq.vhd index 86cfbd0fe4..b1c858b2d6 100644 --- a/libraries/base/diag/src/vhdl/mms_diag_rx_seq.vhd +++ b/libraries/base/diag/src/vhdl/mms_diag_rx_seq.vhd @@ -317,6 +317,3 @@ end str; - - - diff --git a/libraries/base/diag/src/vhdl/mms_diag_tx_seq.vhd b/libraries/base/diag/src/vhdl/mms_diag_tx_seq.vhd index 7ddf93cc02..1a2c2fdf58 100644 --- a/libraries/base/diag/src/vhdl/mms_diag_tx_seq.vhd +++ b/libraries/base/diag/src/vhdl/mms_diag_tx_seq.vhd @@ -395,6 +395,3 @@ end str; - - - diff --git a/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd b/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd index 17eba40fd9..9479645c78 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd @@ -280,4 +280,4 @@ begin random(random'high) when g_flow_control_verify = e_random else toggle when g_flow_control_verify = e_pulse; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_frm_generator.vhd b/libraries/base/diag/tb/vhdl/tb_diag_frm_generator.vhd index 7315464ed1..7244a460fb 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_frm_generator.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_frm_generator.vhd @@ -179,4 +179,4 @@ begin end if; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_frm_monitor.vhd b/libraries/base/diag/tb/vhdl/tb_diag_frm_monitor.vhd index 445b5524f1..0a048e5e2c 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_frm_monitor.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_frm_monitor.vhd @@ -200,4 +200,4 @@ begin end if; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_pkg.vhd b/libraries/base/diag/tb/vhdl/tb_diag_pkg.vhd index af2f8bf283..d44322cf00 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_pkg.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_pkg.vhd @@ -269,7 +269,7 @@ package body tb_diag_pkg is variable v_sel : natural; variable v_ctlr : natural; begin - if c_pattern ="PSRG " then + if c_pattern ="PSRG " then v_sel := 0; -- pseudo random data else v_sel := 1; -- counter data @@ -297,7 +297,7 @@ package body tb_diag_pkg is variable v_sel : natural; variable v_ctlr : natural; begin - if c_pattern ="PSRG " then + if c_pattern ="PSRG " then v_sel := 0; -- pseudo random data else v_sel := 1; -- counter data diff --git a/libraries/base/diag/tb/vhdl/tb_diag_rx_seq.vhd b/libraries/base/diag/tb/vhdl/tb_diag_rx_seq.vhd index 08692db3ae..1a8c64424d 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_rx_seq.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_rx_seq.vhd @@ -301,4 +301,4 @@ begin end if; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_tx_frm.vhd b/libraries/base/diag/tb/vhdl/tb_diag_tx_frm.vhd index 0e24df89c3..1b4ef172d1 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_tx_frm.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_tx_frm.vhd @@ -198,4 +198,4 @@ begin end if; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_tx_seq.vhd b/libraries/base/diag/tb/vhdl/tb_diag_tx_seq.vhd index 4589534ec9..fa6fac04a9 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_tx_seq.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_tx_seq.vhd @@ -120,4 +120,4 @@ begin out_val => seq_val ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_wg.vhd b/libraries/base/diag/tb/vhdl/tb_diag_wg.vhd index d746c0173f..586d0de477 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_wg.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_wg.vhd @@ -259,4 +259,4 @@ begin out_sync => wg_sync ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diag/tb/vhdl/tb_diag_wg_wideband.vhd b/libraries/base/diag/tb/vhdl/tb_diag_wg_wideband.vhd index 7cffdd45c1..6e0cf952eb 100644 --- a/libraries/base/diag/tb/vhdl/tb_diag_wg_wideband.vhd +++ b/libraries/base/diag/tb/vhdl/tb_diag_wg_wideband.vhd @@ -96,10 +96,10 @@ architecture tb of tb_diag_wg_wideband is signal out_val : std_logic_vector(g_wideband_factor - 1 downto 0); signal out_sync : std_logic_vector(g_wideband_factor - 1 downto 0); - signal wg_ovr : std_logic_vector(0 TO g_wideband_factor - 1); + signal wg_ovr : std_logic_vector(0 to g_wideband_factor - 1); signal wg_dat : t_buf_dat_arr(0 to g_wideband_factor - 1); - signal wg_val : std_logic_vector(0 TO g_wideband_factor - 1); - signal wg_sync : std_logic_vector(0 TO g_wideband_factor - 1); + signal wg_val : std_logic_vector(0 to g_wideband_factor - 1); + signal wg_sync : std_logic_vector(0 to g_wideband_factor - 1); signal sample_clk : std_logic := '1'; signal sample_cnt : natural range 0 to g_wideband_factor - 1; @@ -325,4 +325,4 @@ begin end if; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/diagnostics.vhd b/libraries/base/diagnostics/src/vhdl/diagnostics.vhd index 4950b096a5..73e2b553b7 100644 --- a/libraries/base/diagnostics/src/vhdl/diagnostics.vhd +++ b/libraries/base/diagnostics/src/vhdl/diagnostics.vhd @@ -284,4 +284,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/mm_rx_logger.vhd b/libraries/base/diagnostics/src/vhdl/mm_rx_logger.vhd index 89faabf28f..018ab6c11a 100644 --- a/libraries/base/diagnostics/src/vhdl/mm_rx_logger.vhd +++ b/libraries/base/diagnostics/src/vhdl/mm_rx_logger.vhd @@ -261,5 +261,4 @@ begin -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/mm_rx_logger_reg.vhd b/libraries/base/diagnostics/src/vhdl/mm_rx_logger_reg.vhd index 230444c138..60c1db3934 100644 --- a/libraries/base/diagnostics/src/vhdl/mm_rx_logger_reg.vhd +++ b/libraries/base/diagnostics/src/vhdl/mm_rx_logger_reg.vhd @@ -210,4 +210,4 @@ begin mm_trig_nof_logged_words <= rx_trig_nof_logged_words; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/mm_rx_logger_trig.vhd b/libraries/base/diagnostics/src/vhdl/mm_rx_logger_trig.vhd index 0b5dbf6236..9dcb318276 100644 --- a/libraries/base/diagnostics/src/vhdl/mm_rx_logger_trig.vhd +++ b/libraries/base/diagnostics/src/vhdl/mm_rx_logger_trig.vhd @@ -110,4 +110,4 @@ begin end case; end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/mm_tx_framer.vhd b/libraries/base/diagnostics/src/vhdl/mm_tx_framer.vhd index 6e70a08f79..35582fc9db 100644 --- a/libraries/base/diagnostics/src/vhdl/mm_tx_framer.vhd +++ b/libraries/base/diagnostics/src/vhdl/mm_tx_framer.vhd @@ -137,4 +137,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/mm_tx_framer_reg.vhd b/libraries/base/diagnostics/src/vhdl/mm_tx_framer_reg.vhd index 62cf1450c8..3b4d842cc5 100644 --- a/libraries/base/diagnostics/src/vhdl/mm_tx_framer_reg.vhd +++ b/libraries/base/diagnostics/src/vhdl/mm_tx_framer_reg.vhd @@ -132,4 +132,4 @@ begin dout => tx_release ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/diagnostics/src/vhdl/mms_diagnostics.vhd b/libraries/base/diagnostics/src/vhdl/mms_diagnostics.vhd index ddd0426b46..15b829de6f 100644 --- a/libraries/base/diagnostics/src/vhdl/mms_diagnostics.vhd +++ b/libraries/base/diagnostics/src/vhdl/mms_diagnostics.vhd @@ -159,4 +159,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/diagnostics/tb/vhdl/tb_diagnostics.vhd b/libraries/base/diagnostics/tb/vhdl/tb_diagnostics.vhd index a2e20b5996..040b6eb296 100644 --- a/libraries/base/diagnostics/tb/vhdl/tb_diagnostics.vhd +++ b/libraries/base/diagnostics/tb/vhdl/tb_diagnostics.vhd @@ -130,5 +130,4 @@ architecture str of tb_diagnostics is ); -end architecture str; - +end architecture str; \ No newline at end of file diff --git a/libraries/base/diagnostics/tb/vhdl/tb_mm_tx_framer.vhd b/libraries/base/diagnostics/tb/vhdl/tb_mm_tx_framer.vhd index 4a1946c70b..cee0f2d577 100644 --- a/libraries/base/diagnostics/tb/vhdl/tb_mm_tx_framer.vhd +++ b/libraries/base/diagnostics/tb/vhdl/tb_mm_tx_framer.vhd @@ -177,4 +177,4 @@ begin slave_release => mst_release ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/mmm_unb1_dp_offload.vhd b/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/mmm_unb1_dp_offload.vhd index b15587402c..bd39d5c34d 100644 --- a/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/mmm_unb1_dp_offload.vhd +++ b/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/mmm_unb1_dp_offload.vhd @@ -156,7 +156,7 @@ architecture str of mmm_unb1_dp_offload is constant c_dp_clk_period : time := 5 ns; constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); constant c_sim_eth_src_mac : std_logic_vector(c_network_eth_mac_slv'range) := x"00228608" & to_uvec(g_sim_unb_nr, c_byte_w) & to_uvec(g_sim_node_nr, c_byte_w); constant c_sim_eth_control_rx_en : natural := 2 ** c_eth_mm_reg_control_bi.rx_en; diff --git a/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/unb1_dp_offload.vhd b/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/unb1_dp_offload.vhd index e99064d5e9..c5b27efdee 100644 --- a/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/unb1_dp_offload.vhd +++ b/libraries/base/dp/designs/unb1_dp_offload/src/vhdl/unb1_dp_offload.vhd @@ -69,8 +69,8 @@ entity unb1_dp_offload is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_dp_offload; @@ -95,7 +95,7 @@ architecture str of unb1_dp_offload is to_uvec( 0, c_diag_bg_bsn_init_w)); -- dp_offload_tx - constant c_nof_hdr_fields : natural := 4 +12 + 4 + 9; -- Total header bits = 512 + constant c_nof_hdr_fields : natural := 4 + 12 + 4 + 9; -- Total header bits = 512 constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( ( field_name_pad("eth_word_align" ), " ", 16, field_default(0) ), ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(x"002286080000") ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), @@ -126,7 +126,7 @@ architecture str of unb1_dp_offload is ( field_name_pad("usr_hdr_field_5" ), " ", 8, field_default(0) ), ( field_name_pad("usr_hdr_field_6" ), " ", 27, field_default(0) ) ); - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "1101" &"111111111100 " &"1111 " &"001111111 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "1101" &"111111111100 " &"1111 " &"001111111 "; constant c_nof_words_per_block : natural := 11; constant c_nof_blocks_per_packet : natural := 2; diff --git a/libraries/base/dp/src/vhdl/dp_bsn_align_reg.vhd b/libraries/base/dp/src/vhdl/dp_bsn_align_reg.vhd index 8cac283e02..08e91bb91e 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_align_reg.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_align_reg.vhd @@ -118,4 +118,4 @@ begin out_en_arr(I) <= out_en_arr_reg(I * c_word_w); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_bsn_delay.vhd b/libraries/base/dp/src/vhdl/dp_bsn_delay.vhd index fc12b7c15a..177308b407 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_delay.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_delay.vhd @@ -87,8 +87,8 @@ architecture rtl of dp_bsn_delay is type t_bsn_arr is array (integer range <> ) of std_logic_vector(g_bsn_w - 1 downto 0); signal hold_sync : std_logic; - signal sync_dly : std_logic_vector(0 TO g_nof_block_latency); -- [0] is hold_sync, the combinatorial in_sync is not delayed, because the DP latency must be > 0 - signal nxt_sync_dly : std_logic_vector(1 TO g_nof_block_latency); + signal sync_dly : std_logic_vector(0 to g_nof_block_latency); -- [0] is hold_sync, the combinatorial in_sync is not delayed, because the DP latency must be > 0 + signal nxt_sync_dly : std_logic_vector(1 to g_nof_block_latency); signal bsn_dly : t_bsn_arr(0 to g_nof_block_latency); -- [0] is combinatorial in_bsn signal nxt_bsn_dly : t_bsn_arr(1 to g_nof_block_latency); @@ -138,4 +138,4 @@ begin nxt_bsn_reg <= bsn_dly(g_nof_block_latency) when out_release = '1' else bsn_reg; -- register the BSN to hold it during the output block out_bsn <= bsn_reg; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_bsn_monitor.vhd b/libraries/base/dp/src/vhdl/dp_bsn_monitor.vhd index 839dd961b5..b846dfe2da 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_monitor.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_monitor.vhd @@ -339,6 +339,4 @@ begin count => cnt_cycle ); -end rtl; - - +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_bsn_monitor_v2.vhd b/libraries/base/dp/src/vhdl/dp_bsn_monitor_v2.vhd index 8d29a312fc..4097d6175a 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_monitor_v2.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_monitor_v2.vhd @@ -341,6 +341,4 @@ begin count => cnt_latency ); -end rtl; - - +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_bsn_scheduler.vhd b/libraries/base/dp/src/vhdl/dp_bsn_scheduler.vhd index d9fa9bb5cd..68c39b9d75 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_scheduler.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_scheduler.vhd @@ -75,4 +75,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_bsn_source.vhd b/libraries/base/dp/src/vhdl/dp_bsn_source.vhd index 421394103c..3657984be3 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_source.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_source.vhd @@ -178,5 +178,4 @@ begin end if; end process; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_bsn_sync_scheduler.vhd b/libraries/base/dp/src/vhdl/dp_bsn_sync_scheduler.vhd index 56cea15ccc..03838e6111 100644 --- a/libraries/base/dp/src/vhdl/dp_bsn_sync_scheduler.vhd +++ b/libraries/base/dp/src/vhdl/dp_bsn_sync_scheduler.vhd @@ -452,5 +452,4 @@ begin out_enable <= output_enable; end generate; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_components_pkg.vhd b/libraries/base/dp/src/vhdl/dp_components_pkg.vhd index 4cfdb85797..656bd59911 100644 --- a/libraries/base/dp/src/vhdl/dp_components_pkg.vhd +++ b/libraries/base/dp/src/vhdl/dp_components_pkg.vhd @@ -47,4 +47,4 @@ end dp_components_pkg; package body dp_components_pkg is -end dp_components_pkg; +end dp_components_pkg; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_counter_func_single.vhd b/libraries/base/dp/src/vhdl/dp_counter_func_single.vhd index 96f60a53ed..fb43680f83 100644 --- a/libraries/base/dp/src/vhdl/dp_counter_func_single.vhd +++ b/libraries/base/dp/src/vhdl/dp_counter_func_single.vhd @@ -67,7 +67,7 @@ architecture rtl of dp_counter_func_single is -- . range(0,7,2) = [0, 2, 4, 6] -- . range(1,7,2) = [1, 3, 5] -- . The maximum value is: start+((stop-1-start)/step)*step - constant c_nof_count : natural := (g_range_stop - 1 -g_range_start)/g_range_step + 1; + constant c_nof_count : natural := (g_range_stop - 1 - g_range_start) / g_range_step + 1; constant c_count_max : natural := g_range_start + (c_nof_count - 1) * g_range_step; constant c_count_w : natural := ceil_log2(c_count_max + 1); diff --git a/libraries/base/dp/src/vhdl/dp_demux.vhd b/libraries/base/dp/src/vhdl/dp_demux.vhd index 726125b950..d3a4a6599f 100644 --- a/libraries/base/dp/src/vhdl/dp_demux.vhd +++ b/libraries/base/dp/src/vhdl/dp_demux.vhd @@ -150,7 +150,7 @@ begin if g_sel_ctrl_invert = FALSE then output_select <= sel_ctrl; else - output_select <= g_nof_output - 1 -sel_ctrl; + output_select <= g_nof_output - 1 - sel_ctrl; end if; end if; end process; @@ -169,7 +169,7 @@ begin if g_sel_ctrl_invert = FALSE then output_select <= sel_ctrl; else - output_select <= g_nof_output - 1 -sel_ctrl; + output_select <= g_nof_output - 1 - sel_ctrl; end if; -- User might need this status port to indicate if/when the output has actually been switched sel_stat <= output_select; diff --git a/libraries/base/dp/src/vhdl/dp_dummy_source.vhd b/libraries/base/dp/src/vhdl/dp_dummy_source.vhd index 00527a59f2..036d016d24 100644 --- a/libraries/base/dp/src/vhdl/dp_dummy_source.vhd +++ b/libraries/base/dp/src/vhdl/dp_dummy_source.vhd @@ -85,4 +85,4 @@ begin en => '1' ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_fifo_fill_reg.vhd b/libraries/base/dp/src/vhdl/dp_fifo_fill_reg.vhd index ddc117c5f5..3281119716 100644 --- a/libraries/base/dp/src/vhdl/dp_fifo_fill_reg.vhd +++ b/libraries/base/dp/src/vhdl/dp_fifo_fill_reg.vhd @@ -149,4 +149,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_fifo_from_mm_reg.vhd b/libraries/base/dp/src/vhdl/dp_fifo_from_mm_reg.vhd index b289cf2f6e..f2c27e1b2c 100644 --- a/libraries/base/dp/src/vhdl/dp_fifo_from_mm_reg.vhd +++ b/libraries/base/dp/src/vhdl/dp_fifo_from_mm_reg.vhd @@ -77,4 +77,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_fifo_monitor.vhd b/libraries/base/dp/src/vhdl/dp_fifo_monitor.vhd index 387dc60362..b34b2bf555 100644 --- a/libraries/base/dp/src/vhdl/dp_fifo_monitor.vhd +++ b/libraries/base/dp/src/vhdl/dp_fifo_monitor.vhd @@ -97,4 +97,4 @@ begin rd_fill_32b <= mm_fields_out(field_hi(c_field_arr, "rd_fill") downto field_lo(c_field_arr, "rd_fill")); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_fifo_monitor_arr.vhd b/libraries/base/dp/src/vhdl/dp_fifo_monitor_arr.vhd index 9a1f6c71fa..b04eef3b27 100644 --- a/libraries/base/dp/src/vhdl/dp_fifo_monitor_arr.vhd +++ b/libraries/base/dp/src/vhdl/dp_fifo_monitor_arr.vhd @@ -99,4 +99,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_fifo_to_mm_reg.vhd b/libraries/base/dp/src/vhdl/dp_fifo_to_mm_reg.vhd index fb0a4f1a4f..ecfac21b77 100644 --- a/libraries/base/dp/src/vhdl/dp_fifo_to_mm_reg.vhd +++ b/libraries/base/dp/src/vhdl/dp_fifo_to_mm_reg.vhd @@ -75,4 +75,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_flush.vhd b/libraries/base/dp/src/vhdl/dp_flush.vhd index 685ce0c7cc..62cf66d5b5 100644 --- a/libraries/base/dp/src/vhdl/dp_flush.vhd +++ b/libraries/base/dp/src/vhdl/dp_flush.vhd @@ -88,7 +88,7 @@ end dp_flush; architecture rtl of dp_flush is - signal flush_dly : std_logic_vector(0 TO g_ready_latency); -- use 0 TO high for delay lines, rather than high DOWNTO 0 + signal flush_dly : std_logic_vector(0 to g_ready_latency); -- use 0 TO high for delay lines, rather than high DOWNTO 0 signal snk_flush : std_logic; signal snk_flush_hi : std_logic; signal snk_flush_lo : std_logic; @@ -210,4 +210,4 @@ begin out_level => snk_flush ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_folder.vhd b/libraries/base/dp/src/vhdl/dp_folder.vhd index e75a507ae7..f9d14e1b8e 100644 --- a/libraries/base/dp/src/vhdl/dp_folder.vhd +++ b/libraries/base/dp/src/vhdl/dp_folder.vhd @@ -252,4 +252,4 @@ begin dp_block_gen_snk_in_arr <= snk_in_arr; end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_gap.vhd b/libraries/base/dp/src/vhdl/dp_gap.vhd index 817c17963b..3cbb863de8 100644 --- a/libraries/base/dp/src/vhdl/dp_gap.vhd +++ b/libraries/base/dp/src/vhdl/dp_gap.vhd @@ -150,4 +150,4 @@ begin snk_out <= src_in; end generate; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_mon.vhd b/libraries/base/dp/src/vhdl/dp_mon.vhd index 4e482c8d88..bf24ad24e1 100644 --- a/libraries/base/dp/src/vhdl/dp_mon.vhd +++ b/libraries/base/dp/src/vhdl/dp_mon.vhd @@ -76,4 +76,4 @@ begin count => word_cnt ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_mux.vhd b/libraries/base/dp/src/vhdl/dp_mux.vhd index 56d43f2642..ab7ce24946 100644 --- a/libraries/base/dp/src/vhdl/dp_mux.vhd +++ b/libraries/base/dp/src/vhdl/dp_mux.vhd @@ -134,7 +134,7 @@ architecture rtl of dp_mux is constant c_sel_w : natural := true_log2(g_nof_input); constant c_rl : natural := 1; - signal tb_ready_reg : std_logic_vector(0 TO g_nof_input * (1 + c_rl) - 1); + signal tb_ready_reg : std_logic_vector(0 to g_nof_input * (1 + c_rl) - 1); type state_type is (s_idle, s_output); @@ -154,14 +154,14 @@ architecture rtl of dp_mux is signal rd_siso_arr : t_dp_siso_arr(0 to g_nof_input - 1); signal rd_sosi_arr : t_dp_sosi_arr(0 to g_nof_input - 1); - signal rd_sosi_busy_arr : std_logic_vector(0 TO g_nof_input - 1); + signal rd_sosi_busy_arr : std_logic_vector(0 to g_nof_input - 1); signal hold_src_in_arr : t_dp_siso_arr(0 to g_nof_input - 1); signal next_src_out_arr : t_dp_sosi_arr(0 to g_nof_input - 1); signal pend_src_out_arr : t_dp_sosi_arr(0 to g_nof_input - 1); -- SOSI control - signal in_xon_arr : std_logic_vector(0 TO g_nof_input - 1); - signal nxt_in_xon_arr : std_logic_vector(0 TO g_nof_input - 1); + signal in_xon_arr : std_logic_vector(0 to g_nof_input - 1); + signal nxt_in_xon_arr : std_logic_vector(0 to g_nof_input - 1); signal prev_src_in : t_dp_siso; signal src_out_hi : t_dp_sosi; -- snk_in_arr().channel as high part of src_out.channel @@ -264,7 +264,7 @@ begin end generate; -- Register and adjust external MM sel_ctrl for g_sel_ctrl_invert - nxt_sel_ctrl_reg <= sel_ctrl when g_sel_ctrl_invert = FALSE else g_nof_input - 1 -sel_ctrl; + nxt_sel_ctrl_reg <= sel_ctrl when g_sel_ctrl_invert = FALSE else g_nof_input - 1 - sel_ctrl; -- Detect change in sel_ctrl nxt_sel_ctrl_evt <= '1' when nxt_sel_ctrl_reg /= sel_ctrl_reg else '0'; diff --git a/libraries/base/dp/src/vhdl/dp_offload_tx_legacy.vhd b/libraries/base/dp/src/vhdl/dp_offload_tx_legacy.vhd index b57259be8e..8b34a2cd88 100644 --- a/libraries/base/dp/src/vhdl/dp_offload_tx_legacy.vhd +++ b/libraries/base/dp/src/vhdl/dp_offload_tx_legacy.vhd @@ -76,7 +76,7 @@ end dp_offload_tx_legacy; architecture str of dp_offload_tx_legacy is constant c_fifo_margin : natural := 10; - constant c_dp_pkt_overhead_nof_words : natural := 4 +1; + constant c_dp_pkt_overhead_nof_words : natural := 4 + 1; constant c_hdr_insert_reg_addr_w : natural := 1; -- Only 1 register used. A width of 1 still yields 2 addresses/instance though. constant c_hdr_insert_ram_addr_w : natural := ceil_log2( g_hdr_nof_words * (g_data_w / c_word_w) ); diff --git a/libraries/base/dp/src/vhdl/dp_packet_dec.vhd b/libraries/base/dp/src/vhdl/dp_packet_dec.vhd index 0ababd0db7..59f9ada3ae 100644 --- a/libraries/base/dp/src/vhdl/dp_packet_dec.vhd +++ b/libraries/base/dp/src/vhdl/dp_packet_dec.vhd @@ -338,4 +338,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_packet_dec_channel_lo.vhd b/libraries/base/dp/src/vhdl/dp_packet_dec_channel_lo.vhd index bcdc5040f9..c48813e86e 100644 --- a/libraries/base/dp/src/vhdl/dp_packet_dec_channel_lo.vhd +++ b/libraries/base/dp/src/vhdl/dp_packet_dec_channel_lo.vhd @@ -87,10 +87,10 @@ begin src_out.channel(g_channel_lo - 1 downto 0) <= channel_lo_hold; -- default combinatorially assign the held channel_lo bits to the sosi.channel field after the sop if snk_in.sop = '1' then -- clear the channel_lo bits in the MSWord of the CHAN field - src_out.data(g_data_w - 2 downto g_data_w - 1 -g_channel_lo) <= (others=>'0'); + src_out.data(g_data_w - 2 downto g_data_w - 1 - g_channel_lo) <= (others => '0'); -- extract the channel_lo bits from the MSWord of the CHAN field - v_channel_lo := snk_in.data(g_data_w - 2 downto g_data_w - 1 -g_channel_lo); + v_channel_lo := snk_in.data(g_data_w - 2 downto g_data_w - 1 - g_channel_lo); src_out.channel(g_channel_lo - 1 downto 0) <= v_channel_lo; -- combinatorially assign the channel_lo bits to the sosi.channel field at the sop nxt_channel_lo_hold <= v_channel_lo; -- register the channel_lo bits so they can be assigned to the rest of the frame as well end if; diff --git a/libraries/base/dp/src/vhdl/dp_packet_enc.vhd b/libraries/base/dp/src/vhdl/dp_packet_enc.vhd index 1d871798ae..38a935dd9f 100644 --- a/libraries/base/dp/src/vhdl/dp_packet_enc.vhd +++ b/libraries/base/dp/src/vhdl/dp_packet_enc.vhd @@ -102,7 +102,7 @@ architecture rtl of dp_packet_enc is constant c_error_vec_w : natural := c_error_len * g_data_w; constant c_rl : natural := 1; - signal tb_ready_reg : std_logic_vector(0 TO c_rl); + signal tb_ready_reg : std_logic_vector(0 to c_rl); type t_state is (s_channel, s_bsn, s_data, s_error); diff --git a/libraries/base/dp/src/vhdl/dp_packet_enc_channel_lo.vhd b/libraries/base/dp/src/vhdl/dp_packet_enc_channel_lo.vhd index eb439bf48a..29b2d8fc87 100644 --- a/libraries/base/dp/src/vhdl/dp_packet_enc_channel_lo.vhd +++ b/libraries/base/dp/src/vhdl/dp_packet_enc_channel_lo.vhd @@ -78,7 +78,7 @@ begin src_out <= snk_in; if g_channel_lo > 0 then if snk_in.sop = '1' then - src_out.data(g_data_w - 2 downto g_data_w - 1 -g_channel_lo) <= snk_in.channel(g_channel_lo-1 downto 0); + src_out.data(g_data_w - 2 downto g_data_w - 1 - g_channel_lo) <= snk_in.channel(g_channel_lo - 1 downto 0); end if; end if; end process; diff --git a/libraries/base/dp/src/vhdl/dp_packet_pkg.vhd b/libraries/base/dp/src/vhdl/dp_packet_pkg.vhd index e33d1b4649..cbba6dd338 100644 --- a/libraries/base/dp/src/vhdl/dp_packet_pkg.vhd +++ b/libraries/base/dp/src/vhdl/dp_packet_pkg.vhd @@ -69,4 +69,4 @@ package body dp_packet_pkg is ceil_div(c_dp_packet_error_w, c_data_w); end; -end dp_packet_pkg; +end dp_packet_pkg; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_packetizing_pkg.vhd b/libraries/base/dp/src/vhdl/dp_packetizing_pkg.vhd index d915d60331..b2aa9a73d0 100644 --- a/libraries/base/dp/src/vhdl/dp_packetizing_pkg.vhd +++ b/libraries/base/dp/src/vhdl/dp_packetizing_pkg.vhd @@ -142,4 +142,4 @@ package body dp_packetizing_pkg is return nxt_crc; end func_dp_next_crc; -end dp_packetizing_pkg; +end dp_packetizing_pkg; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_ram_from_mm.vhd b/libraries/base/dp/src/vhdl/dp_ram_from_mm.vhd index de8a354e6f..8ae7c6b704 100644 --- a/libraries/base/dp/src/vhdl/dp_ram_from_mm.vhd +++ b/libraries/base/dp/src/vhdl/dp_ram_from_mm.vhd @@ -177,4 +177,4 @@ begin rd_val => open ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_ram_from_mm_reg.vhd b/libraries/base/dp/src/vhdl/dp_ram_from_mm_reg.vhd index 56b965fad2..fbe11f2a01 100644 --- a/libraries/base/dp/src/vhdl/dp_ram_from_mm_reg.vhd +++ b/libraries/base/dp/src/vhdl/dp_ram_from_mm_reg.vhd @@ -82,4 +82,4 @@ begin dout => dp_on ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_ram_to_mm.vhd b/libraries/base/dp/src/vhdl/dp_ram_to_mm.vhd index 070245f9b4..75a694f9a0 100644 --- a/libraries/base/dp/src/vhdl/dp_ram_to_mm.vhd +++ b/libraries/base/dp/src/vhdl/dp_ram_to_mm.vhd @@ -155,4 +155,4 @@ begin rd_val => sla_out.rdval ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_ready.vhd b/libraries/base/dp/src/vhdl/dp_ready.vhd index 98da6b2a07..a8a286d06d 100644 --- a/libraries/base/dp/src/vhdl/dp_ready.vhd +++ b/libraries/base/dp/src/vhdl/dp_ready.vhd @@ -83,4 +83,4 @@ begin src_out.eop <= snk_in.eop and reg_val; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_repack_data.vhd b/libraries/base/dp/src/vhdl/dp_repack_data.vhd index d0dd31a629..67bbc66030 100644 --- a/libraries/base/dp/src/vhdl/dp_repack_data.vhd +++ b/libraries/base/dp/src/vhdl/dp_repack_data.vhd @@ -680,8 +680,8 @@ architecture str of dp_repack_data is signal i_src_out : t_dp_sosi; signal src_out_data : std_logic_vector(g_out_dat_w - 1 downto 0); - signal snk_out_ready_reg : std_logic_vector(0 TO c_dp_stream_rl); - signal pack_ready_reg : std_logic_vector(0 TO c_dp_stream_rl); + signal snk_out_ready_reg : std_logic_vector(0 to c_dp_stream_rl); + signal pack_ready_reg : std_logic_vector(0 to c_dp_stream_rl); begin diff --git a/libraries/base/dp/src/vhdl/dp_requantize.vhd b/libraries/base/dp/src/vhdl/dp_requantize.vhd index 5c1d280df3..26032c4c8c 100644 --- a/libraries/base/dp/src/vhdl/dp_requantize.vhd +++ b/libraries/base/dp/src/vhdl/dp_requantize.vhd @@ -176,7 +176,7 @@ begin begin src_out <= snk_in_piped; if g_complex = FALSE then - if g_representation ="unsigned " then + if g_representation ="unsigned " then src_out.data <= RESIZE_DP_DATA( quantized_data); else src_out.data <= RESIZE_DP_SDATA(quantized_data); diff --git a/libraries/base/dp/src/vhdl/dp_stream_pkg.vhd b/libraries/base/dp/src/vhdl/dp_stream_pkg.vhd index e75488ab15..0bdf701eb6 100644 --- a/libraries/base/dp/src/vhdl/dp_stream_pkg.vhd +++ b/libraries/base/dp/src/vhdl/dp_stream_pkg.vhd @@ -270,7 +270,7 @@ package dp_stream_pkg is function REPLICATE_DP_DATA( seq : std_logic_vector ) return std_logic_vector; -- replicate seq as often as fits in c_dp_stream_data_w function UNREPLICATE_DP_DATA(data : std_logic_vector; seq_w : natural) return std_logic_vector; -- unreplicate data to width seq_w, return low seq_w bits and set mismatch MSbits bits to '1' - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned; + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned; -- Map between array and single element function TO_DP_ARR(sosi : t_dp_sosi) return t_dp_sosi_arr; @@ -627,7 +627,7 @@ package body dp_stream_pkg is return v_vec(c_data_w - 1 downto 0); end UNREPLICATE_DP_DATA; - function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : UNSIGNED) return t_dp_sosi_unsigned is + function TO_DP_SOSI_unsigned(sync, valid, sop, eop : std_logic; bsn, data, re, im, empty, channel, err : unsigned) return t_dp_sosi_unsigned is variable v_sosi_unsigned : t_dp_sosi_unsigned; begin v_sosi_unsigned.sync := sync; @@ -798,8 +798,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_and for t_dp_siso_arr"; end if; end if; @@ -820,10 +820,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_and for t_dp_sosi_arr"; end if; end if; @@ -856,8 +856,8 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="READY " then v_vec(I) := dp(I).ready; - elsif str ="XON " then v_vec(I) := dp(I).xon; + if str ="READY " then v_vec(I) := dp(I).ready; + elsif str ="XON " then v_vec(I) := dp(I).xon; else report "Error in func_dp_stream_arr_or for t_dp_siso_arr"; end if; end if; @@ -878,10 +878,10 @@ package body dp_stream_pkg is for I in dp'range loop if mask(I) = '1' then v_any := '1'; - if str ="VALID " then v_vec(I) := dp(I).valid; - elsif str ="SOP " then v_vec(I) := dp(I).sop; - elsif str ="EOP " then v_vec(I) := dp(I).eop; - elsif str ="SYNC " then v_vec(I) := dp(I).sync; + if str ="VALID " then v_vec(I) := dp(I).valid; + elsif str ="SOP " then v_vec(I) := dp(I).sop; + elsif str ="EOP " then v_vec(I) := dp(I).eop; + elsif str ="SYNC " then v_vec(I) := dp(I).sync; else report "Error in func_dp_stream_arr_or for t_dp_sosi_arr"; end if; end if; @@ -913,8 +913,8 @@ package body dp_stream_pkg is variable v_slv : std_logic_vector(dp'range) := slv; -- map to ensure same range as for dp begin for I in dp'range loop - if str ="READY " then v_dp(I).ready := v_slv(I); - elsif str ="XON " then v_dp(I).xon := v_slv(I); + if str ="READY " then v_dp(I).ready := v_slv(I); + elsif str ="XON " then v_dp(I).xon := v_slv(I); else report "Error in func_dp_stream_arr_set for t_dp_siso_arr"; end if; end loop; @@ -927,15 +927,15 @@ package body dp_stream_pkg is begin for I in dp'range loop -- use v_slv(I) to set individual sl field - if str ="VALID " then v_dp(I).valid := v_slv(I); - elsif str ="SOP " then v_dp(I).sop := v_slv(I); - elsif str ="EOP " then v_dp(I).eop := v_slv(I); - elsif str ="SYNC " then v_dp(I).sync := v_slv(I); + if str ="VALID " then v_dp(I).valid := v_slv(I); + elsif str ="SOP " then v_dp(I).sop := v_slv(I); + elsif str ="EOP " then v_dp(I).eop := v_slv(I); + elsif str ="SYNC " then v_dp(I).sync := v_slv(I); -- use slv to set individual slv field - elsif str ="BSN " then v_dp(I).bsn := RESIZE_DP_BSN(slv); - elsif str ="CHANNEL " then v_dp(I).channel := RESIZE_DP_CHANNEL(slv); - elsif str ="EMPTY " then v_dp(I).empty := RESIZE_DP_EMPTY(slv); - elsif str ="ERR " then v_dp(I).err := RESIZE_DP_ERROR(slv); + elsif str ="BSN " then v_dp(I).bsn := RESIZE_DP_BSN(slv); + elsif str ="CHANNEL " then v_dp(I).channel := RESIZE_DP_CHANNEL(slv); + elsif str ="EMPTY " then v_dp(I).empty := RESIZE_DP_EMPTY(slv); + elsif str ="ERR " then v_dp(I).err := RESIZE_DP_ERROR(slv); else report "Error in func_dp_stream_arr_set for t_dp_sosi_arr"; end if; end loop; @@ -958,8 +958,8 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="READY " then v_ctrl(I) := dp(I).ready; - elsif str ="XON " then v_ctrl(I) := dp(I).xon; + if str ="READY " then v_ctrl(I) := dp(I).ready; + elsif str ="XON " then v_ctrl(I) := dp(I).xon; else report "Error in func_dp_stream_arr_get for t_dp_siso_arr"; end if; end loop; @@ -970,10 +970,10 @@ package body dp_stream_pkg is variable v_ctrl : std_logic_vector(dp'range); begin for I in dp'range loop - if str ="VALID " then v_ctrl(I) := dp(I).valid; - elsif str ="SOP " then v_ctrl(I) := dp(I).sop; - elsif str ="EOP " then v_ctrl(I) := dp(I).eop; - elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; + if str ="VALID " then v_ctrl(I) := dp(I).valid; + elsif str ="SOP " then v_ctrl(I) := dp(I).sop; + elsif str ="EOP " then v_ctrl(I) := dp(I).eop; + elsif str ="SYNC " then v_ctrl(I) := dp(I).sync; else report "Error in func_dp_stream_arr_get for t_dp_sosi_arr"; end if; end loop; @@ -1312,12 +1312,12 @@ package body dp_stream_pkg is function func_dp_stream_set_data(dp : t_dp_sosi; slv : std_logic_vector; str : string) return t_dp_sosi is variable v_dp : t_dp_sosi := dp; begin - if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); - elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + if str ="DATA " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="DSP " then v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); - elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); - elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); + elsif str ="RE " then v_dp.re := RESIZE_DP_DSP_DATA(slv); + elsif str ="IM " then v_dp.im := RESIZE_DP_DSP_DATA(slv); + elsif str ="all " then v_dp.data := RESIZE_DP_DATA(slv); v_dp.re := RESIZE_DP_DSP_DATA(slv); v_dp.im := RESIZE_DP_DSP_DATA(slv); else report "Error in func_dp_stream_set_data for t_dp_sosi"; @@ -1487,10 +1487,10 @@ package body dp_stream_pkg is v_src_out.im := (others => '0'); for i in 0 to nof_data - 1 loop v_in_data := snk_in.data((i + 1) * in_w - 1 downto i * in_w); - if data_representation ="unsigned " then -- treat data as unsigned + if data_representation ="unsigned " then -- treat data as unsigned v_out_data := RESIZE_UVEC(v_in_data, out_w); else - if data_representation ="signed " then -- treat data as signed + if data_representation ="signed " then -- treat data as signed v_out_data := RESIZE_SVEC(v_in_data, out_w); else -- treat data as complex @@ -1573,4 +1573,4 @@ package body dp_stream_pkg is end; -end dp_stream_pkg; +end dp_stream_pkg; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_sync_checker.vhd b/libraries/base/dp/src/vhdl/dp_sync_checker.vhd index e3e2b432ba..55fc67e7fb 100644 --- a/libraries/base/dp/src/vhdl/dp_sync_checker.vhd +++ b/libraries/base/dp/src/vhdl/dp_sync_checker.vhd @@ -175,5 +175,4 @@ begin nof_early_syncs <= to_uvec(r.nof_early_syncs, c_word_w); nof_late_syncs <= to_uvec(r.nof_late_syncs, c_word_w); -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_throttle.vhd b/libraries/base/dp/src/vhdl/dp_throttle.vhd index 771e73e043..1473101726 100644 --- a/libraries/base/dp/src/vhdl/dp_throttle.vhd +++ b/libraries/base/dp/src/vhdl/dp_throttle.vhd @@ -82,4 +82,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_throttle_sop.vhd b/libraries/base/dp/src/vhdl/dp_throttle_sop.vhd index f22852e30f..01f5978c4b 100644 --- a/libraries/base/dp/src/vhdl/dp_throttle_sop.vhd +++ b/libraries/base/dp/src/vhdl/dp_throttle_sop.vhd @@ -93,4 +93,4 @@ begin switch_low <= snk_in.eop; snk_out.ready <= switch_out; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_throttle_xon.vhd b/libraries/base/dp/src/vhdl/dp_throttle_xon.vhd index 5320736f79..89c9100789 100644 --- a/libraries/base/dp/src/vhdl/dp_throttle_xon.vhd +++ b/libraries/base/dp/src/vhdl/dp_throttle_xon.vhd @@ -121,4 +121,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_unfolder.vhd b/libraries/base/dp/src/vhdl/dp_unfolder.vhd index 7ac3de9cc8..0c6e03b93b 100644 --- a/libraries/base/dp/src/vhdl/dp_unfolder.vhd +++ b/libraries/base/dp/src/vhdl/dp_unfolder.vhd @@ -266,4 +266,4 @@ begin dp_block_gen_snk_in_arr <= snk_in_arr; end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/dp_wideband_sp_arr_scope.vhd b/libraries/base/dp/src/vhdl/dp_wideband_sp_arr_scope.vhd index 919ca48823..7dda12cee4 100644 --- a/libraries/base/dp/src/vhdl/dp_wideband_sp_arr_scope.vhd +++ b/libraries/base/dp/src/vhdl/dp_wideband_sp_arr_scope.vhd @@ -102,7 +102,7 @@ begin begin if rising_edge(SCLKi) then if g_wideband_big_endian = TRUE then - vI := g_wideband_factor - 1 -scope_cnt_arr(I); + vI := g_wideband_factor - 1 - scope_cnt_arr(I); else vI := scope_cnt_arr(I); end if; diff --git a/libraries/base/dp/src/vhdl/dp_wideband_wb_arr_scope.vhd b/libraries/base/dp/src/vhdl/dp_wideband_wb_arr_scope.vhd index eae5439074..e43612e520 100644 --- a/libraries/base/dp/src/vhdl/dp_wideband_wb_arr_scope.vhd +++ b/libraries/base/dp/src/vhdl/dp_wideband_wb_arr_scope.vhd @@ -90,7 +90,7 @@ begin begin if rising_edge(SCLKi) then if g_wideband_big_endian = TRUE then - st_sosi <= wb_sosi_arr(g_wideband_factor - 1 -sample_cnt); + st_sosi <= wb_sosi_arr(g_wideband_factor - 1 - sample_cnt); else st_sosi <= wb_sosi_arr(sample_cnt); end if; diff --git a/libraries/base/dp/src/vhdl/mmp_dp_bsn_align_v2.vhd b/libraries/base/dp/src/vhdl/mmp_dp_bsn_align_v2.vhd index 3414a80eb6..6ef9f7eaaf 100644 --- a/libraries/base/dp/src/vhdl/mmp_dp_bsn_align_v2.vhd +++ b/libraries/base/dp/src/vhdl/mmp_dp_bsn_align_v2.vhd @@ -253,4 +253,4 @@ begin out_sosi_arr => i_out_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mmp_dp_bsn_sync_scheduler.vhd b/libraries/base/dp/src/vhdl/mmp_dp_bsn_sync_scheduler.vhd index cf83fd8330..c8b57e1ab1 100644 --- a/libraries/base/dp/src/vhdl/mmp_dp_bsn_sync_scheduler.vhd +++ b/libraries/base/dp/src/vhdl/mmp_dp_bsn_sync_scheduler.vhd @@ -220,4 +220,4 @@ begin out_enable => out_enable ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_block_select.vhd b/libraries/base/dp/src/vhdl/mms_dp_block_select.vhd index 83c1afe55b..eb50b9afed 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_block_select.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_block_select.vhd @@ -118,4 +118,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_bsn_align.vhd b/libraries/base/dp/src/vhdl/mms_dp_bsn_align.vhd index fb1745fd7e..9e194beaf0 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_bsn_align.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_bsn_align.vhd @@ -112,4 +112,4 @@ begin out_en_arr => en_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor.vhd b/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor.vhd index e9a144a368..4c3aea5d9f 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor.vhd @@ -165,4 +165,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor_v2.vhd b/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor_v2.vhd index 526fa61639..808c2ebfd4 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor_v2.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_bsn_monitor_v2.vhd @@ -162,4 +162,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_bsn_scheduler.vhd b/libraries/base/dp/src/vhdl/mms_dp_bsn_scheduler.vhd index cbd78e4795..70d12fb2ab 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_bsn_scheduler.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_bsn_scheduler.vhd @@ -92,4 +92,4 @@ begin trigger_out => trigger_out ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_bsn_source.vhd b/libraries/base/dp/src/vhdl/mms_dp_bsn_source.vhd index cc7578a622..eeeb045731 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_bsn_source.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_bsn_source.vhd @@ -120,4 +120,4 @@ begin --capture_bsn <= i_bs_sosi.bsn WHEN rising_edge(dp_clk) AND dp_pps='1'; -- capture BSN at external PPS capture_bsn <= i_bs_sosi.bsn when rising_edge(dp_clk) and i_bs_sosi.sync = '1'; -- capture BSN at internal sync -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_bsn_source_v2.vhd b/libraries/base/dp/src/vhdl/mms_dp_bsn_source_v2.vhd index 7d60537ccf..fecab0a6dd 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_bsn_source_v2.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_bsn_source_v2.vhd @@ -129,4 +129,4 @@ begin capture_bsn <= i_bs_sosi.bsn when rising_edge(dp_clk) and i_bs_sosi.sync = '1'; -- capture BSN at internal sync -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_fifo_from_mm.vhd b/libraries/base/dp/src/vhdl/mms_dp_fifo_from_mm.vhd index 1770cf6369..ff81df4f98 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_fifo_from_mm.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_fifo_from_mm.vhd @@ -89,4 +89,4 @@ begin mm_wr_data <= data_mosi.wrdata(c_word_w - 1 downto 0); mm_wr <= data_mosi.wr; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_fifo_to_mm.vhd b/libraries/base/dp/src/vhdl/mms_dp_fifo_to_mm.vhd index d0e26d647b..4827f94dee 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_fifo_to_mm.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_fifo_to_mm.vhd @@ -92,4 +92,4 @@ begin data_miso.rdval <= mm_rd_val; mm_rd <= data_mosi.rd; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel.vhd b/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel.vhd index 78e35a9830..4dc09a8f6e 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel.vhd @@ -161,4 +161,4 @@ begin src_in => src_in, src_out => src_out ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel_arr.vhd b/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel_arr.vhd index e8b50f898a..0050c8c20c 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel_arr.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_force_data_parallel_arr.vhd @@ -130,4 +130,4 @@ begin src_out => src_out_arr(I) ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_force_data_serial.vhd b/libraries/base/dp/src/vhdl/mms_dp_force_data_serial.vhd index a9ee0579de..252f607e63 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_force_data_serial.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_force_data_serial.vhd @@ -170,4 +170,4 @@ begin src_out => src_out ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_force_data_serial_arr.vhd b/libraries/base/dp/src/vhdl/mms_dp_force_data_serial_arr.vhd index a0df780ada..ef06ebcb58 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_force_data_serial_arr.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_force_data_serial_arr.vhd @@ -111,4 +111,4 @@ begin src_out => src_out_arr(I) ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_gain.vhd b/libraries/base/dp/src/vhdl/mms_dp_gain.vhd index 55337351d0..0e38a22c98 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_gain.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_gain.vhd @@ -132,4 +132,4 @@ begin out_sosi_arr => out_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_gain_arr.vhd b/libraries/base/dp/src/vhdl/mms_dp_gain_arr.vhd index a026b896e3..2b94d22166 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_gain_arr.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_gain_arr.vhd @@ -286,4 +286,4 @@ begin end generate gen_nof_streams; end generate gen_complex_multiply; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_gain_serial.vhd b/libraries/base/dp/src/vhdl/mms_dp_gain_serial.vhd index 6b9a5c5c7a..f0eea0b206 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_gain_serial.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_gain_serial.vhd @@ -129,4 +129,4 @@ begin out_sosi_arr => out_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_packet_merge.vhd b/libraries/base/dp/src/vhdl/mms_dp_packet_merge.vhd index 6e12b88af0..652fc69c39 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_packet_merge.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_packet_merge.vhd @@ -122,4 +122,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_split.vhd b/libraries/base/dp/src/vhdl/mms_dp_split.vhd index c1ddf3f2cd..26358026fd 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_split.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_split.vhd @@ -120,4 +120,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_sync_checker.vhd b/libraries/base/dp/src/vhdl/mms_dp_sync_checker.vhd index 36b60d5387..14a4faca1a 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_sync_checker.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_sync_checker.vhd @@ -143,5 +143,4 @@ begin out_new => open ); -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_sync_checker_arr.vhd b/libraries/base/dp/src/vhdl/mms_dp_sync_checker_arr.vhd index 7ce857589d..b16ca9183d 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_sync_checker_arr.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_sync_checker_arr.vhd @@ -123,5 +123,4 @@ begin end loop; end process; -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_throttle.vhd b/libraries/base/dp/src/vhdl/mms_dp_throttle.vhd index 857630f077..2da8ae77c4 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_throttle.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_throttle.vhd @@ -92,4 +92,4 @@ begin throttle => throttle ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/dp/src/vhdl/mms_dp_xonoff.vhd b/libraries/base/dp/src/vhdl/mms_dp_xonoff.vhd index 3515f37623..917227a89d 100644 --- a/libraries/base/dp/src/vhdl/mms_dp_xonoff.vhd +++ b/libraries/base/dp/src/vhdl/mms_dp_xonoff.vhd @@ -158,5 +158,4 @@ begin ); end generate; -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb2_dp_mux.vhd b/libraries/base/dp/tb/vhdl/tb2_dp_mux.vhd index 82ad52425c..7065cc7014 100644 --- a/libraries/base/dp/tb/vhdl/tb2_dp_mux.vhd +++ b/libraries/base/dp/tb/vhdl/tb2_dp_mux.vhd @@ -112,7 +112,7 @@ architecture tb of tb2_dp_mux is type t_ctrl_2arr is array (0 to c_nof_type -1, 0 to c_nof_input - 1) of std_logic; type t_data_2arr is array (0 to c_nof_type -1, 0 to c_nof_input - 1) of std_logic_vector(c_data_w - 1 downto 0); - type t_rl_vec_2arr is array (0 to c_nof_type -1, 0 to c_nof_input - 1) of std_logic_vector(0 TO c_rl); + type t_rl_vec_2arr is array (0 to c_nof_type -1, 0 to c_nof_input - 1) of std_logic_vector(0 to c_rl); signal tb_end_vec : std_logic_vector(c_nof_streams - 1 downto 0) := (others => '0'); signal tb_end : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb3_dp_demux.vhd b/libraries/base/dp/tb/vhdl/tb3_dp_demux.vhd index 4c98750413..264fece062 100644 --- a/libraries/base/dp/tb/vhdl/tb3_dp_demux.vhd +++ b/libraries/base/dp/tb/vhdl/tb3_dp_demux.vhd @@ -97,7 +97,7 @@ architecture tb of tb3_dp_demux is signal verify_done : std_logic := '0'; signal count_eop : natural := 0; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal prev_out_data : std_logic_vector(c_data_w - 1 downto 0) := to_svec(c_data_init -1, c_data_w); signal out_data : std_logic_vector(c_data_w - 1 downto 0); signal out_val : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb3_dp_mux.vhd b/libraries/base/dp/tb/vhdl/tb3_dp_mux.vhd index 69fe45e141..3b8b782d58 100644 --- a/libraries/base/dp/tb/vhdl/tb3_dp_mux.vhd +++ b/libraries/base/dp/tb/vhdl/tb3_dp_mux.vhd @@ -92,7 +92,7 @@ architecture tb of tb3_dp_mux is signal verify_done : std_logic := '0'; signal count_eop : natural := 0; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal prev_out_data : std_logic_vector(c_data_w - 1 downto 0) := to_svec(c_data_init -1, c_data_w); signal out_data : std_logic_vector(c_data_w - 1 downto 0); signal out_val : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_block_gen.vhd b/libraries/base/dp/tb/vhdl/tb_dp_block_gen.vhd index e58c331ffe..2670d0c3dc 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_block_gen.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_block_gen.vhd @@ -72,7 +72,7 @@ architecture tb of tb_dp_block_gen is signal out_siso : t_dp_siso := c_dp_siso_rdy; signal out_sosi : t_dp_sosi; signal prev_out_sosi : t_dp_sosi; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal out_gap : std_logic := '0'; signal hold_sop : std_logic := '0'; signal exp_size : natural := g_nof_data_per_block; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_bsn_align.vhd b/libraries/base/dp/tb/vhdl/tb_dp_bsn_align.vhd index 2bb90c68ee..d8a4df2ca7 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_bsn_align.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_bsn_align.vhd @@ -83,7 +83,7 @@ architecture tb of tb_dp_bsn_align is type t_bsn_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(c_bsn_w - 1 downto 0); type t_err_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(c_dp_stream_error_w - 1 downto 0); type t_channel_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(c_dp_stream_channel_w - 1 downto 0); - type t_rl_vec_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(0 TO c_rl); + type t_rl_vec_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(0 to c_rl); type t_tb_state is (s_idle, s_bsn_mis_aligned, s_bsn_aligned, s_small_bsn_diff, s_large_bsn_diff, s_restore_bsn, s_disable_one_input, s_enable_inputs); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor.vhd b/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor.vhd index ddaa5f01f9..be3300b52a 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor.vhd @@ -98,7 +98,7 @@ architecture tb of tb_dp_bsn_monitor is signal verify_done : std_logic := '0'; signal count_eop : natural := 0; - signal prev_in_ready : std_logic_vector(0 TO c_rl); + signal prev_in_ready : std_logic_vector(0 to c_rl); signal prev_in_data : std_logic_vector(c_data_w - 1 downto 0) := to_svec(c_data_init -1, c_data_w); signal in_bsn : std_logic_vector(c_word_w - 1 downto 0); signal in_data : std_logic_vector(c_data_w - 1 downto 0); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor_v2.vhd b/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor_v2.vhd index 3bd15ef4ae..03faa63c77 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor_v2.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_bsn_monitor_v2.vhd @@ -100,7 +100,7 @@ architecture tb of tb_dp_bsn_monitor_v2 is signal verify_done : std_logic := '0'; signal count_eop : natural := 0; - signal prev_in_ready : std_logic_vector(0 TO c_rl); + signal prev_in_ready : std_logic_vector(0 to c_rl); signal prev_in_data : std_logic_vector(c_data_w - 1 downto 0) := to_svec(c_data_init -1, c_data_w); signal in_bsn : std_logic_vector(c_word_w - 1 downto 0); signal in_data : std_logic_vector(c_data_w - 1 downto 0); @@ -262,7 +262,7 @@ begin ref_sync <= '0'; proc_common_wait_until_low(clk, rst); proc_common_wait_until_hi_lo(clk, in_sosi.sync); - proc_common_wait_some_cycles(clk, (c_sync_timeout - 2 -c_ref_sync_latency)); + proc_common_wait_some_cycles(clk, (c_sync_timeout - 2 - c_ref_sync_latency)); for I in 0 to c_nof_repeat - 2 loop ref_sync <= '1'; proc_common_wait_some_cycles(clk, 1); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_concat.vhd b/libraries/base/dp/tb/vhdl/tb_dp_concat.vhd index 509926ce5c..2f86c75003 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_concat.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_concat.vhd @@ -57,7 +57,7 @@ architecture tb of tb_dp_concat is signal random_1 : std_logic_vector(15 downto 0) := (others => '0'); signal random_2 : std_logic_vector(17 downto 0) := (others => '0'); - signal in_en : std_logic_vector(0 TO 1) := (others => '1'); + signal in_en : std_logic_vector(0 to 1) := (others => '1'); signal in_siso_arr : t_dp_siso_arr(0 to 1); signal in_sosi_arr : t_dp_sosi_arr(0 to 1) := (others => c_dp_sosi_rst); signal out_siso : t_dp_siso := c_dp_siso_rdy; @@ -79,7 +79,7 @@ architecture tb of tb_dp_concat is signal out_val : std_logic; signal out_sop : std_logic; signal out_eop : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal prev_out_data : std_logic_vector(g_data_w - 1 downto 0); signal expected_data : std_logic_vector(g_data_w - 1 downto 0); signal hold_out_sop : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_concat_field_blk.vhd b/libraries/base/dp/tb/vhdl/tb_dp_concat_field_blk.vhd index 52588b2667..7c49e9242f 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_concat_field_blk.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_concat_field_blk.vhd @@ -92,7 +92,7 @@ architecture tb of tb_dp_concat_field_blk is -- Tx offload ----------------------------------------------------------------------------- -- From apertif_udp_offload_pkg.vhd: - constant c_udp_offload_nof_hdr_fields : natural := 3 +12 + 4 + 3; -- 448b; 7 64b words + constant c_udp_offload_nof_hdr_fields : natural := 3 + 12 + 4 + 3; -- 448b; 7 64b words -- Notes: -- . pre-calculated ip_header_checksum is valid only for UNB0, FN0 targeting IP 10.10.10.10 -- . udp_total_length = 176 beamlets * 64b / 8b = 1408B + 14 DP bytes + 8 UDP bytes = 1430B @@ -122,7 +122,7 @@ architecture tb of tb_dp_concat_field_blk is -- From apertif_unb1_fn_beamformer_udp_offload.vhd: -- Override ('1') only the Ethernet fields so we can use MM defaults there. - constant c_hdr_field_ovr_init : std_logic_vector(c_udp_offload_nof_hdr_fields - 1 downto 0) := "101" &"111111111111 " &"1111 " &"100 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_udp_offload_nof_hdr_fields - 1 downto 0) := "101" &"111111111111 " &"1111 " &"100 "; constant c_NODE_ID : std_logic_vector(7 downto 0) := to_uvec(0, 8); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_demux.vhd b/libraries/base/dp/tb/vhdl/tb_dp_demux.vhd index 8f216ab7e5..f5180cc043 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_demux.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_demux.vhd @@ -66,36 +66,36 @@ architecture tb of tb_dp_demux is constant c_random_w : natural := 19; - signal tb_end_vec : std_logic_vector(0 TO g_dut_nof_output - 1) := (others => '0'); + signal tb_end_vec : std_logic_vector(0 to g_dut_nof_output - 1) := (others => '0'); signal tb_end : std_logic := '0'; signal clk : std_logic := '0'; signal rst : std_logic; signal sync : std_logic; - signal sync_dly : std_logic_vector(0 TO g_dut_nof_output - 1); + signal sync_dly : std_logic_vector(0 to g_dut_nof_output - 1); signal lfsr1 : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal lfsr2 : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal cnt_dat : t_dp_data_arr(0 to g_dut_nof_output - 1); - signal cnt_val : std_logic_vector(0 TO g_dut_nof_output - 1); - signal cnt_en : std_logic_vector(0 TO g_dut_nof_output - 1); + signal cnt_val : std_logic_vector(0 to g_dut_nof_output - 1); + signal cnt_en : std_logic_vector(0 to g_dut_nof_output - 1); type t_dp_state_enum_arr is array (natural range <> ) of t_dp_state_enum; type t_tx_data_arr_arr is array (natural range <> ) of t_dp_data_arr( 0 to c_tx_latency + c_tx_void); - type t_tx_val_arr_arr is array (natural range <> ) of std_logic_vector(0 TO c_tx_latency + c_tx_void); + type t_tx_val_arr_arr is array (natural range <> ) of std_logic_vector(0 to c_tx_latency + c_tx_void); - type t_prev_out_ready_arr_arr is array (natural range <> ) of std_logic_vector(0 TO c_rx_latency); + type t_prev_out_ready_arr_arr is array (natural range <> ) of std_logic_vector(0 to c_rx_latency); signal tx_data : t_tx_data_arr_arr(0 to g_dut_nof_output - 1) := (others => (others => (others => '0'))); signal tx_val : t_tx_val_arr_arr( 0 to g_dut_nof_output - 1) := (others => (others => '0')); - signal in_ready : std_logic_vector(0 TO g_dut_nof_output - 1); + signal in_ready : std_logic_vector(0 to g_dut_nof_output - 1); signal in_data : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal in_empty : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal in_channel : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); - signal in_val : std_logic_vector(0 TO g_dut_nof_output - 1); - signal in_sop : std_logic_vector(0 TO g_dut_nof_output - 1); - signal in_eop : std_logic_vector(0 TO g_dut_nof_output - 1); + signal in_val : std_logic_vector(0 to g_dut_nof_output - 1); + signal in_sop : std_logic_vector(0 to g_dut_nof_output - 1); + signal in_eop : std_logic_vector(0 to g_dut_nof_output - 1); signal in_data_vec : std_logic_vector(g_dut_nof_output * c_dp_data_w - 1 downto 0) := (others => '0'); signal in_empty_vec : std_logic_vector(g_dut_nof_output * c_dp_data_w - 1 downto 0) := (others => '0'); @@ -116,22 +116,22 @@ architecture tb of tb_dp_demux is signal demux_eop : std_logic_vector(g_dut_nof_output - 1 downto 0); signal demux_ready : std_logic_vector(g_dut_nof_output - 1 downto 0); - signal out_ready : std_logic_vector( 0 TO g_dut_nof_output - 1); + signal out_ready : std_logic_vector( 0 to g_dut_nof_output - 1); signal prev_out_ready : t_prev_out_ready_arr_arr(0 to g_dut_nof_output - 1); signal out_data : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal out_empty : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal out_channel : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); - signal out_val : std_logic_vector(0 TO g_dut_nof_output - 1); - signal out_sop : std_logic_vector(0 TO g_dut_nof_output - 1); - signal out_eop : std_logic_vector(0 TO g_dut_nof_output - 1); - signal hold_out_sop : std_logic_vector(0 TO g_dut_nof_output - 1); + signal out_val : std_logic_vector(0 to g_dut_nof_output - 1); + signal out_sop : std_logic_vector(0 to g_dut_nof_output - 1); + signal out_eop : std_logic_vector(0 to g_dut_nof_output - 1); + signal hold_out_sop : std_logic_vector(0 to g_dut_nof_output - 1); signal prev_out_data : t_dp_data_arr(0 to g_dut_nof_output - 1) := (others => (others => '0')); signal state : t_dp_state_enum_arr(0 to g_dut_nof_output - 1); signal verify_en : std_logic; - signal verify_done : std_logic_vector(0 TO g_dut_nof_output - 1); + signal verify_done : std_logic_vector(0 to g_dut_nof_output - 1); signal exp_data : std_logic_vector(c_dp_data_w - 1 downto 0) := to_uvec(5000, c_dp_data_w); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_distribute.vhd b/libraries/base/dp/tb/vhdl/tb_dp_distribute.vhd index e91bf2fe0e..9137c6dbfe 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_distribute.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_distribute.vhd @@ -92,9 +92,9 @@ architecture tb of tb_dp_distribute is constant c_rx_use_fifo_link_channel_lo : boolean := not g_code_channel_lo; -- FALSE when the link_channel_lo is coded in the CHAN field of the DP packet data, else it needs to go in parallel through the Rx FIFO subtype t_data_arr is t_slv_16_arr(0 to g_nof_input - 1); -- width 16 must match c_data_w - type t_rl_vec_arr is array (0 to g_nof_input - 1) of std_logic_vector(0 TO c_rl); + type t_rl_vec_arr is array (0 to g_nof_input - 1) of std_logic_vector(0 to c_rl); - signal tb_end_vec : std_logic_vector(0 TO g_nof_input - 1) := (others => '0'); + signal tb_end_vec : std_logic_vector(0 to g_nof_input - 1) := (others => '0'); signal tb_end : std_logic; signal clk : std_logic := '1'; signal rst : std_logic := '1'; @@ -116,9 +116,9 @@ architecture tb of tb_dp_distribute is signal out_siso_arr : t_dp_siso_arr(0 to g_nof_input - 1); signal out_sosi_arr : t_dp_sosi_arr(0 to g_nof_input - 1); - signal verify_en : std_logic_vector(0 TO g_nof_input - 1) := (others => '0'); - signal verify_done : std_logic_vector(0 TO g_nof_input - 1) := (others => '0'); - signal verify_end : std_logic_vector(0 TO g_nof_input - 1) := (others => '0'); + signal verify_en : std_logic_vector(0 to g_nof_input - 1) := (others => '0'); + signal verify_done : std_logic_vector(0 to g_nof_input - 1) := (others => '0'); + signal verify_end : std_logic_vector(0 to g_nof_input - 1) := (others => '0'); signal count_eop : t_integer_arr(0 to g_nof_input - 1) := (others => 0); signal prev_count_eop : t_integer_arr(0 to g_nof_input - 1) := (others => 0); @@ -126,11 +126,11 @@ architecture tb of tb_dp_distribute is signal prev_out_data : t_data_arr := array_init(c_data_init -1, g_nof_input, g_data_init_offset); signal out_bsn : t_data_arr; signal out_data : t_data_arr; - signal out_sync : std_logic_vector(0 TO g_nof_input - 1); - signal out_val : std_logic_vector(0 TO g_nof_input - 1); - signal out_sop : std_logic_vector(0 TO g_nof_input - 1); - signal out_eop : std_logic_vector(0 TO g_nof_input - 1); - signal hold_out_sop : std_logic_vector(0 TO g_nof_input - 1); + signal out_sync : std_logic_vector(0 to g_nof_input - 1); + signal out_val : std_logic_vector(0 to g_nof_input - 1); + signal out_sop : std_logic_vector(0 to g_nof_input - 1); + signal out_eop : std_logic_vector(0 to g_nof_input - 1); + signal hold_out_sop : std_logic_vector(0 to g_nof_input - 1); signal expected_out_data : t_data_arr; begin diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc.vhd index cca72dc705..7a7ec5409c 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc.vhd @@ -81,7 +81,7 @@ architecture tb of tb_dp_fifo_dc is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -99,7 +99,7 @@ architecture tb of tb_dp_fifo_dc is signal out_sosi : t_dp_sosi; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_bsn : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_arr.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_arr.vhd index 38e6f61b82..085385952f 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_arr.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_arr.vhd @@ -88,7 +88,7 @@ architecture tb of tb_dp_fifo_dc_arr is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -107,7 +107,7 @@ architecture tb of tb_dp_fifo_dc_arr is signal out_sosi_arr : t_dp_sosi_arr(g_dut_nof_streams - 1 downto 0); signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_bsn : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_mixed_widths.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_mixed_widths.vhd index b1dc3ae01b..7769cca6d0 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_mixed_widths.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_dc_mixed_widths.vhd @@ -90,12 +90,12 @@ architecture tb of tb_dp_fifo_dc_mixed_widths is signal verify_out_en : std_logic := '0'; signal verify_done : std_logic; - signal prev_wide_ready : std_logic_vector(0 TO c_rl); + signal prev_wide_ready : std_logic_vector(0 to c_rl); signal wide_data : std_logic_vector(c_wide_w - 1 downto 0); signal prev_wide_data : std_logic_vector(c_wide_w - 1 downto 0); signal wide_gap : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal out_data : std_logic_vector(g_narrow_w - 1 downto 0); signal prev_out_data : std_logic_vector(g_narrow_w - 1 downto 0) := to_svec(-1, g_narrow_w); signal out_gap : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill.vhd index 72d204118f..e182d71de0 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill.vhd @@ -94,7 +94,7 @@ architecture tb of tb_dp_fifo_fill is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -113,7 +113,7 @@ architecture tb of tb_dp_fifo_fill is signal out_sosi : t_dp_sosi; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_bsn : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_eop.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_eop.vhd index 3d2a2b566d..99ce07696e 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_eop.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_eop.vhd @@ -104,7 +104,7 @@ architecture tb of tb_dp_fifo_fill_eop is signal cnt_en : std_logic := '1'; -- default always active input control. signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -125,7 +125,7 @@ architecture tb of tb_dp_fifo_fill_eop is signal out_sosi : t_dp_sosi; signal out_ready : std_logic := '1'; -- default always active output flow control. - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_bsn : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_sc.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_sc.vhd index ad02de6b6f..e781ea0ff7 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_sc.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_fill_sc.vhd @@ -97,7 +97,7 @@ architecture tb of tb_dp_fifo_fill_sc is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -118,7 +118,7 @@ architecture tb of tb_dp_fifo_fill_sc is signal out_sosi : t_dp_sosi; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_bsn : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_info.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_info.vhd index 49eb627fa8..ba8cb07ef9 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_info.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_info.vhd @@ -97,7 +97,7 @@ architecture tb of tb_dp_fifo_info is signal fifo_usedw : std_logic_vector(ceil_log2(g_info_fifo_size) - 1 downto 0); signal fifo_rd_emp : std_logic; - signal prev_verify_snk_out_ready : std_logic_vector(0 TO c_rl); + signal prev_verify_snk_out_ready : std_logic_vector(0 to c_rl); signal verify_snk_out : t_dp_siso := c_dp_siso_rdy; signal verify_snk_in : t_dp_sosi; signal prev_verify_snk_in : t_dp_sosi; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_fifo_sc.vhd b/libraries/base/dp/tb/vhdl/tb_dp_fifo_sc.vhd index f0c3da6869..8c0da8f37e 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_fifo_sc.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_fifo_sc.vhd @@ -80,7 +80,7 @@ architecture tb of tb_dp_fifo_sc is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -98,7 +98,7 @@ architecture tb of tb_dp_fifo_sc is signal out_sosi : t_dp_sosi; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_bsn : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_flush.vhd b/libraries/base/dp/tb/vhdl/tb_dp_flush.vhd index 96927bcde9..91f7d7ed02 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_flush.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_flush.vhd @@ -100,7 +100,7 @@ architecture tb of tb_dp_flush is signal reg_m : t_mon := ('x', 'x', 'x', 'x', 'x', 'x', '0', 'x', 'x', 'x', 'x', 'x', 'x', '1'); signal flush_en : std_logic := '0'; - signal flush_en_dly : std_logic_vector(0 TO g_rl); + signal flush_en_dly : std_logic_vector(0 to g_rl); signal reg_mode_flush_en_streaming : std_logic; signal reg_mode_flush_en_framed : std_logic := '0'; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_folder.vhd b/libraries/base/dp/tb/vhdl/tb_dp_folder.vhd index 659c28dece..386cc0f99b 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_folder.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_folder.vhd @@ -125,4 +125,4 @@ begin src_out_arr => dp_folder_src_out_arr ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_dp_frame_rd.vhd b/libraries/base/dp/tb/vhdl/tb_dp_frame_rd.vhd index a9db573e7f..414e0ed1fb 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_frame_rd.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_frame_rd.vhd @@ -48,7 +48,7 @@ architecture tb of tb_dp_frame_rd is constant c_data_w : natural := 16; constant c_fifo_nof_words : natural := 1024; - constant c_fifo_dat_w : natural := 1 +1 + c_data_w; -- = 1+1+32=34 + constant c_fifo_dat_w : natural := 1 + 1 + c_data_w; -- = 1+1+32=34 constant c_throttle_num : natural := 1; -- numerator <= g_throttle_den constant c_throttle_den : natural := 4; -- denominator (use 1 for full speed, i.e no output throttling) --CONSTANT c_throttle_sof : BOOLEAN := TRUE; -- when false immediately do request next data after sof diff --git a/libraries/base/dp/tb/vhdl/tb_dp_frame_scheduler.vhd b/libraries/base/dp/tb/vhdl/tb_dp_frame_scheduler.vhd index e689c9267d..0287123494 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_frame_scheduler.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_frame_scheduler.vhd @@ -396,8 +396,8 @@ begin mark_out_data_x_0 <= mark_out_fsn_x_hld_d and lane_tx_val; mark_out_data_b_0 <= mark_out_fsn_b_hld_d and lane_tx_val; - mark_out_eof_x <= '1' when unsigned(lane_tx_dat) = c_packet_size_x - 1 -3 and mark_out_data_x='1' and lane_tx_val='1' else '0'; -- data 0..n-1 -3 to account for: idle, sfd, fsn - mark_out_eof_b <= '1' when unsigned(lane_tx_dat) = c_packet_size_b - 1 -3 and mark_out_data_b='1' and lane_tx_val='1' else '0'; -- data 0..n-1 -3 to account for: idle, sfd, fsn + mark_out_eof_x <= '1' when unsigned(lane_tx_dat) = c_packet_size_x - 1 - 3 and mark_out_data_x = '1' and lane_tx_val = '1' else '0'; -- data 0..n-1 -3 to account for: idle, sfd, fsn + mark_out_eof_b <= '1' when unsigned(lane_tx_dat) = c_packet_size_b - 1 - 3 and mark_out_data_b = '1' and lane_tx_val = '1' else '0'; -- data 0..n-1 -3 to account for: idle, sfd, fsn mark_out_eof <= mark_out_eof_x or mark_out_eof_b; mark_out_eof_x_d <= mark_out_eof_x when rising_edge(clk); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_hdr_insert_remove.vhd b/libraries/base/dp/tb/vhdl/tb_dp_hdr_insert_remove.vhd index 713d0418cc..1de95e7d8b 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_hdr_insert_remove.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_hdr_insert_remove.vhd @@ -82,7 +82,7 @@ architecture tb of tb_dp_hdr_insert_remove is signal verify_en : std_logic := '0'; signal verify_done : std_logic := '0'; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal prev_out_data : std_logic_vector(g_data_w - 1 downto 0); signal prev_out_bsn : std_logic_vector(c_bsn_w - 1 downto 0) := (others => '1'); -- = -1 signal prev_out_channel : std_logic_vector(c_dp_stream_channel_w - 1 downto 0) := to_svec(c_channel_init -1, c_dp_stream_channel_w); @@ -189,7 +189,7 @@ begin proc_common_wait_some_cycles(mm_clk, 5); proc_mem_mm_bus_wr(0, c_ram_header_start, mm_clk, ram_hdr_mosi); - for i in 0 to c_hdr_nof_mm_words - 2 -1 loop + for i in 0 to c_hdr_nof_mm_words - 2 - 1 loop proc_mem_mm_bus_wr(1 + i, i, mm_clk, ram_hdr_mosi); end loop; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_latency_adapter.vhd b/libraries/base/dp/tb/vhdl/tb_dp_latency_adapter.vhd index 8189445a42..ff69a25624 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_latency_adapter.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_latency_adapter.vhd @@ -87,7 +87,7 @@ architecture tb of tb_dp_latency_adapter is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0); @@ -110,7 +110,7 @@ architecture tb of tb_dp_latency_adapter is signal dut_sosi : t_dp_sosi_arr(-1 to c_nof_dut - 1) := (others => c_dp_sosi_rst); signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_empty : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_channel : std_logic_vector(c_dp_data_w - 1 downto 0); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_latency_fifo.vhd b/libraries/base/dp/tb/vhdl/tb_dp_latency_fifo.vhd index cae5c3e805..875a08ce2f 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_latency_fifo.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_latency_fifo.vhd @@ -86,7 +86,7 @@ architecture tb of tb_dp_latency_fifo is signal verify_en : std_logic := '0'; signal verify_done : std_logic := '0'; - signal prev_out_ready : std_logic_vector(0 TO g_output_rl); + signal prev_out_ready : std_logic_vector(0 to g_output_rl); signal prev_out_data : std_logic_vector(c_data_w - 1 downto 0); signal expected_out_data : std_logic_vector(c_data_w - 1 downto 0); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_mux.vhd b/libraries/base/dp/tb/vhdl/tb_dp_mux.vhd index 47f136033b..9db77e91c4 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_mux.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_mux.vhd @@ -76,39 +76,39 @@ architecture tb of tb_dp_mux is constant c_random_w : natural := 19; - signal tb_end_vec : std_logic_vector(0 TO g_dut_nof_input - 1) := (others => '0'); + signal tb_end_vec : std_logic_vector(0 to g_dut_nof_input - 1) := (others => '0'); signal tb_end : std_logic := '0'; signal clk : std_logic := '0'; signal rst : std_logic; signal sync : std_logic; - signal sync_dly : std_logic_vector(0 TO g_dut_nof_input - 1); + signal sync_dly : std_logic_vector(0 to g_dut_nof_input - 1); signal lfsr1 : std_logic_vector(c_random_w - 1 downto 0) := (others => '0'); signal lfsr2 : std_logic_vector(c_random_w downto 0) := (others => '0'); signal cnt_dat : t_dp_data_arr(0 to g_dut_nof_input - 1); - signal cnt_val : std_logic_vector(0 TO g_dut_nof_input - 1); - signal cnt_en : std_logic_vector(0 TO g_dut_nof_input - 1); + signal cnt_val : std_logic_vector(0 to g_dut_nof_input - 1); + signal cnt_en : std_logic_vector(0 to g_dut_nof_input - 1); type t_dp_state_enum_arr is array (natural range <> ) of t_dp_state_enum; type t_tx_data_arr_arr is array (natural range <> ) of t_dp_data_arr( 0 to c_tx_latency + c_tx_void); - type t_tx_val_arr_arr is array (natural range <> ) of std_logic_vector(0 TO c_tx_latency + c_tx_void); + type t_tx_val_arr_arr is array (natural range <> ) of std_logic_vector(0 to c_tx_latency + c_tx_void); - type t_prev_out_ready_arr_arr is array (natural range <> ) of std_logic_vector(0 TO c_rx_latency); + type t_prev_out_ready_arr_arr is array (natural range <> ) of std_logic_vector(0 to c_rx_latency); signal tx_data : t_tx_data_arr_arr(0 to g_dut_nof_input - 1) := (others => (others => (others => '0'))); signal tx_val : t_tx_val_arr_arr( 0 to g_dut_nof_input - 1) := (others => (others => '0')); signal sel_ctrl : natural range 0 to g_dut_nof_input - 1 := 0; -- used by g_mode = 2, 3 - signal in_ready : std_logic_vector(0 TO g_dut_nof_input - 1); + signal in_ready : std_logic_vector(0 to g_dut_nof_input - 1); signal in_data : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); signal in_empty : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); signal in_channel : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); - signal in_sync : std_logic_vector(0 TO g_dut_nof_input - 1); - signal in_val : std_logic_vector(0 TO g_dut_nof_input - 1); - signal in_sop : std_logic_vector(0 TO g_dut_nof_input - 1); - signal in_eop : std_logic_vector(0 TO g_dut_nof_input - 1); + signal in_sync : std_logic_vector(0 to g_dut_nof_input - 1); + signal in_val : std_logic_vector(0 to g_dut_nof_input - 1); + signal in_sop : std_logic_vector(0 to g_dut_nof_input - 1); + signal in_eop : std_logic_vector(0 to g_dut_nof_input - 1); signal in_data_vec : std_logic_vector(g_dut_nof_input * c_dp_data_w - 1 downto 0) := (others => '0'); signal in_empty_vec : std_logic_vector(g_dut_nof_input * c_dp_data_w - 1 downto 0) := (others => '0'); @@ -128,23 +128,23 @@ architecture tb of tb_dp_mux is signal mux_eop : std_logic; signal mux_ready : std_logic; - signal out_ready : std_logic_vector( 0 TO g_dut_nof_input - 1); + signal out_ready : std_logic_vector( 0 to g_dut_nof_input - 1); signal prev_out_ready : t_prev_out_ready_arr_arr(0 to g_dut_nof_input - 1); signal out_data : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); signal out_empty : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); signal out_channel : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); - signal out_sync : std_logic_vector(0 TO g_dut_nof_input - 1); - signal out_val : std_logic_vector(0 TO g_dut_nof_input - 1); - signal out_sop : std_logic_vector(0 TO g_dut_nof_input - 1); - signal out_eop : std_logic_vector(0 TO g_dut_nof_input - 1); - signal hold_out_sop : std_logic_vector(0 TO g_dut_nof_input - 1); + signal out_sync : std_logic_vector(0 to g_dut_nof_input - 1); + signal out_val : std_logic_vector(0 to g_dut_nof_input - 1); + signal out_sop : std_logic_vector(0 to g_dut_nof_input - 1); + signal out_eop : std_logic_vector(0 to g_dut_nof_input - 1); + signal hold_out_sop : std_logic_vector(0 to g_dut_nof_input - 1); signal prev_out_data : t_dp_data_arr(0 to g_dut_nof_input - 1) := (others => (others => '0')); signal state : t_dp_state_enum_arr(0 to g_dut_nof_input - 1); signal verify_en : std_logic; - signal verify_done : std_logic_vector(0 TO g_dut_nof_input - 1); + signal verify_done : std_logic_vector(0 to g_dut_nof_input - 1); signal exp_data : std_logic_vector(c_dp_data_w - 1 downto 0) := to_uvec(1000, c_dp_data_w); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_offload_rx_filter.vhd b/libraries/base/dp/tb/vhdl/tb_dp_offload_rx_filter.vhd index 92e4905070..a3d95d725f 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_offload_rx_filter.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_offload_rx_filter.vhd @@ -68,7 +68,7 @@ architecture tb of tb_dp_offload_rx_filter is constant c_nof_packets : natural := 5; - constant c_nof_hdr_fields : natural := 3 +12 + 4 + 9 + 1; + constant c_nof_hdr_fields : natural := 3 + 12 + 4 + 9 + 1; constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_type" ), " ", 16, field_default(x"0800") ), diff --git a/libraries/base/dp/tb/vhdl/tb_dp_offload_tx_v3.vhd b/libraries/base/dp/tb/vhdl/tb_dp_offload_tx_v3.vhd index a3aaa49218..5171574591 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_offload_tx_v3.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_offload_tx_v3.vhd @@ -129,7 +129,7 @@ architecture tb of tb_dp_offload_tx_v3 is -- Tx offload ----------------------------------------------------------------------------- -- From apertif_udp_offload_pkg.vhd: - constant c_udp_offload_nof_hdr_fields : natural := 3 +12 + 4 +3; -- 22, 448b; 7 64b words + constant c_udp_offload_nof_hdr_fields : natural := 3 + 12 + 4 +3; -- 22, 448b; 7 64b words constant c_udp_offload_nof_hdr_words_default : natural := 26; -- 23 single word + 3 double word = 26 32b words constant c_udp_offload_nof_hdr_words_shortened : natural := c_udp_offload_nof_hdr_words_default - 1; constant c_udp_offload_nof_hdr_words : natural := sel_a_b(c_use_shortened_header, c_udp_offload_nof_hdr_words_shortened, c_udp_offload_nof_hdr_words_default); @@ -276,7 +276,7 @@ architecture tb of tb_dp_offload_tx_v3 is -- From apertif_unb1_fn_beamformer_udp_offload.vhd: 221 111111111000 0000 000 -- Override ('1') only the Ethernet fields so we can use MM defaults there. 109 876543210987 6543 210 - constant c_hdr_field_ovr_init : std_logic_vector(c_udp_offload_nof_hdr_fields - 1 downto 0) := "101" &"111111111111 " &"1111 " &"100 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_udp_offload_nof_hdr_fields - 1 downto 0) := "101" &"111111111111 " &"1111 " &"100 "; constant c_NODE_ID : std_logic_vector(7 downto 0) := to_uvec(0, 8); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_packet.vhd b/libraries/base/dp/tb/vhdl/tb_dp_packet.vhd index 066b8002a1..71714d44a0 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_packet.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_packet.vhd @@ -96,7 +96,7 @@ architecture tb of tb_dp_packet is signal enc_siso : t_dp_siso := c_dp_siso_rdy; signal enc_sosi : t_dp_sosi; - signal prev_pkt_ready : std_logic_vector(0 TO c_rl); + signal prev_pkt_ready : std_logic_vector(0 to c_rl); signal pkt_siso : t_dp_siso := c_dp_siso_rdy; signal pkt_sosi : t_dp_sosi; signal pkt_data : std_logic_vector(g_data_w - 1 downto 0); @@ -105,7 +105,7 @@ architecture tb of tb_dp_packet is signal pkt_eop : std_logic; signal pkt_sync : std_logic; - signal prev_rx_ready : std_logic_vector(0 TO c_rl); + signal prev_rx_ready : std_logic_vector(0 to c_rl); signal rx_siso : t_dp_siso := c_dp_siso_rdy; signal rx_sosi : t_dp_sosi; signal prev_rx_data : std_logic_vector(g_data_w - 1 downto 0) := to_svec(c_data_init -1, g_data_w); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_pad_insert_remove.vhd b/libraries/base/dp/tb/vhdl/tb_dp_pad_insert_remove.vhd index 66bf5d8637..0775b5c2a1 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_pad_insert_remove.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_pad_insert_remove.vhd @@ -82,7 +82,7 @@ architecture tb of tb_dp_pad_insert_remove is signal verify_en : std_logic := '0'; signal verify_done : std_logic := '0'; - signal prev_out_ready : std_logic_vector(0 TO c_rl); + signal prev_out_ready : std_logic_vector(0 to c_rl); signal prev_out_data : std_logic_vector(g_data_w - 1 downto 0); signal prev_out_bsn : std_logic_vector(c_bsn_w - 1 downto 0) := (others => '1'); -- = -1 signal prev_out_channel : std_logic_vector(c_dp_stream_channel_w - 1 downto 0) := to_svec(c_channel_init -1, c_dp_stream_channel_w); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_pipeline.vhd b/libraries/base/dp/tb/vhdl/tb_dp_pipeline.vhd index a34859f939..d9ec0cb8c1 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_pipeline.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_pipeline.vhd @@ -65,7 +65,7 @@ architecture tb of tb_dp_pipeline is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -80,7 +80,7 @@ architecture tb of tb_dp_pipeline is signal out_sosi : t_dp_sosi; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_sync : std_logic; signal out_val : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_pipeline_ready.vhd b/libraries/base/dp/tb/vhdl/tb_dp_pipeline_ready.vhd index 76cd02df87..51beb322ce 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_pipeline_ready.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_pipeline_ready.vhd @@ -84,7 +84,7 @@ architecture tb of tb_dp_pipeline_ready is signal verify_done : std_logic := '0'; signal count_eop : natural := 0; - signal prev_out_ready : std_logic_vector(0 TO g_out_latency); + signal prev_out_ready : std_logic_vector(0 to g_out_latency); signal prev_out_data : std_logic_vector(c_data_w - 1 downto 0) := to_svec(c_data_init -1, c_data_w); signal out_bsn : std_logic_vector(c_data_w - 1 downto 0); signal out_data : std_logic_vector(c_data_w - 1 downto 0); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_pkg.vhd b/libraries/base/dp/tb/vhdl/tb_dp_pkg.vhd index 3249061ac5..ff3008fe9c 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_pkg.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_pkg.vhd @@ -2165,19 +2165,19 @@ package body tb_dp_pkg is begin if rising_edge(clk) then if verify_en = '1' then - if c_str ="bsn " then + if c_str ="bsn " then if unsigned(c_exp_data(c_dp_bsn_w - 1 downto 0)) /= unsigned(res_data(c_dp_bsn_w - 1 downto 0)) then report "DP : Wrong sosi.bsn value" severity ERROR; end if; - elsif c_str ="empty " then + elsif c_str ="empty " then if unsigned(c_exp_data(c_dp_empty_w - 1 downto 0)) /= unsigned(res_data(c_dp_empty_w - 1 downto 0)) then report "DP : Wrong sosi.empty value" severity ERROR; end if; - elsif c_str ="channel " then + elsif c_str ="channel " then if unsigned(c_exp_data(c_dp_channel_user_w - 1 downto 0)) /= unsigned(res_data(c_dp_channel_user_w - 1 downto 0)) then report "DP : Wrong sosi.channel value" severity ERROR; end if; - elsif c_str ="error " then + elsif c_str ="error " then if unsigned(c_exp_data(c_dp_error_w - 1 downto 0)) /= unsigned(res_data(c_dp_error_w - 1 downto 0)) then report "DP : Wrong sosi.error value" severity ERROR; end if; @@ -2204,51 +2204,51 @@ package body tb_dp_pkg is if rising_edge(clk) then if verify_en = '1' then -- sosi ctrl fields - if c_str ="sync " then + if c_str ="sync " then if dut_sosi.sync /= exp_sosi.sync then report "DP : Wrong dut_sosi.sync (" & sl_to_str(dut_sosi.sync) & " /= " & sl_to_str(exp_sosi.sync) & ")" severity ERROR; end if; - elsif c_str ="sop " then + elsif c_str ="sop " then if dut_sosi.sop /= exp_sosi.sop then report "DP : Wrong dut_sosi.sop (" & sl_to_str(dut_sosi.sop) & " /= " & sl_to_str(exp_sosi.sop) & ")" severity ERROR; end if; - elsif c_str ="eop " then + elsif c_str ="eop " then if dut_sosi.eop /= exp_sosi.eop then report "DP : Wrong dut_sosi.eop (" & sl_to_str(dut_sosi.eop) & " /= " & sl_to_str(exp_sosi.eop) & ")" severity ERROR; end if; - elsif c_str ="valid " then + elsif c_str ="valid " then if dut_sosi.valid /= exp_sosi.valid then report "DP : Wrong dut_sosi.valid (" & sl_to_str(dut_sosi.valid) & " /= " & sl_to_str(exp_sosi.valid) & ")" severity ERROR; end if; -- sosi info fields - elsif c_str ="bsn " then + elsif c_str ="bsn " then if dut_sosi.bsn /= exp_sosi.bsn then report "DP : Wrong dut_sosi.bsn (" & int_to_str(dut_sosi.bsn) & " /= " & int_to_str(exp_sosi.bsn) & ")" severity ERROR; end if; - elsif c_str ="empty " then + elsif c_str ="empty " then if dut_sosi.empty /= exp_sosi.empty then report "DP : Wrong dut_sosi.empty (" & int_to_str(dut_sosi.empty) & " /= " & int_to_str(exp_sosi.empty) & ")" severity ERROR; end if; - elsif c_str ="channel " then + elsif c_str ="channel " then if dut_sosi.channel /= exp_sosi.channel then report "DP : Wrong dut_sosi.channel (" & int_to_str(dut_sosi.channel) & " /= " & int_to_str(exp_sosi.channel) & ")" severity ERROR; end if; - elsif c_str ="err " then + elsif c_str ="err " then if dut_sosi.err /= exp_sosi.err then report "DP : Wrong dut_sosi.err (" & int_to_str(dut_sosi.err) & " /= " & int_to_str(exp_sosi.err) & ")" severity ERROR; end if; -- sosi data fields - elsif c_str ="data " then + elsif c_str ="data " then if dut_sosi.data /= exp_sosi.data then report "DP : Wrong dut_sosi.data (" & int_to_str(dut_sosi.data) & " /= " & int_to_str(exp_sosi.data) & ")" severity ERROR; end if; - elsif c_str ="re " then + elsif c_str ="re " then if dut_sosi.re /= exp_sosi.re then report "DP : Wrong dut_sosi.re (" & int_to_str(dut_sosi.re) & " /= " & int_to_str(exp_sosi.re) & ")" severity ERROR; end if; - elsif c_str ="im " then + elsif c_str ="im " then if dut_sosi.im /= exp_sosi.im then report "DP : Wrong dut_sosi.im (" & int_to_str(dut_sosi.im) & " /= " & int_to_str(exp_sosi.im) & ")" & ")" severity ERROR; end if; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_selector_arr.vhd b/libraries/base/dp/tb/vhdl/tb_dp_selector_arr.vhd index fc898090dc..59b4074b49 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_selector_arr.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_selector_arr.vhd @@ -243,4 +243,4 @@ begin wait; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_dp_shiftram.vhd b/libraries/base/dp/tb/vhdl/tb_dp_shiftram.vhd index 38b9a8edd0..62e4570943 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_shiftram.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_shiftram.vhd @@ -214,4 +214,4 @@ begin src_out_arr => out_sosi_arr ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_dp_shiftreg.vhd b/libraries/base/dp/tb/vhdl/tb_dp_shiftreg.vhd index 8153137ba9..036cf39858 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_shiftreg.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_shiftreg.vhd @@ -66,7 +66,7 @@ architecture tb of tb_dp_shiftreg is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -82,7 +82,7 @@ architecture tb of tb_dp_shiftreg is signal out_sosi : t_dp_sosi; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_val : std_logic; signal out_sop : std_logic; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_split.vhd b/libraries/base/dp/tb/vhdl/tb_dp_split.vhd index c29fbf49e3..be90bb7ffa 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_split.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_split.vhd @@ -74,8 +74,8 @@ architecture tb of tb_dp_split is signal verify_en_1 : std_logic := '0'; signal verify_done : std_logic; - signal prev_out_ready_0 : std_logic_vector(0 TO c_rl); - signal prev_out_ready_1 : std_logic_vector(0 TO c_rl); + signal prev_out_ready_0 : std_logic_vector(0 to c_rl); + signal prev_out_ready_1 : std_logic_vector(0 to c_rl); signal out_data_0 : std_logic_vector(g_data_w - 1 downto 0); signal out_data_1 : std_logic_vector(g_data_w - 1 downto 0); signal prev_out_data_0 : std_logic_vector(g_data_w - 1 downto 0); diff --git a/libraries/base/dp/tb/vhdl/tb_dp_switch.vhd b/libraries/base/dp/tb/vhdl/tb_dp_switch.vhd index 3f7f472017..92d42c34ae 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_switch.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_switch.vhd @@ -186,4 +186,4 @@ begin reg_miso => reg_dp_switch_miso ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_dp_sync_checker.vhd b/libraries/base/dp/tb/vhdl/tb_dp_sync_checker.vhd index 5eb5c81bae..6fda3e75a8 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_sync_checker.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_sync_checker.vhd @@ -285,5 +285,4 @@ begin verify_snk_in_data <= verify_snk_in.data when verify_snk_in.valid = '1'; -end tb; - +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_dp_sync_insert.vhd b/libraries/base/dp/tb/vhdl/tb_dp_sync_insert.vhd index 314888cdfb..4e1e08fb70 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_sync_insert.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_sync_insert.vhd @@ -68,7 +68,7 @@ architecture tb of tb_dp_sync_insert is signal out_sosi : t_dp_sosi; -- Verification - signal dly_valid_arr : std_logic_vector(0 TO c_dut_latency) := (others => '0'); + signal dly_valid_arr : std_logic_vector(0 to c_dut_latency) := (others => '0'); signal out_hold_sop : std_logic := '0'; signal exp_size : natural := g_nof_data_per_block; signal cnt_size : natural; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_sync_insert_v2.vhd b/libraries/base/dp/tb/vhdl/tb_dp_sync_insert_v2.vhd index 40d4ec52d9..2af84a3249 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_sync_insert_v2.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_sync_insert_v2.vhd @@ -82,7 +82,7 @@ architecture tb of tb_dp_sync_insert_v2 is signal reg_miso : t_mem_miso := c_mem_miso_rst; -- Verification - signal dly_valid_arr : std_logic_vector(0 TO c_dut_latency) := (others => '0'); + signal dly_valid_arr : std_logic_vector(0 to c_dut_latency) := (others => '0'); signal dly_ref_sosi_arr : t_dp_sosi_arr(0 to c_dut_latency) := (others => c_dp_sosi_rst); signal exp_sync : std_logic := '0'; signal out_hold_sop : std_logic := '0'; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_sync_recover.vhd b/libraries/base/dp/tb/vhdl/tb_dp_sync_recover.vhd index c87d8ffb79..adee78fa46 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_sync_recover.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_sync_recover.vhd @@ -73,7 +73,7 @@ architecture tb of tb_dp_sync_recover is signal restart : std_logic := '0'; -- Verification - signal dly_valid_arr : std_logic_vector(0 TO g_dut_latency) := (others => '0'); + signal dly_valid_arr : std_logic_vector(0 to g_dut_latency) := (others => '0'); signal dly_ref_sosi_arr : t_dp_sosi_arr(0 to g_dut_latency) := (others => c_dp_sosi_rst); signal exp_sync : std_logic := '0'; signal out_hold_sop : std_logic := '0'; diff --git a/libraries/base/dp/tb/vhdl/tb_dp_tail_remove.vhd b/libraries/base/dp/tb/vhdl/tb_dp_tail_remove.vhd index 878797e08f..32f0e05121 100644 --- a/libraries/base/dp/tb/vhdl/tb_dp_tail_remove.vhd +++ b/libraries/base/dp/tb/vhdl/tb_dp_tail_remove.vhd @@ -49,7 +49,7 @@ architecture tb of tb_dp_tail_remove is signal rst : std_logic; signal clk : std_logic := '0'; - signal in_en : std_logic_vector(0 TO 1) := (others => '1'); + signal in_en : std_logic_vector(0 to 1) := (others => '1'); signal in_siso_arr : t_dp_siso_arr(0 to 1) := (others => c_dp_siso_rdy); signal in_sosi_arr : t_dp_sosi_arr(0 to 1) := (others => c_dp_sosi_rst); diff --git a/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_align.vhd b/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_align.vhd index b9047aab44..1c5db527f9 100644 --- a/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_align.vhd +++ b/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_align.vhd @@ -86,7 +86,7 @@ architecture tb of tb_mms_dp_bsn_align is type t_bsn_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(c_bsn_w - 1 downto 0); type t_err_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(c_dp_stream_error_w - 1 downto 0); type t_channel_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(c_dp_stream_channel_w - 1 downto 0); - type t_rl_vec_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(0 TO c_rl); + type t_rl_vec_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(0 to c_rl); type t_tb_state is (s_idle, s_bsn_mis_aligned, s_bsn_aligned, s_small_bsn_diff, s_large_bsn_diff, s_restore_bsn, s_disable_one_input, s_enable_inputs); diff --git a/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source.vhd b/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source.vhd index 62ca04106e..202297eeb0 100644 --- a/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source.vhd +++ b/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source.vhd @@ -180,4 +180,4 @@ begin bs_sosi => bs_sosi ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source_v2.vhd b/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source_v2.vhd index 988ddf8a10..c5106f6ec8 100644 --- a/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source_v2.vhd +++ b/libraries/base/dp/tb/vhdl/tb_mms_dp_bsn_source_v2.vhd @@ -205,4 +205,4 @@ begin bs_sosi => bs_sosi ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_mms_dp_gain_arr.vhd b/libraries/base/dp/tb/vhdl/tb_mms_dp_gain_arr.vhd index 253158a442..598a8cf548 100644 --- a/libraries/base/dp/tb/vhdl/tb_mms_dp_gain_arr.vhd +++ b/libraries/base/dp/tb/vhdl/tb_mms_dp_gain_arr.vhd @@ -152,7 +152,7 @@ begin gain_re_arr(I) <= v_gain_re; proc_mem_mm_bus_wr(I, v_gain_re, mm_clk, reg_gain_re_miso, reg_gain_re_mosi); if g_complex_gain = TRUE then - v_gain_im := 2 ** (g_nof_streams - 1 -I); + v_gain_im := 2 ** (g_nof_streams - 1 - I); gain_im_arr(I) <= v_gain_im; proc_mem_mm_bus_wr(I, v_gain_im, mm_clk, reg_gain_im_miso, reg_gain_im_mosi); end if; diff --git a/libraries/base/dp/tb/vhdl/tb_mms_dp_sync_checker.vhd b/libraries/base/dp/tb/vhdl/tb_mms_dp_sync_checker.vhd index e25b3eea37..24f62772c1 100644 --- a/libraries/base/dp/tb/vhdl/tb_mms_dp_sync_checker.vhd +++ b/libraries/base/dp/tb/vhdl/tb_mms_dp_sync_checker.vhd @@ -306,5 +306,4 @@ begin verify_snk_in_data <= verify_snk_in.data when verify_snk_in.valid = '1'; -end tb; - +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_mms_dp_xonoff.vhd b/libraries/base/dp/tb/vhdl/tb_mms_dp_xonoff.vhd index 807f0484b2..637690282f 100644 --- a/libraries/base/dp/tb/vhdl/tb_mms_dp_xonoff.vhd +++ b/libraries/base/dp/tb/vhdl/tb_mms_dp_xonoff.vhd @@ -221,4 +221,4 @@ begin wait; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_tb2_dp_demux.vhd b/libraries/base/dp/tb/vhdl/tb_tb2_dp_demux.vhd index 91ad92e1b1..b1b5cdb4d6 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb2_dp_demux.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb2_dp_demux.vhd @@ -50,4 +50,4 @@ begin u2_rnd_rnd_comb : entity work.tb2_dp_demux generic map (e_random, e_random, 1, 30, 3, 2, 2, FALSE, TRUE); u2_rnd_pls : entity work.tb2_dp_demux generic map (e_random, e_pulse, 1, 30, 3, 2, 2, FALSE, FALSE); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_block_from_mm.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_block_from_mm.vhd index 5e72c18e4d..a26f25c355 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb_dp_block_from_mm.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb_dp_block_from_mm.vhd @@ -50,4 +50,4 @@ begin u5_tst_2_8_256 : entity work.tb_dp_block_from_mm generic map (2, 8, 256); u6_tst_3_6_17 : entity work.tb_dp_block_from_mm generic map (3, 6, 17); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_source_v2.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_source_v2.vhd index bbe0b11693..a50252a12c 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_source_v2.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_source_v2.vhd @@ -72,4 +72,4 @@ begin u_17_3 : entity work.tb_dp_bsn_source_v2 generic map (17, 3); -- 17 // 3 = 5, 17 MOD 3 = 2, 17/3 = 5.66 block/sync u_101_17 : entity work.tb_dp_bsn_source_v2 generic map (101, 17); -- 101 // 17 = 5, 101 MOD 17 = 16, 101/17 = 5.9411 block/sync -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_sync_scheduler.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_sync_scheduler.vhd index 72e29a0a80..bcdb819699 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_sync_scheduler.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb_dp_bsn_sync_scheduler.vhd @@ -80,4 +80,4 @@ begin u_fraction_0 : entity work.tb_dp_bsn_sync_scheduler generic map (c_nof_input_sync, 17, 10, 3, 50, P); -- 50/10 = 5 block/out_sync end generate; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_flush.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_flush.vhd index edc1f56c94..77a553624d 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb_dp_flush.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb_dp_flush.vhd @@ -61,4 +61,4 @@ begin u_1_str_frm_act_act : entity work.tb_dp_flush generic map (1, FALSE, TRUE, e_active, e_active, c_nof_repeat); u_1_str_frm_rnd_rnd : entity work.tb_dp_flush generic map (1, FALSE, TRUE, e_random, e_random, c_nof_repeat); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_rsn_source.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_rsn_source.vhd index a35cf1c71f..1f52e07985 100644 --- a/libraries/base/dp/tb/vhdl/tb_tb_dp_rsn_source.vhd +++ b/libraries/base/dp/tb/vhdl/tb_tb_dp_rsn_source.vhd @@ -93,4 +93,4 @@ begin u_17_3 : entity work.tb_dp_rsn_source generic map (17, 3, 3); -- 17 // 3 = 5, 17 MOD 3 = 2, 17/3 = 5.66 block/sync u_101_17 : entity work.tb_dp_rsn_source generic map (101, 17, 17); -- 101 // 17 = 5, 101 MOD 17 = 16, 101/17 = 5.9411 block/sync -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/mm/tb/vhdl/mm_file.vhd b/libraries/base/mm/tb/vhdl/mm_file.vhd index 10fae91a32..8cf857f5bd 100644 --- a/libraries/base/mm/tb/vhdl/mm_file.vhd +++ b/libraries/base/mm/tb/vhdl/mm_file.vhd @@ -179,4 +179,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/mm/tb/vhdl/mm_file_pkg.vhd b/libraries/base/mm/tb/vhdl/mm_file_pkg.vhd index f2c34cd02c..e21882e1df 100644 --- a/libraries/base/mm/tb/vhdl/mm_file_pkg.vhd +++ b/libraries/base/mm/tb/vhdl/mm_file_pkg.vhd @@ -307,7 +307,7 @@ package body mm_file_pkg is hread(rd_line, v_addr_slv); -- read the string as HEX and assign to SLV. -- Write only: The third line contains the data to write: - if v_rd_wr_str ="WR " then + if v_rd_wr_str ="WR " then readline(rd_file, rd_line); hread(rd_line, v_data_slv); -- read the string as HEX and assign to SLV. end if; @@ -319,13 +319,13 @@ package body mm_file_pkg is mmf_file_create(rd_filename); -- Execute the MM request to the MM slave - if v_rd_wr_str ="WR " then + if v_rd_wr_str ="WR " then print_str("[" & time_to_str(now) & "] " & rd_filename & ": Writing 0x" & slv_to_hex(v_data_slv) & " to address 0x" & slv_to_hex(v_addr_slv)); -- Treat 32 bit hex data from file as 32 bit VHDL INTEGER, so need to use signed TO_SINT() to avoid out of NATURAL range -- warning in simulation due to '1' sign bit, because unsigned VHDL NATURAL only fits 31 bits proc_mem_mm_bus_wr(to_uint(v_addr_slv), to_sint(v_data_slv), mm_clk, mm_miso, mm_mosi); - elsif v_rd_wr_str ="RD " then + elsif v_rd_wr_str ="RD " then proc_mem_mm_bus_rd(to_uint(v_addr_slv), mm_clk, mm_miso, mm_mosi); if rd_latency > 0 then proc_mem_mm_bus_rd_latency(rd_latency, mm_clk); @@ -389,7 +389,7 @@ package body mm_file_pkg is mmf_file_create(rd_filename); -- Execute the simulation request - if v_rd_wr_str ="GET_SIM_TIME " then + if v_rd_wr_str ="GET_SIM_TIME " then -- Write the GET_SIM_TIME response time NOW to the .stat file file_open(open_status_wr, wr_file, wr_filename, write_mode); write(wr_line, time_to_str(now)); @@ -411,7 +411,7 @@ package body mm_file_pkg is end; - procedure mmf_poll_sim_ctrl_file(rd_file_name : in string; wr_file_name : IN string) is + procedure mmf_poll_sim_ctrl_file(rd_file_name : in string; wr_file_name : in string) is begin -- Create the ctrl file that we're going to read from print_str("[" & time_to_str(now) & "] " & rd_file_name & ": Created" ); @@ -426,7 +426,7 @@ package body mm_file_pkg is procedure mmf_poll_sim_ctrl_file(signal mm_clk : in std_logic; - rd_file_name : in string; wr_file_name : IN string) is + rd_file_name : in string; wr_file_name : in string) is begin -- Create the ctrl file that we're going to read from print_str("[" & time_to_str(now) & "] " & rd_file_name & ": Created" ); @@ -611,20 +611,20 @@ package body mm_file_pkg is while TRUE loop -- Read current mmf_mm_bus_rd(filename, rd_addr, rd_data, mm_clk); -- only read low part - if c_representation ="signed " then - if c_condition ="> " then if to_sint(rd_data) > c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition =">= " then if to_sint(rd_data) >= c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition ="/= " then if to_sint(rd_data) /= c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition ="<= " then if to_sint(rd_data) <= c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition ="< " then if to_sint(rd_data) < c_rd_value then exit; else wait for c_rd_interval; end if; + if c_representation ="signed " then + if c_condition ="> " then if to_sint(rd_data) > c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition =">= " then if to_sint(rd_data) >= c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition ="/= " then if to_sint(rd_data) /= c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition ="<= " then if to_sint(rd_data) <= c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition ="< " then if to_sint(rd_data) < c_rd_value then exit; else wait for c_rd_interval; end if; else if to_sint(rd_data) = c_rd_value then exit; else wait for c_rd_interval; end if; -- default: "=" end if; else -- default: UNSIGED - if c_condition ="> " then if to_uint(rd_data) > c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition =">= " then if to_uint(rd_data) >= c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition ="/= " then if to_uint(rd_data) /= c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition ="<= " then if to_uint(rd_data) <= c_rd_value then exit; else wait for c_rd_interval; end if; - elsif c_condition ="< " then if to_uint(rd_data) < c_rd_value then exit; else wait for c_rd_interval; end if; + if c_condition ="> " then if to_uint(rd_data) > c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition =">= " then if to_uint(rd_data) >= c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition ="/= " then if to_uint(rd_data) /= c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition ="<= " then if to_uint(rd_data) <= c_rd_value then exit; else wait for c_rd_interval; end if; + elsif c_condition ="< " then if to_uint(rd_data) < c_rd_value then exit; else wait for c_rd_interval; end if; else if to_uint(rd_data) = c_rd_value then exit; else wait for c_rd_interval; end if; -- default: "=" end if; end if; @@ -753,4 +753,4 @@ package body mm_file_pkg is return c_mmf_local_dir_path & mmf_prefix(s0, i0) & mmf_prefix(s1, i1) & mmf_prefix(s2, i2) & mmf_prefix(s3, i3) & mmf_prefix(s4, i4); end; -end mm_file_pkg; +end mm_file_pkg; \ No newline at end of file diff --git a/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd b/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd index 9f9551d960..911da84c73 100644 --- a/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd +++ b/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd @@ -94,4 +94,4 @@ package body mm_file_unb_pkg is return mmf_slave_prefix(c_mmf_unb_file_path, "TB", tb, "SUBRACK", subrack, "UNB", unb, c_node_type, c_node_nr); end; -end mm_file_unb_pkg; +end mm_file_unb_pkg; \ No newline at end of file diff --git a/libraries/base/mm/tb/vhdl/tb_mm_file.vhd b/libraries/base/mm/tb/vhdl/tb_mm_file.vhd index c5102b53c6..ec2630b4cf 100644 --- a/libraries/base/mm/tb/vhdl/tb_mm_file.vhd +++ b/libraries/base/mm/tb/vhdl/tb_mm_file.vhd @@ -74,7 +74,7 @@ architecture tb of tb_mm_file is constant c_unb_nr : natural := 3; --unb constant c_pn_nr : natural := 1; --gn = 0:7 constant c_node_type : string(1 to 2) := sel_a_b(c_pn_nr <4, "FN", "BN"); - constant c_node_nr : natural := sel_a_b(c_node_type ="BN ", c_pn_nr -4, c_pn_nr); + constant c_node_nr : natural := sel_a_b(c_node_type ="BN ", c_pn_nr -4, c_pn_nr); -- Use local mmfiles/ subdirectory in mm project build directory constant c_sim_file_pathname : string := mmf_slave_prefix("TB", g_tb_index) & "sim"; diff --git a/libraries/base/reorder/src/vhdl/reorder_col.vhd b/libraries/base/reorder/src/vhdl/reorder_col.vhd index 9051be473b..0befb118c5 100644 --- a/libraries/base/reorder/src/vhdl/reorder_col.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_col.vhd @@ -283,4 +283,4 @@ begin output_sosi <= func_dp_stream_combine_info_and_data(info_sosi, ss_sosi); ss_siso <= output_siso; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_col_select.vhd b/libraries/base/reorder/src/vhdl/reorder_col_select.vhd index bd75c4b921..faa949dc01 100644 --- a/libraries/base/reorder/src/vhdl/reorder_col_select.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_col_select.vhd @@ -93,8 +93,8 @@ architecture str of reorder_col_select is signal nxt_ch_cnt : integer; signal retrieve_sosi : t_dp_sosi; signal retrieve_en : std_logic; - signal retrieve_sop_dly : std_logic_vector(0 TO c_retrieve_lat); - signal retrieve_eop_dly : std_logic_vector(0 TO c_retrieve_lat); + signal retrieve_sop_dly : std_logic_vector(0 to c_retrieve_lat); + signal retrieve_eop_dly : std_logic_vector(0 to c_retrieve_lat); begin @@ -224,4 +224,4 @@ begin output_sosi <= func_dp_stream_combine_info_and_data(info_sosi, retrieve_sosi); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_col_wide.vhd b/libraries/base/reorder/src/vhdl/reorder_col_wide.vhd index 98c0d7d5f6..461b57dd39 100644 --- a/libraries/base/reorder/src/vhdl/reorder_col_wide.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_col_wide.vhd @@ -106,7 +106,7 @@ begin g_dsp_data_w => g_dsp_data_w, g_nof_ch_in => c_nof_ch_in, g_nof_ch_sel => c_nof_ch_sel, - g_select_file_name => sel_a_b(g_select_file_prefix ="UNUSED ", "UNUSED", g_select_file_prefix & "_" & natural'image(I) & ".hex"), + g_select_file_name => sel_a_b(g_select_file_prefix ="UNUSED ", "UNUSED", g_select_file_prefix & "_" & natural'image(I) & ".hex"), g_use_complex => g_use_complex ) port map ( @@ -128,4 +128,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_col_wide_select.vhd b/libraries/base/reorder/src/vhdl/reorder_col_wide_select.vhd index cba2123dae..4338013009 100644 --- a/libraries/base/reorder/src/vhdl/reorder_col_wide_select.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_col_wide_select.vhd @@ -96,4 +96,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_matrix.vhd b/libraries/base/reorder/src/vhdl/reorder_matrix.vhd index 8dfa4dd734..13f761277a 100644 --- a/libraries/base/reorder/src/vhdl/reorder_matrix.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_matrix.vhd @@ -201,4 +201,4 @@ begin output_sosi_arr => output_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd index 21c57c3ebc..ccc6870392 100644 --- a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd @@ -80,4 +80,4 @@ end reorder_pkg; package body reorder_pkg is -end reorder_pkg; +end reorder_pkg; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_retreive.vhd b/libraries/base/reorder/src/vhdl/reorder_retreive.vhd index 28ed184c0c..3ee2fd873b 100644 --- a/libraries/base/reorder/src/vhdl/reorder_retreive.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_retreive.vhd @@ -85,8 +85,8 @@ architecture rtl of reorder_retrieve is signal retrieve_ready : std_logic; signal nxt_retrieve_done : std_logic; - signal retrieve_sop_dly : std_logic_vector(0 TO c_retrieve_lat); - signal retrieve_eop_dly : std_logic_vector(0 TO c_retrieve_lat); + signal retrieve_sop_dly : std_logic_vector(0 to c_retrieve_lat); + signal retrieve_eop_dly : std_logic_vector(0 to c_retrieve_lat); begin diff --git a/libraries/base/reorder/src/vhdl/reorder_rewire_reg.vhd b/libraries/base/reorder/src/vhdl/reorder_rewire_reg.vhd index 48c0b307fe..0946d93b5f 100644 --- a/libraries/base/reorder/src/vhdl/reorder_rewire_reg.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_rewire_reg.vhd @@ -119,4 +119,4 @@ begin sel_reg <= sel_in_reg(g_nof_streams * g_sel_in_w - 1 downto 0); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_row.vhd b/libraries/base/reorder/src/vhdl/reorder_row.vhd index 5b1f0ae17f..9a6485307f 100644 --- a/libraries/base/reorder/src/vhdl/reorder_row.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_row.vhd @@ -241,4 +241,4 @@ begin output_sosi_arr <= r.output_sosi_arr; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_row_select.vhd b/libraries/base/reorder/src/vhdl/reorder_row_select.vhd index 4952c6d88d..359cc55578 100644 --- a/libraries/base/reorder/src/vhdl/reorder_row_select.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_row_select.vhd @@ -149,4 +149,4 @@ begin output_sosi_arr <= r.output_sosi_arr; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd b/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd index 9680804ad3..91eaef3b26 100644 --- a/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_sequencer.vhd @@ -324,4 +324,4 @@ begin address <= to_uvec(r.start_addr, address'length); burstsize <= to_uvec(r.burstsize, burstsize'length); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/base/reorder/src/vhdl/reorder_transpose.vhd b/libraries/base/reorder/src/vhdl/reorder_transpose.vhd index 9049a8349b..4d8c7bdc7a 100644 --- a/libraries/base/reorder/src/vhdl/reorder_transpose.vhd +++ b/libraries/base/reorder/src/vhdl/reorder_transpose.vhd @@ -505,5 +505,4 @@ begin src_out_arr => i_src_out_arr ); -end str; - +end str; \ No newline at end of file diff --git a/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd b/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd index e491f6ccda..55150ffbe0 100644 --- a/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd +++ b/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd @@ -291,4 +291,4 @@ begin in_sosi_arr => out_sosi_arr ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/reorder/tb/vhdl/tb_reorder_transpose.vhd b/libraries/base/reorder/tb/vhdl/tb_reorder_transpose.vhd index 3255e81277..d417790435 100644 --- a/libraries/base/reorder/tb/vhdl/tb_reorder_transpose.vhd +++ b/libraries/base/reorder/tb/vhdl/tb_reorder_transpose.vhd @@ -466,4 +466,4 @@ begin in_sosi_arr => out_sosi_arr ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/ring/src/vhdl/ring_info.vhd b/libraries/base/ring/src/vhdl/ring_info.vhd index 2bc2027512..929d15fbd6 100644 --- a/libraries/base/ring/src/vhdl/ring_info.vhd +++ b/libraries/base/ring/src/vhdl/ring_info.vhd @@ -89,6 +89,3 @@ begin end str; - - - diff --git a/libraries/base/ring/src/vhdl/ring_pkg.vhd b/libraries/base/ring/src/vhdl/ring_pkg.vhd index 6830d0a512..bfb22c140b 100644 --- a/libraries/base/ring/src/vhdl/ring_pkg.vhd +++ b/libraries/base/ring/src/vhdl/ring_pkg.vhd @@ -81,7 +81,7 @@ package ring_pkg is constant c_ring_eth_hdr_field_size : natural := ceil_div(field_slv_len(c_ring_eth_hdr_field_arr), c_longword_w); -- = 14/8 = 2 longwords constant c_ring_dp_nof_hdr_fields : natural := 6; - constant c_ring_dp_hdr_field_sel : std_logic_vector(c_ring_dp_nof_hdr_fields - 1 downto 0) := "000" &"000 "; + constant c_ring_dp_hdr_field_sel : std_logic_vector(c_ring_dp_nof_hdr_fields - 1 downto 0) := "000" &"000 "; constant c_ring_dp_hdr_field_arr : t_common_field_arr(c_ring_dp_nof_hdr_fields - 1 downto 0) := ( ( field_name_pad("eth_dst_mac" ), "RW", 48, field_default(c_ring_eth_dst_mac) ), ( field_name_pad("eth_src_mac" ), "RW", 48, field_default(c_ring_eth_src_mac) ), @@ -127,4 +127,4 @@ package body ring_pkg is return to_uvec(func_ring_nof_hops_to_source_rn(to_uint(hops), to_uint(this_rn), to_uint(N_rn), lane_dir),hops'length); end; -end ring_pkg; +end ring_pkg; \ No newline at end of file diff --git a/libraries/base/sens/tb/vhdl/tb_sens.vhd b/libraries/base/sens/tb/vhdl/tb_sens.vhd index b23d43025b..56cd3f0f47 100644 --- a/libraries/base/sens/tb/vhdl/tb_sens.vhd +++ b/libraries/base/sens/tb/vhdl/tb_sens.vhd @@ -81,7 +81,7 @@ begin p_debug : process (sens_data) begin for i in 0 to c_sens_temp_volt_sz - 1 loop - sens_data_bytes(c_sens_temp_volt_sz - 1 -i) <= sens_data((i+1)*c_bus_dat_w-1 downto i*c_bus_dat_w); + sens_data_bytes(c_sens_temp_volt_sz - 1 - i) <= sens_data((i + 1) * c_bus_dat_w - 1 downto i * c_bus_dat_w); end loop; end process; @@ -194,4 +194,4 @@ begin temp => c_temp_pcb ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/base/ss/src/vhdl/ss.vhd b/libraries/base/ss/src/vhdl/ss.vhd index b8669f9949..f572da4724 100644 --- a/libraries/base/ss/src/vhdl/ss.vhd +++ b/libraries/base/ss/src/vhdl/ss.vhd @@ -283,4 +283,4 @@ begin output_sosi <= func_dp_stream_combine_info_and_data(info_sosi, ss_sosi); ss_siso <= output_siso; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/ss/src/vhdl/ss_parallel.vhd b/libraries/base/ss/src/vhdl/ss_parallel.vhd index a1a166ce82..bc03fe5c64 100644 --- a/libraries/base/ss/src/vhdl/ss_parallel.vhd +++ b/libraries/base/ss/src/vhdl/ss_parallel.vhd @@ -201,4 +201,4 @@ begin output_sosi_arr => output_sosi_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/base/ss/src/vhdl/ss_reorder.vhd b/libraries/base/ss/src/vhdl/ss_reorder.vhd index b564e6d04e..646c7b09ae 100644 --- a/libraries/base/ss/src/vhdl/ss_reorder.vhd +++ b/libraries/base/ss/src/vhdl/ss_reorder.vhd @@ -231,4 +231,4 @@ begin output_sosi_arr <= r.output_sosi_arr; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/ss/src/vhdl/ss_retrieve.vhd b/libraries/base/ss/src/vhdl/ss_retrieve.vhd index 58533be3fe..06d0184c5f 100644 --- a/libraries/base/ss/src/vhdl/ss_retrieve.vhd +++ b/libraries/base/ss/src/vhdl/ss_retrieve.vhd @@ -85,8 +85,8 @@ architecture rtl of ss_retrieve is signal retrieve_ready : std_logic; signal nxt_retrieve_done : std_logic; - signal retrieve_sop_dly : std_logic_vector(0 TO c_retrieve_lat); - signal retrieve_eop_dly : std_logic_vector(0 TO c_retrieve_lat); + signal retrieve_sop_dly : std_logic_vector(0 to c_retrieve_lat); + signal retrieve_eop_dly : std_logic_vector(0 to c_retrieve_lat); begin diff --git a/libraries/base/ss/src/vhdl/ss_wide.vhd b/libraries/base/ss/src/vhdl/ss_wide.vhd index 39b2c78bd2..11b2a1f055 100644 --- a/libraries/base/ss/src/vhdl/ss_wide.vhd +++ b/libraries/base/ss/src/vhdl/ss_wide.vhd @@ -106,7 +106,7 @@ begin g_dsp_data_w => g_dsp_data_w, g_nof_ch_in => c_nof_ch_in, g_nof_ch_sel => c_nof_ch_sel, - g_select_file_name => sel_a_b(g_select_file_prefix ="UNUSED ", "UNUSED", g_select_file_prefix & "_" & natural'image(I) & ".hex"), + g_select_file_name => sel_a_b(g_select_file_prefix ="UNUSED ", "UNUSED", g_select_file_prefix & "_" & natural'image(I) & ".hex"), g_use_complex => g_use_complex ) port map ( @@ -128,4 +128,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/base/uth/src/vhdl/uth_pkg.vhd b/libraries/base/uth/src/vhdl/uth_pkg.vhd index f4c8ea3bb6..fa27a5ee8c 100644 --- a/libraries/base/uth/src/vhdl/uth_pkg.vhd +++ b/libraries/base/uth/src/vhdl/uth_pkg.vhd @@ -116,4 +116,4 @@ package body uth_pkg is return nxt_crc; end func_uth_next_crc; -end uth_pkg; +end uth_pkg; \ No newline at end of file diff --git a/libraries/base/uth/src/vhdl/uth_rx.vhd b/libraries/base/uth/src/vhdl/uth_rx.vhd index 94bf92d967..a49f7642ba 100644 --- a/libraries/base/uth/src/vhdl/uth_rx.vhd +++ b/libraries/base/uth/src/vhdl/uth_rx.vhd @@ -787,4 +787,4 @@ begin nxt_state <= v_nxt_state; end process; -end rtl_hold; +end rtl_hold; \ No newline at end of file diff --git a/libraries/base/uth/tb/vhdl/tb_uth.vhd b/libraries/base/uth/tb/vhdl/tb_uth.vhd index a0aeef7c54..cbc0e8de0b 100644 --- a/libraries/base/uth/tb/vhdl/tb_uth.vhd +++ b/libraries/base/uth/tb/vhdl/tb_uth.vhd @@ -100,7 +100,7 @@ architecture tb of tb_uth is signal phy_link_sosi : t_dp_sosi; signal phy_link_err : std_logic; - signal prev_uth_rx_ready : std_logic_vector(0 TO c_rl); + signal prev_uth_rx_ready : std_logic_vector(0 to c_rl); signal uth_rx_siso : t_dp_siso := c_dp_siso_rdy; signal uth_rx_sosi : t_dp_sosi; signal prev_uth_rx_data : std_logic_vector(c_data_w - 1 downto 0) := to_svec(c_data_init -1, c_data_w); @@ -221,7 +221,7 @@ begin ------------------------------------------------------------------------------ -- Transmit the data block as a UTH frame - use_tx_hold : if g_use_uth_tx_arch ="HOLD " generate + use_tx_hold : if g_use_uth_tx_arch ="HOLD " generate u_uth_tx : entity work.uth_tx(rtl_hold) generic map ( g_data_w => c_data_w, @@ -241,7 +241,7 @@ begin ); end generate; - use_tx_delay : if g_use_uth_tx_arch ="DELAY " generate + use_tx_delay : if g_use_uth_tx_arch ="DELAY " generate u_uth_tx : entity work.uth_tx(rtl_delay) generic map ( g_data_w => c_data_w, @@ -298,7 +298,7 @@ begin -- RECEIVER ------------------------------------------------------------------------------ - use_rx_adapt : if g_use_uth_rx_arch ="ADAPT " generate + use_rx_adapt : if g_use_uth_rx_arch ="ADAPT " generate u_uth_rx : entity work.uth_rx(rtl_adapt) generic map ( g_data_w => c_data_w, @@ -320,7 +320,7 @@ begin ); end generate; - use_rx_hold : if g_use_uth_rx_arch ="HOLD " generate + use_rx_hold : if g_use_uth_rx_arch ="HOLD " generate u_uth_rx : entity work.uth_rx(rtl_hold) generic map ( g_data_w => c_data_w, diff --git a/libraries/base/uth/tb/vhdl/tb_uth_dp_packet.vhd b/libraries/base/uth/tb/vhdl/tb_uth_dp_packet.vhd index 56ff6fbb17..4856877ff8 100644 --- a/libraries/base/uth/tb/vhdl/tb_uth_dp_packet.vhd +++ b/libraries/base/uth/tb/vhdl/tb_uth_dp_packet.vhd @@ -94,7 +94,7 @@ architecture tb of tb_uth_dp_packet is type t_sosi_2arr is array (integer range <> ) of t_dp_sosi_arr(0 to c_nof_input - 1); type t_data_2arr is array (0 to c_nof_tlen -1, 0 to c_nof_input - 1) of std_logic_vector(g_data_w - 1 downto 0); - type t_rl_vec_2arr is array (0 to c_nof_tlen -1, 0 to c_nof_input - 1) of std_logic_vector(0 TO c_rl); + type t_rl_vec_2arr is array (0 to c_nof_tlen -1, 0 to c_nof_input - 1) of std_logic_vector(0 to c_rl); signal tb_end_vec : std_logic_vector(c_nof_streams - 1 downto 0) := (others => '0'); signal tb_end : std_logic; diff --git a/libraries/base/uth/tb/vhdl/tb_uth_terminals.vhd b/libraries/base/uth/tb/vhdl/tb_uth_terminals.vhd index 30367c7df3..cd28d6fde4 100644 --- a/libraries/base/uth/tb/vhdl/tb_uth_terminals.vhd +++ b/libraries/base/uth/tb/vhdl/tb_uth_terminals.vhd @@ -111,7 +111,7 @@ architecture tb of tb_uth_terminals is constant c_uth_len_arr : t_natural_arr := array_init(c_uth_frame_len, c_uth_nof_ch); subtype t_data_arr is t_slv_16_arr(g_nof_input - 1 downto 0); -- width 16 must match c_data_w - type t_rl_vec_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(0 TO c_rl); + type t_rl_vec_arr is array (g_nof_input - 1 downto 0) of std_logic_vector(0 to c_rl); signal tb_end_vec : std_logic_vector(g_nof_input - 1 downto 0) := (others => '0'); signal tb_end : std_logic; diff --git a/libraries/base/util/src/vhdl/util_heater_pkg.vhd b/libraries/base/util/src/vhdl/util_heater_pkg.vhd index 96deee95a8..93b72ddaf0 100644 --- a/libraries/base/util/src/vhdl/util_heater_pkg.vhd +++ b/libraries/base/util/src/vhdl/util_heater_pkg.vhd @@ -57,4 +57,4 @@ end util_heater_pkg; package body util_heater_pkg is -end util_heater_pkg; +end util_heater_pkg; \ No newline at end of file diff --git a/libraries/base/util/src/vhdl/util_logic.vhd b/libraries/base/util/src/vhdl/util_logic.vhd index 374c79f111..4d3f942502 100644 --- a/libraries/base/util/src/vhdl/util_logic.vhd +++ b/libraries/base/util/src/vhdl/util_logic.vhd @@ -84,4 +84,4 @@ begin out_dat <= out_dat_reg(g_nof_reg); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/dsp/beamformer/src/vhdl/beamformer.vhd b/libraries/dsp/beamformer/src/vhdl/beamformer.vhd index d1424b3a5f..2ed92578d2 100644 --- a/libraries/dsp/beamformer/src/vhdl/beamformer.vhd +++ b/libraries/dsp/beamformer/src/vhdl/beamformer.vhd @@ -150,7 +150,7 @@ begin generic map ( g_technology => g_technology, g_ram => c_common_ram_crw_crw_ram, - g_init_file => sel_a_b(g_weights_file ="UNUSED ", "UNUSED", g_weights_file & "_" & natural'image(i) & ".hex"), + g_init_file => sel_a_b(g_weights_file ="UNUSED ", "UNUSED", g_weights_file & "_" & natural'image(i) & ".hex"), g_true_dual_port => g_weights_ram_dual_port ) port map ( diff --git a/libraries/dsp/beamformer/tb/vhdl/tb_beamformer.vhd b/libraries/dsp/beamformer/tb/vhdl/tb_beamformer.vhd index 59c8ec7d29..c1d69fc2d4 100644 --- a/libraries/dsp/beamformer/tb/vhdl/tb_beamformer.vhd +++ b/libraries/dsp/beamformer/tb/vhdl/tb_beamformer.vhd @@ -169,7 +169,7 @@ architecture tb of tb_beamformer is for I in 0 to g_nof_inputs - 1 loop for J in 0 to g_nof_weights - 1 loop -- write MM page - mmf_mm_bus_wr(c_mm_file_ram_beamformer, I * g_nof_weights + J, (J + 1) *2**16 + J +1, mm_clk); + mmf_mm_bus_wr(c_mm_file_ram_beamformer, I * g_nof_weights + J, (J + 1) * 2**16 + J +1, mm_clk); end loop; end loop; @@ -327,5 +327,4 @@ architecture tb of tb_beamformer is src_out => beamformer_src_out ); -end tb; - +end tb; \ No newline at end of file diff --git a/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/mmm_unb1_fn_bf.vhd b/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/mmm_unb1_fn_bf.vhd index be91592efd..eb96e06bf9 100644 --- a/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/mmm_unb1_fn_bf.vhd +++ b/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/mmm_unb1_fn_bf.vhd @@ -137,7 +137,7 @@ architecture str of mmm_unb1_fn_bf is constant c_tse_clk_period : time := 8 ns; constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); signal i_mm_clk : std_logic := '1'; signal i_tse_clk : std_logic := '1'; @@ -445,6 +445,3 @@ end; - - - diff --git a/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/unb1_fn_bf.vhd b/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/unb1_fn_bf.vhd index a5d3403cc7..e2d58a79fb 100644 --- a/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/unb1_fn_bf.vhd +++ b/libraries/dsp/bf/designs/unb1_fn_bf/src/vhdl/unb1_fn_bf.vhd @@ -65,8 +65,8 @@ entity unb1_fn_bf is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_fn_bf; @@ -408,6 +408,3 @@ end; - - - diff --git a/libraries/dsp/bf/src/vhdl/bf.vhd b/libraries/dsp/bf/src/vhdl/bf.vhd index b748fa785f..75ad914c13 100644 --- a/libraries/dsp/bf/src/vhdl/bf.vhd +++ b/libraries/dsp/bf/src/vhdl/bf.vhd @@ -183,4 +183,4 @@ begin in_siso_arr <= in_siso_2arr(0); -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/bf/src/vhdl/bf_pkg.vhd b/libraries/dsp/bf/src/vhdl/bf_pkg.vhd index b46eb81734..c3114fe22d 100644 --- a/libraries/dsp/bf/src/vhdl/bf_pkg.vhd +++ b/libraries/dsp/bf/src/vhdl/bf_pkg.vhd @@ -55,4 +55,4 @@ package bf_pkg is end bf_pkg; package body bf_pkg is -end bf_pkg; +end bf_pkg; \ No newline at end of file diff --git a/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/mmm_unb1_correlator.vhd b/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/mmm_unb1_correlator.vhd index 5c23374aea..d350d28cb0 100644 --- a/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/mmm_unb1_correlator.vhd +++ b/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/mmm_unb1_correlator.vhd @@ -95,7 +95,7 @@ architecture str of mmm_unb1_correlator is constant c_mm_clk_period : time := 8 ns; -- 125 MHz constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); signal i_mm_clk : std_logic := '1'; diff --git a/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/unb1_correlator.vhd b/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/unb1_correlator.vhd index 84599589ae..f782921325 100644 --- a/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/unb1_correlator.vhd +++ b/libraries/dsp/correlator/designs/unb1_correlator/src/vhdl/unb1_correlator.vhd @@ -58,8 +58,8 @@ entity unb1_correlator is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic + ETH_SGin : in std_logic; + ETH_SGout : out std_logic ); end unb1_correlator; @@ -433,4 +433,4 @@ begin eth1g_ram_miso => eth1g_ram_miso ); -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/correlator/src/vhdl/corr_folder.vhd b/libraries/dsp/correlator/src/vhdl/corr_folder.vhd index 5a73b748b4..37cbdaa9cd 100644 --- a/libraries/dsp/correlator/src/vhdl/corr_folder.vhd +++ b/libraries/dsp/correlator/src/vhdl/corr_folder.vhd @@ -151,4 +151,4 @@ begin src_out_arr <= snk_in_arr; end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/correlator/src/vhdl/corr_folder_2arr_2.vhd b/libraries/dsp/correlator/src/vhdl/corr_folder_2arr_2.vhd index 4893c38511..20e8a76939 100644 --- a/libraries/dsp/correlator/src/vhdl/corr_folder_2arr_2.vhd +++ b/libraries/dsp/correlator/src/vhdl/corr_folder_2arr_2.vhd @@ -144,4 +144,4 @@ begin end generate; end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/correlator/src/vhdl/corr_output_framer.vhd b/libraries/dsp/correlator/src/vhdl/corr_output_framer.vhd index aaa63c1841..5d7fc1371f 100644 --- a/libraries/dsp/correlator/src/vhdl/corr_output_framer.vhd +++ b/libraries/dsp/correlator/src/vhdl/corr_output_framer.vhd @@ -169,4 +169,4 @@ begin end loop; end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/correlator/src/vhdl/corr_permutor_pkg.vhd b/libraries/dsp/correlator/src/vhdl/corr_permutor_pkg.vhd index a2eca4702f..f1765a0eaa 100644 --- a/libraries/dsp/correlator/src/vhdl/corr_permutor_pkg.vhd +++ b/libraries/dsp/correlator/src/vhdl/corr_permutor_pkg.vhd @@ -151,6 +151,4 @@ package body corr_permutor_pkg is return v_result; end corr_permute; -end corr_permutor_pkg; - - +end corr_permutor_pkg; \ No newline at end of file diff --git a/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd b/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd index 1d52e56a96..cfe13b4daa 100644 --- a/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd +++ b/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd @@ -155,4 +155,4 @@ begin src_out_arr <= snk_in_arr; end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_lfsr.vhd b/libraries/dsp/fft/src/vhdl/fft_lfsr.vhd index 37e298ea68..499c9a413c 100644 --- a/libraries/dsp/fft/src/vhdl/fft_lfsr.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_lfsr.vhd @@ -96,4 +96,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_pkg.vhd b/libraries/dsp/fft/src/vhdl/fft_pkg.vhd index 51f64966e0..0d45def4fc 100644 --- a/libraries/dsp/fft/src/vhdl/fft_pkg.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_pkg.vhd @@ -168,4 +168,4 @@ package body fft_pkg is return to_uint(fft_shift(to_uvec(bin, w))); end; -end fft_pkg; +end fft_pkg; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_r2_pipe.vhd b/libraries/dsp/fft/src/vhdl/fft_r2_pipe.vhd index 4165fe4991..488d803aaf 100644 --- a/libraries/dsp/fft/src/vhdl/fft_r2_pipe.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_r2_pipe.vhd @@ -380,4 +380,4 @@ begin out_dat => out_raw_im ); -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_reorder_sepa_pipe.vhd b/libraries/dsp/fft/src/vhdl/fft_reorder_sepa_pipe.vhd index b0608375b6..e21fd2008b 100644 --- a/libraries/dsp/fft/src/vhdl/fft_reorder_sepa_pipe.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_reorder_sepa_pipe.vhd @@ -347,5 +347,4 @@ begin out_val <= out_val_i; end generate; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_sepa.vhd b/libraries/dsp/fft/src/vhdl/fft_sepa.vhd index 1c51049e8f..90d5146185 100644 --- a/libraries/dsp/fft/src/vhdl/fft_sepa.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_sepa.vhd @@ -188,5 +188,4 @@ begin out_dat <= r.out_dat; out_val <= r.out_val; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_sepa_wide.vhd b/libraries/dsp/fft/src/vhdl/fft_sepa_wide.vhd index 21613491a5..5a031ede66 100644 --- a/libraries/dsp/fft/src/vhdl/fft_sepa_wide.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_sepa_wide.vhd @@ -184,9 +184,9 @@ begin -- once every two clock cylces. gen_compose_zip_matrix : for I in g_fft.wb_factor / 2 - 1 downto 0 generate zip_in_matrix(2 * I)(0) (c_dat_w - 1 downto 0) <= rd_dat_arr(I); - zip_in_matrix(2 * I)(1) (c_dat_w - 1 downto 0) <= rd_dat_arr((g_fft.wb_factor - I) rem g_fft.wb_factor) when r.count_up = 0 else rd_dat_arr(g_fft.wb_factor - 1 -I); + zip_in_matrix(2 * I)(1) (c_dat_w - 1 downto 0) <= rd_dat_arr((g_fft.wb_factor - I) rem g_fft.wb_factor) when r.count_up = 0 else rd_dat_arr(g_fft.wb_factor - 1 - I); zip_in_matrix(2 * I + 1)(0)(c_dat_w - 1 downto 0) <= rd_dat_arr(I); - zip_in_matrix(2 * I + 1)(1)(c_dat_w - 1 downto 0) <= rd_dat_arr(g_fft.wb_factor - 1 -I); + zip_in_matrix(2 * I + 1)(1)(c_dat_w - 1 downto 0) <= rd_dat_arr(g_fft.wb_factor - 1 - I); zip_in_val(2 * I) <= r.val_even; zip_in_val(2 * I + 1) <= r.val_odd; end generate; @@ -329,5 +329,4 @@ begin out_im_arr(I) <= resize_fft_svec(out_dat_arr(I)(c_nof_complex * c_out_w - 1 downto c_out_w)); end generate; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_wide_unit.vhd b/libraries/dsp/fft/src/vhdl/fft_wide_unit.vhd index ed165c0bf3..c14177cc4f 100644 --- a/libraries/dsp/fft/src/vhdl/fft_wide_unit.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_wide_unit.vhd @@ -227,5 +227,4 @@ begin out_sosi_arr(I) <= fft_out_sosi_arr(I); end generate; -end str; - +end str; \ No newline at end of file diff --git a/libraries/dsp/fft/src/vhdl/fft_wide_unit_control.vhd b/libraries/dsp/fft/src/vhdl/fft_wide_unit_control.vhd index 5eacb922f4..935c2a44cc 100644 --- a/libraries/dsp/fft/src/vhdl/fft_wide_unit_control.vhd +++ b/libraries/dsp/fft/src/vhdl/fft_wide_unit_control.vhd @@ -292,5 +292,4 @@ begin out_sosi_arr(I) <= r.out_sosi_arr(I); end generate; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/dsp/fft/tb/vhdl/tb_fft_functions.vhd b/libraries/dsp/fft/tb/vhdl/tb_fft_functions.vhd index f20fdf51c9..65dd8c7925 100644 --- a/libraries/dsp/fft/tb/vhdl/tb_fft_functions.vhd +++ b/libraries/dsp/fft/tb/vhdl/tb_fft_functions.vhd @@ -95,4 +95,4 @@ begin wait; end process; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/dsp/fft/tb/vhdl/tb_fft_pkg.vhd b/libraries/dsp/fft/tb/vhdl/tb_fft_pkg.vhd index b06f67ce3c..6f8eeb5041 100644 --- a/libraries/dsp/fft/tb/vhdl/tb_fft_pkg.vhd +++ b/libraries/dsp/fft/tb/vhdl/tb_fft_pkg.vhd @@ -615,4 +615,4 @@ package body tb_fft_pkg is -- proc_common_close_file(v_file_status, v_in_file); -- Close the file -- END proc_prepare_input_data; -end tb_fft_pkg; +end tb_fft_pkg; \ No newline at end of file diff --git a/libraries/dsp/fft/tb/vhdl/tb_fft_sepa.vhd b/libraries/dsp/fft/tb/vhdl/tb_fft_sepa.vhd index 8eb499f872..a688ad61c7 100644 --- a/libraries/dsp/fft/tb/vhdl/tb_fft_sepa.vhd +++ b/libraries/dsp/fft/tb/vhdl/tb_fft_sepa.vhd @@ -212,6 +212,4 @@ begin end if; end process p_tester; -end tb; - - +end tb; \ No newline at end of file diff --git a/libraries/dsp/fft/tb/vhdl/tb_fft_switch.vhd b/libraries/dsp/fft/tb/vhdl/tb_fft_switch.vhd index cd0b81a7c6..dca54e3ac8 100644 --- a/libraries/dsp/fft/tb/vhdl/tb_fft_switch.vhd +++ b/libraries/dsp/fft/tb/vhdl/tb_fft_switch.vhd @@ -122,7 +122,7 @@ architecture tb of tb_fft_switch is signal out_eop : std_logic := '0'; signal out_sync : std_logic := '0'; - signal dly_val : std_logic_vector(0 TO c_dly) := (others => '0'); + signal dly_val : std_logic_vector(0 to c_dly) := (others => '0'); signal dly_a : t_integer_arr(0 to c_dly) := (others => 0); signal dly_b : t_integer_arr(0 to c_dly) := (others => 0); signal exp_val : std_logic := '0'; diff --git a/libraries/dsp/fft/tb/vhdl/tb_fft_wide_unit.vhd b/libraries/dsp/fft/tb/vhdl/tb_fft_wide_unit.vhd index 342ef803f4..6d7f37aac3 100644 --- a/libraries/dsp/fft/tb/vhdl/tb_fft_wide_unit.vhd +++ b/libraries/dsp/fft/tb/vhdl/tb_fft_wide_unit.vhd @@ -101,18 +101,18 @@ architecture tb of tb_fft_wide_unit is constant c_normal : boolean := TRUE; -- input from uniform noise file created automatically by MATLAB testFFT_input.m - constant c_noiseInputFile : string := "data/test/in/uniNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) &"_in.txt "; - constant c_noiseGoldenFile : string := "data/test/out/uniNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; + constant c_noiseInputFile : string := "data/test/in/uniNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) &"_in.txt "; + constant c_noiseGoldenFile : string := "data/test/out/uniNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; constant c_noiseOutputFile : string := "data/test/out/uniNoise_out.txt"; -- input from sinus file. Data is from diag_wg_wideband. - constant c_sinusInputFile : string := "data/test/in/sinus_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_in.txt "; - constant c_sinusGoldenFile : string := "data/test/out/sinus_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; + constant c_sinusInputFile : string := "data/test/in/sinus_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_in.txt "; + constant c_sinusGoldenFile : string := "data/test/out/sinus_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; constant c_sinusOutputFile : string := "data/test/out/sinus_out.txt"; -- input from combined sinus with noise file. Real part is sinus, imaginary part is noise - constant c_sinNoiseInputFile : string := "data/test/in/sinNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_in.txt "; - constant c_sinNoiseGoldenFile : string := "data/test/out/sinNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; + constant c_sinNoiseInputFile : string := "data/test/in/sinNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_in.txt "; + constant c_sinNoiseGoldenFile : string := "data/test/out/sinNoise_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; constant c_sinNoiseOutputFile : string := "data/test/out/sinNoise_out.txt"; -- input from impulse files @@ -125,9 +125,9 @@ architecture tb of tb_fft_wide_unit is constant c_2xrealImpulseGoldenFile : string := "data/2xreal_impulse_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) & "_out.txt"; constant c_2xrealImpulseOutputFile : string := "data/2xreal_impulse_out.txt"; - constant c_2xrealNoiseGoldenFile : string := "data/test/out/uniNoise_2xreal_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; - constant c_2xrealSinusGoldenFile : string := "data/test/out/sinus_2xreal_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; - constant c_2xrealSinNoiseGoldenFile : string := "data/test/out/sinNoise_2xreal_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; + constant c_2xrealNoiseGoldenFile : string := "data/test/out/uniNoise_2xreal_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(c_twiddle_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; + constant c_2xrealSinusGoldenFile : string := "data/test/out/sinus_2xreal_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; + constant c_2xrealSinNoiseGoldenFile : string := "data/test/out/sinNoise_2xreal_p" & natural'image(g_fft.nof_points) & "_b" & natural'image(g_fft.in_dat_w) &"_tb " & natural'image(wTyp'length) &"_out.txt "; -- determine active stimuli and result files constant c_preSelImpulseInputFile : string := sel_a_b(g_use_2xreal_inputs, c_2xrealImpulseInputFile, c_impulseInputFile); diff --git a/libraries/dsp/filter/src/vhdl/fil_pkg.vhd b/libraries/dsp/filter/src/vhdl/fil_pkg.vhd index c243c5fb35..1f1fa5d716 100644 --- a/libraries/dsp/filter/src/vhdl/fil_pkg.vhd +++ b/libraries/dsp/filter/src/vhdl/fil_pkg.vhd @@ -69,4 +69,4 @@ package fil_pkg is end package fil_pkg; package body fil_pkg is -end fil_pkg; +end fil_pkg; \ No newline at end of file diff --git a/libraries/dsp/filter/src/vhdl/fil_ppf_filter.vhd b/libraries/dsp/filter/src/vhdl/fil_ppf_filter.vhd index 49b9c8529b..3aa9640187 100644 --- a/libraries/dsp/filter/src/vhdl/fil_ppf_filter.vhd +++ b/libraries/dsp/filter/src/vhdl/fil_ppf_filter.vhd @@ -142,4 +142,4 @@ begin result <= RESIZE_SVEC(requant_out, result'length); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/dsp/filter/src/vhdl/fil_ppf_wide.vhd b/libraries/dsp/filter/src/vhdl/fil_ppf_wide.vhd index 1c1b95d5c6..44e03f5b95 100644 --- a/libraries/dsp/filter/src/vhdl/fil_ppf_wide.vhd +++ b/libraries/dsp/filter/src/vhdl/fil_ppf_wide.vhd @@ -218,7 +218,7 @@ begin begin for P in 0 to g_fil_ppf.wb_factor - 1 loop if g_big_endian_wb_in = true then - vP := g_fil_ppf.wb_factor - 1 -P; -- convert input big endian time [0,1,2,3] to P [3,2,1,0] index mapping to internal little endian + vP := g_fil_ppf.wb_factor - 1 - P; -- convert input big endian time [0,1,2,3] to P [3,2,1,0] index mapping to internal little endian else vP := P; -- keep input little endian time [0,1,2,3] to P [0,1,2,3] index mapping end if; @@ -259,7 +259,7 @@ begin begin for P in 0 to g_fil_ppf.wb_factor - 1 loop if g_big_endian_wb_out = true then - vP := g_fil_ppf.wb_factor - 1 -P; -- convert internal little endian to output big endian time [0,1,2,3] to P [3,2,1,0] index mapping + vP := g_fil_ppf.wb_factor - 1 - P; -- convert internal little endian to output big endian time [0,1,2,3] to P [3,2,1,0] index mapping else vP := P; -- keep internal little endian for output little endian time [0,1,2,3] to P [0,1,2,3] index mapping end if; diff --git a/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_single.vhd b/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_single.vhd index be472ba8c1..a893ba941d 100644 --- a/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_single.vhd +++ b/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_single.vhd @@ -300,7 +300,7 @@ begin -- Reverse the coeffs per tap for J in 0 to g_fil_ppf.nof_taps - 1 loop for I in 0 to g_fil_ppf.nof_bands - 1 loop - v_coefs_flip_arr(J * g_fil_ppf.nof_bands + g_fil_ppf.nof_bands - 1 -I) := ref_coefs_arr(J*g_fil_ppf.nof_bands+I); + v_coefs_flip_arr(J * g_fil_ppf.nof_bands + g_fil_ppf.nof_bands - 1 - I) := ref_coefs_arr(J * g_fil_ppf.nof_bands + I); end loop; end loop; -- Expand the channels (for one stream) diff --git a/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide.vhd b/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide.vhd index cfed7edcd2..92df5cc4a8 100644 --- a/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide.vhd +++ b/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide.vhd @@ -215,7 +215,7 @@ begin -- Reverse the coeffs per tap for J in 0 to g_fil_ppf.nof_taps - 1 loop for I in 0 to g_fil_ppf.nof_bands - 1 loop - v_coefs_flip_arr(J * g_fil_ppf.nof_bands + g_fil_ppf.nof_bands - 1 -I) := ref_coefs_arr(J*g_fil_ppf.nof_bands+I); + v_coefs_flip_arr(J * g_fil_ppf.nof_bands + g_fil_ppf.nof_bands - 1 - I) := ref_coefs_arr(J * g_fil_ppf.nof_bands + I); end loop; end loop; -- Distribute over wb_factor and expand the channels (for one stream) @@ -258,7 +258,7 @@ begin for J in 0 to g_fil_ppf.nof_taps - 1 loop v_mif_index := P * g_fil_ppf.nof_taps + J; v_mif_base := v_mif_index * c_mif_coef_mem_span; - v_coef_offset := g_fil_ppf.nof_bands * (J + 1) - 1 -P; -- coeff in MIF are in flipped order, unflip this in v_coef_index + v_coef_offset := g_fil_ppf.nof_bands * (J + 1) - 1 - P; -- coeff in MIF are in flipped order, unflip this in v_coef_index for I in 0 to c_nof_bands_per_mif - 1 loop proc_mem_mm_bus_rd(v_mif_base + I, clk, ram_coefs_miso, ram_coefs_mosi); proc_mem_mm_bus_rd_latency(1, clk); @@ -334,7 +334,7 @@ begin if g_big_endian_wb_out = false then vP := P; else - vP := g_fil_ppf.wb_factor - 1 -P; + vP := g_fil_ppf.wb_factor - 1 - P; end if; -- Output data width must be large enough to fit the coefficients width, this is verified by p_verify_out_dat_width diff --git a/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide_file_data.vhd b/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide_file_data.vhd index 75eecfd1c4..37267f0b00 100644 --- a/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide_file_data.vhd +++ b/libraries/dsp/filter/tb/vhdl/tb_fil_ppf_wide_file_data.vhd @@ -244,7 +244,7 @@ begin for K in 0 to c_nof_channels - 1 loop -- serial for P in 0 to g_fil_ppf.wb_factor - 1 loop -- parallel if g_big_endian_wb_in = TRUE then - vP := g_fil_ppf.wb_factor - 1 -P; -- time to wideband big endian + vP := g_fil_ppf.wb_factor - 1 - P; -- time to wideband big endian else vP := P; -- time to wideband little endian end if; @@ -360,7 +360,7 @@ begin if out_val = '1' then for P in 0 to g_fil_ppf.wb_factor - 1 loop -- parallel if g_big_endian_wb_out = true then - vP := g_fil_ppf.wb_factor - 1 -P; -- time to wideband big endian + vP := g_fil_ppf.wb_factor - 1 - P; -- time to wideband big endian else vP := P; -- time to wideband little endian end if; @@ -412,7 +412,7 @@ begin begin for P in 0 to g_fil_ppf.wb_factor - 1 loop if g_big_endian_wb_out = true then - vP := g_fil_ppf.wb_factor - 1 -P; + vP := g_fil_ppf.wb_factor - 1 - P; else vP := P; end if; diff --git a/libraries/dsp/fringe_stop/src/vhdl/fringe_stop_unit.vhd b/libraries/dsp/fringe_stop/src/vhdl/fringe_stop_unit.vhd index b05a38208c..3095677f68 100644 --- a/libraries/dsp/fringe_stop/src/vhdl/fringe_stop_unit.vhd +++ b/libraries/dsp/fringe_stop/src/vhdl/fringe_stop_unit.vhd @@ -472,6 +472,3 @@ begin end process; end str; - - - diff --git a/libraries/dsp/fringe_stop/tb/vhdl/tb_fringe_stop_unit.vhd b/libraries/dsp/fringe_stop/tb/vhdl/tb_fringe_stop_unit.vhd index 33e683bef8..200927cc83 100644 --- a/libraries/dsp/fringe_stop/tb/vhdl/tb_fringe_stop_unit.vhd +++ b/libraries/dsp/fringe_stop/tb/vhdl/tb_fringe_stop_unit.vhd @@ -190,7 +190,7 @@ begin if g_sim_type = 0 then for J in 0 to g_nof_channels - 1 loop fs_offset_matrix(I,J) <= I + 10 + J; - fs_step_matrix(I,J) <= 2 ** (g_fs_step_w - 1) - 1 -g_nof_channels+J; + fs_step_matrix(I,J) <= 2 ** (g_fs_step_w - 1) - 1 - g_nof_channels + J; end loop; end if; @@ -198,7 +198,7 @@ begin if g_sim_type = 1 then for J in 0 to g_nof_channels - 1 loop fs_offset_matrix(I,J) <= 2 ** g_fs_offset_w - 1; - fs_step_matrix(I,J) <= 2 ** (g_fs_step_w - 1) - 1 -g_nof_channels+J; + fs_step_matrix(I,J) <= 2 ** (g_fs_step_w - 1) - 1 - g_nof_channels + J; end loop; end if; @@ -432,6 +432,4 @@ begin tb_end <= '1' when r.loop_cnt = 4 else '0'; -end tb; - - +end tb; \ No newline at end of file diff --git a/libraries/dsp/fringe_stop/tb/vhdl/tb_mmf_fringe_stop_unit.vhd b/libraries/dsp/fringe_stop/tb/vhdl/tb_mmf_fringe_stop_unit.vhd index c204e44268..5ce5f30518 100644 --- a/libraries/dsp/fringe_stop/tb/vhdl/tb_mmf_fringe_stop_unit.vhd +++ b/libraries/dsp/fringe_stop/tb/vhdl/tb_mmf_fringe_stop_unit.vhd @@ -392,6 +392,4 @@ begin wait; end process; -end tb; - - +end tb; \ No newline at end of file diff --git a/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_fringe_stop_unit.vhd b/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_fringe_stop_unit.vhd index f370ffc7a4..bfe184787d 100644 --- a/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_fringe_stop_unit.vhd +++ b/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_fringe_stop_unit.vhd @@ -59,6 +59,4 @@ begin sim_minus_phi : entity work.tb_fringe_stop_unit generic map (I, 8, 10, 31, 17, 4, 9, TRUE); end generate; -end tb; - - +end tb; \ No newline at end of file diff --git a/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_mmf_fringe_stop_unit.vhd b/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_mmf_fringe_stop_unit.vhd index 1063fefdb9..7890128c44 100644 --- a/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_mmf_fringe_stop_unit.vhd +++ b/libraries/dsp/fringe_stop/tb/vhdl/tb_tb_mmf_fringe_stop_unit.vhd @@ -44,6 +44,4 @@ begin u_mm_slower_no_gap : entity work.tb_mmf_fringe_stop_unit generic map (0, TRUE, FALSE, 0); -- use no gap to enable verification of phasor period u_mm_faster_with_gap : entity work.tb_mmf_fringe_stop_unit generic map (1, TRUE, TRUE, 1); -- use gap to verify valid gaps -end tb; - - +end tb; \ No newline at end of file diff --git a/libraries/dsp/iquv/src/vhdl/iquv_iab.vhd b/libraries/dsp/iquv/src/vhdl/iquv_iab.vhd index 427eacdfba..35ef5e0e37 100644 --- a/libraries/dsp/iquv/src/vhdl/iquv_iab.vhd +++ b/libraries/dsp/iquv/src/vhdl/iquv_iab.vhd @@ -643,4 +643,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/iquv/tb/vhdl/tb_iquv.vhd b/libraries/dsp/iquv/tb/vhdl/tb_iquv.vhd index 70934c09d6..4888101291 100644 --- a/libraries/dsp/iquv/tb/vhdl/tb_iquv.vhd +++ b/libraries/dsp/iquv/tb/vhdl/tb_iquv.vhd @@ -195,13 +195,13 @@ begin for BLOCKCOUNT in 0 to 0 loop -- Repeat as needed in_complex.im <= TO_DP_DSP_DATA(0); -- Keep the imaginary part 0 - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle one + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle one in_complex.re <= TO_DP_DSP_DATA(FBIN); -- The real part of the X pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; in_complex.re <= TO_DP_DSP_DATA(0); -- The real part of the Y pol stays 0 wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle two + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle two in_complex.re <= TO_DP_DSP_DATA(0); -- The real part of the X pol stays 0 wait until rising_edge(dp_clk) and valid_enable = '1'; in_complex.re <= TO_DP_DSP_DATA(FBIN); -- The real part of the Y pol counts up @@ -209,13 +209,13 @@ begin end loop; in_complex.re <= TO_DP_DSP_DATA(0); -- Keep the real part 0 - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle three + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle three in_complex.im <= TO_DP_DSP_DATA(FBIN); -- The im part of the X pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; in_complex.im <= TO_DP_DSP_DATA(0); -- The im part of the Y pol stays 0 wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle four + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle four in_complex.im <= TO_DP_DSP_DATA(0); -- The im part of the X pol stays 0 wait until rising_edge(dp_clk) and valid_enable = '1'; in_complex.im <= TO_DP_DSP_DATA(FBIN); -- The im part of the Y pol counts up @@ -223,21 +223,21 @@ begin end loop; in_complex.im <= TO_DP_DSP_DATA(0); -- Keep the imaginary part 0 - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle five + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle five in_complex.re <= TO_DP_DSP_DATA(FBIN); -- The real part of the X pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; in_complex.re <= TO_DP_DSP_DATA(FBIN); -- The real part of the Y pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; in_complex.re <= TO_DP_DSP_DATA(0); -- Keep the real part 0 - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle six + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle six in_complex.im <= TO_DP_DSP_DATA(FBIN); -- The im part of the X pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; in_complex.im <= TO_DP_DSP_DATA(FBIN); -- The im part of the Y pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle seven + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle seven in_complex.re <= TO_DP_DSP_DATA(FBIN); -- The real part of the X pol counts up in_complex.im <= TO_DP_DSP_DATA(FBIN); -- The im part of the X pol counts up wait until rising_edge(dp_clk) and valid_enable = '1'; @@ -246,7 +246,7 @@ begin wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle eight + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle eight in_complex.re <= TO_DP_DSP_DATA(-8); -- The real part of the X pol is fixed in_complex.im <= TO_DP_DSP_DATA(20); -- The im part of the X pol is fixed wait until rising_edge(dp_clk) and valid_enable = '1'; @@ -255,7 +255,7 @@ begin wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle nine + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle nine in_complex.re <= TO_DP_DSP_DATA(2047); -- The real part of the X pol is fixed in_complex.im <= TO_DP_DSP_DATA(2047); -- The im part of the X pol is fixed wait until rising_edge(dp_clk) and valid_enable = '1'; diff --git a/libraries/dsp/iquv/tb/vhdl/tb_iquv_iab.vhd b/libraries/dsp/iquv/tb/vhdl/tb_iquv_iab.vhd index 07d59cef3a..1d9942e6fe 100644 --- a/libraries/dsp/iquv/tb/vhdl/tb_iquv_iab.vhd +++ b/libraries/dsp/iquv/tb/vhdl/tb_iquv_iab.vhd @@ -145,7 +145,7 @@ begin for BLOCKCOUNT in 0 to 0 loop -- Repeat as needed - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle one + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle one in_complex.re <= TO_DP_DSP_DATA(10 * FBIN); -- Set the real part of the X pol in_complex.im <= TO_DP_DSP_DATA(50 - 10 * FBIN ); -- Set the imag part of the X pol wait until rising_edge(dp_clk) and valid_enable = '1'; @@ -154,7 +154,7 @@ begin wait until rising_edge(dp_clk) and valid_enable = '1'; end loop; - for FBin IN 0 to c_npoints - 1 loop -- BLOCK cycle one + for FBin in 0 to c_npoints - 1 loop -- BLOCK cycle one in_complex.re <= TO_DP_DSP_DATA(2047); -- Set the real part of the X pol in_complex.im <= TO_DP_DSP_DATA(2047); -- Set the imag part of the X pol wait until rising_edge(dp_clk) and valid_enable = '1'; diff --git a/libraries/dsp/rTwoSDF/src/vhdl/rTwoSDFPkg.vhd b/libraries/dsp/rTwoSDF/src/vhdl/rTwoSDFPkg.vhd index fc4fb64433..2c209ef277 100644 --- a/libraries/dsp/rTwoSDF/src/vhdl/rTwoSDFPkg.vhd +++ b/libraries/dsp/rTwoSDF/src/vhdl/rTwoSDFPkg.vhd @@ -44,4 +44,4 @@ package rTwoSDFPkg is end package rTwoSDFPkg; package body rTwoSDFPkg is -end rTwoSDFPkg; +end rTwoSDFPkg; \ No newline at end of file diff --git a/libraries/dsp/rTwoSDF/src/vhdl/rTwoWMul.vhd b/libraries/dsp/rTwoSDF/src/vhdl/rTwoWMul.vhd index d584674743..210d9f1308 100644 --- a/libraries/dsp/rTwoSDF/src/vhdl/rTwoWMul.vhd +++ b/libraries/dsp/rTwoSDF/src/vhdl/rTwoWMul.vhd @@ -30,7 +30,7 @@ entity rTwoWMul is g_technology : natural := c_tech_select_default; g_stage : natural := 1; g_round_even : boolean := true; - g_lat : natural := 3 +1 -- 3 for mult, 1 for round + g_lat : natural := 3 + 1 -- 3 for mult, 1 for round ); port ( clk : in std_logic; diff --git a/libraries/dsp/si/tb/vhdl/tb_si.vhd b/libraries/dsp/si/tb/vhdl/tb_si.vhd index c449cab82d..4549a1d44e 100755 --- a/libraries/dsp/si/tb/vhdl/tb_si.vhd +++ b/libraries/dsp/si/tb/vhdl/tb_si.vhd @@ -248,4 +248,4 @@ begin cnt_even <= cnt_even + 1 when rising_edge(clk) and clip_even = '1'; cnt_odd <= cnt_odd + 1 when rising_edge(clk) and clip_odd = '1'; -end tb; +end tb; \ No newline at end of file diff --git a/libraries/dsp/st/src/vhdl/mmp_st_histogram.vhd b/libraries/dsp/st/src/vhdl/mmp_st_histogram.vhd index 3aa8f8aca4..c068434b8f 100644 --- a/libraries/dsp/st/src/vhdl/mmp_st_histogram.vhd +++ b/libraries/dsp/st/src/vhdl/mmp_st_histogram.vhd @@ -225,4 +225,4 @@ begin miso_arr => ram_cipo_arr ); -end str; +end str; \ No newline at end of file diff --git a/libraries/dsp/st/src/vhdl/st_ctrl.vhd b/libraries/dsp/st/src/vhdl/st_ctrl.vhd index 3e696c077b..8a36883841 100644 --- a/libraries/dsp/st/src/vhdl/st_ctrl.vhd +++ b/libraries/dsp/st/src/vhdl/st_ctrl.vhd @@ -77,9 +77,9 @@ architecture rtl of st_ctrl is constant c_tin_out : natural := c_tot_rd; constant c_tot_out : natural := c_tin_out + g_dly_out; - signal dly_val : std_logic_vector(0 TO c_tin_wr); - signal dly_sync : std_logic_vector(0 TO c_tin_wr); - signal dly_load : std_logic_vector(c_tin_rd TO c_tin_wr); + signal dly_val : std_logic_vector(0 to c_tin_wr); + signal dly_sync : std_logic_vector(0 to c_tin_wr); + signal dly_load : std_logic_vector(c_tin_rd to c_tin_wr); signal i_rd_adr : std_logic_vector(rd_adr'range); signal nxt_rd_adr : std_logic_vector(rd_adr'range); diff --git a/libraries/dsp/st/src/vhdl/st_histogram.vhd b/libraries/dsp/st/src/vhdl/st_histogram.vhd index 82676c9eec..437bbb4086 100644 --- a/libraries/dsp/st/src/vhdl/st_histogram.vhd +++ b/libraries/dsp/st/src/vhdl/st_histogram.vhd @@ -211,7 +211,7 @@ begin ------------------------------------------------------------------------------- -- Select range from snk_in.data and interpret as (un)signed ------------------------------------------------------------------------------- - gen_unsigned : if g_data_type /="signed " generate + gen_unsigned : if g_data_type /="signed " generate snk_in_data <= snk_in.data(g_data_w - 1 downto c_adr_low); end generate; @@ -225,7 +225,7 @@ begin -- signed two-complement value: -128 -1 0 +127 -- signed offset binary value: -127.5 -0.5 +0.5 +127.5 -- unsigned value: 0 127 128 255 - gen_signed : if g_data_type ="signed " generate + gen_signed : if g_data_type ="signed " generate snk_in_data <= offset_binary(snk_in.data(g_data_w - 1 downto c_adr_low)); end generate; diff --git a/libraries/dsp/st/tb/vhdl/tb_st_histogram.vhd b/libraries/dsp/st/tb/vhdl/tb_st_histogram.vhd index 75a617c974..972f959423 100644 --- a/libraries/dsp/st/tb/vhdl/tb_st_histogram.vhd +++ b/libraries/dsp/st/tb/vhdl/tb_st_histogram.vhd @@ -166,7 +166,7 @@ begin proc_common_wait_some_cycles(dp_clk, 5); -- Generate a block of counter data every sync - if g_stimuli_mode ="counter " then + if g_stimuli_mode ="counter " then for I in 0 to g_nof_sync - 1 loop v_sosi.sync := '1'; v_sosi.data := RESIZE_DP_DATA(v_sosi.data(g_data_w - 1 downto 0)); -- wrap when >= 2**g_data_w @@ -175,7 +175,7 @@ begin end if; -- Generate a DC level that increments every sync - if g_stimuli_mode ="dc " then + if g_stimuli_mode ="dc " then nxt_stimuli_src_out.valid <= '1'; for I in 0 to g_nof_sync - 1 loop nxt_stimuli_src_out.data <= INCR_UVEC(stimuli_src_out.data, 1); --all g_nof_data_per_sync cycles @@ -189,7 +189,7 @@ begin end if; -- Generate a sine wave - if g_stimuli_mode ="sine " then + if g_stimuli_mode ="sine " then nxt_stimuli_src_out <= stimuli_src_out; nxt_stimuli_src_out.valid <= '1'; stimuli_count <= 0.0; @@ -206,7 +206,7 @@ begin end if; -- Generate pseudo random noise - if g_stimuli_mode ="random " then + if g_stimuli_mode ="random " then nxt_stimuli_src_out.valid <= '1'; for I in 0 to g_nof_sync - 1 loop random_data <= (others => '0'); @@ -319,10 +319,10 @@ begin if i = 0 then -- Sync period 0: we expect RAM to contain zeros assert histogram_data = 0 report "RAM contains wrong bin count (expected 0, actual " & integer'image(histogram_data) & ")" severity ERROR; else -- Sync period 1 onwards - if g_stimuli_mode ="counter " then + if g_stimuli_mode ="counter " then -- Counter data: bin values remain the same every sync assert histogram_data = c_expected_ram_content_counter report "RAM contains wrong bin count (expected " & integer'image(c_expected_ram_content_counter) & ", actual " & integer'image(histogram_data) & ")" severity ERROR; - elsif g_stimuli_mode ="dc " then + elsif g_stimuli_mode ="dc " then -- DC data: DC level increments every sync if j = (i / c_nof_levels_per_bin) then -- Check bin address and account for multiple levels per bin -- this address (j) should contain the DC level total count of this sync period (i) diff --git a/libraries/dsp/verify_pfb/tb_verify_pfb_response.vhd b/libraries/dsp/verify_pfb/tb_verify_pfb_response.vhd index 79d6a82607..94d403e1fa 100644 --- a/libraries/dsp/verify_pfb/tb_verify_pfb_response.vhd +++ b/libraries/dsp/verify_pfb/tb_verify_pfb_response.vhd @@ -310,7 +310,7 @@ begin -- Read and verify FIR coefficients (similar as in tb_fil_ppf_single.vhd) --------------------------------------------------------------- - gen_mm_wpfb : if g_sel_pfb ="WPFB " generate + gen_mm_wpfb : if g_sel_pfb ="WPFB " generate p_get_coefs_ref : process begin -- Read all coeffs from coefs file @@ -319,7 +319,7 @@ begin -- Reverse the coeffs per tap for J in 0 to c_N_taps - 1 loop for I in 0 to c_N_fft - 1 loop - flip_coefs_arr(J * c_N_fft + c_N_fft - 1 -I) <= ref_coefs_arr(J*c_N_fft + I); + flip_coefs_arr(J * c_N_fft + c_N_fft - 1 - I) <= ref_coefs_arr(J * c_N_fft + I); end loop; end loop; wait; @@ -358,7 +358,7 @@ begin in_sosi_arr(0) <= in_sosi; -- DUT = APERTIF WFPB - dut_wpfb_unit_dev : if g_sel_pfb ="WPFB " generate + dut_wpfb_unit_dev : if g_sel_pfb ="WPFB " generate u_wpfb_unit_dev : entity wpfb_lib.wpfb_unit_dev generic map ( g_wpfb => c_wpfb, @@ -379,7 +379,7 @@ begin end generate; -- DUT = LOFAR1 WFPB - dut_pfb2_unit : if g_sel_pfb ="PFB2 " generate + dut_pfb2_unit : if g_sel_pfb ="PFB2 " generate u_pfb2_unit : entity pfb2_lib.pfb2_unit generic map ( g_nof_streams => 1, -- number of pfb2 instances, 1 pfb2 per stream diff --git a/libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd b/libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd index 948cb78388..071a5dc316 100644 --- a/libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd +++ b/libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd @@ -176,21 +176,21 @@ architecture tb of tb_verify_pfb_wg is constant c_pfs_lofar1 : boolean := g_fil_coefs_file_prefix = "data/Coeffs16384Kaiser-quant_1wb"; -- Determine PFIR coefficient width for WPFB and PFB2 - constant c_pfir_coef_w : natural := sel_a_b(g_sel_pfb ="WPFB ", g_fil_coef_dat_w, 16); + constant c_pfir_coef_w : natural := sel_a_b(g_sel_pfb ="WPFB ", g_fil_coef_dat_w, 16); constant c_pfir_coefs_file : string := c_pfs_coefs_file; -- PFB2 "data/pfs_coefsbuf_1024.hex" default from pfs_pkg.vhd -- Determine internal data width between PFIR and PFT for WPFB and PFB2, use default if g_internal_dat_w=0 - constant c_internal_dat_w : natural := sel_a_b(g_sel_pfb ="WPFB ", + constant c_internal_dat_w : natural := sel_a_b(g_sel_pfb ="WPFB ", sel_a_b(g_internal_dat_w >0, g_internal_dat_w, g_fft_stage_dat_w - g_fft_guard_w), sel_a_b(g_internal_dat_w >0, g_internal_dat_w, g_fft_stage_dat_w)); -- Determine two real input decorrelation logic option, only supported in PFB2 - constant c_switch_en : std_logic := sel_a_b(g_sel_pfb ="WPFB ", '0', g_switch_en); + constant c_switch_en : std_logic := sel_a_b(g_sel_pfb ="WPFB ", '0', g_switch_en); -- Determine FFT twiddle factors info constant c_fft_twiddle : wTyp := (others => '0'); constant c_fft_twiddle_w : natural := c_fft_twiddle'length; -- from rTwoSDF twiddlesPkg.vhd - constant c_twiddle_w : natural := sel_a_b(g_sel_pfb ="WPFB ", c_fft_twiddle_w, c_pft_twiddle_w); + constant c_twiddle_w : natural := sel_a_b(g_sel_pfb ="WPFB ", c_fft_twiddle_w, c_pft_twiddle_w); -- WPFB -- type t_wpfb is record @@ -910,8 +910,8 @@ begin -- Convert SST to unsigned REAL per signal path (SP) and normalize for integration interval of c_N_blk for SUB in 0 to c_N_sub - 1 loop - sp_subband_powers_a(SUB) <= to_ureal(sp_subband_powers_arr2(0)(SUB)) / REAL(c_N_blk); - sp_subband_powers_b(SUB) <= to_ureal(sp_subband_powers_arr2(1)(SUB)) / REAL(c_N_blk); + sp_subband_powers_a(SUB) <= to_ureal(sp_subband_powers_arr2(0)(SUB)) / real(c_N_blk); + sp_subband_powers_b(SUB) <= to_ureal(sp_subband_powers_arr2(1)(SUB)) / real(c_N_blk); end loop; proc_common_wait_some_cycles(dp_clk, 1); @@ -970,7 +970,7 @@ begin -- Report --------------------------------------------------------------------------- proc_common_wait_some_cycles(dp_clk, g_tb_index); -- use g_tb_index to identify and separate logging in case of multiple tb instances finishing in parallel - if g_sel_pfb ="WPFB " then + if g_sel_pfb ="WPFB " then print_str("-------------------------------------------------------------"); print_str("-- WPFB settings of tb-" & int_to_str(g_tb_index) & ":"); print_str("-------------------------------------------------------------"); @@ -987,7 +987,7 @@ begin print_str(". g_fft_guard_w = " & int_to_str(g_fft_guard_w)); print_str(". c_switch_en = " & slv_to_str(slv(c_switch_en))); end if; - if g_sel_pfb ="PFB2 " then + if g_sel_pfb ="PFB2 " then print_str("-------------------------------------------------------------"); print_str("-- PFB2 settings of tb-" & int_to_str(g_tb_index) & ":"); print_str("-------------------------------------------------------------"); @@ -1120,7 +1120,7 @@ begin in_sosi_arr(0) <= in_sosi; -- DUT = APERTIF WFPB - dut_wpfb_unit_dev : if g_sel_pfb ="WPFB " generate + dut_wpfb_unit_dev : if g_sel_pfb ="WPFB " generate u_wpfb_unit_dev : entity wpfb_lib.wpfb_unit_dev generic map ( g_wpfb => c_wpfb, @@ -1143,7 +1143,7 @@ begin end generate; -- DUT = LOFAR1 WFPB - dut_pfb2_unit : if g_sel_pfb ="PFB2 " generate + dut_pfb2_unit : if g_sel_pfb ="PFB2 " generate u_pfb2_unit : entity pfb2_lib.pfb2_unit generic map ( g_nof_streams => 1, -- number of pfb2 instances, 1 pfb2 per stream diff --git a/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd b/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd index 49fb7bc2b3..67f7cd6aff 100644 --- a/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd +++ b/libraries/dsp/wpfb/src/vhdl/wpfb_pkg.vhd @@ -355,4 +355,4 @@ package body wpfb_pkg is return v_wpfb; end func_wpfb_set_nof_block_per_sync; -end wpfb_pkg; +end wpfb_pkg; \ No newline at end of file diff --git a/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd b/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd index 4c61c00408..5cc1b916e8 100644 --- a/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd +++ b/libraries/dsp/wpfb/src/vhdl/wpfb_unit.vhd @@ -396,6 +396,4 @@ begin end generate; end generate; -end str; - - +end str; \ No newline at end of file diff --git a/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd b/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd index 4ba6cc7559..0d1051bb29 100644 --- a/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd +++ b/libraries/dsp/wpfb/src/vhdl/wpfb_unit_dev.vhd @@ -725,6 +725,4 @@ begin -- Connect to the outside world out_quant_sosi_arr <= pfb_out_quant_sosi_arr; -end str; - - +end str; \ No newline at end of file diff --git a/libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_wide.vhd b/libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_wide.vhd index fe6e37a5bc..a30300342c 100644 --- a/libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_wide.vhd +++ b/libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_wide.vhd @@ -381,7 +381,7 @@ begin for S in 0 to g_wpfb.nof_wb_streams - 1 loop -- parallel for P in 0 to g_wpfb.wb_factor - 1 loop -- parallel if c_big_endian_wb_in = TRUE then - vP := g_wpfb.wb_factor - 1 -P; -- time to big endian + vP := g_wpfb.wb_factor - 1 - P; -- time to big endian else vP := P; -- time in little endian end if; diff --git a/libraries/io/aduh/src/vhdl/aduh_quad.vhd b/libraries/io/aduh/src/vhdl/aduh_quad.vhd index c5ca9d380c..4dd3d23769 100644 --- a/libraries/io/aduh/src/vhdl/aduh_quad.vhd +++ b/libraries/io/aduh/src/vhdl/aduh_quad.vhd @@ -72,8 +72,8 @@ entity aduh_quad is aduh_cd_control : in std_logic_vector(c_word_w - 1 downto 0); aduh_verify_res : out t_slv_32_arr(0 to g_ai.nof_sp - 1); -- [8,7:0] - aduh_verify_res_val : out std_logic_vector(0 TO g_ai.nof_sp - 1); - aduh_verify_res_ack : in std_logic_vector(0 TO g_ai.nof_sp - 1) + aduh_verify_res_val : out std_logic_vector(0 to g_ai.nof_sp - 1); + aduh_verify_res_ack : in std_logic_vector(0 to g_ai.nof_sp - 1) ); end aduh_quad; diff --git a/libraries/io/aduh/src/vhdl/aduh_quad_reg.vhd b/libraries/io/aduh/src/vhdl/aduh_quad_reg.vhd index 67f3ebd321..fb9cc40b48 100644 --- a/libraries/io/aduh/src/vhdl/aduh_quad_reg.vhd +++ b/libraries/io/aduh/src/vhdl/aduh_quad_reg.vhd @@ -535,4 +535,4 @@ begin ); end generate; -- gen_cross -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/aduh/src/vhdl/aduh_verify.vhd b/libraries/io/aduh/src/vhdl/aduh_verify.vhd index 3641744826..ed8d6e5f5c 100644 --- a/libraries/io/aduh/src/vhdl/aduh_verify.vhd +++ b/libraries/io/aduh/src/vhdl/aduh_verify.vhd @@ -121,17 +121,17 @@ architecture rtl of aduh_verify is constant c_tp_symbol : t_slv_8_arr(0 to 1) := (x"02", x"01"); -- = (I, Q), use patter_sel to select - type t_nibble_arr is array (integer range <> ) of std_logic_vector(0 TO g_nof_symbols_per_data - 1); -- here use index [0:3] for the big endian nibbles + type t_nibble_arr is array (integer range <> ) of std_logic_vector(0 to g_nof_symbols_per_data - 1); -- here use index [0:3] for the big endian nibbles signal symbols : t_slv_8_arr(0 to g_nof_symbols_per_data - 1); - signal symb : std_logic_vector(0 TO g_nof_symbols_per_data - 1); -- here use index [0:3] for the big endian nibbles - signal symb_err : std_logic_vector(0 TO g_nof_symbols_per_data - 1); + signal symb : std_logic_vector(0 to g_nof_symbols_per_data - 1); -- here use index [0:3] for the big endian nibbles + signal symb_err : std_logic_vector(0 to g_nof_symbols_per_data - 1); signal bits : t_nibble_arr(g_symbol_w - 1 downto 0); signal in_val : std_logic; signal nxt_in_val : std_logic; - signal in_symb : std_logic_vector(0 TO g_nof_symbols_per_data - 1); -- here use index [0:3] for the big endian nibbles - signal nxt_in_symb : std_logic_vector(0 TO g_nof_symbols_per_data - 1); + signal in_symb : std_logic_vector(0 to g_nof_symbols_per_data - 1); -- here use index [0:3] for the big endian nibbles + signal nxt_in_symb : std_logic_vector(0 to g_nof_symbols_per_data - 1); signal in_symb_err : std_logic; signal nxt_in_symb_err : std_logic; signal in_bits : t_nibble_arr(g_symbol_w - 1 downto 0); diff --git a/libraries/io/aduh/src/vhdl/aduh_verify_bit.vhd b/libraries/io/aduh/src/vhdl/aduh_verify_bit.vhd index 221420f3ea..b3e0e3cf68 100644 --- a/libraries/io/aduh/src/vhdl/aduh_verify_bit.vhd +++ b/libraries/io/aduh/src/vhdl/aduh_verify_bit.vhd @@ -40,7 +40,7 @@ entity aduh_verify_bit is -- ST input in_val : in std_logic; - in_dat : in std_logic_vector(0 TO g_nof_symbols_per_data - 1); + in_dat : in std_logic_vector(0 to g_nof_symbols_per_data - 1); in_dat_err : in std_logic := '0'; -- Static control input (connect via MM or leave open to use default) @@ -74,10 +74,10 @@ architecture rtl of aduh_verify_bit is return to_uvec(0, g_nof_symbols_per_data); -- else return invalid value end; - signal ref_dat : std_logic_vector(0 TO g_nof_symbols_per_data - 1); - signal nxt_ref_dat : std_logic_vector(0 TO g_nof_symbols_per_data - 1); - signal prev_ref_dat : std_logic_vector(0 TO g_nof_symbols_per_data - 1); - signal nxt_prev_ref_dat : std_logic_vector(0 TO g_nof_symbols_per_data - 1); + signal ref_dat : std_logic_vector(0 to g_nof_symbols_per_data - 1); + signal nxt_ref_dat : std_logic_vector(0 to g_nof_symbols_per_data - 1); + signal prev_ref_dat : std_logic_vector(0 to g_nof_symbols_per_data - 1); + signal nxt_prev_ref_dat : std_logic_vector(0 to g_nof_symbols_per_data - 1); signal state : t_state; signal nxt_state : t_state; diff --git a/libraries/io/aduh/src/vhdl/lvdsh_dd_phs4_align.vhd b/libraries/io/aduh/src/vhdl/lvdsh_dd_phs4_align.vhd index dc0c325225..c3ccd643ab 100644 --- a/libraries/io/aduh/src/vhdl/lvdsh_dd_phs4_align.vhd +++ b/libraries/io/aduh/src/vhdl/lvdsh_dd_phs4_align.vhd @@ -358,7 +358,7 @@ begin -- Declare dd_phs_locked when dd_sync=0 to ensure the dd_sync will be detected when it is becoming 1 again. nxt_r.dd_phs_locked <= '0' when dd_phs_detected_ok = '0' else - '1' when dd_phs_detected_ok = '1' and r.dd_sync ="0000 " else r.dd_phs_locked; + '1' when dd_phs_detected_ok = '1' and r.dd_sync ="0000 " else r.dd_phs_locked; ------------------------------------------------------------------------------ diff --git a/libraries/io/aduh/src/vhdl/lvdsh_dd_wb4.vhd b/libraries/io/aduh/src/vhdl/lvdsh_dd_wb4.vhd index 63e3b4671b..1d4e2eb149 100644 --- a/libraries/io/aduh/src/vhdl/lvdsh_dd_wb4.vhd +++ b/libraries/io/aduh/src/vhdl/lvdsh_dd_wb4.vhd @@ -380,12 +380,12 @@ begin -- Set phase based on where the valid be_sync "1111" is detected in two cycles -- Signal illegal be_sync combinations that can occur if the in_clk and dp_clk edges are too close nxt_r.sync_phase <= r.sync_phase; - if r.be_sync ="1111 " and be_sync ="0000 " then nxt_r.sync_phase <= 0; end if; -- F0 - if r.be_sync ="0111 " and be_sync ="1000 " then nxt_r.sync_phase <= 1; end if; -- 78 - if r.be_sync ="0011 " and be_sync ="1100 " then nxt_r.sync_phase <= 2; end if; -- 3C - if r.be_sync ="0001 " and be_sync ="1110 " then nxt_r.sync_phase <= 3; end if; -- 1E - if r.be_sync ="1011 " and be_sync ="0100 " then nxt_r.sync_phase <= 5; end if; -- B4 = swap hi lo of 78, so map to phase 4+1=5 - if r.be_sync ="0010 " and be_sync ="1101 " then nxt_r.sync_phase <= 7; end if; -- 2D = swap hi lo of 1E, so map to phase 4+3=7 + if r.be_sync ="1111 " and be_sync ="0000 " then nxt_r.sync_phase <= 0; end if; -- F0 + if r.be_sync ="0111 " and be_sync ="1000 " then nxt_r.sync_phase <= 1; end if; -- 78 + if r.be_sync ="0011 " and be_sync ="1100 " then nxt_r.sync_phase <= 2; end if; -- 3C + if r.be_sync ="0001 " and be_sync ="1110 " then nxt_r.sync_phase <= 3; end if; -- 1E + if r.be_sync ="1011 " and be_sync ="0100 " then nxt_r.sync_phase <= 5; end if; -- B4 = swap hi lo of 78, so map to phase 4+1=5 + if r.be_sync ="0010 " and be_sync ="1101 " then nxt_r.sync_phase <= 7; end if; -- 2D = swap hi lo of 1E, so map to phase 4+3=7 -- F0 = swap hi lo of F0, so phase 4 cannot be distinghuised from phase 0 -- 3C = swap hi lo of 3C, so phase 6 cannot be distinghuised from phase 2 -- Map sync_phase 0:3 and 5:7 on dat_phase 0:3 @@ -402,10 +402,10 @@ begin nxt_r.status <= r.status; nxt_r.status(7 downto 4) <= to_uvec(r.sync_phase, 4); nxt_r.status(7 downto 4) <= "000" & dd_phase; - if r.be_sync ="1111 " or (r.be_sync /="0000 " and be_sync /="0000 ") then + if r.be_sync ="1111 " or (r.be_sync /="0000 " and be_sync /="0000 ") then nxt_r.status(15 downto 8) <= r.be_sync & be_sync; end if; - if be_sync /="0000 " then + if be_sync /="0000 " then nxt_r.status(23 downto 16) <= r.be_sync & be_sync; elsif unsigned(wb_cnt) > c_wb_sync_latency then nxt_r.status(23 downto 16) <= (others => '0'); diff --git a/libraries/io/aduh/src/vhdl/mms_aduh_quad.vhd b/libraries/io/aduh/src/vhdl/mms_aduh_quad.vhd index 63606ba2e5..0ccc55cacc 100644 --- a/libraries/io/aduh/src/vhdl/mms_aduh_quad.vhd +++ b/libraries/io/aduh/src/vhdl/mms_aduh_quad.vhd @@ -86,8 +86,8 @@ architecture str of mms_aduh_quad is signal aduh_cd_control : std_logic_vector(c_word_w - 1 downto 0); signal aduh_verify_res : t_slv_32_arr(0 to g_ai.nof_sp - 1); -- [8,7:0] - signal aduh_verify_res_val : std_logic_vector(0 TO g_ai.nof_sp - 1); - signal aduh_verify_res_ack : std_logic_vector(0 TO g_ai.nof_sp - 1); + signal aduh_verify_res_val : std_logic_vector(0 to g_ai.nof_sp - 1); + signal aduh_verify_res_ack : std_logic_vector(0 to g_ai.nof_sp - 1); begin diff --git a/libraries/io/aduh/tb/vhdl/tb_aduh_dd.vhd b/libraries/io/aduh/tb/vhdl/tb_aduh_dd.vhd index a0d4185fc2..fe52134bd2 100644 --- a/libraries/io/aduh/tb/vhdl/tb_aduh_dd.vhd +++ b/libraries/io/aduh/tb/vhdl/tb_aduh_dd.vhd @@ -126,10 +126,10 @@ architecture tb of tb_aduh_dd is signal cd_stable_ack : std_logic := '0'; -- Verify - signal verify_en : std_logic_vector(0 TO c_ai.nof_sp - 1) := (others => '0'); + signal verify_en : std_logic_vector(0 to c_ai.nof_sp - 1) := (others => '0'); signal verify_en_all : std_logic := '0'; - signal verify_valid : std_logic_vector(0 TO c_ai.nof_sp - 1) := (others => '0'); - signal verify_done : std_logic_vector(0 TO c_ai.nof_sp - 1) := (others => '0'); + signal verify_valid : std_logic_vector(0 to c_ai.nof_sp - 1) := (others => '0'); + signal verify_done : std_logic_vector(0 to c_ai.nof_sp - 1) := (others => '0'); signal verify_data : t_dp_data_arr( 0 to c_ai.nof_sp - 1); signal prev_verify_data : t_dp_data_arr( 0 to c_ai.nof_sp - 1); signal sl0 : std_logic := '0'; diff --git a/libraries/io/aduh/tb/vhdl/tb_aduh_pll.vhd b/libraries/io/aduh/tb/vhdl/tb_aduh_pll.vhd index c881f40760..848c29e9a0 100644 --- a/libraries/io/aduh/tb/vhdl/tb_aduh_pll.vhd +++ b/libraries/io/aduh/tb/vhdl/tb_aduh_pll.vhd @@ -154,9 +154,9 @@ architecture tb of tb_aduh_pll is -- Verify signal restart_any : std_logic := '0'; - signal verify_valid : std_logic_vector(0 TO c_ai.nof_sp - 1) := (others => '0'); - signal verify_restart : std_logic_vector(0 TO c_ai.nof_sp - 1) := (others => '0'); - signal verify_en : std_logic_vector(0 TO c_ai.nof_sp - 1) := (others => '0'); + signal verify_valid : std_logic_vector(0 to c_ai.nof_sp - 1) := (others => '0'); + signal verify_restart : std_logic_vector(0 to c_ai.nof_sp - 1) := (others => '0'); + signal verify_en : std_logic_vector(0 to c_ai.nof_sp - 1) := (others => '0'); signal verify_en_all : std_logic := '0'; signal verify_data : t_dp_data_arr( 0 to c_ai.nof_sp - 1); signal prev_verify_data : t_dp_data_arr( 0 to c_ai.nof_sp - 1); diff --git a/libraries/io/ddr/src/vhdl/io_ddr.vhd b/libraries/io/ddr/src/vhdl/io_ddr.vhd index db32873537..2f496b018f 100644 --- a/libraries/io/ddr/src/vhdl/io_ddr.vhd +++ b/libraries/io/ddr/src/vhdl/io_ddr.vhd @@ -230,8 +230,8 @@ end io_ddr; architecture str of io_ddr is - constant c_wr_use_sync : boolean := sel_a_b(g_wr_flush_mode ="SYN ", TRUE, FALSE); - constant c_wr_use_ctrl : boolean := sel_a_b(g_wr_flush_mode ="SOP ", TRUE, FALSE); + constant c_wr_use_sync : boolean := sel_a_b(g_wr_flush_mode ="SYN ", TRUE, FALSE); + constant c_wr_use_ctrl : boolean := sel_a_b(g_wr_flush_mode ="SOP ", TRUE, FALSE); constant c_wr_fifo_use_ctrl : boolean := c_wr_use_sync or c_wr_use_ctrl; constant c_ddr_gigabytes : natural := func_tech_ddr_module_size(g_tech_ddr); -- units GiByte @@ -243,7 +243,7 @@ architecture str of io_ddr is constant c_wr_fifo_af_margin : natural := 8 + 1; -- use 8 (>= 4 default) to be safe and use +1 to compensate for latency introduced by registering wr_siso.ready due to RL=0 - constant c_nof_rd_bursts_max : natural := sel_a_b(g_tech_ddr.name ="DDR3 ", 1, 3); -- max number of rd bursts in queue, derived empirically from simulation, seems fixed 1 for DDR3 and seems to match (g_tech_ddr.command_queue_depth-1)/2 for DDR4 + constant c_nof_rd_bursts_max : natural := sel_a_b(g_tech_ddr.name ="DDR3 ", 1, 3); -- max number of rd bursts in queue, derived empirically from simulation, seems fixed 1 for DDR3 and seems to match (g_tech_ddr.command_queue_depth-1)/2 for DDR4 constant c_rd_fifo_af_margin : natural := 8 + c_nof_rd_bursts_max * g_tech_ddr.maxburstsize; -- use 8 (>= 4 default) to be safe and use sufficient extra margin to fit one or more rd burst accesses of g_tech_ddr.maxburstsize each constant c_mem_reg_adr_w : natural := 2; @@ -555,4 +555,4 @@ begin out_reg => open ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr/src/vhdl/io_ddr_driver.vhd b/libraries/io/ddr/src/vhdl/io_ddr_driver.vhd index 94d7f2e12f..4b0840668a 100644 --- a/libraries/io/ddr/src/vhdl/io_ddr_driver.vhd +++ b/libraries/io/ddr/src/vhdl/io_ddr_driver.vhd @@ -276,4 +276,4 @@ begin end case; end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr/src/vhdl/io_ddr_driver_flush_ctrl.vhd b/libraries/io/ddr/src/vhdl/io_ddr_driver_flush_ctrl.vhd index c85ac22bc1..3ff6b47ab6 100644 --- a/libraries/io/ddr/src/vhdl/io_ddr_driver_flush_ctrl.vhd +++ b/libraries/io/ddr/src/vhdl/io_ddr_driver_flush_ctrl.vhd @@ -85,17 +85,17 @@ begin -- Flush disable control no_channel : if g_use_channel = FALSE generate - gen_valid : if g_mode ="VAL " generate flush_dis <= ctlr_wr_sosi.valid; end generate; - gen_sop : if g_mode ="SOP " generate flush_dis <= ctlr_wr_sosi.sop ; end generate; - gen_sync : if g_mode ="SYN " generate flush_dis <= ctlr_wr_sosi.sync ; end generate; + gen_valid : if g_mode ="VAL " generate flush_dis <= ctlr_wr_sosi.valid; end generate; + gen_sop : if g_mode ="SOP " generate flush_dis <= ctlr_wr_sosi.sop ; end generate; + gen_sync : if g_mode ="SYN " generate flush_dis <= ctlr_wr_sosi.sync ; end generate; end generate; use_channel : if g_use_channel = TRUE generate channel <= to_uint(ctlr_wr_sosi.channel(c_channel_w - 1 downto 0)); - gen_valid : if g_mode ="VAL " generate flush_dis <= '1' when ctlr_wr_sosi.valid = '1' and channel = g_start_channel else '0'; end generate; - gen_sop : if g_mode ="SOP " generate flush_dis <= '1' when ctlr_wr_sosi.sop = '1' and channel = g_start_channel else '0'; end generate; - gen_sync : if g_mode ="SYN " generate flush_dis <= '1' when ctlr_wr_sosi.sync = '1' and channel = g_start_channel else '0'; end generate; + gen_valid : if g_mode ="VAL " generate flush_dis <= '1' when ctlr_wr_sosi.valid = '1' and channel = g_start_channel else '0'; end generate; + gen_sop : if g_mode ="SOP " generate flush_dis <= '1' when ctlr_wr_sosi.sop = '1' and channel = g_start_channel else '0'; end generate; + gen_sync : if g_mode ="SYN " generate flush_dis <= '1' when ctlr_wr_sosi.sync = '1' and channel = g_start_channel else '0'; end generate; end generate; p_reg : process(rst, clk) @@ -136,4 +136,4 @@ begin end case; end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr/src/vhdl/io_ddr_reg.vhd b/libraries/io/ddr/src/vhdl/io_ddr_reg.vhd index c7e1a284f8..4f7baedefd 100644 --- a/libraries/io/ddr/src/vhdl/io_ddr_reg.vhd +++ b/libraries/io/ddr/src/vhdl/io_ddr_reg.vhd @@ -141,4 +141,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/ddr/src/vhdl/mms_io_ddr.vhd b/libraries/io/ddr/src/vhdl/mms_io_ddr.vhd index 4037d66200..182da5fa0b 100644 --- a/libraries/io/ddr/src/vhdl/mms_io_ddr.vhd +++ b/libraries/io/ddr/src/vhdl/mms_io_ddr.vhd @@ -205,4 +205,4 @@ begin dvr_mosi => mm_dvr_mosi ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr/tb/vhdl/tb_io_ddr.vhd b/libraries/io/ddr/tb/vhdl/tb_io_ddr.vhd index 18a27d9b48..ad21d96cd9 100644 --- a/libraries/io/ddr/tb/vhdl/tb_io_ddr.vhd +++ b/libraries/io/ddr/tb/vhdl/tb_io_ddr.vhd @@ -77,7 +77,7 @@ architecture str of tb_io_ddr is constant c_dp_clk_period : time := 5 ns; -- 200 MHz constant c_mm_clk_period : time := 8 ns; -- 125 MHz - constant c_ctlr_ref_clk_period : time := sel_a_b(g_sim_model, c_dp_clk_period, sel_a_b(c_tech_ddr.name ="DDR3 ", 5 ns, 40 ns)); -- 200 MHz for DDR3 on UniBoard and 25 MHz for DDR4 on UniBoard2, use dp clock for sim_model + constant c_ctlr_ref_clk_period : time := sel_a_b(g_sim_model, c_dp_clk_period, sel_a_b(c_tech_ddr.name ="DDR3 ", 5 ns, 40 ns)); -- 200 MHz for DDR3 on UniBoard and 25 MHz for DDR4 on UniBoard2, use dp clock for sim_model constant c_ctlr_clk_freq : natural := c_tech_ddr.mts / c_tech_ddr.rsl; -- 200 MHz constant c_ctlr_clk_period : time := (1000000 / c_ctlr_clk_freq) * 1 ps; -- 5000 ps constant c_cross_domain_dvr_ctlr : boolean := g_cross_domain_dvr_ctlr or g_dvr_clk_period /= c_ctlr_clk_period; @@ -142,7 +142,7 @@ architecture str of tb_io_ddr is end; function func_ctlr_wr_not_rd_arr return std_logic_vector is - variable v_arr : std_logic_vector(0 TO c_nof_access - 1); + variable v_arr : std_logic_vector(0 to c_nof_access - 1); begin for R in 0 to g_nof_block - 1 loop -- Write block in g_nof_wr_per_block accesses @@ -159,11 +159,11 @@ architecture str of tb_io_ddr is constant c_ctlr_address_lo_arr : t_nat_natural_arr(0 to c_nof_access - 1) := func_ctlr_address_lo_arr; constant c_ctlr_nof_address_arr : t_nat_natural_arr(0 to c_nof_access - 1) := func_ctlr_nof_address_arr; - constant c_ctlr_wr_not_rd_arr : std_logic_vector(0 TO c_nof_access - 1) := func_ctlr_wr_not_rd_arr; + constant c_ctlr_wr_not_rd_arr : std_logic_vector(0 to c_nof_access - 1) := func_ctlr_wr_not_rd_arr; signal dbg_c_ctlr_address_lo_arr : t_nat_natural_arr(0 to c_nof_access - 1) := c_ctlr_address_lo_arr; signal dbg_c_ctlr_nof_address_arr : t_nat_natural_arr(0 to c_nof_access - 1) := c_ctlr_nof_address_arr; - signal dbg_c_ctlr_wr_not_rd_arr : std_logic_vector(0 TO c_nof_access - 1) := c_ctlr_wr_not_rd_arr; + signal dbg_c_ctlr_wr_not_rd_arr : std_logic_vector(0 to c_nof_access - 1) := c_ctlr_wr_not_rd_arr; signal dbg_c_tech_ddr : t_c_tech_ddr := c_tech_ddr; signal dbg_c_exp_gigabytes : natural := c_exp_gigabytes; -- = 0 for sim model, else nof GB @@ -407,7 +407,7 @@ begin -- Default, fits g_wr_flush_mode="VAL" wr_src_out <= diag_wr_src_out; - if g_wr_flush_mode ="SOP " then + if g_wr_flush_mode ="SOP " then wr_src_out.sop <= '0'; wr_src_out.eop <= '0'; if wr_val_cnt mod c_wr_frame_size = 0 then @@ -417,7 +417,7 @@ begin end if; end if; - if g_wr_flush_mode ="SYN " then + if g_wr_flush_mode ="SYN " then wr_src_out.sync <= '0'; if wr_val_cnt mod c_wr_sync_period = 0 then wr_src_out.sync <= diag_wr_src_out.valid; @@ -517,5 +517,4 @@ begin mem4_io => phy4_io ); -end architecture str; - +end architecture str; \ No newline at end of file diff --git a/libraries/io/ddr/tb/vhdl/tb_tb_io_ddr.vhd b/libraries/io/ddr/tb/vhdl/tb_tb_io_ddr.vhd index 9b3e45243c..fd26490118 100644 --- a/libraries/io/ddr/tb/vhdl/tb_tb_io_ddr.vhd +++ b/libraries/io/ddr/tb/vhdl/tb_tb_io_ddr.vhd @@ -70,7 +70,7 @@ begin u_sim_model : entity work.tb_io_ddr generic map ( TRUE, c_technology, c_tech_ddr3, c_tech_ddr4, FALSE, FALSE, 5 ns, 4, 2500, 2, 1, 1, 1, "VAL") port map (tb_end_vec(0)); - gen_ddr3 : if c_tech_ddr.name ="DDR3 " generate + gen_ddr3 : if c_tech_ddr.name ="DDR3 " generate u_default : entity work.tb_io_ddr generic map (FALSE, c_technology, c_tech_ddr3, c_tech_ddr4, FALSE, FALSE, 5 ns, 4, 2500, 2, 1, 1, 1, "VAL") port map (tb_end_vec(1)); u_fill_wrfifo_on_next_valid : entity work.tb_io_ddr generic map (FALSE, c_technology, c_tech_ddr3, c_tech_ddr4, FALSE, FALSE, 5 ns, 1, 1000, 2, 1, 4, 2, "VAL") port map (tb_end_vec(2)); @@ -91,7 +91,7 @@ begin end generate; -- Distinghuis between tests for DDR3 and DDR4, because the Quartus 14.1 ip_arria10 DDR4 model simulates about 40x slower than the Quartus 11.1 ip_stratixiv DDR3 uniphy model. - gen_ddr4 : if c_tech_ddr.name ="DDR4 " generate + gen_ddr4 : if c_tech_ddr.name ="DDR4 " generate u_default : entity work.tb_io_ddr generic map (FALSE, c_technology, c_tech_ddr3, c_tech_ddr4, FALSE, FALSE, 5 ns, 4, 2500, 2, 1, 1, 1, "VAL") port map (tb_end_vec(1)); end generate; diff --git a/libraries/io/ddr3/src/vhdl/ddr3.vhd b/libraries/io/ddr3/src/vhdl/ddr3.vhd index 11143724e5..84bbd0364c 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3.vhd @@ -373,4 +373,4 @@ begin phy3_ou => phy_ou ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/ddr3_driver.vhd b/libraries/io/ddr3/src/vhdl/ddr3_driver.vhd index bfc23caa81..1e2af73d48 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3_driver.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3_driver.vhd @@ -272,4 +272,4 @@ begin cur_addr.row( g_ddr.a_w - 1 downto 0) <= cur_address( g_ddr.a_w + g_ddr.a_col_w - 1 downto g_ddr.a_col_w); cur_addr.column(g_ddr.a_col_w - 1 downto 0) <= cur_address( g_ddr.a_col_w - 1 downto 0); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/ddr3_flush_ctrl.vhd b/libraries/io/ddr3/src/vhdl/ddr3_flush_ctrl.vhd index bdeec8367c..644a9e4281 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3_flush_ctrl.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3_flush_ctrl.vhd @@ -151,4 +151,4 @@ begin end case; end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/ddr3_pkg.vhd b/libraries/io/ddr3/src/vhdl/ddr3_pkg.vhd index dff72c51a7..6802cc8fce 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3_pkg.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3_pkg.vhd @@ -276,4 +276,4 @@ end ddr3_pkg; package body ddr3_pkg is -end ddr3_pkg; +end ddr3_pkg; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/ddr3_reg.vhd b/libraries/io/ddr3/src/vhdl/ddr3_reg.vhd index fb78cf988d..8c085fd5d2 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3_reg.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3_reg.vhd @@ -267,4 +267,4 @@ begin out_new => open ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/ddr3_seq.vhd b/libraries/io/ddr3/src/vhdl/ddr3_seq.vhd index dd7f9f3165..833da44b50 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3_seq.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3_seq.vhd @@ -247,4 +247,4 @@ begin end_addr.row(c_address_w - c_ddr3_phy.a_col_w - 1 downto 0) <= r.end_addr(c_address_w - 1 downto c_ddr3_phy.a_col_w); end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/ddr3_transpose.vhd b/libraries/io/ddr3/src/vhdl/ddr3_transpose.vhd index acb70c1a80..68905b91f2 100644 --- a/libraries/io/ddr3/src/vhdl/ddr3_transpose.vhd +++ b/libraries/io/ddr3/src/vhdl/ddr3_transpose.vhd @@ -436,5 +436,4 @@ begin end process; end generate; -end str; - +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/mms_ddr3.vhd b/libraries/io/ddr3/src/vhdl/mms_ddr3.vhd index e265b1bbdc..c88cf43375 100644 --- a/libraries/io/ddr3/src/vhdl/mms_ddr3.vhd +++ b/libraries/io/ddr3/src/vhdl/mms_ddr3.vhd @@ -199,4 +199,4 @@ begin st_ctlr_rdy => ctlr_rdy ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/mms_ddr3_capture.vhd b/libraries/io/ddr3/src/vhdl/mms_ddr3_capture.vhd index 593589f38b..a049205477 100644 --- a/libraries/io/ddr3/src/vhdl/mms_ddr3_capture.vhd +++ b/libraries/io/ddr3/src/vhdl/mms_ddr3_capture.vhd @@ -164,4 +164,4 @@ begin ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/src/vhdl/seq_ddr3.vhd b/libraries/io/ddr3/src/vhdl/seq_ddr3.vhd index 52b5db3a7e..74c2f69be5 100644 --- a/libraries/io/ddr3/src/vhdl/seq_ddr3.vhd +++ b/libraries/io/ddr3/src/vhdl/seq_ddr3.vhd @@ -185,4 +185,4 @@ begin ctlr_rdy => ctlr_rdy ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ddr3/tb/vhdl/tb_ddr3.vhd b/libraries/io/ddr3/tb/vhdl/tb_ddr3.vhd index e772111689..0485a79f1d 100644 --- a/libraries/io/ddr3/tb/vhdl/tb_ddr3.vhd +++ b/libraries/io/ddr3/tb/vhdl/tb_ddr3.vhd @@ -284,5 +284,4 @@ begin phy_in => phy_in ); -end architecture str; - +end architecture str; \ No newline at end of file diff --git a/libraries/io/epcs/src/vhdl/epcs_reg.vhd b/libraries/io/epcs/src/vhdl/epcs_reg.vhd index fcbfd13d74..4198ceae15 100644 --- a/libraries/io/epcs/src/vhdl/epcs_reg.vhd +++ b/libraries/io/epcs/src/vhdl/epcs_reg.vhd @@ -190,4 +190,4 @@ begin epcs_in_rden <= mm_epcs_in_rden; unprotect_address_range <= mm_unprotect_address_range; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/epcs/src/vhdl/mms_epcs.vhd b/libraries/io/epcs/src/vhdl/mms_epcs.vhd index 378c674e67..d84339ccdc 100644 --- a/libraries/io/epcs/src/vhdl/mms_epcs.vhd +++ b/libraries/io/epcs/src/vhdl/mms_epcs.vhd @@ -371,4 +371,4 @@ begin out_rst => epcs_rst ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/epcs/tb/vhdl/tb_mms_epcs.vhd b/libraries/io/epcs/tb/vhdl/tb_mms_epcs.vhd index 26ddeb8c12..5f5d49c099 100644 --- a/libraries/io/epcs/tb/vhdl/tb_mms_epcs.vhd +++ b/libraries/io/epcs/tb/vhdl/tb_mms_epcs.vhd @@ -190,4 +190,4 @@ begin ); -end architecture str; +end architecture str; \ No newline at end of file diff --git a/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/mmm_unb1_eth_10g.vhd b/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/mmm_unb1_eth_10g.vhd index 09418a0558..60265140c2 100644 --- a/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/mmm_unb1_eth_10g.vhd +++ b/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/mmm_unb1_eth_10g.vhd @@ -227,7 +227,7 @@ end entity mmm_unb1_eth_10g; architecture str of mmm_unb1_eth_10g is constant c_sim_node_type : string(1 to 2) := sel_a_b(g_sim_node_nr <4, "FN", "BN"); - constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); + constant c_sim_node_nr : natural := sel_a_b(c_sim_node_type ="BN ", g_sim_node_nr -4, g_sim_node_nr); constant c_sim_eth_src_mac : std_logic_vector(c_network_eth_mac_slv'range) := x"00228608" & to_uvec(g_sim_unb_nr, c_byte_w) & to_uvec(g_sim_node_nr, c_byte_w); constant c_sim_eth_control_rx_en : natural := 2 ** c_eth_mm_reg_control_bi.rx_en; diff --git a/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/unb1_eth_10g.vhd b/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/unb1_eth_10g.vhd index 38c9b9a5a5..7ae3eef66c 100644 --- a/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/unb1_eth_10g.vhd +++ b/libraries/io/eth/designs/unb1_eth_10g/src/vhdl/unb1_eth_10g.vhd @@ -75,8 +75,8 @@ entity unb1_eth_10g is -- 1GbE Control Interface ETH_clk : in std_logic; - ETH_SGin : IN std_logic; - ETH_SGout : OUT std_logic; + ETH_SGin : in std_logic; + ETH_SGout : out std_logic; -- Transceiver clocks SA_CLK : in std_logic := '0'; -- SerDes Clock BN-BI / SI_FN @@ -136,7 +136,7 @@ architecture str of unb1_eth_10g is -- . UDP total length: 8 (UDP header) + 20 (usr header) + 2920 (payload bytes) = 2948 -- 1488 constant c_ip_length : natural := c_bg_block_size * 8 + 50; --2970; constant c_udp_length : natural := c_bg_block_size * 8 + 30; --2950; - constant c_nof_hdr_fields : natural := 3 +12 + 4 + 9 + 1; -- Total header bits = 512 + constant c_nof_hdr_fields : natural := 3 + 12 + 4 + 9 + 1; -- Total header bits = 512 constant c_hdr_field_arr : t_common_field_arr(c_nof_hdr_fields - 1 downto 0) := ( ( field_name_pad("eth_dst_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_src_mac" ), " ", 48, field_default(0) ), ( field_name_pad("eth_type" ), " ", 16, field_default(x"0800") ), @@ -172,7 +172,7 @@ architecture str of unb1_eth_10g is constant c_bypass_rx_filter : boolean := TRUE; - constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "111" &"111111111111 " &"0011 " &"001111111 " &"0 "; + constant c_hdr_field_ovr_init : std_logic_vector(c_nof_hdr_fields - 1 downto 0) := "111" &"111111111111 " &"0011 " &"001111111 " &"0 "; constant c_nof_crc_words : natural := 0; constant c_max_nof_words_per_block : natural := c_bg_block_size; @@ -888,5 +888,4 @@ begin reg_mdio_1_miso <= reg_mdio_miso_arr(1); reg_mdio_2_miso <= reg_mdio_miso_arr(2); -end str; - +end str; \ No newline at end of file diff --git a/libraries/io/eth/src/vhdl/eth_control.vhd b/libraries/io/eth/src/vhdl/eth_control.vhd index ca2fa213ed..9f767b43e1 100644 --- a/libraries/io/eth/src/vhdl/eth_control.vhd +++ b/libraries/io/eth/src/vhdl/eth_control.vhd @@ -110,8 +110,8 @@ architecture rtl of eth_control is signal i_mem_in : t_mem_mosi; signal nxt_mem_in : t_mem_mosi; - signal rd_val : std_logic_vector(0 TO c_mem_ram_rd_latency); -- use [0] to combinatorially store rd (= rd_en) - signal nxt_rd_val : std_logic_vector(1 TO c_mem_ram_rd_latency); + signal rd_val : std_logic_vector(0 to c_mem_ram_rd_latency); -- use [0] to combinatorially store rd (= rd_en) + signal nxt_rd_val : std_logic_vector(1 to c_mem_ram_rd_latency); signal rd_sop : std_logic_vector( rd_val'range); signal nxt_rd_sop : std_logic_vector(nxt_rd_val'range); signal rd_eop : std_logic_vector( rd_val'range); diff --git a/libraries/io/eth/src/vhdl/eth_hdr.vhd b/libraries/io/eth/src/vhdl/eth_hdr.vhd index 0d74b8b713..b69d1055d5 100644 --- a/libraries/io/eth/src/vhdl/eth_hdr.vhd +++ b/libraries/io/eth/src/vhdl/eth_hdr.vhd @@ -60,9 +60,9 @@ entity eth_hdr is -- Header info hdr_words_arr : out t_network_total_header_32b_arr; - hdr_words_arr_val : out std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + hdr_words_arr_val : out std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); hdr_fields : out t_network_total_header; - hdr_fields_val : out std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + hdr_fields_val : out std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); hdr_data : out std_logic_vector(c_word_w - 1 downto 0); hdr_data_val : out std_logic; hdr_status : out t_eth_hdr_status; @@ -81,9 +81,9 @@ architecture str of eth_hdr is -- Extract total header signal i_hdr_words_arr : t_network_total_header_32b_arr; - signal i_hdr_words_arr_val : std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + signal i_hdr_words_arr_val : std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); signal i_hdr_fields : t_network_total_header; - signal i_hdr_fields_val : std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + signal i_hdr_fields_val : std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); signal i_hdr_data : std_logic_vector(c_word_w - 1 downto 0); signal i_hdr_data_val : std_logic; signal i_hdr_status : t_eth_hdr_status; diff --git a/libraries/io/eth/src/vhdl/eth_hdr_status.vhd b/libraries/io/eth/src/vhdl/eth_hdr_status.vhd index fe73278645..0fc6b40454 100644 --- a/libraries/io/eth/src/vhdl/eth_hdr_status.vhd +++ b/libraries/io/eth/src/vhdl/eth_hdr_status.vhd @@ -52,9 +52,9 @@ entity eth_hdr_status is -- Total header hdr_words_arr : in t_network_total_header_32b_arr; - hdr_words_arr_val : in std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + hdr_words_arr_val : in std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); hdr_fields : in t_network_total_header; - hdr_fields_val : in std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + hdr_fields_val : in std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); hdr_data : in std_logic_vector(c_word_w - 1 downto 0); hdr_data_val : in std_logic; diff --git a/libraries/io/eth/src/vhdl/eth_hdr_store.vhd b/libraries/io/eth/src/vhdl/eth_hdr_store.vhd index 701f81a05d..d16c626bba 100644 --- a/libraries/io/eth/src/vhdl/eth_hdr_store.vhd +++ b/libraries/io/eth/src/vhdl/eth_hdr_store.vhd @@ -64,10 +64,10 @@ entity eth_hdr_store is -- Total header hdr_words_arr : out t_network_total_header_32b_arr; - hdr_words_arr_val : out std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + hdr_words_arr_val : out std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); -- Combinatorial map of the 11 header words on to the Ethernet header records hdr_fields : out t_network_total_header; - hdr_fields_val : out std_logic_vector(0 TO c_network_total_header_32b_nof_words - 1); + hdr_fields_val : out std_logic_vector(0 to c_network_total_header_32b_nof_words - 1); -- Support also outputting only the currently valid header data hdr_data : out std_logic_vector(c_word_w - 1 downto 0); hdr_data_val : out std_logic diff --git a/libraries/io/eth/src/vhdl/eth_pkg.vhd b/libraries/io/eth/src/vhdl/eth_pkg.vhd index b0f87cddd7..35befeed97 100644 --- a/libraries/io/eth/src/vhdl/eth_pkg.vhd +++ b/libraries/io/eth/src/vhdl/eth_pkg.vhd @@ -109,7 +109,7 @@ package eth_pkg is -- . write/read back registers type t_eth_demux_ports_arr is array(1 to c_eth_nof_udp_ports) of std_logic_vector(c_network_udp_port_w - 1 downto 0); type t_eth_mm_reg_demux is record - udp_ports_en : std_logic_vector(1 TO c_eth_nof_udp_ports); -- [16] + udp_ports_en : std_logic_vector(1 to c_eth_nof_udp_ports); -- [16] udp_ports : t_eth_demux_ports_arr; -- [15:0] end record; @@ -353,4 +353,4 @@ package body eth_pkg is return v_reg; end func_eth_mm_reg_status; -end eth_pkg; +end eth_pkg; \ No newline at end of file diff --git a/libraries/io/eth/src/vhdl/eth_tester_axi4_wrapper.vhd b/libraries/io/eth/src/vhdl/eth_tester_axi4_wrapper.vhd index 1dc6ba295c..51cb652182 100644 --- a/libraries/io/eth/src/vhdl/eth_tester_axi4_wrapper.vhd +++ b/libraries/io/eth/src/vhdl/eth_tester_axi4_wrapper.vhd @@ -1,612 +1,612 @@ -------------------------------------------------------------------------------- --- --- Copyright 2023 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- -------------------------------------------------------------------------------- --- Author: R. van der Walle --- Purpose: Provide AXI4-Stream and AXI4-Lite interface for eth_tester.vhd such --- that it can be used to create a Vivado IP block. --- Description: --- . The eth_tester_axi4_wrapper uses axi4_stream_dp_bridge to convert the dp --- sosi/siso interfaces of the eth_tester into AXI4-Stream interfaces. --- Similarly, axi4_lite_mm_bridge is used to convert the mem copi/cipo --- interfaces into AXI4_Lite interfaces. --- . In order for this component to be suitable as a Vivado IP, the ports are --- exclusively STD_LOGIC(_VECTOR) where the widths are hard-coded as demanded --- by the Vivado IP creator (only supports VHDL-93). - -LIBRARY IEEE, common_lib, dp_lib, diag_lib, axi4_lib; -USE IEEE.std_logic_1164.ALL; -USE common_lib.common_pkg.ALL; -USE common_lib.common_mem_pkg.ALL; -USE common_lib.common_network_layers_pkg.ALL; -USE dp_lib.dp_stream_pkg.ALL; -USE dp_lib.dp_components_pkg.ALL; -USE diag_lib.diag_pkg.ALL; -USE axi4_lib.axi4_stream_pkg.ALL; -USE axi4_lib.axi4_lite_pkg.ALL; -USE work.eth_pkg.ALL; -USE work.eth_tester_pkg.ALL; - -ENTITY eth_tester_axi4_wrapper IS - PORT ( - -- Clocks and reset - mm_clk : IN STD_LOGIC; - st_clk : IN STD_LOGIC; - st_pps : IN STD_LOGIC; - aresetn : IN STD_LOGIC; - -- UDP transmit interface - eth_src_mac : IN STD_LOGIC_VECTOR(6*8-1 DOWNTO 0); - ip_src_addr : IN STD_LOGIC_VECTOR(4*8-1 DOWNTO 0); - udp_src_port : IN STD_LOGIC_VECTOR(2*8-1 DOWNTO 0); - - tx_fifo_rd_emp_arr : OUT STD_LOGIC_VECTOR(0 DOWNTO 0); - - -- tx_udp - -- Source In and Sink Out - tx_udp_tready : IN STD_LOGIC; - - -- Source Out and Sink In - tx_udp_tvalid : OUT STD_LOGIC; - tx_udp_tdata : OUT STD_LOGIC_VECTOR(512-1 DOWNTO 0); - tx_udp_tstrb : OUT STD_LOGIC_VECTOR(512/8-1 DOWNTO 0); - tx_udp_tkeep : OUT STD_LOGIC_VECTOR(512/8-1 DOWNTO 0); - tx_udp_tlast : OUT STD_LOGIC; - tx_udp_tid : OUT STD_LOGIC_VECTOR(4-1 DOWNTO 0); - tx_udp_tdest : OUT STD_LOGIC_VECTOR(32-1 DOWNTO 0); - tx_udp_tuser : OUT STD_LOGIC_VECTOR(70-1 DOWNTO 0); - - -- rx_udp - -- Source In and Sink Out - rx_udp_tready : OUT STD_LOGIC; - - -- Source Out and Sink In - rx_udp_tvalid : IN STD_LOGIC; - rx_udp_tdata : IN STD_LOGIC_VECTOR(512-1 DOWNTO 0); - rx_udp_tstrb : IN STD_LOGIC_VECTOR(512/8-1 DOWNTO 0); - rx_udp_tkeep : IN STD_LOGIC_VECTOR(512/8-1 DOWNTO 0); - rx_udp_tlast : IN STD_LOGIC; - rx_udp_tid : IN STD_LOGIC_VECTOR(4-1 DOWNTO 0); - rx_udp_tdest : IN STD_LOGIC_VECTOR(32-1 DOWNTO 0); - rx_udp_tuser : IN STD_LOGIC_VECTOR(70-1 DOWNTO 0); - - -- reg_bg_ctrl - -- copi - reg_bg_ctrl_awaddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bg_ctrl_awprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_bg_ctrl_awvalid : IN STD_LOGIC; - reg_bg_ctrl_wdata : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bg_ctrl_wstrb : IN STD_LOGIC_VECTOR((32/8)-1 downto 0); - reg_bg_ctrl_wvalid : IN STD_LOGIC; - reg_bg_ctrl_bready : IN STD_LOGIC; - reg_bg_ctrl_araddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bg_ctrl_arprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_bg_ctrl_arvalid : IN STD_LOGIC; - reg_bg_ctrl_rready : IN STD_LOGIC; - -- cipo - reg_bg_ctrl_awready : OUT STD_LOGIC; - reg_bg_ctrl_wready : OUT STD_LOGIC; - reg_bg_ctrl_bresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_bg_ctrl_bvalid : OUT STD_LOGIC; - reg_bg_ctrl_arready : OUT STD_LOGIC; - reg_bg_ctrl_rdata : OUT STD_LOGIC_VECTOR(32-1 downto 0); - reg_bg_ctrl_rresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_bg_ctrl_rvalid : OUT STD_LOGIC; - - -- reg_hdr_dat - -- copi - reg_hdr_dat_awaddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_hdr_dat_awprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_hdr_dat_awvalid : IN STD_LOGIC; - reg_hdr_dat_wdata : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_hdr_dat_wstrb : IN STD_LOGIC_VECTOR((32/8)-1 downto 0); - reg_hdr_dat_wvalid : IN STD_LOGIC; - reg_hdr_dat_bready : IN STD_LOGIC; - reg_hdr_dat_araddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_hdr_dat_arprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_hdr_dat_arvalid : IN STD_LOGIC; - reg_hdr_dat_rready : IN STD_LOGIC; - -- cipo - reg_hdr_dat_awready : OUT STD_LOGIC; - reg_hdr_dat_wready : OUT STD_LOGIC; - reg_hdr_dat_bresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_hdr_dat_bvalid : OUT STD_LOGIC; - reg_hdr_dat_arready : OUT STD_LOGIC; - reg_hdr_dat_rdata : OUT STD_LOGIC_VECTOR(32-1 downto 0); - reg_hdr_dat_rresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_hdr_dat_rvalid : OUT STD_LOGIC; - - -- reg_bsn_monitor_v2_tx - -- copi - reg_bsn_monitor_v2_tx_awaddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_tx_awprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_bsn_monitor_v2_tx_awvalid : IN STD_LOGIC; - reg_bsn_monitor_v2_tx_wdata : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_tx_wstrb : IN STD_LOGIC_VECTOR((32/8)-1 downto 0); - reg_bsn_monitor_v2_tx_wvalid : IN STD_LOGIC; - reg_bsn_monitor_v2_tx_bready : IN STD_LOGIC; - reg_bsn_monitor_v2_tx_araddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_tx_arprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_bsn_monitor_v2_tx_arvalid : IN STD_LOGIC; - reg_bsn_monitor_v2_tx_rready : IN STD_LOGIC; - -- cipo - reg_bsn_monitor_v2_tx_awready : OUT STD_LOGIC; - reg_bsn_monitor_v2_tx_wready : OUT STD_LOGIC; - reg_bsn_monitor_v2_tx_bresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_bsn_monitor_v2_tx_bvalid : OUT STD_LOGIC; - reg_bsn_monitor_v2_tx_arready : OUT STD_LOGIC; - reg_bsn_monitor_v2_tx_rdata : OUT STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_tx_rresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_bsn_monitor_v2_tx_rvalid : OUT STD_LOGIC; - - -- reg_strobe_total_count_tx - -- copi - reg_strobe_total_count_tx_awaddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_tx_awprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_strobe_total_count_tx_awvalid : IN STD_LOGIC; - reg_strobe_total_count_tx_wdata : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_tx_wstrb : IN STD_LOGIC_VECTOR((32/8)-1 downto 0); - reg_strobe_total_count_tx_wvalid : IN STD_LOGIC; - reg_strobe_total_count_tx_bready : IN STD_LOGIC; - reg_strobe_total_count_tx_araddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_tx_arprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_strobe_total_count_tx_arvalid : IN STD_LOGIC; - reg_strobe_total_count_tx_rready : IN STD_LOGIC; - -- cipo - reg_strobe_total_count_tx_awready : OUT STD_LOGIC; - reg_strobe_total_count_tx_wready : OUT STD_LOGIC; - reg_strobe_total_count_tx_bresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_strobe_total_count_tx_bvalid : OUT STD_LOGIC; - reg_strobe_total_count_tx_arready : OUT STD_LOGIC; - reg_strobe_total_count_tx_rdata : OUT STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_tx_rresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_strobe_total_count_tx_rvalid : OUT STD_LOGIC; - - -- reg_bsn_monitor_v2_rx - -- copi - reg_bsn_monitor_v2_rx_awaddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_rx_awprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_bsn_monitor_v2_rx_awvalid : IN STD_LOGIC; - reg_bsn_monitor_v2_rx_wdata : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_rx_wstrb : IN STD_LOGIC_VECTOR((32/8)-1 downto 0); - reg_bsn_monitor_v2_rx_wvalid : IN STD_LOGIC; - reg_bsn_monitor_v2_rx_bready : IN STD_LOGIC; - reg_bsn_monitor_v2_rx_araddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_rx_arprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_bsn_monitor_v2_rx_arvalid : IN STD_LOGIC; - reg_bsn_monitor_v2_rx_rready : IN STD_LOGIC; - -- cipo - reg_bsn_monitor_v2_rx_awready : OUT STD_LOGIC; - reg_bsn_monitor_v2_rx_wready : OUT STD_LOGIC; - reg_bsn_monitor_v2_rx_bresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_bsn_monitor_v2_rx_bvalid : OUT STD_LOGIC; - reg_bsn_monitor_v2_rx_arready : OUT STD_LOGIC; - reg_bsn_monitor_v2_rx_rdata : OUT STD_LOGIC_VECTOR(32-1 downto 0); - reg_bsn_monitor_v2_rx_rresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_bsn_monitor_v2_rx_rvalid : OUT STD_LOGIC; - - -- reg_strobe_total_count_rx - -- copi - reg_strobe_total_count_rx_awaddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_rx_awprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_strobe_total_count_rx_awvalid : IN STD_LOGIC; - reg_strobe_total_count_rx_wdata : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_rx_wstrb : IN STD_LOGIC_VECTOR((32/8)-1 downto 0); - reg_strobe_total_count_rx_wvalid : IN STD_LOGIC; - reg_strobe_total_count_rx_bready : IN STD_LOGIC; - reg_strobe_total_count_rx_araddr : IN STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_rx_arprot : IN STD_LOGIC_VECTOR(3-1 downto 0); - reg_strobe_total_count_rx_arvalid : IN STD_LOGIC; - reg_strobe_total_count_rx_rready : IN STD_LOGIC; - -- cipo - reg_strobe_total_count_rx_awready : OUT STD_LOGIC; - reg_strobe_total_count_rx_wready : OUT STD_LOGIC; - reg_strobe_total_count_rx_bresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_strobe_total_count_rx_bvalid : OUT STD_LOGIC; - reg_strobe_total_count_rx_arready : OUT STD_LOGIC; - reg_strobe_total_count_rx_rdata : OUT STD_LOGIC_VECTOR(32-1 downto 0); - reg_strobe_total_count_rx_rresp : OUT STD_LOGIC_VECTOR(2-1 downto 0); - reg_strobe_total_count_rx_rvalid : OUT STD_LOGIC - - ); -END eth_tester_axi4_wrapper; - - -ARCHITECTURE str OF eth_tester_axi4_wrapper IS - SIGNAL rx_udp_sosi_arr : t_dp_sosi_arr(0 DOWNTO 0) := (OTHERS => c_dp_sosi_rst); - SIGNAL rx_udp_siso_arr : t_dp_siso_arr(0 DOWNTO 0) := (OTHERS => c_dp_siso_rdy); - SIGNAL tx_udp_sosi_arr : t_dp_sosi_arr(0 DOWNTO 0) := (OTHERS => c_dp_sosi_rst); - SIGNAL tx_udp_siso_arr : t_dp_siso_arr(0 DOWNTO 0) := (OTHERS => c_dp_siso_rdy); - - SIGNAL rx_udp_axi4_sosi : t_axi4_sosi := c_axi4_sosi_rst; - SIGNAL rx_udp_axi4_siso : t_axi4_siso := c_axi4_siso_rst; - SIGNAL tx_udp_axi4_sosi : t_axi4_sosi := c_axi4_sosi_rst; - SIGNAL tx_udp_axi4_siso : t_axi4_siso := c_axi4_siso_rst; - - SIGNAL reg_bg_ctrl_copi : t_mem_copi := c_mem_copi_rst; - SIGNAL reg_bg_ctrl_cipo : t_mem_cipo; - SIGNAL reg_hdr_dat_copi : t_mem_copi := c_mem_copi_rst; - SIGNAL reg_hdr_dat_cipo : t_mem_cipo; - SIGNAL reg_bsn_monitor_v2_tx_copi : t_mem_copi := c_mem_copi_rst; - SIGNAL reg_bsn_monitor_v2_tx_cipo : t_mem_cipo; - SIGNAL reg_strobe_total_count_tx_copi : t_mem_copi := c_mem_copi_rst; - SIGNAL reg_strobe_total_count_tx_cipo : t_mem_cipo; - - SIGNAL reg_bsn_monitor_v2_rx_copi : t_mem_copi := c_mem_copi_rst; - SIGNAL reg_bsn_monitor_v2_rx_cipo : t_mem_cipo; - SIGNAL reg_strobe_total_count_rx_copi : t_mem_copi := c_mem_copi_rst; - SIGNAL reg_strobe_total_count_rx_cipo : t_mem_cipo; - - - SIGNAL reg_bg_ctrl_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - SIGNAL reg_bg_ctrl_axi4_cipo : t_axi4_lite_cipo; - SIGNAL reg_hdr_dat_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - SIGNAL reg_hdr_dat_axi4_cipo : t_axi4_lite_cipo; - SIGNAL reg_bsn_monitor_v2_tx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - SIGNAL reg_bsn_monitor_v2_tx_axi4_cipo : t_axi4_lite_cipo; - SIGNAL reg_strobe_total_count_tx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - SIGNAL reg_strobe_total_count_tx_axi4_cipo : t_axi4_lite_cipo; - - SIGNAL reg_bsn_monitor_v2_rx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - SIGNAL reg_bsn_monitor_v2_rx_axi4_cipo : t_axi4_lite_cipo; - SIGNAL reg_strobe_total_count_rx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; - SIGNAL reg_strobe_total_count_rx_axi4_cipo : t_axi4_lite_cipo; - - SIGNAL mm_rst : STD_LOGIC := '0'; - SIGNAL st_rst : STD_LOGIC := '0'; - -BEGIN - - u_eth_tester : ENTITY work.eth_tester - GENERIC MAP ( - g_remove_crc => FALSE - ) - PORT MAP ( - -- Clocks and reset - mm_rst => mm_rst, - mm_clk => mm_clk, - st_rst => st_rst, - st_clk => st_clk, - st_pps => st_pps, - - -- UDP transmit interface - eth_src_mac => eth_src_mac, - ip_src_addr => ip_src_addr, - udp_src_port => udp_src_port, - - tx_fifo_rd_emp_arr => tx_fifo_rd_emp_arr, - - tx_udp_sosi_arr => tx_udp_sosi_arr, - tx_udp_siso_arr => tx_udp_siso_arr, - - -- UDP receive interface - rx_udp_sosi_arr => rx_udp_sosi_arr, - - -- Memory Mapped Slaves (one per stream) - reg_bg_ctrl_copi => reg_bg_ctrl_copi, - reg_bg_ctrl_cipo => reg_bg_ctrl_cipo, - reg_hdr_dat_copi => reg_hdr_dat_copi, - reg_hdr_dat_cipo => reg_hdr_dat_cipo, - reg_bsn_monitor_v2_tx_copi => reg_bsn_monitor_v2_tx_copi, - reg_bsn_monitor_v2_tx_cipo => reg_bsn_monitor_v2_tx_cipo, - reg_strobe_total_count_tx_copi => reg_strobe_total_count_tx_copi, - reg_strobe_total_count_tx_cipo => reg_strobe_total_count_tx_cipo, - - reg_bsn_monitor_v2_rx_copi => reg_bsn_monitor_v2_rx_copi, - reg_bsn_monitor_v2_rx_cipo => reg_bsn_monitor_v2_rx_cipo, - reg_strobe_total_count_rx_copi => reg_strobe_total_count_rx_copi, - reg_strobe_total_count_rx_cipo => reg_strobe_total_count_rx_cipo - ); - - -- DP to AXI4 - u_axi4_tx_udp : ENTITY axi4_lib.axi4_stream_dp_bridge - GENERIC MAP ( - g_axi4_rl => 0, - g_dp_rl => 1, - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => st_clk, - in_rst => aresetn, - - dp_rst => st_rst, - - dp_in_sosi => tx_udp_sosi_arr(0), - dp_in_siso => tx_udp_siso_arr(0), - - axi4_out_sosi => tx_udp_axi4_sosi, - axi4_out_siso => tx_udp_axi4_siso - ); - - u_axi4_rx_udp : ENTITY axi4_lib.axi4_stream_dp_bridge - GENERIC MAP ( - g_axi4_rl => 0, - g_dp_rl => 1, - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => st_clk, - in_rst => aresetn, - - axi4_in_sosi => rx_udp_axi4_sosi, - axi4_in_siso => rx_udp_axi4_siso, - - dp_out_sosi => rx_udp_sosi_arr(0), - dp_out_siso => rx_udp_siso_arr(0) - ); - - -- AXI4 to MM - u_axi4_reg_bg_ctrl : ENTITY axi4_lib.axi4_lite_mm_bridge - GENERIC MAP ( - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => mm_clk, - in_rst => aresetn, - - mm_rst => mm_rst, - - axi4_in_copi => reg_bg_ctrl_axi4_copi, - axi4_in_cipo => reg_bg_ctrl_axi4_cipo, - - mm_out_copi => reg_bg_ctrl_copi, - mm_out_cipo => reg_bg_ctrl_cipo - ); - - u_axi4_reg_hdr_dat : ENTITY axi4_lib.axi4_lite_mm_bridge - GENERIC MAP ( - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => mm_clk, - in_rst => aresetn, - - axi4_in_copi => reg_hdr_dat_axi4_copi, - axi4_in_cipo => reg_hdr_dat_axi4_cipo, - - mm_out_copi => reg_hdr_dat_copi, - mm_out_cipo => reg_hdr_dat_cipo - ); - - - u_axi4_reg_bsn_monitor_v2_tx : ENTITY axi4_lib.axi4_lite_mm_bridge - GENERIC MAP ( - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => mm_clk, - in_rst => aresetn, - - axi4_in_copi => reg_bsn_monitor_v2_tx_axi4_copi, - axi4_in_cipo => reg_bsn_monitor_v2_tx_axi4_cipo, - - mm_out_copi => reg_bsn_monitor_v2_tx_copi, - mm_out_cipo => reg_bsn_monitor_v2_tx_cipo - ); - - - u_axi4_reg_strobe_total_count_tx : ENTITY axi4_lib.axi4_lite_mm_bridge - GENERIC MAP ( - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => mm_clk, - in_rst => aresetn, - - axi4_in_copi => reg_strobe_total_count_tx_axi4_copi, - axi4_in_cipo => reg_strobe_total_count_tx_axi4_cipo, - - mm_out_copi => reg_strobe_total_count_tx_copi, - mm_out_cipo => reg_strobe_total_count_tx_cipo - ); - - - u_axi4_reg_bsn_monitor_v2_rx : ENTITY axi4_lib.axi4_lite_mm_bridge - GENERIC MAP ( - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => mm_clk, - in_rst => aresetn, - - axi4_in_copi => reg_bsn_monitor_v2_rx_axi4_copi, - axi4_in_cipo => reg_bsn_monitor_v2_rx_axi4_cipo, - - mm_out_copi => reg_bsn_monitor_v2_rx_copi, - mm_out_cipo => reg_bsn_monitor_v2_rx_cipo - ); - - u_axi4_reg_strobe_total_count_rx : ENTITY axi4_lib.axi4_lite_mm_bridge - GENERIC MAP ( - g_active_low_rst => TRUE - ) - PORT MAP ( - in_clk => mm_clk, - in_rst => aresetn, - - axi4_in_copi => reg_strobe_total_count_rx_axi4_copi, - axi4_in_cipo => reg_strobe_total_count_rx_axi4_cipo, - - mm_out_copi => reg_strobe_total_count_rx_copi, - mm_out_cipo => reg_strobe_total_count_rx_cipo - ); - - -- Wire Records to IN/OUT ports. - - -- tx_udp - tx_udp_axi4_siso.tready <= tx_udp_tready; - - tx_udp_tvalid <= tx_udp_axi4_sosi.tvalid; - tx_udp_tdata <= tx_udp_axi4_sosi.tdata; - tx_udp_tstrb <= tx_udp_axi4_sosi.tstrb; - tx_udp_tkeep <= tx_udp_axi4_sosi.tkeep; - tx_udp_tlast <= tx_udp_axi4_sosi.tlast; - tx_udp_tid <= tx_udp_axi4_sosi.tid; - tx_udp_tdest <= tx_udp_axi4_sosi.tdest; - tx_udp_tuser <= tx_udp_axi4_sosi.tuser; - - -- rx_udp - rx_udp_tready <= rx_udp_axi4_siso.tready; - - rx_udp_axi4_sosi.tvalid <= rx_udp_tvalid; - rx_udp_axi4_sosi.tdata <= rx_udp_tdata; - rx_udp_axi4_sosi.tstrb <= rx_udp_tstrb; - rx_udp_axi4_sosi.tkeep <= rx_udp_tkeep; - rx_udp_axi4_sosi.tlast <= rx_udp_tlast; - rx_udp_axi4_sosi.tid <= rx_udp_tid; - rx_udp_axi4_sosi.tdest <= rx_udp_tdest; - rx_udp_axi4_sosi.tuser <= rx_udp_tuser; - - -- reg_bg_ctrl - -- copi - reg_bg_ctrl_axi4_copi.awaddr <= reg_bg_ctrl_awaddr; - reg_bg_ctrl_axi4_copi.awprot <= reg_bg_ctrl_awprot; - reg_bg_ctrl_axi4_copi.awvalid <= reg_bg_ctrl_awvalid; - reg_bg_ctrl_axi4_copi.wdata <= reg_bg_ctrl_wdata; - reg_bg_ctrl_axi4_copi.wstrb <= reg_bg_ctrl_wstrb; - reg_bg_ctrl_axi4_copi.wvalid <= reg_bg_ctrl_wvalid; - reg_bg_ctrl_axi4_copi.bready <= reg_bg_ctrl_bready; - reg_bg_ctrl_axi4_copi.araddr <= reg_bg_ctrl_araddr; - reg_bg_ctrl_axi4_copi.arprot <= reg_bg_ctrl_arprot; - reg_bg_ctrl_axi4_copi.arvalid <= reg_bg_ctrl_arvalid; - reg_bg_ctrl_axi4_copi.rready <= reg_bg_ctrl_rready; - -- cipo - reg_bg_ctrl_awready <= reg_bg_ctrl_axi4_cipo.awready; - reg_bg_ctrl_wready <= reg_bg_ctrl_axi4_cipo.wready; - reg_bg_ctrl_bresp <= reg_bg_ctrl_axi4_cipo.bresp; - reg_bg_ctrl_bvalid <= reg_bg_ctrl_axi4_cipo.bvalid; - reg_bg_ctrl_arready <= reg_bg_ctrl_axi4_cipo.arready; - reg_bg_ctrl_rdata <= reg_bg_ctrl_axi4_cipo.rdata; - reg_bg_ctrl_rresp <= reg_bg_ctrl_axi4_cipo.rresp; - reg_bg_ctrl_rvalid <= reg_bg_ctrl_axi4_cipo.rvalid; - - -- reg_hdr_dat - -- copi - reg_hdr_dat_axi4_copi.awaddr <= reg_hdr_dat_awaddr; - reg_hdr_dat_axi4_copi.awprot <= reg_hdr_dat_awprot; - reg_hdr_dat_axi4_copi.awvalid <= reg_hdr_dat_awvalid; - reg_hdr_dat_axi4_copi.wdata <= reg_hdr_dat_wdata; - reg_hdr_dat_axi4_copi.wstrb <= reg_hdr_dat_wstrb; - reg_hdr_dat_axi4_copi.wvalid <= reg_hdr_dat_wvalid; - reg_hdr_dat_axi4_copi.bready <= reg_hdr_dat_bready; - reg_hdr_dat_axi4_copi.araddr <= reg_hdr_dat_araddr; - reg_hdr_dat_axi4_copi.arprot <= reg_hdr_dat_arprot; - reg_hdr_dat_axi4_copi.arvalid <= reg_hdr_dat_arvalid; - reg_hdr_dat_axi4_copi.rready <= reg_hdr_dat_rready; - -- cipo - reg_hdr_dat_awready <= reg_hdr_dat_axi4_cipo.awready; - reg_hdr_dat_wready <= reg_hdr_dat_axi4_cipo.wready; - reg_hdr_dat_bresp <= reg_hdr_dat_axi4_cipo.bresp; - reg_hdr_dat_bvalid <= reg_hdr_dat_axi4_cipo.bvalid; - reg_hdr_dat_arready <= reg_hdr_dat_axi4_cipo.arready; - reg_hdr_dat_rdata <= reg_hdr_dat_axi4_cipo.rdata; - reg_hdr_dat_rresp <= reg_hdr_dat_axi4_cipo.rresp; - reg_hdr_dat_rvalid <= reg_hdr_dat_axi4_cipo.rvalid; - - -- reg_bsn_monitor_v2_tx - -- copi - reg_bsn_monitor_v2_tx_axi4_copi.awaddr <= reg_bsn_monitor_v2_tx_awaddr; - reg_bsn_monitor_v2_tx_axi4_copi.awprot <= reg_bsn_monitor_v2_tx_awprot; - reg_bsn_monitor_v2_tx_axi4_copi.awvalid <= reg_bsn_monitor_v2_tx_awvalid; - reg_bsn_monitor_v2_tx_axi4_copi.wdata <= reg_bsn_monitor_v2_tx_wdata; - reg_bsn_monitor_v2_tx_axi4_copi.wstrb <= reg_bsn_monitor_v2_tx_wstrb; - reg_bsn_monitor_v2_tx_axi4_copi.wvalid <= reg_bsn_monitor_v2_tx_wvalid; - reg_bsn_monitor_v2_tx_axi4_copi.bready <= reg_bsn_monitor_v2_tx_bready; - reg_bsn_monitor_v2_tx_axi4_copi.araddr <= reg_bsn_monitor_v2_tx_araddr; - reg_bsn_monitor_v2_tx_axi4_copi.arprot <= reg_bsn_monitor_v2_tx_arprot; - reg_bsn_monitor_v2_tx_axi4_copi.arvalid <= reg_bsn_monitor_v2_tx_arvalid; - reg_bsn_monitor_v2_tx_axi4_copi.rready <= reg_bsn_monitor_v2_tx_rready; - -- cipo - reg_bsn_monitor_v2_tx_awready <= reg_bsn_monitor_v2_tx_axi4_cipo.awready; - reg_bsn_monitor_v2_tx_wready <= reg_bsn_monitor_v2_tx_axi4_cipo.wready; - reg_bsn_monitor_v2_tx_bresp <= reg_bsn_monitor_v2_tx_axi4_cipo.bresp; - reg_bsn_monitor_v2_tx_bvalid <= reg_bsn_monitor_v2_tx_axi4_cipo.bvalid; - reg_bsn_monitor_v2_tx_arready <= reg_bsn_monitor_v2_tx_axi4_cipo.arready; - reg_bsn_monitor_v2_tx_rdata <= reg_bsn_monitor_v2_tx_axi4_cipo.rdata; - reg_bsn_monitor_v2_tx_rresp <= reg_bsn_monitor_v2_tx_axi4_cipo.rresp; - reg_bsn_monitor_v2_tx_rvalid <= reg_bsn_monitor_v2_tx_axi4_cipo.rvalid; - - -- reg_strobe_total_count_tx - -- copi - reg_strobe_total_count_tx_axi4_copi.awaddr <= reg_strobe_total_count_tx_awaddr; - reg_strobe_total_count_tx_axi4_copi.awprot <= reg_strobe_total_count_tx_awprot; - reg_strobe_total_count_tx_axi4_copi.awvalid <= reg_strobe_total_count_tx_awvalid; - reg_strobe_total_count_tx_axi4_copi.wdata <= reg_strobe_total_count_tx_wdata; - reg_strobe_total_count_tx_axi4_copi.wstrb <= reg_strobe_total_count_tx_wstrb; - reg_strobe_total_count_tx_axi4_copi.wvalid <= reg_strobe_total_count_tx_wvalid; - reg_strobe_total_count_tx_axi4_copi.bready <= reg_strobe_total_count_tx_bready; - reg_strobe_total_count_tx_axi4_copi.araddr <= reg_strobe_total_count_tx_araddr; - reg_strobe_total_count_tx_axi4_copi.arprot <= reg_strobe_total_count_tx_arprot; - reg_strobe_total_count_tx_axi4_copi.arvalid <= reg_strobe_total_count_tx_arvalid; - reg_strobe_total_count_tx_axi4_copi.rready <= reg_strobe_total_count_tx_rready; - -- cipo - reg_strobe_total_count_tx_awready <= reg_strobe_total_count_tx_axi4_cipo.awready; - reg_strobe_total_count_tx_wready <= reg_strobe_total_count_tx_axi4_cipo.wready; - reg_strobe_total_count_tx_bresp <= reg_strobe_total_count_tx_axi4_cipo.bresp; - reg_strobe_total_count_tx_bvalid <= reg_strobe_total_count_tx_axi4_cipo.bvalid; - reg_strobe_total_count_tx_arready <= reg_strobe_total_count_tx_axi4_cipo.arready; - reg_strobe_total_count_tx_rdata <= reg_strobe_total_count_tx_axi4_cipo.rdata; - reg_strobe_total_count_tx_rresp <= reg_strobe_total_count_tx_axi4_cipo.rresp; - reg_strobe_total_count_tx_rvalid <= reg_strobe_total_count_tx_axi4_cipo.rvalid; - - -- reg_bsn_monitor_v2_rx - -- copi - reg_bsn_monitor_v2_rx_axi4_copi.awaddr <= reg_bsn_monitor_v2_rx_awaddr; - reg_bsn_monitor_v2_rx_axi4_copi.awprot <= reg_bsn_monitor_v2_rx_awprot; - reg_bsn_monitor_v2_rx_axi4_copi.awvalid <= reg_bsn_monitor_v2_rx_awvalid; - reg_bsn_monitor_v2_rx_axi4_copi.wdata <= reg_bsn_monitor_v2_rx_wdata; - reg_bsn_monitor_v2_rx_axi4_copi.wstrb <= reg_bsn_monitor_v2_rx_wstrb; - reg_bsn_monitor_v2_rx_axi4_copi.wvalid <= reg_bsn_monitor_v2_rx_wvalid; - reg_bsn_monitor_v2_rx_axi4_copi.bready <= reg_bsn_monitor_v2_rx_bready; - reg_bsn_monitor_v2_rx_axi4_copi.araddr <= reg_bsn_monitor_v2_rx_araddr; - reg_bsn_monitor_v2_rx_axi4_copi.arprot <= reg_bsn_monitor_v2_rx_arprot; - reg_bsn_monitor_v2_rx_axi4_copi.arvalid <= reg_bsn_monitor_v2_rx_arvalid; - reg_bsn_monitor_v2_rx_axi4_copi.rready <= reg_bsn_monitor_v2_rx_rready; - -- cipo - reg_bsn_monitor_v2_rx_awready <= reg_bsn_monitor_v2_rx_axi4_cipo.awready; - reg_bsn_monitor_v2_rx_wready <= reg_bsn_monitor_v2_rx_axi4_cipo.wready; - reg_bsn_monitor_v2_rx_bresp <= reg_bsn_monitor_v2_rx_axi4_cipo.bresp; - reg_bsn_monitor_v2_rx_bvalid <= reg_bsn_monitor_v2_rx_axi4_cipo.bvalid; - reg_bsn_monitor_v2_rx_arready <= reg_bsn_monitor_v2_rx_axi4_cipo.arready; - reg_bsn_monitor_v2_rx_rdata <= reg_bsn_monitor_v2_rx_axi4_cipo.rdata; - reg_bsn_monitor_v2_rx_rresp <= reg_bsn_monitor_v2_rx_axi4_cipo.rresp; - reg_bsn_monitor_v2_rx_rvalid <= reg_bsn_monitor_v2_rx_axi4_cipo.rvalid; - - -- reg_strobe_total_count_rx - -- copi - reg_strobe_total_count_rx_axi4_copi.awaddr <= reg_strobe_total_count_rx_awaddr; - reg_strobe_total_count_rx_axi4_copi.awprot <= reg_strobe_total_count_rx_awprot; - reg_strobe_total_count_rx_axi4_copi.awvalid <= reg_strobe_total_count_rx_awvalid; - reg_strobe_total_count_rx_axi4_copi.wdata <= reg_strobe_total_count_rx_wdata; - reg_strobe_total_count_rx_axi4_copi.wstrb <= reg_strobe_total_count_rx_wstrb; - reg_strobe_total_count_rx_axi4_copi.wvalid <= reg_strobe_total_count_rx_wvalid; - reg_strobe_total_count_rx_axi4_copi.bready <= reg_strobe_total_count_rx_bready; - reg_strobe_total_count_rx_axi4_copi.araddr <= reg_strobe_total_count_rx_araddr; - reg_strobe_total_count_rx_axi4_copi.arprot <= reg_strobe_total_count_rx_arprot; - reg_strobe_total_count_rx_axi4_copi.arvalid <= reg_strobe_total_count_rx_arvalid; - reg_strobe_total_count_rx_axi4_copi.rready <= reg_strobe_total_count_rx_rready; - -- cipo - reg_strobe_total_count_rx_awready <= reg_strobe_total_count_rx_axi4_cipo.awready; - reg_strobe_total_count_rx_wready <= reg_strobe_total_count_rx_axi4_cipo.wready; - reg_strobe_total_count_rx_bresp <= reg_strobe_total_count_rx_axi4_cipo.bresp; - reg_strobe_total_count_rx_bvalid <= reg_strobe_total_count_rx_axi4_cipo.bvalid; - reg_strobe_total_count_rx_arready <= reg_strobe_total_count_rx_axi4_cipo.arready; - reg_strobe_total_count_rx_rdata <= reg_strobe_total_count_rx_axi4_cipo.rdata; - reg_strobe_total_count_rx_rresp <= reg_strobe_total_count_rx_axi4_cipo.rresp; - reg_strobe_total_count_rx_rvalid <= reg_strobe_total_count_rx_axi4_cipo.rvalid; - -END str; +------------------------------------------------------------------------------- +-- +-- Copyright 2023 +-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> +-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +------------------------------------------------------------------------------- +-- Author: R. van der Walle +-- Purpose: Provide AXI4-Stream and AXI4-Lite interface for eth_tester.vhd such +-- that it can be used to create a Vivado IP block. +-- Description: +-- . The eth_tester_axi4_wrapper uses axi4_stream_dp_bridge to convert the dp +-- sosi/siso interfaces of the eth_tester into AXI4-Stream interfaces. +-- Similarly, axi4_lite_mm_bridge is used to convert the mem copi/cipo +-- interfaces into AXI4_Lite interfaces. +-- . In order for this component to be suitable as a Vivado IP, the ports are +-- exclusively STD_LOGIC(_VECTOR) where the widths are hard-coded as demanded +-- by the Vivado IP creator (only supports VHDL-93). + +library IEEE, common_lib, dp_lib, diag_lib, axi4_lib; +use IEEE.std_logic_1164.all; +use common_lib.common_pkg.all; +use common_lib.common_mem_pkg.all; +use common_lib.common_network_layers_pkg.all; +use dp_lib.dp_stream_pkg.all; +use dp_lib.dp_components_pkg.all; +use diag_lib.diag_pkg.all; +use axi4_lib.axi4_stream_pkg.all; +use axi4_lib.axi4_lite_pkg.all; +use work.eth_pkg.all; +use work.eth_tester_pkg.all; + +entity eth_tester_axi4_wrapper is + port ( + -- Clocks and reset + mm_clk : in std_logic; + st_clk : in std_logic; + st_pps : in std_logic; + aresetn : in std_logic; + -- UDP transmit interface + eth_src_mac : in std_logic_vector(6 * 8 - 1 downto 0); + ip_src_addr : in std_logic_vector(4 * 8 - 1 downto 0); + udp_src_port : in std_logic_vector(2 * 8 - 1 downto 0); + + tx_fifo_rd_emp_arr : out std_logic_vector(0 downto 0); + + -- tx_udp + -- Source In and Sink Out + tx_udp_tready : in std_logic; + + -- Source Out and Sink In + tx_udp_tvalid : out std_logic; + tx_udp_tdata : out std_logic_vector(512 - 1 downto 0); + tx_udp_tstrb : out std_logic_vector(512 / 8 - 1 downto 0); + tx_udp_tkeep : out std_logic_vector(512 / 8 - 1 downto 0); + tx_udp_tlast : out std_logic; + tx_udp_tid : out std_logic_vector(4 - 1 downto 0); + tx_udp_tdest : out std_logic_vector(32 - 1 downto 0); + tx_udp_tuser : out std_logic_vector(70 - 1 downto 0); + + -- rx_udp + -- Source In and Sink Out + rx_udp_tready : out std_logic; + + -- Source Out and Sink In + rx_udp_tvalid : in std_logic; + rx_udp_tdata : in std_logic_vector(512 - 1 downto 0); + rx_udp_tstrb : in std_logic_vector(512 / 8 - 1 downto 0); + rx_udp_tkeep : in std_logic_vector(512 / 8 - 1 downto 0); + rx_udp_tlast : in std_logic; + rx_udp_tid : in std_logic_vector(4 - 1 downto 0); + rx_udp_tdest : in std_logic_vector(32 - 1 downto 0); + rx_udp_tuser : in std_logic_vector(70 - 1 downto 0); + + -- reg_bg_ctrl + -- copi + reg_bg_ctrl_awaddr : in std_logic_vector(32 - 1 downto 0); + reg_bg_ctrl_awprot : in std_logic_vector(3 - 1 downto 0); + reg_bg_ctrl_awvalid : in std_logic; + reg_bg_ctrl_wdata : in std_logic_vector(32 - 1 downto 0); + reg_bg_ctrl_wstrb : in std_logic_vector((32 / 8) - 1 downto 0); + reg_bg_ctrl_wvalid : in std_logic; + reg_bg_ctrl_bready : in std_logic; + reg_bg_ctrl_araddr : in std_logic_vector(32 - 1 downto 0); + reg_bg_ctrl_arprot : in std_logic_vector(3 - 1 downto 0); + reg_bg_ctrl_arvalid : in std_logic; + reg_bg_ctrl_rready : in std_logic; + -- cipo + reg_bg_ctrl_awready : out std_logic; + reg_bg_ctrl_wready : out std_logic; + reg_bg_ctrl_bresp : out std_logic_vector(2 - 1 downto 0); + reg_bg_ctrl_bvalid : out std_logic; + reg_bg_ctrl_arready : out std_logic; + reg_bg_ctrl_rdata : out std_logic_vector(32 - 1 downto 0); + reg_bg_ctrl_rresp : out std_logic_vector(2 - 1 downto 0); + reg_bg_ctrl_rvalid : out std_logic; + + -- reg_hdr_dat + -- copi + reg_hdr_dat_awaddr : in std_logic_vector(32 - 1 downto 0); + reg_hdr_dat_awprot : in std_logic_vector(3 - 1 downto 0); + reg_hdr_dat_awvalid : in std_logic; + reg_hdr_dat_wdata : in std_logic_vector(32 - 1 downto 0); + reg_hdr_dat_wstrb : in std_logic_vector((32 / 8) - 1 downto 0); + reg_hdr_dat_wvalid : in std_logic; + reg_hdr_dat_bready : in std_logic; + reg_hdr_dat_araddr : in std_logic_vector(32 - 1 downto 0); + reg_hdr_dat_arprot : in std_logic_vector(3 - 1 downto 0); + reg_hdr_dat_arvalid : in std_logic; + reg_hdr_dat_rready : in std_logic; + -- cipo + reg_hdr_dat_awready : out std_logic; + reg_hdr_dat_wready : out std_logic; + reg_hdr_dat_bresp : out std_logic_vector(2 - 1 downto 0); + reg_hdr_dat_bvalid : out std_logic; + reg_hdr_dat_arready : out std_logic; + reg_hdr_dat_rdata : out std_logic_vector(32 - 1 downto 0); + reg_hdr_dat_rresp : out std_logic_vector(2 - 1 downto 0); + reg_hdr_dat_rvalid : out std_logic; + + -- reg_bsn_monitor_v2_tx + -- copi + reg_bsn_monitor_v2_tx_awaddr : in std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_tx_awprot : in std_logic_vector(3 - 1 downto 0); + reg_bsn_monitor_v2_tx_awvalid : in std_logic; + reg_bsn_monitor_v2_tx_wdata : in std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_tx_wstrb : in std_logic_vector((32 / 8) - 1 downto 0); + reg_bsn_monitor_v2_tx_wvalid : in std_logic; + reg_bsn_monitor_v2_tx_bready : in std_logic; + reg_bsn_monitor_v2_tx_araddr : in std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_tx_arprot : in std_logic_vector(3 - 1 downto 0); + reg_bsn_monitor_v2_tx_arvalid : in std_logic; + reg_bsn_monitor_v2_tx_rready : in std_logic; + -- cipo + reg_bsn_monitor_v2_tx_awready : out std_logic; + reg_bsn_monitor_v2_tx_wready : out std_logic; + reg_bsn_monitor_v2_tx_bresp : out std_logic_vector(2 - 1 downto 0); + reg_bsn_monitor_v2_tx_bvalid : out std_logic; + reg_bsn_monitor_v2_tx_arready : out std_logic; + reg_bsn_monitor_v2_tx_rdata : out std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_tx_rresp : out std_logic_vector(2 - 1 downto 0); + reg_bsn_monitor_v2_tx_rvalid : out std_logic; + + -- reg_strobe_total_count_tx + -- copi + reg_strobe_total_count_tx_awaddr : in std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_tx_awprot : in std_logic_vector(3 - 1 downto 0); + reg_strobe_total_count_tx_awvalid : in std_logic; + reg_strobe_total_count_tx_wdata : in std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_tx_wstrb : in std_logic_vector((32 / 8) - 1 downto 0); + reg_strobe_total_count_tx_wvalid : in std_logic; + reg_strobe_total_count_tx_bready : in std_logic; + reg_strobe_total_count_tx_araddr : in std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_tx_arprot : in std_logic_vector(3 - 1 downto 0); + reg_strobe_total_count_tx_arvalid : in std_logic; + reg_strobe_total_count_tx_rready : in std_logic; + -- cipo + reg_strobe_total_count_tx_awready : out std_logic; + reg_strobe_total_count_tx_wready : out std_logic; + reg_strobe_total_count_tx_bresp : out std_logic_vector(2 - 1 downto 0); + reg_strobe_total_count_tx_bvalid : out std_logic; + reg_strobe_total_count_tx_arready : out std_logic; + reg_strobe_total_count_tx_rdata : out std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_tx_rresp : out std_logic_vector(2 - 1 downto 0); + reg_strobe_total_count_tx_rvalid : out std_logic; + + -- reg_bsn_monitor_v2_rx + -- copi + reg_bsn_monitor_v2_rx_awaddr : in std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_rx_awprot : in std_logic_vector(3 - 1 downto 0); + reg_bsn_monitor_v2_rx_awvalid : in std_logic; + reg_bsn_monitor_v2_rx_wdata : in std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_rx_wstrb : in std_logic_vector((32 / 8) - 1 downto 0); + reg_bsn_monitor_v2_rx_wvalid : in std_logic; + reg_bsn_monitor_v2_rx_bready : in std_logic; + reg_bsn_monitor_v2_rx_araddr : in std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_rx_arprot : in std_logic_vector(3 - 1 downto 0); + reg_bsn_monitor_v2_rx_arvalid : in std_logic; + reg_bsn_monitor_v2_rx_rready : in std_logic; + -- cipo + reg_bsn_monitor_v2_rx_awready : out std_logic; + reg_bsn_monitor_v2_rx_wready : out std_logic; + reg_bsn_monitor_v2_rx_bresp : out std_logic_vector(2 - 1 downto 0); + reg_bsn_monitor_v2_rx_bvalid : out std_logic; + reg_bsn_monitor_v2_rx_arready : out std_logic; + reg_bsn_monitor_v2_rx_rdata : out std_logic_vector(32 - 1 downto 0); + reg_bsn_monitor_v2_rx_rresp : out std_logic_vector(2 - 1 downto 0); + reg_bsn_monitor_v2_rx_rvalid : out std_logic; + + -- reg_strobe_total_count_rx + -- copi + reg_strobe_total_count_rx_awaddr : in std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_rx_awprot : in std_logic_vector(3 - 1 downto 0); + reg_strobe_total_count_rx_awvalid : in std_logic; + reg_strobe_total_count_rx_wdata : in std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_rx_wstrb : in std_logic_vector((32 / 8) - 1 downto 0); + reg_strobe_total_count_rx_wvalid : in std_logic; + reg_strobe_total_count_rx_bready : in std_logic; + reg_strobe_total_count_rx_araddr : in std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_rx_arprot : in std_logic_vector(3 - 1 downto 0); + reg_strobe_total_count_rx_arvalid : in std_logic; + reg_strobe_total_count_rx_rready : in std_logic; + -- cipo + reg_strobe_total_count_rx_awready : out std_logic; + reg_strobe_total_count_rx_wready : out std_logic; + reg_strobe_total_count_rx_bresp : out std_logic_vector(2 - 1 downto 0); + reg_strobe_total_count_rx_bvalid : out std_logic; + reg_strobe_total_count_rx_arready : out std_logic; + reg_strobe_total_count_rx_rdata : out std_logic_vector(32 - 1 downto 0); + reg_strobe_total_count_rx_rresp : out std_logic_vector(2 - 1 downto 0); + reg_strobe_total_count_rx_rvalid : out std_logic + + ); +end eth_tester_axi4_wrapper; + + +architecture str of eth_tester_axi4_wrapper is + signal rx_udp_sosi_arr : t_dp_sosi_arr(0 downto 0) := (others => c_dp_sosi_rst); + signal rx_udp_siso_arr : t_dp_siso_arr(0 downto 0) := (others => c_dp_siso_rdy); + signal tx_udp_sosi_arr : t_dp_sosi_arr(0 downto 0) := (others => c_dp_sosi_rst); + signal tx_udp_siso_arr : t_dp_siso_arr(0 downto 0) := (others => c_dp_siso_rdy); + + signal rx_udp_axi4_sosi : t_axi4_sosi := c_axi4_sosi_rst; + signal rx_udp_axi4_siso : t_axi4_siso := c_axi4_siso_rst; + signal tx_udp_axi4_sosi : t_axi4_sosi := c_axi4_sosi_rst; + signal tx_udp_axi4_siso : t_axi4_siso := c_axi4_siso_rst; + + signal reg_bg_ctrl_copi : t_mem_copi := c_mem_copi_rst; + signal reg_bg_ctrl_cipo : t_mem_cipo; + signal reg_hdr_dat_copi : t_mem_copi := c_mem_copi_rst; + signal reg_hdr_dat_cipo : t_mem_cipo; + signal reg_bsn_monitor_v2_tx_copi : t_mem_copi := c_mem_copi_rst; + signal reg_bsn_monitor_v2_tx_cipo : t_mem_cipo; + signal reg_strobe_total_count_tx_copi : t_mem_copi := c_mem_copi_rst; + signal reg_strobe_total_count_tx_cipo : t_mem_cipo; + + signal reg_bsn_monitor_v2_rx_copi : t_mem_copi := c_mem_copi_rst; + signal reg_bsn_monitor_v2_rx_cipo : t_mem_cipo; + signal reg_strobe_total_count_rx_copi : t_mem_copi := c_mem_copi_rst; + signal reg_strobe_total_count_rx_cipo : t_mem_cipo; + + + signal reg_bg_ctrl_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; + signal reg_bg_ctrl_axi4_cipo : t_axi4_lite_cipo; + signal reg_hdr_dat_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; + signal reg_hdr_dat_axi4_cipo : t_axi4_lite_cipo; + signal reg_bsn_monitor_v2_tx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; + signal reg_bsn_monitor_v2_tx_axi4_cipo : t_axi4_lite_cipo; + signal reg_strobe_total_count_tx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; + signal reg_strobe_total_count_tx_axi4_cipo : t_axi4_lite_cipo; + + signal reg_bsn_monitor_v2_rx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; + signal reg_bsn_monitor_v2_rx_axi4_cipo : t_axi4_lite_cipo; + signal reg_strobe_total_count_rx_axi4_copi : t_axi4_lite_copi := c_axi4_lite_copi_rst; + signal reg_strobe_total_count_rx_axi4_cipo : t_axi4_lite_cipo; + + signal mm_rst : std_logic := '0'; + signal st_rst : std_logic := '0'; + +begin + + u_eth_tester : entity work.eth_tester + generic map ( + g_remove_crc => FALSE + ) + port map ( + -- Clocks and reset + mm_rst => mm_rst, + mm_clk => mm_clk, + st_rst => st_rst, + st_clk => st_clk, + st_pps => st_pps, + + -- UDP transmit interface + eth_src_mac => eth_src_mac, + ip_src_addr => ip_src_addr, + udp_src_port => udp_src_port, + + tx_fifo_rd_emp_arr => tx_fifo_rd_emp_arr, + + tx_udp_sosi_arr => tx_udp_sosi_arr, + tx_udp_siso_arr => tx_udp_siso_arr, + + -- UDP receive interface + rx_udp_sosi_arr => rx_udp_sosi_arr, + + -- Memory Mapped Slaves (one per stream) + reg_bg_ctrl_copi => reg_bg_ctrl_copi, + reg_bg_ctrl_cipo => reg_bg_ctrl_cipo, + reg_hdr_dat_copi => reg_hdr_dat_copi, + reg_hdr_dat_cipo => reg_hdr_dat_cipo, + reg_bsn_monitor_v2_tx_copi => reg_bsn_monitor_v2_tx_copi, + reg_bsn_monitor_v2_tx_cipo => reg_bsn_monitor_v2_tx_cipo, + reg_strobe_total_count_tx_copi => reg_strobe_total_count_tx_copi, + reg_strobe_total_count_tx_cipo => reg_strobe_total_count_tx_cipo, + + reg_bsn_monitor_v2_rx_copi => reg_bsn_monitor_v2_rx_copi, + reg_bsn_monitor_v2_rx_cipo => reg_bsn_monitor_v2_rx_cipo, + reg_strobe_total_count_rx_copi => reg_strobe_total_count_rx_copi, + reg_strobe_total_count_rx_cipo => reg_strobe_total_count_rx_cipo + ); + + -- DP to AXI4 + u_axi4_tx_udp : entity axi4_lib.axi4_stream_dp_bridge + generic map ( + g_axi4_rl => 0, + g_dp_rl => 1, + g_active_low_rst => TRUE + ) + port map ( + in_clk => st_clk, + in_rst => aresetn, + + dp_rst => st_rst, + + dp_in_sosi => tx_udp_sosi_arr(0), + dp_in_siso => tx_udp_siso_arr(0), + + axi4_out_sosi => tx_udp_axi4_sosi, + axi4_out_siso => tx_udp_axi4_siso + ); + + u_axi4_rx_udp : entity axi4_lib.axi4_stream_dp_bridge + generic map ( + g_axi4_rl => 0, + g_dp_rl => 1, + g_active_low_rst => TRUE + ) + port map ( + in_clk => st_clk, + in_rst => aresetn, + + axi4_in_sosi => rx_udp_axi4_sosi, + axi4_in_siso => rx_udp_axi4_siso, + + dp_out_sosi => rx_udp_sosi_arr(0), + dp_out_siso => rx_udp_siso_arr(0) + ); + + -- AXI4 to MM + u_axi4_reg_bg_ctrl : entity axi4_lib.axi4_lite_mm_bridge + generic map ( + g_active_low_rst => TRUE + ) + port map ( + in_clk => mm_clk, + in_rst => aresetn, + + mm_rst => mm_rst, + + axi4_in_copi => reg_bg_ctrl_axi4_copi, + axi4_in_cipo => reg_bg_ctrl_axi4_cipo, + + mm_out_copi => reg_bg_ctrl_copi, + mm_out_cipo => reg_bg_ctrl_cipo + ); + + u_axi4_reg_hdr_dat : entity axi4_lib.axi4_lite_mm_bridge + generic map ( + g_active_low_rst => TRUE + ) + port map ( + in_clk => mm_clk, + in_rst => aresetn, + + axi4_in_copi => reg_hdr_dat_axi4_copi, + axi4_in_cipo => reg_hdr_dat_axi4_cipo, + + mm_out_copi => reg_hdr_dat_copi, + mm_out_cipo => reg_hdr_dat_cipo + ); + + + u_axi4_reg_bsn_monitor_v2_tx : entity axi4_lib.axi4_lite_mm_bridge + generic map ( + g_active_low_rst => TRUE + ) + port map ( + in_clk => mm_clk, + in_rst => aresetn, + + axi4_in_copi => reg_bsn_monitor_v2_tx_axi4_copi, + axi4_in_cipo => reg_bsn_monitor_v2_tx_axi4_cipo, + + mm_out_copi => reg_bsn_monitor_v2_tx_copi, + mm_out_cipo => reg_bsn_monitor_v2_tx_cipo + ); + + + u_axi4_reg_strobe_total_count_tx : entity axi4_lib.axi4_lite_mm_bridge + generic map ( + g_active_low_rst => TRUE + ) + port map ( + in_clk => mm_clk, + in_rst => aresetn, + + axi4_in_copi => reg_strobe_total_count_tx_axi4_copi, + axi4_in_cipo => reg_strobe_total_count_tx_axi4_cipo, + + mm_out_copi => reg_strobe_total_count_tx_copi, + mm_out_cipo => reg_strobe_total_count_tx_cipo + ); + + + u_axi4_reg_bsn_monitor_v2_rx : entity axi4_lib.axi4_lite_mm_bridge + generic map ( + g_active_low_rst => TRUE + ) + port map ( + in_clk => mm_clk, + in_rst => aresetn, + + axi4_in_copi => reg_bsn_monitor_v2_rx_axi4_copi, + axi4_in_cipo => reg_bsn_monitor_v2_rx_axi4_cipo, + + mm_out_copi => reg_bsn_monitor_v2_rx_copi, + mm_out_cipo => reg_bsn_monitor_v2_rx_cipo + ); + + u_axi4_reg_strobe_total_count_rx : entity axi4_lib.axi4_lite_mm_bridge + generic map ( + g_active_low_rst => TRUE + ) + port map ( + in_clk => mm_clk, + in_rst => aresetn, + + axi4_in_copi => reg_strobe_total_count_rx_axi4_copi, + axi4_in_cipo => reg_strobe_total_count_rx_axi4_cipo, + + mm_out_copi => reg_strobe_total_count_rx_copi, + mm_out_cipo => reg_strobe_total_count_rx_cipo + ); + + -- Wire Records to IN/OUT ports. + + -- tx_udp + tx_udp_axi4_siso.tready <= tx_udp_tready; + + tx_udp_tvalid <= tx_udp_axi4_sosi.tvalid; + tx_udp_tdata <= tx_udp_axi4_sosi.tdata; + tx_udp_tstrb <= tx_udp_axi4_sosi.tstrb; + tx_udp_tkeep <= tx_udp_axi4_sosi.tkeep; + tx_udp_tlast <= tx_udp_axi4_sosi.tlast; + tx_udp_tid <= tx_udp_axi4_sosi.tid; + tx_udp_tdest <= tx_udp_axi4_sosi.tdest; + tx_udp_tuser <= tx_udp_axi4_sosi.tuser; + + -- rx_udp + rx_udp_tready <= rx_udp_axi4_siso.tready; + + rx_udp_axi4_sosi.tvalid <= rx_udp_tvalid; + rx_udp_axi4_sosi.tdata <= rx_udp_tdata; + rx_udp_axi4_sosi.tstrb <= rx_udp_tstrb; + rx_udp_axi4_sosi.tkeep <= rx_udp_tkeep; + rx_udp_axi4_sosi.tlast <= rx_udp_tlast; + rx_udp_axi4_sosi.tid <= rx_udp_tid; + rx_udp_axi4_sosi.tdest <= rx_udp_tdest; + rx_udp_axi4_sosi.tuser <= rx_udp_tuser; + + -- reg_bg_ctrl + -- copi + reg_bg_ctrl_axi4_copi.awaddr <= reg_bg_ctrl_awaddr; + reg_bg_ctrl_axi4_copi.awprot <= reg_bg_ctrl_awprot; + reg_bg_ctrl_axi4_copi.awvalid <= reg_bg_ctrl_awvalid; + reg_bg_ctrl_axi4_copi.wdata <= reg_bg_ctrl_wdata; + reg_bg_ctrl_axi4_copi.wstrb <= reg_bg_ctrl_wstrb; + reg_bg_ctrl_axi4_copi.wvalid <= reg_bg_ctrl_wvalid; + reg_bg_ctrl_axi4_copi.bready <= reg_bg_ctrl_bready; + reg_bg_ctrl_axi4_copi.araddr <= reg_bg_ctrl_araddr; + reg_bg_ctrl_axi4_copi.arprot <= reg_bg_ctrl_arprot; + reg_bg_ctrl_axi4_copi.arvalid <= reg_bg_ctrl_arvalid; + reg_bg_ctrl_axi4_copi.rready <= reg_bg_ctrl_rready; + -- cipo + reg_bg_ctrl_awready <= reg_bg_ctrl_axi4_cipo.awready; + reg_bg_ctrl_wready <= reg_bg_ctrl_axi4_cipo.wready; + reg_bg_ctrl_bresp <= reg_bg_ctrl_axi4_cipo.bresp; + reg_bg_ctrl_bvalid <= reg_bg_ctrl_axi4_cipo.bvalid; + reg_bg_ctrl_arready <= reg_bg_ctrl_axi4_cipo.arready; + reg_bg_ctrl_rdata <= reg_bg_ctrl_axi4_cipo.rdata; + reg_bg_ctrl_rresp <= reg_bg_ctrl_axi4_cipo.rresp; + reg_bg_ctrl_rvalid <= reg_bg_ctrl_axi4_cipo.rvalid; + + -- reg_hdr_dat + -- copi + reg_hdr_dat_axi4_copi.awaddr <= reg_hdr_dat_awaddr; + reg_hdr_dat_axi4_copi.awprot <= reg_hdr_dat_awprot; + reg_hdr_dat_axi4_copi.awvalid <= reg_hdr_dat_awvalid; + reg_hdr_dat_axi4_copi.wdata <= reg_hdr_dat_wdata; + reg_hdr_dat_axi4_copi.wstrb <= reg_hdr_dat_wstrb; + reg_hdr_dat_axi4_copi.wvalid <= reg_hdr_dat_wvalid; + reg_hdr_dat_axi4_copi.bready <= reg_hdr_dat_bready; + reg_hdr_dat_axi4_copi.araddr <= reg_hdr_dat_araddr; + reg_hdr_dat_axi4_copi.arprot <= reg_hdr_dat_arprot; + reg_hdr_dat_axi4_copi.arvalid <= reg_hdr_dat_arvalid; + reg_hdr_dat_axi4_copi.rready <= reg_hdr_dat_rready; + -- cipo + reg_hdr_dat_awready <= reg_hdr_dat_axi4_cipo.awready; + reg_hdr_dat_wready <= reg_hdr_dat_axi4_cipo.wready; + reg_hdr_dat_bresp <= reg_hdr_dat_axi4_cipo.bresp; + reg_hdr_dat_bvalid <= reg_hdr_dat_axi4_cipo.bvalid; + reg_hdr_dat_arready <= reg_hdr_dat_axi4_cipo.arready; + reg_hdr_dat_rdata <= reg_hdr_dat_axi4_cipo.rdata; + reg_hdr_dat_rresp <= reg_hdr_dat_axi4_cipo.rresp; + reg_hdr_dat_rvalid <= reg_hdr_dat_axi4_cipo.rvalid; + + -- reg_bsn_monitor_v2_tx + -- copi + reg_bsn_monitor_v2_tx_axi4_copi.awaddr <= reg_bsn_monitor_v2_tx_awaddr; + reg_bsn_monitor_v2_tx_axi4_copi.awprot <= reg_bsn_monitor_v2_tx_awprot; + reg_bsn_monitor_v2_tx_axi4_copi.awvalid <= reg_bsn_monitor_v2_tx_awvalid; + reg_bsn_monitor_v2_tx_axi4_copi.wdata <= reg_bsn_monitor_v2_tx_wdata; + reg_bsn_monitor_v2_tx_axi4_copi.wstrb <= reg_bsn_monitor_v2_tx_wstrb; + reg_bsn_monitor_v2_tx_axi4_copi.wvalid <= reg_bsn_monitor_v2_tx_wvalid; + reg_bsn_monitor_v2_tx_axi4_copi.bready <= reg_bsn_monitor_v2_tx_bready; + reg_bsn_monitor_v2_tx_axi4_copi.araddr <= reg_bsn_monitor_v2_tx_araddr; + reg_bsn_monitor_v2_tx_axi4_copi.arprot <= reg_bsn_monitor_v2_tx_arprot; + reg_bsn_monitor_v2_tx_axi4_copi.arvalid <= reg_bsn_monitor_v2_tx_arvalid; + reg_bsn_monitor_v2_tx_axi4_copi.rready <= reg_bsn_monitor_v2_tx_rready; + -- cipo + reg_bsn_monitor_v2_tx_awready <= reg_bsn_monitor_v2_tx_axi4_cipo.awready; + reg_bsn_monitor_v2_tx_wready <= reg_bsn_monitor_v2_tx_axi4_cipo.wready; + reg_bsn_monitor_v2_tx_bresp <= reg_bsn_monitor_v2_tx_axi4_cipo.bresp; + reg_bsn_monitor_v2_tx_bvalid <= reg_bsn_monitor_v2_tx_axi4_cipo.bvalid; + reg_bsn_monitor_v2_tx_arready <= reg_bsn_monitor_v2_tx_axi4_cipo.arready; + reg_bsn_monitor_v2_tx_rdata <= reg_bsn_monitor_v2_tx_axi4_cipo.rdata; + reg_bsn_monitor_v2_tx_rresp <= reg_bsn_monitor_v2_tx_axi4_cipo.rresp; + reg_bsn_monitor_v2_tx_rvalid <= reg_bsn_monitor_v2_tx_axi4_cipo.rvalid; + + -- reg_strobe_total_count_tx + -- copi + reg_strobe_total_count_tx_axi4_copi.awaddr <= reg_strobe_total_count_tx_awaddr; + reg_strobe_total_count_tx_axi4_copi.awprot <= reg_strobe_total_count_tx_awprot; + reg_strobe_total_count_tx_axi4_copi.awvalid <= reg_strobe_total_count_tx_awvalid; + reg_strobe_total_count_tx_axi4_copi.wdata <= reg_strobe_total_count_tx_wdata; + reg_strobe_total_count_tx_axi4_copi.wstrb <= reg_strobe_total_count_tx_wstrb; + reg_strobe_total_count_tx_axi4_copi.wvalid <= reg_strobe_total_count_tx_wvalid; + reg_strobe_total_count_tx_axi4_copi.bready <= reg_strobe_total_count_tx_bready; + reg_strobe_total_count_tx_axi4_copi.araddr <= reg_strobe_total_count_tx_araddr; + reg_strobe_total_count_tx_axi4_copi.arprot <= reg_strobe_total_count_tx_arprot; + reg_strobe_total_count_tx_axi4_copi.arvalid <= reg_strobe_total_count_tx_arvalid; + reg_strobe_total_count_tx_axi4_copi.rready <= reg_strobe_total_count_tx_rready; + -- cipo + reg_strobe_total_count_tx_awready <= reg_strobe_total_count_tx_axi4_cipo.awready; + reg_strobe_total_count_tx_wready <= reg_strobe_total_count_tx_axi4_cipo.wready; + reg_strobe_total_count_tx_bresp <= reg_strobe_total_count_tx_axi4_cipo.bresp; + reg_strobe_total_count_tx_bvalid <= reg_strobe_total_count_tx_axi4_cipo.bvalid; + reg_strobe_total_count_tx_arready <= reg_strobe_total_count_tx_axi4_cipo.arready; + reg_strobe_total_count_tx_rdata <= reg_strobe_total_count_tx_axi4_cipo.rdata; + reg_strobe_total_count_tx_rresp <= reg_strobe_total_count_tx_axi4_cipo.rresp; + reg_strobe_total_count_tx_rvalid <= reg_strobe_total_count_tx_axi4_cipo.rvalid; + + -- reg_bsn_monitor_v2_rx + -- copi + reg_bsn_monitor_v2_rx_axi4_copi.awaddr <= reg_bsn_monitor_v2_rx_awaddr; + reg_bsn_monitor_v2_rx_axi4_copi.awprot <= reg_bsn_monitor_v2_rx_awprot; + reg_bsn_monitor_v2_rx_axi4_copi.awvalid <= reg_bsn_monitor_v2_rx_awvalid; + reg_bsn_monitor_v2_rx_axi4_copi.wdata <= reg_bsn_monitor_v2_rx_wdata; + reg_bsn_monitor_v2_rx_axi4_copi.wstrb <= reg_bsn_monitor_v2_rx_wstrb; + reg_bsn_monitor_v2_rx_axi4_copi.wvalid <= reg_bsn_monitor_v2_rx_wvalid; + reg_bsn_monitor_v2_rx_axi4_copi.bready <= reg_bsn_monitor_v2_rx_bready; + reg_bsn_monitor_v2_rx_axi4_copi.araddr <= reg_bsn_monitor_v2_rx_araddr; + reg_bsn_monitor_v2_rx_axi4_copi.arprot <= reg_bsn_monitor_v2_rx_arprot; + reg_bsn_monitor_v2_rx_axi4_copi.arvalid <= reg_bsn_monitor_v2_rx_arvalid; + reg_bsn_monitor_v2_rx_axi4_copi.rready <= reg_bsn_monitor_v2_rx_rready; + -- cipo + reg_bsn_monitor_v2_rx_awready <= reg_bsn_monitor_v2_rx_axi4_cipo.awready; + reg_bsn_monitor_v2_rx_wready <= reg_bsn_monitor_v2_rx_axi4_cipo.wready; + reg_bsn_monitor_v2_rx_bresp <= reg_bsn_monitor_v2_rx_axi4_cipo.bresp; + reg_bsn_monitor_v2_rx_bvalid <= reg_bsn_monitor_v2_rx_axi4_cipo.bvalid; + reg_bsn_monitor_v2_rx_arready <= reg_bsn_monitor_v2_rx_axi4_cipo.arready; + reg_bsn_monitor_v2_rx_rdata <= reg_bsn_monitor_v2_rx_axi4_cipo.rdata; + reg_bsn_monitor_v2_rx_rresp <= reg_bsn_monitor_v2_rx_axi4_cipo.rresp; + reg_bsn_monitor_v2_rx_rvalid <= reg_bsn_monitor_v2_rx_axi4_cipo.rvalid; + + -- reg_strobe_total_count_rx + -- copi + reg_strobe_total_count_rx_axi4_copi.awaddr <= reg_strobe_total_count_rx_awaddr; + reg_strobe_total_count_rx_axi4_copi.awprot <= reg_strobe_total_count_rx_awprot; + reg_strobe_total_count_rx_axi4_copi.awvalid <= reg_strobe_total_count_rx_awvalid; + reg_strobe_total_count_rx_axi4_copi.wdata <= reg_strobe_total_count_rx_wdata; + reg_strobe_total_count_rx_axi4_copi.wstrb <= reg_strobe_total_count_rx_wstrb; + reg_strobe_total_count_rx_axi4_copi.wvalid <= reg_strobe_total_count_rx_wvalid; + reg_strobe_total_count_rx_axi4_copi.bready <= reg_strobe_total_count_rx_bready; + reg_strobe_total_count_rx_axi4_copi.araddr <= reg_strobe_total_count_rx_araddr; + reg_strobe_total_count_rx_axi4_copi.arprot <= reg_strobe_total_count_rx_arprot; + reg_strobe_total_count_rx_axi4_copi.arvalid <= reg_strobe_total_count_rx_arvalid; + reg_strobe_total_count_rx_axi4_copi.rready <= reg_strobe_total_count_rx_rready; + -- cipo + reg_strobe_total_count_rx_awready <= reg_strobe_total_count_rx_axi4_cipo.awready; + reg_strobe_total_count_rx_wready <= reg_strobe_total_count_rx_axi4_cipo.wready; + reg_strobe_total_count_rx_bresp <= reg_strobe_total_count_rx_axi4_cipo.bresp; + reg_strobe_total_count_rx_bvalid <= reg_strobe_total_count_rx_axi4_cipo.bvalid; + reg_strobe_total_count_rx_arready <= reg_strobe_total_count_rx_axi4_cipo.arready; + reg_strobe_total_count_rx_rdata <= reg_strobe_total_count_rx_axi4_cipo.rdata; + reg_strobe_total_count_rx_rresp <= reg_strobe_total_count_rx_axi4_cipo.rresp; + reg_strobe_total_count_rx_rvalid <= reg_strobe_total_count_rx_axi4_cipo.rvalid; + +end str; \ No newline at end of file diff --git a/libraries/io/eth/src/vhdl/eth_tester_pkg.vhd b/libraries/io/eth/src/vhdl/eth_tester_pkg.vhd index 1ea6120bec..1a05df86b1 100644 --- a/libraries/io/eth/src/vhdl/eth_tester_pkg.vhd +++ b/libraries/io/eth/src/vhdl/eth_tester_pkg.vhd @@ -58,8 +58,8 @@ package eth_tester_pkg is -- to 0 by declaring hdr_fields_in_arr with all 0. Hence e.g. udp_checksum -- = 0 can be achieve via data path and default hdr_fields_in_arr = 0 or -- via MM controlled and field_default(0). - constant c_eth_tester_nof_hdr_fields : natural := 1 +3 + 12 + 4 + 4; - constant c_eth_tester_hdr_field_sel : std_logic_vector(c_eth_tester_nof_hdr_fields - 1 downto 0) := "1" &"101 " &"111011111001 " &"0100 " &"0100 "; + constant c_eth_tester_nof_hdr_fields : natural := 1 + 3 + 12 + 4 + 4; + constant c_eth_tester_hdr_field_sel : std_logic_vector(c_eth_tester_nof_hdr_fields - 1 downto 0) := "1" &"101 " &"111011111001 " &"0100 " &"0100 "; -- Default use destination MAC/IP/UDP = 0, so these have to be MM programmed -- before eth_tester packets can be send. @@ -230,4 +230,4 @@ package body eth_tester_pkg is return v; end func_eth_tester_map_header; -end eth_tester_pkg; +end eth_tester_pkg; \ No newline at end of file diff --git a/libraries/io/eth/tb/vhdl/tb_eth_crc_ctrl.vhd b/libraries/io/eth/tb/vhdl/tb_eth_crc_ctrl.vhd index 87e82db153..845bc35058 100644 --- a/libraries/io/eth/tb/vhdl/tb_eth_crc_ctrl.vhd +++ b/libraries/io/eth/tb/vhdl/tb_eth_crc_ctrl.vhd @@ -68,7 +68,7 @@ architecture tb of tb_eth_crc_ctrl is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_eth_data_w - 1 downto 0) := (others => '0'); @@ -77,7 +77,7 @@ architecture tb of tb_eth_crc_ctrl is signal in_eop : std_logic; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_eth_data_w - 1 downto 0); signal out_data_1 : std_logic_vector(out_data'range); signal out_data_2 : std_logic_vector(out_data'range); diff --git a/libraries/io/eth/tb/vhdl/tb_eth_hdr.vhd b/libraries/io/eth/tb/vhdl/tb_eth_hdr.vhd index ca61031603..4dd72eb296 100644 --- a/libraries/io/eth/tb/vhdl/tb_eth_hdr.vhd +++ b/libraries/io/eth/tb/vhdl/tb_eth_hdr.vhd @@ -67,7 +67,7 @@ architecture tb of tb_eth_hdr is signal cnt_en : std_logic; signal tx_data : t_dp_data_arr(0 to c_tx_latency + c_tx_void) := (others => (others => '0')); - signal tx_val : std_logic_vector(0 TO c_tx_latency + c_tx_void) := (others => '0'); + signal tx_val : std_logic_vector(0 to c_tx_latency + c_tx_void) := (others => '0'); signal in_ready : std_logic; signal in_data : std_logic_vector(c_dp_data_w - 1 downto 0) := (others => '0'); @@ -76,7 +76,7 @@ architecture tb of tb_eth_hdr is signal in_eop : std_logic; signal out_ready : std_logic; - signal prev_out_ready : std_logic_vector(0 TO c_rx_latency); + signal prev_out_ready : std_logic_vector(0 to c_rx_latency); signal out_data : std_logic_vector(c_dp_data_w - 1 downto 0); signal out_val : std_logic; signal out_sop : std_logic; diff --git a/libraries/io/eth/tb/vhdl/tb_eth_tester_pkg.vhd b/libraries/io/eth/tb/vhdl/tb_eth_tester_pkg.vhd index 310a4b73a6..33bcb833a9 100644 --- a/libraries/io/eth/tb/vhdl/tb_eth_tester_pkg.vhd +++ b/libraries/io/eth/tb/vhdl/tb_eth_tester_pkg.vhd @@ -64,4 +64,4 @@ package body tb_eth_tester_pkg is return c_network_eth_preamble_len + func_eth_tester_eth_packet_length(block_len) + c_word_sz; end func_eth_tester_eth_packet_on_link_length; -end tb_eth_tester_pkg; +end tb_eth_tester_pkg; \ No newline at end of file diff --git a/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd b/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd index a6fe3c69e5..be8488ae2d 100644 --- a/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd +++ b/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd @@ -177,7 +177,7 @@ architecture tb of tb_eth_udp_offload is signal verify_en : std_logic := '0'; signal verify_done : std_logic := '0'; - signal prev_udp_rx_ready : std_logic_vector(0 TO c_rl); + signal prev_udp_rx_ready : std_logic_vector(0 to c_rl); signal prev_udp_rx_data : std_logic_vector(g_data_w - 1 downto 0); signal out_gap : std_logic := '1'; diff --git a/libraries/io/eth1g/src/vhdl/eth1g_master.vhd b/libraries/io/eth1g/src/vhdl/eth1g_master.vhd index 11659e151f..7991faffdd 100644 --- a/libraries/io/eth1g/src/vhdl/eth1g_master.vhd +++ b/libraries/io/eth1g/src/vhdl/eth1g_master.vhd @@ -141,11 +141,11 @@ architecture rtl of eth1g_master is constant lat_vec_size : natural := 8; signal lat_reg_rd : std_logic; - signal lat_reg_vec : std_logic_vector(0 TO lat_vec_size - 1); + signal lat_reg_vec : std_logic_vector(0 to lat_vec_size - 1); signal reg_rd_valid : std_logic; signal lat_ram_rd : std_logic; - signal lat_ram_vec : std_logic_vector(0 TO lat_vec_size - 1); + signal lat_ram_vec : std_logic_vector(0 to lat_vec_size - 1); signal ram_rd_valid : std_logic; diff --git a/libraries/io/i2c/src/vhdl/avs_i2c_master.vhd b/libraries/io/i2c/src/vhdl/avs_i2c_master.vhd index 243e217e97..ba295249c7 100644 --- a/libraries/io/i2c/src/vhdl/avs_i2c_master.vhd +++ b/libraries/io/i2c/src/vhdl/avs_i2c_master.vhd @@ -168,4 +168,4 @@ begin sda => coe_i2c_sda_export ); -end wrap; +end wrap; \ No newline at end of file diff --git a/libraries/io/i2c/src/vhdl/i2c_bit.vhd b/libraries/io/i2c/src/vhdl/i2c_bit.vhd index a7179f7ac8..390b297a88 100644 --- a/libraries/io/i2c/src/vhdl/i2c_bit.vhd +++ b/libraries/io/i2c/src/vhdl/i2c_bit.vhd @@ -512,4 +512,4 @@ begin scl_oen <= iscl_oen; sda_o <= '0'; sda_oen <= isda_oen; -end architecture rtl; +end architecture rtl; \ No newline at end of file diff --git a/libraries/io/i2c/src/vhdl/i2c_bit_scl_sense.vhd b/libraries/io/i2c/src/vhdl/i2c_bit_scl_sense.vhd index ab507f65dd..a508f604ea 100644 --- a/libraries/io/i2c/src/vhdl/i2c_bit_scl_sense.vhd +++ b/libraries/io/i2c/src/vhdl/i2c_bit_scl_sense.vhd @@ -512,4 +512,4 @@ begin scl_oen <= iscl_oen; sda_o <= '0'; sda_oen <= isda_oen; -end architecture rtl; +end architecture rtl; \ No newline at end of file diff --git a/libraries/io/i2c/src/vhdl/i2c_byte.vhd b/libraries/io/i2c/src/vhdl/i2c_byte.vhd index 5067fe35b1..703d0f096d 100644 --- a/libraries/io/i2c/src/vhdl/i2c_byte.vhd +++ b/libraries/io/i2c/src/vhdl/i2c_byte.vhd @@ -433,4 +433,4 @@ begin end block statemachine; -end architecture structural; +end architecture structural; \ No newline at end of file diff --git a/libraries/io/i2c/src/vhdl/i2c_smbus.vhd b/libraries/io/i2c/src/vhdl/i2c_smbus.vhd index 5441ab0c7e..821c26040c 100644 --- a/libraries/io/i2c/src/vhdl/i2c_smbus.vhd +++ b/libraries/io/i2c/src/vhdl/i2c_smbus.vhd @@ -74,7 +74,7 @@ architecture rtl of i2c_smbus is signal rdy : std_logic; signal nrst : std_logic; - signal srst : std_logic_vector(0 TO 2); + signal srst : std_logic_vector(0 to 2); signal nxt_srst : std_logic_vector(srst'range); signal scl_i : std_logic; diff --git a/libraries/io/i2c/src/vhdl/i2c_smbus_pkg.vhd b/libraries/io/i2c/src/vhdl/i2c_smbus_pkg.vhd index a6c0ede4ae..92e9dff0f6 100644 --- a/libraries/io/i2c/src/vhdl/i2c_smbus_pkg.vhd +++ b/libraries/io/i2c/src/vhdl/i2c_smbus_pkg.vhd @@ -49,7 +49,7 @@ package i2c_smbus_pkg is -- SMBUS protocol definitions -- a protocol is implemented as fixed length array of opcodes - type SMBUS_PROtoCOL is array (0 TO 15) of OPCODE; + type SMBUS_PROtoCOL is array (0 to 15) of OPCODE; -- The following protocols are as defined in the System Management Bus Specification v2.0 @@ -143,7 +143,7 @@ package i2c_smbus_pkg is constant PROTOCOL_C_SAMPLE_SDA : SMBUS_PROTOCOL := ( OP_LD_TIMEOUT, OP_LD_TIMEOUT, OP_LD_TIMEOUT, OP_LD_TIMEOUT, OP_WAIT, OP_RD_SDA, others => OP_IDLE ); - type PROTOCOL_array is ARRAY (natural range <> ) of SMBUS_PROTOCOL; + type PROTOCOL_array is array (natural range <> ) of SMBUS_PROTOCOL; -- Protocol list -- This maps a protocol identifier to the corresponding protocol diff --git a/libraries/io/i2c/src/vhdl/i2cslave.vhd b/libraries/io/i2c/src/vhdl/i2cslave.vhd index 2e5fd118e5..1b5ff9472a 100644 --- a/libraries/io/i2c/src/vhdl/i2cslave.vhd +++ b/libraries/io/i2c/src/vhdl/i2cslave.vhd @@ -75,8 +75,8 @@ architecture rtl of i2cslave is signal clk_cnt : unsigned(c_clk_cnt_w - 1 downto 0) := (others => '0'); signal nxt_clk_cnt : unsigned(clk_cnt'range); - signal scl_meta : std_logic_vector(0 TO c_meta_len - 1); - signal scl_line : std_logic_vector(0 TO c_line_len - 1); + signal scl_meta : std_logic_vector(0 to c_meta_len - 1); + signal scl_line : std_logic_vector(0 to c_line_len - 1); signal scl_or : std_logic; signal nxt_scl_or : std_logic; signal scl_and : std_logic; @@ -86,8 +86,8 @@ architecture rtl of i2cslave is signal scl_rx : std_logic; signal nxt_scl_rx : std_logic; - signal sda_meta : std_logic_vector(0 TO c_meta_len - 1); - signal sda_line : std_logic_vector(0 TO c_line_len - 1); + signal sda_meta : std_logic_vector(0 to c_meta_len - 1); + signal sda_line : std_logic_vector(0 to c_line_len - 1); signal sda_or : std_logic; signal nxt_sda_or : std_logic; signal sda_and : std_logic; @@ -364,7 +364,7 @@ begin when write_data => if wbitcnt < 8 then tri_en <= '1'; --enable tri-state buffer to write SDA - if i_ctrl_reg(8 * g_nof_ctrl_bytes - 1 -(8*wbytecnt+wbitcnt))='0' then + if i_ctrl_reg(8 * g_nof_ctrl_bytes - 1 - (8 * wbytecnt + wbitcnt)) = '0' then sda_int <= '0'; --copy one bit to SDA (MSB first), else default to 'H' end if; wbitcnt <= wbitcnt + 1; diff --git a/libraries/io/i2c/tb/vhdl/i2c_slv_device.vhd b/libraries/io/i2c/tb/vhdl/i2c_slv_device.vhd index 9a49eb0590..709d7db9ca 100644 --- a/libraries/io/i2c/tb/vhdl/i2c_slv_device.vhd +++ b/libraries/io/i2c/tb/vhdl/i2c_slv_device.vhd @@ -149,7 +149,7 @@ begin --output control signals en <= '1' when dev_state = ST_CMD_OR_DATA else '0'; wr_val <= latch_ctrl_dly when dev_state = ST_CMD_OR_DATA else '0'; - rd_req <= rd_first or rd_next when dev_state = ST_CMD_or_DATA OR dev_state = ST_READ_DATA else '0'; + rd_req <= rd_first or rd_next when dev_state = ST_CMD_or_DATA or dev_state = ST_READ_DATA else '0'; p <= stop; --output p is can be used to distinghuis beteen direct write data or cmd write data. -- if at p n bytes were written, then it was a direct write, -- else if at p 1+n bytes were written then it the first byte was the cmd. @@ -340,7 +340,7 @@ begin when write_data => if wbitcnt < 8 then tri_en <= '1'; --enable tri-state buffer to write SDA - if i_ctrl_reg(8 * g_nof_ctrl_bytes - 1 -(8*wbytecnt+wbitcnt))='0' then + if i_ctrl_reg(8 * g_nof_ctrl_bytes - 1 - (8 * wbytecnt + wbitcnt)) = '0' then sda_int <= '0'; --copy one bit to SDA (MSB first), else default to 'H' end if; wbitcnt <= wbitcnt + 1; diff --git a/libraries/io/i2c/tb/vhdl/tb_avs_i2c_master.vhd b/libraries/io/i2c/tb/vhdl/tb_avs_i2c_master.vhd index 15932644b0..df5a2f60e7 100644 --- a/libraries/io/i2c/tb/vhdl/tb_avs_i2c_master.vhd +++ b/libraries/io/i2c/tb/vhdl/tb_avs_i2c_master.vhd @@ -134,4 +134,4 @@ begin ins_interrupt_irq => open ); -end; +end; \ No newline at end of file diff --git a/libraries/io/i2c/tb/vhdl/tb_i2c_commander.vhd b/libraries/io/i2c/tb/vhdl/tb_i2c_commander.vhd index f8e86e8520..ee8c34ecc5 100644 --- a/libraries/io/i2c/tb/vhdl/tb_i2c_commander.vhd +++ b/libraries/io/i2c/tb/vhdl/tb_i2c_commander.vhd @@ -79,7 +79,7 @@ use work.i2c_commander_unbh_pkg.all; architecture tb of tb_i2c_commander is - constant c_protocol_ram_init_file : string := sel_a_b(g_board ="adu ", "data/adu_protocol_ram_init.hex", "data/unb_protocol_ram_init.hex"); + constant c_protocol_ram_init_file : string := sel_a_b(g_board ="adu ", "data/adu_protocol_ram_init.hex", "data/unb_protocol_ram_init.hex"); --CONSTANT c_protocol_ram_init_file : STRING := "UNUSED"; constant c_use_result_ram : boolean := TRUE; @@ -93,9 +93,9 @@ architecture tb of tb_i2c_commander is constant c_phy_i2c : t_c_i2c_phy := func_i2c_sel_a_b(c_sim, c_i2c_phy_sim, func_i2c_calculate_phy(c_clk_freq_in_MHz)); -- Model I2C sensor slaves on the bus - constant ADR_MAX6652 : natural := sel_a_b(g_board ="adu ", 0, I2C_UNB_MAX6652_ADR); - constant ADR_MAX1617 : natural := sel_a_b(g_board ="adu ", I2C_ADU_MAX1617_ADR, I2C_UNB_MAX1617_ADR); - constant ADR_PCA9555 : natural := sel_a_b(g_board ="adu ", I2C_ADU_PCA9555_ADR, 0); + constant ADR_MAX6652 : natural := sel_a_b(g_board ="adu ", 0, I2C_UNB_MAX6652_ADR); + constant ADR_MAX1617 : natural := sel_a_b(g_board ="adu ", I2C_ADU_MAX1617_ADR, I2C_UNB_MAX1617_ADR); + constant ADR_PCA9555 : natural := sel_a_b(g_board ="adu ", I2C_ADU_PCA9555_ADR, 0); constant c_sens_volt_address : std_logic_vector := to_uvec(ADR_MAX6652, 7); -- MAX6652 address GND constant c_max6652_volt_1v2 : natural := 92; -- 92 * 2.5/192 = 1.2 @@ -116,22 +116,22 @@ architecture tb of tb_i2c_commander is constant c_max6652_expected_data_read_config_arr : t_i2c_cmdr_natural_arr := (c_max6652_volt_1v2, c_max6652_volt_2v5, c_max6652_volt_3v3, c_max6652_temp, c_i2c_cmdr_expected_x, c_i2c_cmdr_expected_x, c_i2c_cmdr_expected_x, c_i2c_cmdr_expected_x); - constant c_expected_data_0_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_max1618_expected_data_read_temp_arr, c_max1618_expected_data_read_temp_arr); - constant c_expected_data_1_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_max6652_expected_data_read_config_arr); - constant c_expected_data_2_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_3_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_4_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_5_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_6_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_7_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_8_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_9_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_10_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_11_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_12_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_13_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_14_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); - constant c_expected_data_15_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_0_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_max1618_expected_data_read_temp_arr, c_max1618_expected_data_read_temp_arr); + constant c_expected_data_1_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_max6652_expected_data_read_config_arr); + constant c_expected_data_2_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_3_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_4_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_5_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_6_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_7_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_8_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_9_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_10_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_11_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_12_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_13_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_14_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); + constant c_expected_data_15_arr : t_i2c_cmdr_natural_arr := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_expected_data_none_arr, c_i2c_cmdr_expected_data_none_arr); constant c_expected_data_mat : t_i2c_cmdr_natural_mat(0 to c_i2c_cmdr_max_nof_protocols - 1) := (c_expected_data_0_arr, c_expected_data_1_arr, @@ -151,13 +151,13 @@ architecture tb of tb_i2c_commander is c_expected_data_15_arr); -- RAM sizes - constant c_mem_i2c : t_c_i2c_mm := func_i2c_sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_i2c_mm, c_i2c_cmdr_unbh_i2c_mm); + constant c_mem_i2c : t_c_i2c_mm := func_i2c_sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_i2c_mm, c_i2c_cmdr_unbh_i2c_mm); -- Commander parameters - constant c_protocol_ram_init : t_nat_natural_arr := sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_protocol_ram_init, c_i2c_cmdr_unbh_protocol_ram_init); - constant c_nof_result_data_arr : t_nat_natural_arr := sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_nof_result_data_arr, c_i2c_cmdr_unbh_nof_result_data_arr); + constant c_protocol_ram_init : t_nat_natural_arr := sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_protocol_ram_init, c_i2c_cmdr_unbh_protocol_ram_init); + constant c_nof_result_data_arr : t_nat_natural_arr := sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_nof_result_data_arr, c_i2c_cmdr_unbh_nof_result_data_arr); - constant c_protocol_commander : t_c_i2c_cmdr_commander := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_protocol_commander, c_i2c_cmdr_unbh_protocol_commander); + constant c_protocol_commander : t_c_i2c_cmdr_commander := func_i2c_cmdr_sel_a_b(g_board ="adu ", c_i2c_cmdr_aduh_protocol_commander, c_i2c_cmdr_unbh_protocol_commander); -- Commander MM register word indexes constant c_protocol_status_wi : natural := 3 * c_protocol_commander.nof_protocols; @@ -261,7 +261,7 @@ begin -- Initialize the u_protocol_ram or verify its default contents ---------------------------------------------------------------------------- - if c_protocol_ram_init_file ="UNUSED " then + if c_protocol_ram_init_file ="UNUSED " then -- Write for I in 0 to c_protocol_ram_init'length - 1 loop proc_mem_mm_bus_wr(I, c_protocol_ram_init(I), clk, protocol_miso, protocol_mosi); -- fill u_protocol_ram @@ -455,4 +455,4 @@ begin adu_atten_ctrl <= iobank1(5 downto 0); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_pmbus.vhd b/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_pmbus.vhd index b4de3c93ba..0173842166 100644 --- a/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_pmbus.vhd +++ b/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_pmbus.vhd @@ -206,7 +206,7 @@ begin -- Initialize the u_protocol_ram or verify its default contents ---------------------------------------------------------------------------- - if c_protocol_ram_init_file ="UNUSED " then + if c_protocol_ram_init_file ="UNUSED " then -- Write for I in 0 to c_protocol_ram_init'length - 1 loop proc_mem_mm_bus_wr(I, c_protocol_ram_init(I), clk, protocol_miso, protocol_mosi); -- fill u_protocol_ram @@ -433,4 +433,4 @@ begin ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_sens.vhd b/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_sens.vhd index fb609f332e..47b1a5aad4 100644 --- a/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_sens.vhd +++ b/libraries/io/i2c/tb/vhdl/tb_i2c_commander_unb2_sens.vhd @@ -211,7 +211,7 @@ begin -- Initialize the u_protocol_ram or verify its default contents ---------------------------------------------------------------------------- - if c_protocol_ram_init_file ="UNUSED " then + if c_protocol_ram_init_file ="UNUSED " then -- Write for I in 0 to c_protocol_ram_init'length - 1 loop proc_mem_mm_bus_wr(I, c_protocol_ram_init(I), clk, protocol_miso, protocol_mosi); -- fill u_protocol_ram @@ -463,4 +463,4 @@ begin ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/io/i2c/tb/vhdl/tb_i2c_master.vhd b/libraries/io/i2c/tb/vhdl/tb_i2c_master.vhd index 6e78871499..51872f830c 100644 --- a/libraries/io/i2c/tb/vhdl/tb_i2c_master.vhd +++ b/libraries/io/i2c/tb/vhdl/tb_i2c_master.vhd @@ -376,4 +376,4 @@ begin temp => c_temp_pcb ); -end tb; +end tb; \ No newline at end of file diff --git a/libraries/io/i2c/tb/vhdl/tb_i2cslave.vhd b/libraries/io/i2c/tb/vhdl/tb_i2cslave.vhd index 075387325e..4b659870d2 100644 --- a/libraries/io/i2c/tb/vhdl/tb_i2cslave.vhd +++ b/libraries/io/i2c/tb/vhdl/tb_i2cslave.vhd @@ -104,16 +104,16 @@ tbsda : process wait for 452 ns; --next lines are evaluated 450 ns later SDA <= 'z'; -- time for slave to acknowledge wait for 50 ns; --WAIT 1 clk cycle - SDA <= 'Z','h' after 10 ns, '0' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, 'H' after 260 ns, 'H' after 310 ns, '0' after 360 ns; -- sent first data byte + SDA <= 'Z','h' after 10 ns, '0' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, 'h' after 260 ns, 'h' after 310 ns, '0' after 360 ns; -- sent first data byte wait for 400 ns; SDA <= 'z'; -- time for slave to acknowledge wait for 50 ns; --WAIT 1 clk cycle - SDA <= 'z','0' after 10 ns, 'h' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, '0' after 260 ns, 'h' after 310 ns, 'H' after 360 ns; -- sent second data byte + SDA <= 'z','0' after 10 ns, 'h' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, '0' after 260 ns, 'h' after 310 ns, 'h' after 360 ns; -- sent second data byte wait for 400 ns; SDA <= 'z'; -- time for slave to acknowledge wait for 50 ns; --WAIT 1 clk cycle - SDA <= 'z','0' after 10 ns, 'h' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, '0' after 260 ns, 'h' after 310 ns, 'H' after 360 ns; -- sent third data byte + SDA <= 'z','0' after 10 ns, 'h' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, '0' after 260 ns, 'h' after 310 ns, 'h' after 360 ns; -- sent third data byte wait for 400 ns; SDA <= 'z'; -- time for slave to nacknowledge @@ -162,11 +162,11 @@ tbsda : process wait for 450 ns; --next lines are evaluated 450 ns later SDA <= 'z'; -- time for slave to acknowledge wait for 50 ns; --WAIT 1 clk cycle - SDA <= 'z','0' after 10 ns, '0' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, 'h' after 260 ns, 'H' after 310 ns, '0' after 360 ns; -- sent first data byte + SDA <= 'z','0' after 10 ns, '0' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, 'h' after 260 ns, 'h' after 310 ns, '0' after 360 ns; -- sent first data byte wait for 400 ns; SDA <= 'z'; -- time for slave to acknowledge wait for 50 ns; --WAIT 1 clk cycle - SDA <= 'z','0' after 10 ns, 'h' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, '0' after 260 ns, 'h' after 310 ns, 'H' after 360 ns; -- sent second data byte + SDA <= 'z','0' after 10 ns, 'h' after 60 ns, 'h' after 110 ns, '0' after 160 ns,'h' after 210 ns, '0' after 260 ns, 'h' after 310 ns, 'h' after 360 ns; -- sent second data byte wait for 400 ns; SDA <= 'z'; -- time for slave to nacknowledge wait for 80 ns; --WAIT 1.5 clk cycle @@ -174,4 +174,4 @@ tbsda : process wait for 20 ns; --to get in line with falling clk edge end process; -end; +end; \ No newline at end of file diff --git a/libraries/io/mac_10g/io_mac_10g.vhd b/libraries/io/mac_10g/io_mac_10g.vhd index 2c9b2e76ed..4846b8babc 100644 --- a/libraries/io/mac_10g/io_mac_10g.vhd +++ b/libraries/io/mac_10g/io_mac_10g.vhd @@ -113,4 +113,4 @@ begin xgmii_rx_data => xgmii_rx_data ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/mdio/src/vhdl/avs_mdio.vhd b/libraries/io/mdio/src/vhdl/avs_mdio.vhd index 2ae1548015..cf9e6c324b 100644 --- a/libraries/io/mdio/src/vhdl/avs_mdio.vhd +++ b/libraries/io/mdio/src/vhdl/avs_mdio.vhd @@ -143,4 +143,4 @@ begin mdat_oen => coe_mdio_phy_mdat_oen_export ); -end wrap; +end wrap; \ No newline at end of file diff --git a/libraries/io/mdio/src/vhdl/mdio_ctlr.vhd b/libraries/io/mdio/src/vhdl/mdio_ctlr.vhd index cbc5fe6748..689867f7ff 100644 --- a/libraries/io/mdio/src/vhdl/mdio_ctlr.vhd +++ b/libraries/io/mdio/src/vhdl/mdio_ctlr.vhd @@ -166,4 +166,4 @@ begin tx_dat <= r.tx_dat; exec_complete <= r.exec_complete; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/mdio/src/vhdl/mdio_phy.vhd b/libraries/io/mdio/src/vhdl/mdio_phy.vhd index 6897baa438..b0e9d8b841 100644 --- a/libraries/io/mdio/src/vhdl/mdio_phy.vhd +++ b/libraries/io/mdio/src/vhdl/mdio_phy.vhd @@ -314,7 +314,7 @@ begin if rx_en = '1' and state = s_receive then for i in 3 to c_receive_msg_length - 1 loop if bit_cnt = i then - nxt_rx_dat(c_receive_msg_length - 1 -i) <= mdat_in; + nxt_rx_dat(c_receive_msg_length - 1 - i) <= mdat_in; end if; end loop; end if; diff --git a/libraries/io/mdio/src/vhdl/mdio_phy_reg.vhd b/libraries/io/mdio/src/vhdl/mdio_phy_reg.vhd index 8ed559eb12..4a500825bf 100644 --- a/libraries/io/mdio/src/vhdl/mdio_phy_reg.vhd +++ b/libraries/io/mdio/src/vhdl/mdio_phy_reg.vhd @@ -178,4 +178,4 @@ begin dout => mm_done ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/mdio/tb/vhdl/mmd_slave.vhd b/libraries/io/mdio/tb/vhdl/mmd_slave.vhd index 173447ac31..d8b83aaf7d 100644 --- a/libraries/io/mdio/tb/vhdl/mmd_slave.vhd +++ b/libraries/io/mdio/tb/vhdl/mmd_slave.vhd @@ -48,10 +48,10 @@ architecture beh of mmd_slave is constant c_preamble_len : natural := 32; constant c_preamble_timeout : natural := 1; -- >= 0 constant c_header_st_len : natural := 2; - constant c_header_op_len : natural := 2 +2; - constant c_header_prtad_len : natural := 2 +2 + 5; - constant c_header_devad_len : natural := 2 +2 + 5 + 5; - constant c_header_ta_len : natural := 2 +2 + 5 + 5 + 2; + constant c_header_op_len : natural := 2 + 2; + constant c_header_prtad_len : natural := 2 + 2 + 5; + constant c_header_devad_len : natural := 2 + 2 + 5 + 5; + constant c_header_ta_len : natural := 2 + 2 + 5 + 5 + 2; constant c_data_len : natural := 16; constant c_hdr_op_addr : std_logic_vector(1 downto 0) := "00"; -- operation code address (typically not used when g_quick = TRUE) diff --git a/libraries/io/nw_10GbE/tb/vhdl/tb_nw_10GbE.vhd b/libraries/io/nw_10GbE/tb/vhdl/tb_nw_10GbE.vhd index 597592135c..fae0c32bf5 100644 --- a/libraries/io/nw_10GbE/tb/vhdl/tb_nw_10GbE.vhd +++ b/libraries/io/nw_10GbE/tb/vhdl/tb_nw_10GbE.vhd @@ -86,7 +86,7 @@ architecture tb of tb_nw_10GbE is constant cal_clk_period : time := 25 ns; -- 40 MHz constant phy_delay : time := sel_a_b(g_sim_level =0, 0 ns, 0 ns); - constant c_tx_rx_loopback : boolean := g_direction /="TX_ONLY "; + constant c_tx_rx_loopback : boolean := g_direction /="TX_ONLY "; constant c_tx_fifo_fill : natural := 100; diff --git a/libraries/io/ppsh/src/vhdl/mm_ppsh.vhd b/libraries/io/ppsh/src/vhdl/mm_ppsh.vhd index bd70aaae5d..20384838b9 100644 --- a/libraries/io/ppsh/src/vhdl/mm_ppsh.vhd +++ b/libraries/io/ppsh/src/vhdl/mm_ppsh.vhd @@ -116,4 +116,4 @@ begin nxt_mm_pps_toggle <= i_pps_toggle when i_mm_pps_pulse = '1' else i_mm_pps_toggle; nxt_mm_pps_capture_cnt <= pps_capture_cnt when i_mm_pps_pulse = '1' else i_mm_pps_capture_cnt; -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ppsh/src/vhdl/mms_ppsh.vhd b/libraries/io/ppsh/src/vhdl/mms_ppsh.vhd index e4987281a2..a81b8ff594 100644 --- a/libraries/io/ppsh/src/vhdl/mms_ppsh.vhd +++ b/libraries/io/ppsh/src/vhdl/mms_ppsh.vhd @@ -165,4 +165,4 @@ begin pin_pps <= mm_pps_toggle & '0' & RESIZE_UVEC(mm_capture_cnt, 30); -- pin_pps did not support pps_stable yet -end str; +end str; \ No newline at end of file diff --git a/libraries/io/ppsh/src/vhdl/ppsh.vhd b/libraries/io/ppsh/src/vhdl/ppsh.vhd index f0f49ce31b..254d3ffa83 100644 --- a/libraries/io/ppsh/src/vhdl/ppsh.vhd +++ b/libraries/io/ppsh/src/vhdl/ppsh.vhd @@ -208,4 +208,4 @@ begin r_stable_ack => pps_stable_ack ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd b/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd index 9d24cd187d..05c38626fa 100644 --- a/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd +++ b/libraries/io/ppsh/src/vhdl/ppsh_reg.vhd @@ -281,4 +281,4 @@ begin end generate; -- gen_cross -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/remu/src/vhdl/mms_remu.vhd b/libraries/io/remu/src/vhdl/mms_remu.vhd index 5c8e89d7a8..3b33c67e22 100644 --- a/libraries/io/remu/src/vhdl/mms_remu.vhd +++ b/libraries/io/remu/src/vhdl/mms_remu.vhd @@ -145,4 +145,4 @@ begin out_rst => epcs_rst ); -end str; +end str; \ No newline at end of file diff --git a/libraries/io/remu/src/vhdl/remu_reg.vhd b/libraries/io/remu/src/vhdl/remu_reg.vhd index 3633bd8606..2a99d36b81 100644 --- a/libraries/io/remu/src/vhdl/remu_reg.vhd +++ b/libraries/io/remu/src/vhdl/remu_reg.vhd @@ -227,4 +227,4 @@ begin out_new => open ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/tr_10GbE/tb/vhdl/tb_tr_10GbE.vhd b/libraries/io/tr_10GbE/tb/vhdl/tb_tr_10GbE.vhd index 6ca6aeab3f..c4ffd0e890 100644 --- a/libraries/io/tr_10GbE/tb/vhdl/tb_tr_10GbE.vhd +++ b/libraries/io/tr_10GbE/tb/vhdl/tb_tr_10GbE.vhd @@ -84,7 +84,7 @@ architecture tb of tb_tr_10GbE is constant cal_clk_period : time := 25 ns; -- 40 MHz constant phy_delay : time := sel_a_b(g_sim_level =0, 0 ns, 0 ns); - constant c_tx_rx_loopback : boolean := g_direction /="TX_ONLY "; + constant c_tx_rx_loopback : boolean := g_direction /="TX_ONLY "; constant c_tx_fifo_fill : natural := 100; diff --git a/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded.vhd b/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded.vhd index e662db9362..12c647af3a 100644 --- a/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded.vhd +++ b/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded.vhd @@ -283,4 +283,4 @@ begin end generate; -- gen_i end generate; -- gen_rx -end str; +end str; \ No newline at end of file diff --git a/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded_reg.vhd b/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded_reg.vhd index 546eabb339..b09cd39b43 100644 --- a/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded_reg.vhd +++ b/libraries/io/tr_nonbonded/src/vhdl/tr_nonbonded_reg.vhd @@ -178,4 +178,4 @@ begin end generate; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/io/tr_nonbonded/tb/vhdl/tb_tr_nonbonded.vhd b/libraries/io/tr_nonbonded/tb/vhdl/tb_tr_nonbonded.vhd index a602b0e54d..e2e3e2cc59 100644 --- a/libraries/io/tr_nonbonded/tb/vhdl/tb_tr_nonbonded.vhd +++ b/libraries/io/tr_nonbonded/tb/vhdl/tb_tr_nonbonded.vhd @@ -307,5 +307,4 @@ begin wait; end process; -end architecture str; - +end architecture str; \ No newline at end of file diff --git a/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd b/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd index 73284be20b..62388cd9db 100644 --- a/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd +++ b/libraries/io/tr_xaui/src/vhdl/mms_tr_xaui.vhd @@ -295,4 +295,4 @@ begin end generate; -end wrap; +end wrap; \ No newline at end of file diff --git a/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd b/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd index f3be4b721c..3d60e1cf59 100644 --- a/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd +++ b/libraries/io/tr_xaui/src/vhdl/tr_xaui.vhd @@ -242,4 +242,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/io/tr_xaui/src/vhdl/tr_xaui_deframer.vhd b/libraries/io/tr_xaui/src/vhdl/tr_xaui_deframer.vhd index af5532231f..8cf60dcfc2 100644 --- a/libraries/io/tr_xaui/src/vhdl/tr_xaui_deframer.vhd +++ b/libraries/io/tr_xaui/src/vhdl/tr_xaui_deframer.vhd @@ -207,5 +207,4 @@ begin end case; end process; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/io/tr_xaui/src/vhdl/tr_xaui_framer.vhd b/libraries/io/tr_xaui/src/vhdl/tr_xaui_framer.vhd index de18d5bbe4..e168fcfe15 100644 --- a/libraries/io/tr_xaui/src/vhdl/tr_xaui_framer.vhd +++ b/libraries/io/tr_xaui/src/vhdl/tr_xaui_framer.vhd @@ -156,5 +156,4 @@ begin end case; end process; -end rtl; - +end rtl; \ No newline at end of file diff --git a/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd b/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd index 39264fb3fd..e98b24f3c4 100644 --- a/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd +++ b/libraries/io/tr_xaui/src/vhdl/tr_xaui_mdio.vhd @@ -207,4 +207,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd b/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd index 97fa188e37..4f8d06feed 100644 --- a/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd +++ b/libraries/io/tr_xaui/tb/vhdl/tb_tr_xaui.vhd @@ -228,5 +228,4 @@ begin src_val_cnt => src_val_cnt ); -end architecture str; - +end architecture str; \ No newline at end of file diff --git a/libraries/technology/10gbase_r/sim_10gbase_r.vhd b/libraries/technology/10gbase_r/sim_10gbase_r.vhd index 545b71598f..377b71e9f8 100644 --- a/libraries/technology/10gbase_r/sim_10gbase_r.vhd +++ b/libraries/technology/10gbase_r/sim_10gbase_r.vhd @@ -141,4 +141,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/10gbase_r/tech_10gbase_r.vhd b/libraries/technology/10gbase_r/tech_10gbase_r.vhd index f3ba946701..c955aeba0a 100644 --- a/libraries/technology/10gbase_r/tech_10gbase_r.vhd +++ b/libraries/technology/10gbase_r/tech_10gbase_r.vhd @@ -126,4 +126,4 @@ begin tx_serial_arr, rx_serial_arr); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/clkbuf/tech_clkbuf.vhd b/libraries/technology/clkbuf/tech_clkbuf.vhd index 5ed687f5f9..5f935adc85 100644 --- a/libraries/technology/clkbuf/tech_clkbuf.vhd +++ b/libraries/technology/clkbuf/tech_clkbuf.vhd @@ -50,7 +50,7 @@ begin -- ip_arria10 ----------------------------------------------------------------------------- - gen_ip_arria10 : if g_technology = c_tech_arria10_proto and g_clock_net ="GLOBAL " generate + gen_ip_arria10 : if g_technology = c_tech_arria10_proto and g_clock_net ="GLOBAL " generate u0 : ip_arria10_clkbuf_global port map ( inclk => inclk, -- inclk @@ -62,7 +62,7 @@ begin -- ip_arria10_e3sge3 ----------------------------------------------------------------------------- - gen_ip_arria10_e3sge3 : if g_technology = c_tech_arria10_e3sge3 and g_clock_net ="GLOBAL " generate + gen_ip_arria10_e3sge3 : if g_technology = c_tech_arria10_e3sge3 and g_clock_net ="GLOBAL " generate u0 : ip_arria10_e3sge3_clkbuf_global port map ( inclk => inclk, -- inclk @@ -74,7 +74,7 @@ begin -- ip_arria10_e1sg ----------------------------------------------------------------------------- - gen_ip_arria10_e1sg : if g_technology = c_tech_arria10_e1sg and g_clock_net ="GLOBAL " generate + gen_ip_arria10_e1sg : if g_technology = c_tech_arria10_e1sg and g_clock_net ="GLOBAL " generate u0 : ip_arria10_e1sg_clkbuf_global port map ( inclk => inclk, -- inclk @@ -86,7 +86,7 @@ begin -- ip_arria10_e2sg ----------------------------------------------------------------------------- - gen_ip_arria10_e2sg : if g_technology = c_tech_arria10_e2sg and g_clock_net ="GLOBAL " generate + gen_ip_arria10_e2sg : if g_technology = c_tech_arria10_e2sg and g_clock_net ="GLOBAL " generate u0 : ip_arria10_e2sg_clkbuf_global port map ( inclk => inclk, -- inclk diff --git a/libraries/technology/clkbuf/tech_clkbuf_component_pkg.vhd b/libraries/technology/clkbuf/tech_clkbuf_component_pkg.vhd index bb3419abd3..6c7fa2870c 100644 --- a/libraries/technology/clkbuf/tech_clkbuf_component_pkg.vhd +++ b/libraries/technology/clkbuf/tech_clkbuf_component_pkg.vhd @@ -71,4 +71,4 @@ package tech_clkbuf_component_pkg is ); end component; -end tech_clkbuf_component_pkg; +end tech_clkbuf_component_pkg; \ No newline at end of file diff --git a/libraries/technology/ddr/sim_ddr.vhd b/libraries/technology/ddr/sim_ddr.vhd index 816c006b18..43b6395ac3 100644 --- a/libraries/technology/ddr/sim_ddr.vhd +++ b/libraries/technology/ddr/sim_ddr.vhd @@ -228,4 +228,4 @@ begin end process; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/ddr/tech_ddr.vhd b/libraries/technology/ddr/tech_ddr.vhd index d9d4e07860..66b180745e 100644 --- a/libraries/technology/ddr/tech_ddr.vhd +++ b/libraries/technology/ddr/tech_ddr.vhd @@ -148,4 +148,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/ddr/tech_ddr_arria10.vhd b/libraries/technology/ddr/tech_ddr_arria10.vhd index 71d4ce5e30..047aa079af 100644 --- a/libraries/technology/ddr/tech_ddr_arria10.vhd +++ b/libraries/technology/ddr/tech_ddr_arria10.vhd @@ -90,7 +90,7 @@ begin ref_rst_n <= not ref_rst; ctlr_gen_rst <= not ctlr_gen_rst_n; - gen_ip_arria10_ddr4_4g_2000 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 2000 generate + gen_ip_arria10_ddr4_4g_2000 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 2000 generate phy_ou.cs_n(1) <= '1'; phy_ou.cke(1) <= '0'; @@ -147,7 +147,7 @@ begin end generate; - gen_ip_arria10_ddr4_4g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_ddr4_4g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 1600 generate phy_ou.cs_n(1) <= '1'; phy_ou.cke(1) <= '0'; diff --git a/libraries/technology/ddr/tech_ddr_arria10_e1sg.vhd b/libraries/technology/ddr/tech_ddr_arria10_e1sg.vhd index 5f3cb1b6f6..738e75c7b1 100644 --- a/libraries/technology/ddr/tech_ddr_arria10_e1sg.vhd +++ b/libraries/technology/ddr/tech_ddr_arria10_e1sg.vhd @@ -93,7 +93,7 @@ begin ref_rst_n <= not ref_rst; ctlr_gen_rst <= not ctlr_gen_rst_n; - gen_ip_arria10_e1sg_ddr4_4g_2000 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 2000 generate + gen_ip_arria10_e1sg_ddr4_4g_2000 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 2000 generate phy_ou.cs_n(1) <= '1'; phy_ou.cke(1) <= '0'; @@ -150,7 +150,7 @@ begin end generate; - gen_ip_arria10_e1sg_ddr4_4g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_e1sg_ddr4_4g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 1600 generate phy_ou.cs_n(1) <= '1'; phy_ou.cke(1) <= '0'; @@ -207,7 +207,7 @@ begin end generate; - gen_ip_arria10_e1sg_ddr4_8g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_e1sg_ddr4_8g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 1600 generate u_ip_arria10_e1sg_ddr4_8g_1600 : ip_arria10_e1sg_ddr4_8g_1600 port map ( @@ -260,7 +260,7 @@ begin end generate; - gen_ip_arria10_e1sg_ddr4_16g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 16 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_e1sg_ddr4_16g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 16 and g_tech_ddr.mts = 1600 generate u_ip_arria10_e1sg_ddr4_16g_1600 : ip_arria10_e1sg_ddr4_16g_1600 port map ( diff --git a/libraries/technology/ddr/tech_ddr_arria10_e2sg.vhd b/libraries/technology/ddr/tech_ddr_arria10_e2sg.vhd index 11139fab70..077900bd8a 100644 --- a/libraries/technology/ddr/tech_ddr_arria10_e2sg.vhd +++ b/libraries/technology/ddr/tech_ddr_arria10_e2sg.vhd @@ -98,7 +98,7 @@ begin ctlr_gen_rst <= not ctlr_gen_rst_n; - gen_ip_arria10_e2sg_ddr4_8g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_e2sg_ddr4_8g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 1600 generate u_ip_arria10_e2sg_ddr4_8g_1600 : ip_arria10_e2sg_ddr4_8g_1600 port map ( @@ -152,7 +152,7 @@ begin end generate; - gen_ip_arria10_e2sg_ddr4_8g_2400 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 2400 generate + gen_ip_arria10_e2sg_ddr4_8g_2400 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 2400 generate u_ip_arria10_e2sg_ddr4_8g_2400 : ip_arria10_e2sg_ddr4_8g_2400 port map ( @@ -206,7 +206,7 @@ begin end generate; - gen_ip_arria10_e2sg_ddr4_16g_1600_64b : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 16 and g_tech_ddr.mts = 1600 and g_tech_ddr.dq_w = 64 generate + gen_ip_arria10_e2sg_ddr4_16g_1600_64b : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 16 and g_tech_ddr.mts = 1600 and g_tech_ddr.dq_w = 64 generate u_ip_arria10_e2sg_ddr4_16g_1600_64b : ip_arria10_e2sg_ddr4_16g_1600_64b port map ( @@ -260,7 +260,7 @@ begin end generate; - gen_ip_arria10_e2sg_ddr4_16g_1600_72b : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 16 and g_tech_ddr.mts = 1600 and g_tech_ddr.dq_w = 72 generate + gen_ip_arria10_e2sg_ddr4_16g_1600_72b : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 16 and g_tech_ddr.mts = 1600 and g_tech_ddr.dq_w = 72 generate u_ip_arria10_e2sg_ddr4_16g_1600_72b : ip_arria10_e2sg_ddr4_16g_1600_72b port map ( diff --git a/libraries/technology/ddr/tech_ddr_arria10_e3sge3.vhd b/libraries/technology/ddr/tech_ddr_arria10_e3sge3.vhd index b26c2529cd..e17e0abaa6 100644 --- a/libraries/technology/ddr/tech_ddr_arria10_e3sge3.vhd +++ b/libraries/technology/ddr/tech_ddr_arria10_e3sge3.vhd @@ -92,7 +92,7 @@ begin ref_rst_n <= not ref_rst; ctlr_gen_rst <= not ctlr_gen_rst_n; - gen_ip_arria10_e3sge3_ddr4_4g_2000 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 2000 generate + gen_ip_arria10_e3sge3_ddr4_4g_2000 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 2000 generate phy_ou.cs_n(1) <= '1'; phy_ou.cke(1) <= '0'; @@ -149,7 +149,7 @@ begin end generate; - gen_ip_arria10_e3sge3_ddr4_4g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_e3sge3_ddr4_4g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 and g_tech_ddr.mts = 1600 generate phy_ou.cs_n(1) <= '1'; phy_ou.cke(1) <= '0'; @@ -206,7 +206,7 @@ begin end generate; - gen_ip_arria10_e3sge3_ddr4_8g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 1600 generate + gen_ip_arria10_e3sge3_ddr4_8g_1600 : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 8 and g_tech_ddr.mts = 1600 generate u_ip_arria10_e3sge3_ddr4_8g_1600 : ip_arria10_e3sge3_ddr4_8g_1600 port map ( diff --git a/libraries/technology/ddr/tech_ddr_mem_model.vhd b/libraries/technology/ddr/tech_ddr_mem_model.vhd index 2d2a7b30eb..9b8ae9791b 100644 --- a/libraries/technology/ddr/tech_ddr_mem_model.vhd +++ b/libraries/technology/ddr/tech_ddr_mem_model.vhd @@ -66,7 +66,7 @@ architecture str of tech_ddr_memory_model is begin - gen_ip_stratixiv_ddr_memory_model : if g_tech_ddr.name ="DDR3 " generate + gen_ip_stratixiv_ddr_memory_model : if g_tech_ddr.name ="DDR3 " generate u_ip_stratixiv_ddr_memory_model : alt_mem_if_ddr3_mem_model_top_ddr3_mem_if_dm_pins_en_mem_if_dqsn_en generic map ( MEM_IF_CLK_EN_WIDTH => g_tech_ddr.cke_w, @@ -114,7 +114,7 @@ begin ); end generate; - gen_ip_arria10_ddr_memory_model : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 generate + gen_ip_arria10_ddr_memory_model : if g_tech_ddr.name ="DDR4 " and c_gigabytes = 4 generate u_ip_arria10_ddr_memory_model : ed_sim_altera_emif_mem_model_141_z3tvrmq port map ( mem_ck => mem4_in.ck(g_tech_ddr.ck_w - 1 downto 0), -- mem_conduit_end.mem_ck @@ -136,4 +136,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/ddr/tech_ddr_pkg.vhd b/libraries/technology/ddr/tech_ddr_pkg.vhd index e2a59c7793..1c710f06ff 100644 --- a/libraries/technology/ddr/tech_ddr_pkg.vhd +++ b/libraries/technology/ddr/tech_ddr_pkg.vhd @@ -188,7 +188,7 @@ package tech_ddr_pkg is afi_reset_n : std_logic; end record; - constant c_tech_ddr3_phy_terminationcontrol_x : t_tech_ddr3_phy_terminationcontrol := ((others => 'x'), (others => 'x'),'x','x','x','x','X','X','X', (others => 'X'), 'X', 'X', 'X'); + constant c_tech_ddr3_phy_terminationcontrol_x : t_tech_ddr3_phy_terminationcontrol := ((others => 'x'), (others => 'x'),'x','x','x','x','x','x','x', (others => 'x'), 'x', 'x', 'x'); constant c_tech_ddr3_phy_terminationcontrol_rst : t_tech_ddr3_phy_terminationcontrol := ((others => '0'), (others => '0'),'0','0','0','0','0','0','0', (others => '0'), '0', '0', '0'); constant c_tech_ddr3_phy_in_x : t_tech_ddr3_phy_in := ('x', 'x', 'x'); @@ -219,8 +219,8 @@ package body tech_ddr_pkg is function func_tech_ddr_dq_address_w(c_ddr : t_c_tech_ddr) return natural is begin - if c_ddr.name ="DDR3 " then return c_ddr.cs_w_w + c_ddr.ba_w + c_ddr.a_row_w + c_ddr.a_col_w; end if; -- PHY address - if c_ddr.name ="DDR4 " then return c_ddr.cs_w_w + c_ddr.ba_w + c_ddr.a_row_w + c_ddr.a_col_w + c_ddr.bg_w; end if; -- PHY address + if c_ddr.name ="DDR3 " then return c_ddr.cs_w_w + c_ddr.ba_w + c_ddr.a_row_w + c_ddr.a_col_w; end if; -- PHY address + if c_ddr.name ="DDR4 " then return c_ddr.cs_w_w + c_ddr.ba_w + c_ddr.a_row_w + c_ddr.a_col_w + c_ddr.bg_w; end if; -- PHY address end; function func_tech_ddr_ctlr_address_w(c_ddr : t_c_tech_ddr) return natural is @@ -284,4 +284,4 @@ package body tech_ddr_pkg is return vec_64b; end; -end tech_ddr_pkg; +end tech_ddr_pkg; \ No newline at end of file diff --git a/libraries/technology/ddr/tech_ddr_stratixiv.vhd b/libraries/technology/ddr/tech_ddr_stratixiv.vhd index ecc9781256..2ee7a0129e 100644 --- a/libraries/technology/ddr/tech_ddr_stratixiv.vhd +++ b/libraries/technology/ddr/tech_ddr_stratixiv.vhd @@ -95,7 +95,7 @@ begin ref_rst_n <= not ref_rst; - gen_ip_stratixiv_ddr3_uphy_4g_800_master : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = TRUE and g_tech_ddr.rank ="DUAL " generate + gen_ip_stratixiv_ddr3_uphy_4g_800_master : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = TRUE and g_tech_ddr.rank ="DUAL " generate u_ip_stratixiv_ddr3_uphy_4g_800_master : ip_stratixiv_ddr3_uphy_4g_800_master port map ( pll_ref_clk => ref_clk, -- pll_ref_clk.clk @@ -147,7 +147,7 @@ begin ); end generate; - gen_ip_stratixiv_ddr3_uphy_4g_800_slave : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = FALSE and g_tech_ddr.rank ="DUAL " generate + gen_ip_stratixiv_ddr3_uphy_4g_800_slave : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = FALSE and g_tech_ddr.rank ="DUAL " generate u_ip_stratixiv_ddr3_uphy_4g_800_slave : ip_stratixiv_ddr3_uphy_4g_800_slave port map ( pll_ref_clk => ref_clk, -- pll_ref_clk.clk @@ -197,7 +197,7 @@ begin ); end generate; - gen_ip_stratixiv_ddr3_uphy_4g_single_rank_800_master : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = TRUE and g_tech_ddr.rank ="SINGLE " generate + gen_ip_stratixiv_ddr3_uphy_4g_single_rank_800_master : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = TRUE and g_tech_ddr.rank ="SINGLE " generate u_ip_stratixiv_ddr3_uphy_4g_single_rank_800_master : ip_stratixiv_ddr3_uphy_4g_single_rank_800_master port map ( pll_ref_clk => ref_clk, -- pll_ref_clk.clk @@ -254,7 +254,7 @@ begin end generate; - gen_ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = FALSE and g_tech_ddr.rank ="SINGLE " generate + gen_ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 4 and g_tech_ddr.mts = 800 and g_tech_ddr.master = FALSE and g_tech_ddr.rank ="SINGLE " generate u_ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave : ip_stratixiv_ddr3_uphy_4g_single_rank_800_slave port map ( pll_ref_clk => ref_clk, -- pll_ref_clk.clk @@ -309,7 +309,7 @@ begin end generate; - gen_ip_stratixiv_ddr3_uphy_16g_dual_rank_800 : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 16 and g_tech_ddr.mts = 800 and g_tech_ddr.master = TRUE and g_tech_ddr.rank ="DUAL " generate + gen_ip_stratixiv_ddr3_uphy_16g_dual_rank_800 : if g_tech_ddr.name ="DDR3 " and c_gigabytes = 16 and g_tech_ddr.mts = 800 and g_tech_ddr.master = TRUE and g_tech_ddr.rank ="DUAL " generate u_ip_stratixiv_ddr3_uphy_16g_dual_rank_800 : ip_stratixiv_ddr3_uphy_16g_dual_rank_800 port map ( pll_ref_clk => ref_clk, -- pll_ref_clk.clk diff --git a/libraries/technology/fifo/tech_fifo_component_pkg.vhd b/libraries/technology/fifo/tech_fifo_component_pkg.vhd index 71eff60860..0483ba63db 100644 --- a/libraries/technology/fifo/tech_fifo_component_pkg.vhd +++ b/libraries/technology/fifo/tech_fifo_component_pkg.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -288,7 +287,7 @@ package tech_fifo_component_pkg is ); end component; - ----------------------------------------------------------------------------- + ----------------------------------------------------------------------------- -- ip_arria10_e2sg ----------------------------------------------------------------------------- @@ -353,425 +352,67 @@ package tech_fifo_component_pkg is ); end component; + ----------------------------------------------------------------------------- + -- ip_ultrascale + ----------------------------------------------------------------------------- + + component ip_ultrascale_fifo_sc is + generic ( + g_dat_w : natural := 20; + g_nof_words : natural := 1024 + ); + port ( + aclr : in std_logic ; + clock : in std_logic ; + data : in std_logic_vector (g_dat_w - 1 downto 0); + rdreq : in std_logic ; + wrreq : in std_logic ; + empty : out std_logic ; + full : out std_logic ; + q : out std_logic_vector (g_dat_w - 1 downto 0) ; + usedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0) + ); + end component; + + component ip_ultrascale_fifo_dc is + generic ( + g_dat_w : natural := 20; + g_nof_words : natural := 1024 + ); + port ( + aclr : in std_logic := '0'; + data : in std_logic_vector (g_dat_w - 1 downto 0); + rdclk : in std_logic ; + rdreq : in std_logic ; + wrclk : in std_logic ; + wrreq : in std_logic ; + q : out std_logic_vector (g_dat_w - 1 downto 0); + rdempty : out std_logic ; + rdusedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0); + wrfull : out std_logic ; + wrusedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0) + ); + end component; + + component ip_ultrascale_fifo_dc_mixed_widths is + generic ( + g_nof_words : natural := 1024; -- FIFO size in nof wr_dat words + g_wrdat_w : natural := 20; + g_rddat_w : natural := 10 + ); + port ( + aclr : in std_logic := '0'; + data : in std_logic_vector (g_wrdat_w - 1 downto 0); + rdclk : in std_logic ; + rdreq : in std_logic ; + wrclk : in std_logic ; + wrreq : in std_logic ; + q : out std_logic_vector (g_rddat_w - 1 downto 0); + rdempty : out std_logic ; + rdusedw : out std_logic_vector (tech_ceil_log2(g_nof_words * g_wrdat_w / g_rddat_w) - 1 downto 0); + wrfull : out std_logic ; + wrusedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0) + ); + end component; -end tech_fifo_component_pkg; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - --- Purpose: IP components declarations for various devices that get wrapped by the tech components - -LIBRARY IEEE, technology_lib; -USE IEEE.STD_LOGIC_1164.ALL; -USE technology_lib.technology_pkg.ALL; - -PACKAGE tech_fifo_component_pkg IS - - ----------------------------------------------------------------------------- - -- ip_stratixiv - ----------------------------------------------------------------------------- - - COMPONENT ip_stratixiv_fifo_sc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL; - g_nof_words : NATURAL - ); - PORT ( - aclr : IN STD_LOGIC; - clock : IN STD_LOGIC; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC; - wrreq : IN STD_LOGIC; - empty : OUT STD_LOGIC; - full : OUT STD_LOGIC; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_stratixiv_fifo_dc IS - GENERIC ( - g_dat_w : NATURAL; - g_nof_words : NATURAL - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC; - rdreq : IN STD_LOGIC; - wrclk : IN STD_LOGIC; - wrreq : IN STD_LOGIC; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_stratixiv_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL; - g_rddat_w : NATURAL - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC; - rdreq : IN STD_LOGIC; - wrclk : IN STD_LOGIC; - wrreq : IN STD_LOGIC; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - - ----------------------------------------------------------------------------- - -- ip_arria10 - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_fifo_sc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC ; - clock : IN STD_LOGIC ; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - empty : OUT STD_LOGIC ; - full : OUT STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) ; - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_fifo_dc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL := 1024; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL := 20; - g_rddat_w : NATURAL := 10 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_arria10_e3sge3 - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_e3sge3_fifo_sc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC ; - clock : IN STD_LOGIC ; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - empty : OUT STD_LOGIC ; - full : OUT STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) ; - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e3sge3_fifo_dc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e3sge3_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL := 1024; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL := 20; - g_rddat_w : NATURAL := 10 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_arria10_e1sg - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_e1sg_fifo_sc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC ; - clock : IN STD_LOGIC ; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - empty : OUT STD_LOGIC ; - full : OUT STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) ; - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e1sg_fifo_dc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e1sg_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL := 1024; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL := 20; - g_rddat_w : NATURAL := 10 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_arria10_e2sg - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_e2sg_fifo_sc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC ; - clock : IN STD_LOGIC ; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - empty : OUT STD_LOGIC ; - full : OUT STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) ; - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e2sg_fifo_dc IS - GENERIC ( - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e2sg_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL := 1024; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL := 20; - g_rddat_w : NATURAL := 10 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_ultrascale - ----------------------------------------------------------------------------- - - COMPONENT ip_ultrascale_fifo_sc IS - GENERIC ( - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC ; - clock : IN STD_LOGIC ; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - empty : OUT STD_LOGIC ; - full : OUT STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) ; - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_ultrascale_fifo_dc IS - GENERIC ( - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_ultrascale_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL := 1024; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL := 20; - g_rddat_w : NATURAL := 10 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); - END COMPONENT; - -END tech_fifo_component_pkg; ->>>>>>> master +end tech_fifo_component_pkg; \ No newline at end of file diff --git a/libraries/technology/fifo/tech_fifo_dc.vhd b/libraries/technology/fifo/tech_fifo_dc.vhd index d8498b3503..8deeb1216e 100644 --- a/libraries/technology/fifo/tech_fifo_dc.vhd +++ b/libraries/technology/fifo/tech_fifo_dc.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -32,6 +31,7 @@ library ip_arria10_fifo_lib; library ip_arria10_e3sge3_fifo_lib; library ip_arria10_e1sg_fifo_lib; library ip_arria10_e2sg_fifo_lib; +library ip_ultrascale_fifo_lib; entity tech_fifo_dc is generic ( @@ -90,105 +90,10 @@ begin port map (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); end generate; -end architecture; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - -LIBRARY ieee, technology_lib; -USE ieee.std_logic_1164.all; -USE work.tech_fifo_component_pkg.ALL; -USE technology_lib.technology_pkg.ALL; -USE technology_lib.technology_select_pkg.ALL; - --- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis. -LIBRARY ip_stratixiv_fifo_lib; -LIBRARY ip_arria10_fifo_lib; -LIBRARY ip_arria10_e3sge3_fifo_lib; -LIBRARY ip_arria10_e1sg_fifo_lib; -LIBRARY ip_arria10_e2sg_fifo_lib; -LIBRARY ip_ultrascale_fifo_lib; - -ENTITY tech_fifo_dc IS - GENERIC ( - g_technology : NATURAL := c_tech_select_default; - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL; - g_nof_words : NATURAL - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC; - rdreq : IN STD_LOGIC; - wrclk : IN STD_LOGIC; - wrreq : IN STD_LOGIC; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); -END tech_fifo_dc; - - -ARCHITECTURE str OF tech_fifo_dc IS - -BEGIN - - gen_ip_stratixiv : IF g_technology=c_tech_stratixiv GENERATE - u0 : ip_stratixiv_fifo_dc - GENERIC MAP (g_dat_w, g_nof_words) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10 : IF g_technology=c_tech_arria10_proto GENERATE - u0 : ip_arria10_fifo_dc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10_e3sge3 : IF g_technology=c_tech_arria10_e3sge3 GENERATE - u0 : ip_arria10_e3sge3_fifo_dc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10_e1sg : IF g_technology=c_tech_arria10_e1sg GENERATE - u0 : ip_arria10_e1sg_fifo_dc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10_e2sg : IF g_technology=c_tech_arria10_e2sg GENERATE - u0 : ip_arria10_e2sg_fifo_dc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_ultrascale : IF g_technology=c_tech_ultrascale GENERATE - u0 : ip_ultrascale_fifo_dc - GENERIC MAP (g_dat_w, g_nof_words) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - -END ARCHITECTURE; ->>>>>>> master + gen_ip_ultrascale : if g_technology = c_tech_ultrascale generate + u0 : ip_ultrascale_fifo_dc + generic map (g_dat_w, g_nof_words) + port map (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); + end generate; + +end architecture; \ No newline at end of file diff --git a/libraries/technology/fifo/tech_fifo_dc_mixed_widths.vhd b/libraries/technology/fifo/tech_fifo_dc_mixed_widths.vhd index d2d738466b..f89d0a918c 100644 --- a/libraries/technology/fifo/tech_fifo_dc_mixed_widths.vhd +++ b/libraries/technology/fifo/tech_fifo_dc_mixed_widths.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -32,6 +31,7 @@ library ip_arria10_fifo_lib; library ip_arria10_e3sge3_fifo_lib; library ip_arria10_e1sg_fifo_lib; library ip_arria10_e2sg_fifo_lib; +library ip_ultrascale_fifo_lib; entity tech_fifo_dc_mixed_widths is generic ( @@ -90,105 +90,10 @@ begin port map (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); end generate; -end architecture; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - -LIBRARY ieee, technology_lib; -USE ieee.std_logic_1164.all; -USE work.tech_fifo_component_pkg.ALL; -USE technology_lib.technology_pkg.ALL; -USE technology_lib.technology_select_pkg.ALL; - --- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis. -LIBRARY ip_stratixiv_fifo_lib; -LIBRARY ip_arria10_fifo_lib; -LIBRARY ip_arria10_e3sge3_fifo_lib; -LIBRARY ip_arria10_e1sg_fifo_lib; -LIBRARY ip_arria10_e2sg_fifo_lib; -LIBRARY ip_ultrascale_fifo_lib; - -ENTITY tech_fifo_dc_mixed_widths IS - GENERIC ( - g_technology : NATURAL := c_tech_select_default; - g_nof_words : NATURAL; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL; - g_rddat_w : NATURAL - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC; - rdreq : IN STD_LOGIC; - wrclk : IN STD_LOGIC; - wrreq : IN STD_LOGIC; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); -END tech_fifo_dc_mixed_widths; - - -ARCHITECTURE str OF tech_fifo_dc_mixed_widths IS - -BEGIN - - gen_ip_stratixiv : IF g_technology=c_tech_stratixiv GENERATE - u0 : ip_stratixiv_fifo_dc_mixed_widths - GENERIC MAP (g_nof_words, g_wrdat_w, g_rddat_w) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10 : IF g_technology=c_tech_arria10_proto GENERATE - u0 : ip_arria10_fifo_dc_mixed_widths - GENERIC MAP (g_nof_words, g_wrdat_w, g_rddat_w) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10_e3sge3 : IF g_technology=c_tech_arria10_e3sge3 GENERATE - u0 : ip_arria10_e3sge3_fifo_dc_mixed_widths - GENERIC MAP (g_nof_words, g_wrdat_w, g_rddat_w) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10_e1sg : IF g_technology=c_tech_arria10_e1sg GENERATE - u0 : ip_arria10_e1sg_fifo_dc_mixed_widths - GENERIC MAP (g_nof_words, g_wrdat_w, g_rddat_w) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_arria10_e2sg : IF g_technology=c_tech_arria10_e2sg GENERATE - u0 : ip_arria10_e2sg_fifo_dc_mixed_widths - GENERIC MAP (g_nof_words, g_wrdat_w, g_rddat_w) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - - gen_ip_ultrascale : IF g_technology=c_tech_ultrascale GENERATE - u0 : ip_ultrascale_fifo_dc_mixed_widths - GENERIC MAP (g_nof_words, g_wrdat_w, g_rddat_w) - PORT MAP (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); - END GENERATE; - -END ARCHITECTURE; ->>>>>>> master + gen_ip_ultrascale : if g_technology = c_tech_ultrascale generate + u0 : ip_ultrascale_fifo_dc_mixed_widths + generic map (g_nof_words, g_wrdat_w, g_rddat_w) + port map (aclr, data, rdclk, rdreq, wrclk, wrreq, q, rdempty, rdusedw, wrfull, wrusedw); + end generate; + +end architecture; \ No newline at end of file diff --git a/libraries/technology/fifo/tech_fifo_sc.vhd b/libraries/technology/fifo/tech_fifo_sc.vhd index 275e5eafd6..96f625e827 100644 --- a/libraries/technology/fifo/tech_fifo_sc.vhd +++ b/libraries/technology/fifo/tech_fifo_sc.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -32,6 +31,7 @@ library ip_arria10_fifo_lib; library ip_arria10_e3sge3_fifo_lib; library ip_arria10_e1sg_fifo_lib; library ip_arria10_e2sg_fifo_lib; +library ip_ultrascale_fifo_lib; entity tech_fifo_sc is generic ( @@ -88,103 +88,10 @@ begin port map (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); end generate; -end architecture; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - -LIBRARY ieee, technology_lib; -USE ieee.std_logic_1164.all; -USE work.tech_fifo_component_pkg.ALL; -USE technology_lib.technology_pkg.ALL; -USE technology_lib.technology_select_pkg.ALL; - --- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis. -LIBRARY ip_stratixiv_fifo_lib; -LIBRARY ip_arria10_fifo_lib; -LIBRARY ip_arria10_e3sge3_fifo_lib; -LIBRARY ip_arria10_e1sg_fifo_lib; -LIBRARY ip_arria10_e2sg_fifo_lib; -LIBRARY ip_ultrascale_fifo_lib; - -ENTITY tech_fifo_sc IS - GENERIC ( - g_technology : NATURAL := c_tech_select_default; - g_use_eab : STRING := "ON"; - g_dat_w : NATURAL; - g_nof_words : NATURAL - ); - PORT ( - aclr : IN STD_LOGIC; - clock : IN STD_LOGIC; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC; - wrreq : IN STD_LOGIC; - empty : OUT STD_LOGIC; - full : OUT STD_LOGIC; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); -END tech_fifo_sc; - - -ARCHITECTURE str OF tech_fifo_sc IS - -BEGIN - - gen_ip_stratixiv : IF g_technology=c_tech_stratixiv GENERATE - u0 : ip_stratixiv_fifo_sc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); - END GENERATE; - - gen_ip_arria10 : IF g_technology=c_tech_arria10_proto GENERATE - u0 : ip_arria10_fifo_sc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); - END GENERATE; - - gen_ip_arria10_e3sge3 : IF g_technology=c_tech_arria10_e3sge3 GENERATE - u0 : ip_arria10_e3sge3_fifo_sc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); - END GENERATE; - - gen_ip_arria10_e1sg : IF g_technology=c_tech_arria10_e1sg GENERATE - u0 : ip_arria10_e1sg_fifo_sc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); - END GENERATE; - - gen_ip_arria10_e2sg : IF g_technology=c_tech_arria10_e2sg GENERATE - u0 : ip_arria10_e2sg_fifo_sc - GENERIC MAP (g_use_eab, g_dat_w, g_nof_words) - PORT MAP (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); - END GENERATE; - - gen_ip_ultrascale : IF g_technology=c_tech_ultrascale GENERATE - u0 : ip_ultrascale_fifo_sc - GENERIC MAP (g_dat_w, g_nof_words) - PORT MAP (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); - END GENERATE; - -END ARCHITECTURE; ->>>>>>> master + gen_ip_ultrascale : if g_technology = c_tech_ultrascale generate + u0 : ip_ultrascale_fifo_sc + generic map (g_dat_w, g_nof_words) + port map (aclr, clock, data, rdreq, wrreq, empty, full, q, usedw); + end generate; + +end architecture; \ No newline at end of file diff --git a/libraries/technology/fpga_temp_sens/tech_fpga_temp_sens_component_pkg.vhd b/libraries/technology/fpga_temp_sens/tech_fpga_temp_sens_component_pkg.vhd index 6c984db200..e3e1fca9a8 100644 --- a/libraries/technology/fpga_temp_sens/tech_fpga_temp_sens_component_pkg.vhd +++ b/libraries/technology/fpga_temp_sens/tech_fpga_temp_sens_component_pkg.vhd @@ -62,4 +62,4 @@ package tech_fpga_temp_sens_component_pkg is ); end component; -end tech_fpga_temp_sens_component_pkg; +end tech_fpga_temp_sens_component_pkg; \ No newline at end of file diff --git a/libraries/technology/fpga_voltage_sens/tech_fpga_voltage_sens_component_pkg.vhd b/libraries/technology/fpga_voltage_sens/tech_fpga_voltage_sens_component_pkg.vhd index 092840e9e0..53ba20b1e0 100644 --- a/libraries/technology/fpga_voltage_sens/tech_fpga_voltage_sens_component_pkg.vhd +++ b/libraries/technology/fpga_voltage_sens/tech_fpga_voltage_sens_component_pkg.vhd @@ -98,4 +98,4 @@ package tech_fpga_voltage_sens_component_pkg is ); end component; -end tech_fpga_voltage_sens_component_pkg; +end tech_fpga_voltage_sens_component_pkg; \ No newline at end of file diff --git a/libraries/technology/fractional_pll/tech_fractional_pll_clk200.vhd b/libraries/technology/fractional_pll/tech_fractional_pll_clk200.vhd index ea8152f0d2..dc678d15cf 100644 --- a/libraries/technology/fractional_pll/tech_fractional_pll_clk200.vhd +++ b/libraries/technology/fractional_pll/tech_fractional_pll_clk200.vhd @@ -101,4 +101,4 @@ begin ); end generate; -end architecture; +end architecture; \ No newline at end of file diff --git a/libraries/technology/fractional_pll/tech_fractional_pll_component_pkg.vhd b/libraries/technology/fractional_pll/tech_fractional_pll_component_pkg.vhd index 48678650c1..4a9856c732 100644 --- a/libraries/technology/fractional_pll/tech_fractional_pll_component_pkg.vhd +++ b/libraries/technology/fractional_pll/tech_fractional_pll_component_pkg.vhd @@ -150,4 +150,4 @@ package tech_fractional_pll_component_pkg is ); end component; -end tech_fractional_pll_component_pkg; +end tech_fractional_pll_component_pkg; \ No newline at end of file diff --git a/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd b/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd index d9afda9e0a..07d3900c04 100644 --- a/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd +++ b/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd @@ -136,8 +136,8 @@ end ip_arria10_eth_10g; architecture str of ip_arria10_eth_10g is -- Enable or disable the conditions that must be ok to release tx_snk_out_arr xon - constant c_check_link_status : boolean := g_direction /="TX_ONLY "; - constant c_check_xgmii_tx_ready : boolean := g_direction /="RX_ONLY "; + constant c_check_link_status : boolean := g_direction /="TX_ONLY "; + constant c_check_xgmii_tx_ready : boolean := g_direction /="RX_ONLY "; signal i_tx_snk_out_arr : t_dp_siso_arr(g_nof_channels - 1 downto 0); @@ -185,7 +185,7 @@ begin if c_check_xgmii_tx_ready = TRUE then v_xgmii_tx_ready := xgmii_tx_ready_arr(I); end if; -- Now apply the conditions to xon - if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then + if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then i_tx_snk_out_arr(I).xon <= '1'; -- XON when Tx PHY is ready and XGMII is ok end if; end if; @@ -223,7 +223,7 @@ begin ); end generate; - xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; + xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; u_tech_10gbase_r : entity tech_10gbase_r_lib.tech_10gbase_r generic map ( diff --git a/libraries/technology/ip_arria10/mult/ip_arria10_mult_rtl.vhd b/libraries/technology/ip_arria10/mult/ip_arria10_mult_rtl.vhd index 849b024552..39be77565c 100644 --- a/libraries/technology/ip_arria10/mult/ip_arria10_mult_rtl.vhd +++ b/libraries/technology/ip_arria10/mult/ip_arria10_mult_rtl.vhd @@ -116,7 +116,7 @@ begin gen_mult : for I in 0 to g_nof_mult - 1 generate nxt_prod((I + 1) * c_prod_w - 1 downto I * c_prod_w) <= - std_logic_vector( signed(inp_a((I + 1) * g_in_a_w - 1 downto I * g_in_a_w)) * signed(inp_b((I + 1) * g_in_b_w - 1 downto I * g_in_b_w))) when g_representation ="signed " else + std_logic_vector( signed(inp_a((I + 1) * g_in_a_w - 1 downto I * g_in_a_w)) * signed(inp_b((I + 1) * g_in_b_w - 1 downto I * g_in_b_w))) when g_representation ="signed " else std_logic_vector(unsigned(inp_a((I + 1) * g_in_a_w - 1 downto I * g_in_a_w)) * unsigned(inp_b((I + 1) * g_in_b_w - 1 downto I * g_in_b_w))); end generate; diff --git a/libraries/technology/ip_arria10/ram/ip_arria10_ram_crwk_crw.vhd b/libraries/technology/ip_arria10/ram/ip_arria10_ram_crwk_crw.vhd index 27394129fe..9ee5672052 100644 --- a/libraries/technology/ip_arria10/ram/ip_arria10_ram_crwk_crw.vhd +++ b/libraries/technology/ip_arria10/ram/ip_arria10_ram_crwk_crw.vhd @@ -138,4 +138,4 @@ begin q_b => q_b ); -end SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_arria10/ram/ip_arria10_simple_dual_port_ram_single_clock.vhd b/libraries/technology/ip_arria10/ram/ip_arria10_simple_dual_port_ram_single_clock.vhd index 6c79ed58e7..e14a9f1e86 100644 --- a/libraries/technology/ip_arria10/ram/ip_arria10_simple_dual_port_ram_single_clock.vhd +++ b/libraries/technology/ip_arria10/ram/ip_arria10_simple_dual_port_ram_single_clock.vhd @@ -72,4 +72,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_170/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_170_yroldmy.vhd b/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_170/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_170_yroldmy.vhd index 4cb760cf16..e0cc256343 100644 --- a/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_170/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_170_yroldmy.vhd +++ b/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_170/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_170_yroldmy.vhd @@ -116,4 +116,4 @@ begin --vhdl renameroo for output signals readdata <= internal_readdata; -end europa; +end europa; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_180/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_180_xymx6za.vhd b/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_180/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_180_xymx6za.vhd index 75ebce007e..5a8cb5a23a 100644 --- a/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_180/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_180_xymx6za.vhd +++ b/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/altera_avalon_onchip_memory2_180/sim/ip_arria10_e1sg_ddr4_8g_2400_altera_avalon_onchip_memory2_180_xymx6za.vhd @@ -116,4 +116,4 @@ begin --vhdl renameroo for output signals readdata <= internal_readdata; -end europa; +end europa; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400_inst.vhd b/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400_inst.vhd index bc9c643d3f..16e51d04df 100644 --- a/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400_inst.vhd +++ b/libraries/technology/ip_arria10_e1sg/ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400/ip_arria10_e1sg_ddr4_8g_2400_inst.vhd @@ -69,4 +69,4 @@ pll_ref_clk => CONNECTED_TO_pll_ref_clk, -- pll_ref_clk_clock_sink.clk local_cal_success => CONNECTED_TO_local_cal_success, -- status_conduit_end.local_cal_success local_cal_fail => CONNECTED_TO_local_cal_fail -- .local_cal_fail - ); + ); \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd b/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd index 08bda8fba2..fb9930b6b0 100644 --- a/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd +++ b/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd @@ -191,7 +191,7 @@ begin if c_check_xgmii_tx_ready = TRUE then v_xgmii_tx_ready := xgmii_tx_ready_arr(I); end if; -- Now apply the conditions to xon - if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then + if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then i_tx_snk_out_arr(I).xon <= '1'; -- XON when Tx PHY is ready and XGMII is ok end if; end if; @@ -229,7 +229,7 @@ begin ); end generate; - xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; + xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; u_tech_10gbase_r : entity tech_10gbase_r_lib.tech_10gbase_r generic map ( diff --git a/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd b/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd index 4448ba392b..2f9616f274 100644 --- a/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd +++ b/libraries/technology/ip_arria10_e1sg/jesd204b/ip_arria10_e1sg_jesd204b.vhd @@ -526,5 +526,4 @@ begin miso_arr => jesd204b_miso_arr ); -end str; - +end str; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw.vhd b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw.vhd index f9e439242f..2dac63cceb 100644 --- a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw.vhd +++ b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw.vhd @@ -138,4 +138,4 @@ begin q_b => q_b ); -end SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ip_arria10_e1sg_ram_crwk_crw_inst.vhd b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ip_arria10_e1sg_ram_crwk_crw_inst.vhd index 4e479e24d8..28e4212299 100644 --- a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ip_arria10_e1sg_ram_crwk_crw_inst.vhd +++ b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ip_arria10_e1sg_ram_crwk_crw_inst.vhd @@ -29,4 +29,4 @@ rden_b => CONNECTED_TO_rden_b, -- .rden_b q_a => CONNECTED_TO_q_a, -- ram_output.dataout_a q_b => CONNECTED_TO_q_b -- .dataout_b - ); + ); \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ram_2port_170/sim/ip_arria10_e1sg_ram_crwk_crw_ram_2port_170_qaianri.vhd b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ram_2port_170/sim/ip_arria10_e1sg_ram_crwk_crw_ram_2port_170_qaianri.vhd index 0195e45b1c..2a4eebc154 100644 --- a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ram_2port_170/sim/ip_arria10_e1sg_ram_crwk_crw_ram_2port_170_qaianri.vhd +++ b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_ram_crwk_crw/ram_2port_170/sim/ip_arria10_e1sg_ram_crwk_crw_ram_2port_170_qaianri.vhd @@ -95,4 +95,4 @@ begin -end SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_simple_dual_port_ram_single_clock.vhd b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_simple_dual_port_ram_single_clock.vhd index 60c03373d7..a2236c35e5 100644 --- a/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_simple_dual_port_ram_single_clock.vhd +++ b/libraries/technology/ip_arria10_e1sg/ram/ip_arria10_e1sg_simple_dual_port_ram_single_clock.vhd @@ -72,4 +72,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e1sg/transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3_inst.vhd b/libraries/technology/ip_arria10_e1sg/transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3_inst.vhd index e657271557..854ca2f6f1 100644 --- a/libraries/technology/ip_arria10_e1sg/transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3_inst.vhd +++ b/libraries/technology/ip_arria10_e1sg/transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3/ip_arria10_e1sg_transceiver_reset_controller_3_inst.vhd @@ -33,4 +33,4 @@ tx_cal_busy => CONNECTED_TO_tx_cal_busy, -- tx_cal_busy.tx_cal_busy tx_digitalreset => CONNECTED_TO_tx_digitalreset, -- tx_digitalreset.tx_digitalreset tx_ready => CONNECTED_TO_tx_ready -- tx_ready.tx_ready - ); + ); \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e2sg/ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600_inst.vhd b/libraries/technology/ip_arria10_e2sg/ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600_inst.vhd index 3e681c55b8..e17ee5e535 100644 --- a/libraries/technology/ip_arria10_e2sg/ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600_inst.vhd +++ b/libraries/technology/ip_arria10_e2sg/ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600/ip_arria10_e2sg_ddr4_8g_1600_inst.vhd @@ -87,4 +87,4 @@ mmr_slave_burstcount_0 => CONNECTED_TO_mmr_slave_burstcount_0, -- .burstcount mmr_slave_beginbursttransfer_0 => CONNECTED_TO_mmr_slave_beginbursttransfer_0, -- .beginbursttransfer mmr_slave_readdatavalid_0 => CONNECTED_TO_mmr_slave_readdatavalid_0 -- .readdatavalid - ); + ); \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd b/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd index 8cd46fb79b..6f119c2df9 100644 --- a/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd +++ b/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd @@ -191,7 +191,7 @@ begin if c_check_xgmii_tx_ready = TRUE then v_xgmii_tx_ready := xgmii_tx_ready_arr(I); end if; -- Now apply the conditions to xon - if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then + if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then i_tx_snk_out_arr(I).xon <= '1'; -- XON when Tx PHY is ready and XGMII is ok end if; end if; @@ -229,7 +229,7 @@ begin ); end generate; - xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; + xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; u_tech_10gbase_r : entity tech_10gbase_r_lib.tech_10gbase_r generic map ( diff --git a/libraries/technology/ip_arria10_e2sg/jesd204b/ip_arria10_e2sg_jesd204b.vhd b/libraries/technology/ip_arria10_e2sg/jesd204b/ip_arria10_e2sg_jesd204b.vhd index def1bc4688..9899e63bdd 100644 --- a/libraries/technology/ip_arria10_e2sg/jesd204b/ip_arria10_e2sg_jesd204b.vhd +++ b/libraries/technology/ip_arria10_e2sg/jesd204b/ip_arria10_e2sg_jesd204b.vhd @@ -526,5 +526,4 @@ begin miso_arr => jesd204b_miso_arr ); -end str; - +end str; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ip_arria10_e2sg_ram_crw_crw_inst.vhd b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ip_arria10_e2sg_ram_crw_crw_inst.vhd index 70f064f953..d2b0527090 100644 --- a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ip_arria10_e2sg_ram_crw_crw_inst.vhd +++ b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ip_arria10_e2sg_ram_crw_crw_inst.vhd @@ -25,4 +25,4 @@ wren_b => CONNECTED_TO_wren_b, -- wren_b.wren_b clock_a => CONNECTED_TO_clock_a, -- clock_a.clk clock_b => CONNECTED_TO_clock_b -- clock_b.clk - ); + ); \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ram_2port_2000/sim/ip_arria10_e2sg_ram_crw_crw_ram_2port_2000_zxnv4ey.vhd b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ram_2port_2000/sim/ip_arria10_e2sg_ram_crw_crw_ram_2port_2000_zxnv4ey.vhd index 050a75b17a..ef0bf09adc 100644 --- a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ram_2port_2000/sim/ip_arria10_e2sg_ram_crw_crw_ram_2port_2000_zxnv4ey.vhd +++ b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crw_crw/ram_2port_2000/sim/ip_arria10_e2sg_ram_crw_crw_ram_2port_2000_zxnv4ey.vhd @@ -90,4 +90,4 @@ begin -end SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crwk_crw.vhd b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crwk_crw.vhd index 4342b44b5b..3fbfbda2ba 100644 --- a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crwk_crw.vhd +++ b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_ram_crwk_crw.vhd @@ -138,4 +138,4 @@ begin q_b => q_b ); -end SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_simple_dual_port_ram_single_clock.vhd b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_simple_dual_port_ram_single_clock.vhd index 50df8cac1f..45f392f386 100644 --- a/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_simple_dual_port_ram_single_clock.vhd +++ b/libraries/technology/ip_arria10_e2sg/ram/ip_arria10_e2sg_simple_dual_port_ram_single_clock.vhd @@ -72,4 +72,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd b/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd index 954b4070ca..f7fbcecd76 100644 --- a/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd +++ b/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd @@ -140,8 +140,8 @@ end ip_arria10_e3sge3_eth_10g; architecture str of ip_arria10_e3sge3_eth_10g is -- Enable or disable the conditions that must be ok to release tx_snk_out_arr xon - constant c_check_link_status : boolean := g_direction /="TX_ONLY "; - constant c_check_xgmii_tx_ready : boolean := g_direction /="RX_ONLY "; + constant c_check_link_status : boolean := g_direction /="TX_ONLY "; + constant c_check_xgmii_tx_ready : boolean := g_direction /="RX_ONLY "; signal i_tx_snk_out_arr : t_dp_siso_arr(g_nof_channels - 1 downto 0); @@ -189,7 +189,7 @@ begin if c_check_xgmii_tx_ready = TRUE then v_xgmii_tx_ready := xgmii_tx_ready_arr(I); end if; -- Now apply the conditions to xon - if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then + if v_xgmii_tx_ready = '1' and v_xgmii_link_status ="00 " then i_tx_snk_out_arr(I).xon <= '1'; -- XON when Tx PHY is ready and XGMII is ok end if; end if; @@ -227,7 +227,7 @@ begin ); end generate; - xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; + xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; u_tech_10gbase_r : entity tech_10gbase_r_lib.tech_10gbase_r generic map ( diff --git a/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_ram_crwk_crw.vhd b/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_ram_crwk_crw.vhd index eaf615e5c9..dc243ea844 100644 --- a/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_ram_crwk_crw.vhd +++ b/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_ram_crwk_crw.vhd @@ -138,4 +138,4 @@ begin q_b => q_b ); -end SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_simple_dual_port_ram_single_clock.vhd b/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_simple_dual_port_ram_single_clock.vhd index 1a898cb672..8b61f85ddd 100644 --- a/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_simple_dual_port_ram_single_clock.vhd +++ b/libraries/technology/ip_arria10_e3sge3/ram/ip_arria10_e3sge3_simple_dual_port_ram_single_clock.vhd @@ -72,4 +72,4 @@ begin end if; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/ip_stratixiv/eth_10g/ip_stratixiv_eth_10g.vhd b/libraries/technology/ip_stratixiv/eth_10g/ip_stratixiv_eth_10g.vhd index fcf4f7a9ad..f4772112e8 100644 --- a/libraries/technology/ip_stratixiv/eth_10g/ip_stratixiv_eth_10g.vhd +++ b/libraries/technology/ip_stratixiv/eth_10g/ip_stratixiv_eth_10g.vhd @@ -134,9 +134,9 @@ end ip_stratixiv_eth_10g; architecture str of ip_stratixiv_eth_10g is -- Enable or disable the conditions that must be ok to release tx_snk_out_arr xon - constant c_check_link_status : boolean := g_direction /="TX_ONLY "; - constant c_check_rx_channelaligned : boolean := g_direction /="TX_ONLY "; - constant c_check_xgmii_tx_ready : boolean := g_direction /="RX_ONLY "; + constant c_check_link_status : boolean := g_direction /="TX_ONLY "; + constant c_check_rx_channelaligned : boolean := g_direction /="TX_ONLY "; + constant c_check_xgmii_tx_ready : boolean := g_direction /="RX_ONLY "; -- MAG_10G control status registers signal mac_mosi_arr : t_mem_mosi_arr(g_nof_channels - 1 downto 0); @@ -168,8 +168,8 @@ begin tx_rst_arr_out <= i_tx_rst_arr_out; rx_rst_arr_out <= i_rx_rst_arr_out; - i_tx_rst_arr_out <= not txc_tx_ready_arr when g_direction /="RX_ONLY " else i_rx_rst_arr_out; -- in case of RX_ONLY use the rx rst also for tx to have an active rst release, clock domain crossing issues can be ignored - i_rx_rst_arr_out <= not rxc_rx_ready_arr when g_direction /="TX_ONLY " else i_tx_rst_arr_out; -- in case of TX_ONLY use the tx rst also for rx to have an active rst release, clock domain crossing issues can be ignored + i_tx_rst_arr_out <= not txc_tx_ready_arr when g_direction /="RX_ONLY " else i_rx_rst_arr_out; -- in case of RX_ONLY use the rx rst also for tx to have an active rst release, clock domain crossing issues can be ignored + i_rx_rst_arr_out <= not rxc_rx_ready_arr when g_direction /="TX_ONLY " else i_tx_rst_arr_out; -- in case of TX_ONLY use the tx rst also for rx to have an active rst release, clock domain crossing issues can be ignored xgmii_tx_ready_arr <= txc_tx_ready_arr; @@ -191,7 +191,7 @@ begin if c_check_xgmii_tx_ready = TRUE then v_xgmii_tx_ready := xgmii_tx_ready_arr(I); end if; -- Now apply the conditions to xon - if v_xgmii_tx_ready = '1' and v_txc_rx_channelaligned = '1' and v_xgmii_link_status ="00 " then + if v_xgmii_tx_ready = '1' and v_txc_rx_channelaligned = '1' and v_xgmii_link_status ="00 " then tx_snk_out_arr(I).xon <= '1'; -- XON when Tx PHY is ready and XGMII is ok end if; end if; @@ -227,7 +227,7 @@ begin ); end generate; - xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; + xgmii_internal_dc_arr <= xgmii_tx_dc_arr when g_direction ="TX_ONLY " else xgmii_rx_dc_arr; u_tech_xaui : entity tech_xaui_lib.tech_xaui generic map ( diff --git a/libraries/technology/ip_stratixiv/mult/ip_stratixiv_mult_rtl.vhd b/libraries/technology/ip_stratixiv/mult/ip_stratixiv_mult_rtl.vhd index 231abe2969..cbde1e04d2 100644 --- a/libraries/technology/ip_stratixiv/mult/ip_stratixiv_mult_rtl.vhd +++ b/libraries/technology/ip_stratixiv/mult/ip_stratixiv_mult_rtl.vhd @@ -116,7 +116,7 @@ begin gen_mult : for I in 0 to g_nof_mult - 1 generate nxt_prod((I + 1) * c_prod_w - 1 downto I * c_prod_w) <= - std_logic_vector( signed(inp_a((I + 1) * g_in_a_w - 1 downto I * g_in_a_w)) * signed(inp_b((I + 1) * g_in_b_w - 1 downto I * g_in_b_w))) when g_representation ="signed " else + std_logic_vector( signed(inp_a((I + 1) * g_in_a_w - 1 downto I * g_in_a_w)) * signed(inp_b((I + 1) * g_in_b_w - 1 downto I * g_in_b_w))) when g_representation ="signed " else std_logic_vector(unsigned(inp_a((I + 1) * g_in_a_w - 1 downto I * g_in_a_w)) * unsigned(inp_b((I + 1) * g_in_b_w - 1 downto I * g_in_b_w))); end generate; diff --git a/libraries/technology/ip_stratixiv/phy_xaui/tb_ip_stratixiv_phy_xaui.vhd b/libraries/technology/ip_stratixiv/phy_xaui/tb_ip_stratixiv_phy_xaui.vhd index b009a48afd..10319687e6 100644 --- a/libraries/technology/ip_stratixiv/phy_xaui/tb_ip_stratixiv_phy_xaui.vhd +++ b/libraries/technology/ip_stratixiv/phy_xaui/tb_ip_stratixiv_phy_xaui.vhd @@ -231,4 +231,4 @@ begin end if; end process; -end architecture str; +end architecture str; \ No newline at end of file diff --git a/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v101.vhd b/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v101.vhd index db128afcf8..d4f7bb4c39 100644 --- a/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v101.vhd +++ b/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v101.vhd @@ -75,4 +75,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v111.vhd b/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v111.vhd index cdb2a7f4bf..2d36d6af53 100644 --- a/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v111.vhd +++ b/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v111.vhd @@ -65,4 +65,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v91.vhd b/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v91.vhd index e1caf0230e..213cf9ae12 100644 --- a/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v91.vhd +++ b/libraries/technology/ip_stratixiv/transceiver/ip_stratixiv_gxb_reconfig_v91.vhd @@ -83,4 +83,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc.vhd b/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc.vhd index 4b901cdef5..64ec598b4f 100644 --- a/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc.vhd +++ b/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc.vhd @@ -1,176 +1,176 @@ -------------------------------------------------------------------------------- --- --- Copyright 2023 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- -------------------------------------------------------------------------------- --- Purpose: Instantiate FIFO IP with generics --- Description: --- Copied component instantiation from Vivado XPM template - -LIBRARY ieee; -USE ieee.std_logic_1164.all; - -LIBRARY technology_lib; -USE technology_lib.technology_pkg.ALL; - -LIBRARY xpm; -USE xpm.vcomponents.ALL; - -ENTITY ip_ultrascale_fifo_dc IS - GENERIC ( - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); -END ip_ultrascale_fifo_dc; - -ARCHITECTURE SYN OF ip_ultrascale_fifo_dc IS - -BEGIN - -- xpm_fifo_async: Asynchronous FIFO - -- Xilinx Parameterized Macro, version 2022.1 - - xpm_fifo_async_inst : xpm_fifo_async - generic map ( - CASCADE_HEIGHT => 0, -- DECIMAL - CDC_SYNC_STAGES => 3, -- DECIMAL - DOUT_RESET_VALUE => "0", -- String - ECC_MODE => "no_ecc", -- String - FIFO_MEMORY_TYPE => "auto", -- String - FIFO_READ_LATENCY => 1, -- DECIMAL - FIFO_WRITE_DEPTH => g_nof_words, -- DECIMAL - FULL_RESET_VALUE => 0, -- DECIMAL - PROG_EMPTY_THRESH => 10, -- DECIMAL - PROG_FULL_THRESH => 10, -- DECIMAL - RD_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words), -- DECIMAL - READ_DATA_WIDTH => g_dat_w, -- DECIMAL - READ_MODE => "std", -- String - RELATED_CLOCKS => 0, -- DECIMAL - SIM_ASSERT_CHK => 0, -- DECIMAL; 0=disable simulation messages, 1=enable simulation messages - USE_ADV_FEATURES => "0404", -- String - WAKEUP_TIME => 0, -- DECIMAL - WRITE_DATA_WIDTH => g_dat_w, -- DECIMAL - WR_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words) -- DECIMAL - ) - port map ( - almost_empty => OPEN, -- 1-bit output: Almost Empty : When asserted, this signal indicates that - -- only one more read can be performed before the FIFO goes to empty. - - almost_full => OPEN, -- 1-bit output: Almost Full: When asserted, this signal indicates that - -- only one more write can be performed before the FIFO is full. - - data_valid => OPEN, -- 1-bit output: Read Data Valid: When asserted, this signal indicates - -- that valid data is available on the output bus (dout). - - dbiterr => OPEN, -- 1-bit output: Double Bit Error: Indicates that the ECC decoder - -- detected a double-bit error and data in the FIFO core is corrupted. - - dout => q, -- READ_DATA_WIDTH-bit output: Read Data: The output data bus is driven - -- when reading the FIFO. - - empty => rdempty, -- 1-bit output: Empty Flag: When asserted, this signal indicates that - -- the FIFO is empty. Read requests are ignored when the FIFO is empty, - -- initiating a read while empty is not destructive to the FIFO. - - full => wrfull, -- 1-bit output: Full Flag: When asserted, this signal indicates that the - -- FIFO is full. Write requests are ignored when the FIFO is full, - -- initiating a write when the FIFO is full is not destructive to the - -- contents of the FIFO. - - overflow => OPEN, -- 1-bit output: Overflow: This signal indicates that a write request - -- (wren) during the prior clock cycle was rejected, because the FIFO is - -- full. Overflowing the FIFO is not destructive to the contents of the - -- FIFO. - - prog_empty => OPEN, -- 1-bit output: Programmable Empty: This signal is asserted when the - -- number of words in the FIFO is less than or equal to the programmable - -- empty threshold value. It is de-asserted when the number of words in - -- the FIFO exceeds the programmable empty threshold value. - - prog_full => OPEN, -- 1-bit output: Programmable Full: This signal is asserted when the - -- number of words in the FIFO is greater than or equal to the - -- programmable full threshold value. It is de-asserted when the number - -- of words in the FIFO is less than the programmable full threshold - -- value. - - rd_data_count => rdusedw, -- RD_DATA_COUNT_WIDTH-bit output: Read Data Count: This bus indicates - -- the number of words read from the FIFO. - - rd_rst_busy => OPEN, -- 1-bit output: Read Reset Busy: Active-High indicator that the FIFO - -- read domain is currently in a reset state. - - sbiterr => OPEN, -- 1-bit output: Single Bit Error: Indicates that the ECC decoder - -- detected and fixed a single-bit error. - - underflow => OPEN, -- 1-bit output: Underflow: Indicates that the read request (rd_en) - -- during the previous clock cycle was rejected because the FIFO is - -- empty. Under flowing the FIFO is not destructive to the FIFO. - - wr_ack => OPEN, -- 1-bit output: Write Acknowledge: This signal indicates that a write - -- request (wr_en) during the prior clock cycle is succeeded. - - wr_data_count => wrusedw, -- WR_DATA_COUNT_WIDTH-bit output: Write Data Count: This bus indicates - -- the number of words written into the FIFO. - - wr_rst_busy => OPEN, -- 1-bit output: Write Reset Busy: Active-High indicator that the FIFO - -- write domain is currently in a reset state. - - din => data, -- WRITE_DATA_WIDTH-bit input: Write Data: The input data bus used when - -- writing the FIFO. - - injectdbiterr => '0', -- 1-bit input: Double Bit Error Injection: Injects a double bit error if - -- the ECC feature is used on block RAMs or UltraRAM macros. - - injectsbiterr => '0', -- 1-bit input: Single Bit Error Injection: Injects a single bit error if - -- the ECC feature is used on block RAMs or UltraRAM macros. - - rd_clk => rdclk, -- 1-bit input: Read clock: Used for read operation. rd_clk must be a - -- free running clock. - - rd_en => rdreq, -- 1-bit input: Read Enable: If the FIFO is not empty, asserting this - -- signal causes data (on dout) to be read from the FIFO. Must be held - -- active-low when rd_rst_busy is active high. - - rst => aclr, -- 1-bit input: Reset: Must be synchronous to wr_clk. The clock(s) can be - -- unstable at the time of applying reset, but reset must be released - -- only after the clock(s) is/are stable. - - sleep => '0', -- 1-bit input: Dynamic power saving: If sleep is High, the memory/fifo - -- block is in power saving mode. - - wr_clk => wrclk, -- 1-bit input: Write clock: Used for write operation. wr_clk must be a - -- free running clock. - - wr_en => wrreq -- 1-bit input: Write Enable: If the FIFO is not full, asserting this - -- signal causes data (on din) to be written to the FIFO. Must be held - -- active-low when rst or wr_rst_busy is active high. - ); - - -- End of xpm_fifo_async_inst instantiation -END SYN; +------------------------------------------------------------------------------- +-- +-- Copyright 2023 +-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> +-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +------------------------------------------------------------------------------- +-- Purpose: Instantiate FIFO IP with generics +-- Description: +-- Copied component instantiation from Vivado XPM template + +library ieee; +use ieee.std_logic_1164.all; + +library technology_lib; +use technology_lib.technology_pkg.all; + +library xpm; +use xpm.vcomponents.all; + +entity ip_ultrascale_fifo_dc is + generic ( + g_dat_w : natural := 20; + g_nof_words : natural := 1024 + ); + port ( + aclr : in std_logic := '0'; + data : in std_logic_vector (g_dat_w - 1 downto 0); + rdclk : in std_logic ; + rdreq : in std_logic ; + wrclk : in std_logic ; + wrreq : in std_logic ; + q : out std_logic_vector (g_dat_w - 1 downto 0); + rdempty : out std_logic ; + rdusedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0); + wrfull : out std_logic ; + wrusedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0) + ); +end ip_ultrascale_fifo_dc; + +architecture SYN of ip_ultrascale_fifo_dc is + +begin + -- xpm_fifo_async: Asynchronous FIFO + -- Xilinx Parameterized Macro, version 2022.1 + + xpm_fifo_async_inst : xpm_fifo_async + generic map ( + CASCADE_HEIGHT => 0, -- DECIMAL + CDC_SYNC_STAGES => 3, -- DECIMAL + DOUT_RESET_VALUE => "0", -- String + ECC_MODE => "no_ecc", -- String + FIFO_MEMORY_TYPE => "auto", -- String + FIFO_READ_LATENCY => 1, -- DECIMAL + FIFO_WRITE_DEPTH => g_nof_words, -- DECIMAL + FULL_RESET_VALUE => 0, -- DECIMAL + PROG_EMPTY_THRESH => 10, -- DECIMAL + PROG_FULL_THRESH => 10, -- DECIMAL + RD_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words), -- DECIMAL + READ_DATA_WIDTH => g_dat_w, -- DECIMAL + READ_MODE => "std", -- String + RELATED_CLOCKS => 0, -- DECIMAL + SIM_ASSERT_CHK => 0, -- DECIMAL; 0=disable simulation messages, 1=enable simulation messages + USE_ADV_FEATURES => "0404", -- String + WAKEUP_TIME => 0, -- DECIMAL + WRITE_DATA_WIDTH => g_dat_w, -- DECIMAL + WR_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words) -- DECIMAL + ) + port map ( + almost_empty => open, -- 1-bit output: Almost Empty : When asserted, this signal indicates that + -- only one more read can be performed before the FIFO goes to empty. + + almost_full => open, -- 1-bit output: Almost Full: When asserted, this signal indicates that + -- only one more write can be performed before the FIFO is full. + + data_valid => open, -- 1-bit output: Read Data Valid: When asserted, this signal indicates + -- that valid data is available on the output bus (dout). + + dbiterr => open, -- 1-bit output: Double Bit Error: Indicates that the ECC decoder + -- detected a double-bit error and data in the FIFO core is corrupted. + + dout => q, -- READ_DATA_WIDTH-bit output: Read Data: The output data bus is driven + -- when reading the FIFO. + + empty => rdempty, -- 1-bit output: Empty Flag: When asserted, this signal indicates that + -- the FIFO is empty. Read requests are ignored when the FIFO is empty, + -- initiating a read while empty is not destructive to the FIFO. + + full => wrfull, -- 1-bit output: Full Flag: When asserted, this signal indicates that the + -- FIFO is full. Write requests are ignored when the FIFO is full, + -- initiating a write when the FIFO is full is not destructive to the + -- contents of the FIFO. + + overflow => open, -- 1-bit output: Overflow: This signal indicates that a write request + -- (wren) during the prior clock cycle was rejected, because the FIFO is + -- full. Overflowing the FIFO is not destructive to the contents of the + -- FIFO. + + prog_empty => open, -- 1-bit output: Programmable Empty: This signal is asserted when the + -- number of words in the FIFO is less than or equal to the programmable + -- empty threshold value. It is de-asserted when the number of words in + -- the FIFO exceeds the programmable empty threshold value. + + prog_full => open, -- 1-bit output: Programmable Full: This signal is asserted when the + -- number of words in the FIFO is greater than or equal to the + -- programmable full threshold value. It is de-asserted when the number + -- of words in the FIFO is less than the programmable full threshold + -- value. + + rd_data_count => rdusedw, -- RD_DATA_COUNT_WIDTH-bit output: Read Data Count: This bus indicates + -- the number of words read from the FIFO. + + rd_rst_busy => open, -- 1-bit output: Read Reset Busy: Active-High indicator that the FIFO + -- read domain is currently in a reset state. + + sbiterr => open, -- 1-bit output: Single Bit Error: Indicates that the ECC decoder + -- detected and fixed a single-bit error. + + underflow => open, -- 1-bit output: Underflow: Indicates that the read request (rd_en) + -- during the previous clock cycle was rejected because the FIFO is + -- empty. Under flowing the FIFO is not destructive to the FIFO. + + wr_ack => open, -- 1-bit output: Write Acknowledge: This signal indicates that a write + -- request (wr_en) during the prior clock cycle is succeeded. + + wr_data_count => wrusedw, -- WR_DATA_COUNT_WIDTH-bit output: Write Data Count: This bus indicates + -- the number of words written into the FIFO. + + wr_rst_busy => open, -- 1-bit output: Write Reset Busy: Active-High indicator that the FIFO + -- write domain is currently in a reset state. + + din => data, -- WRITE_DATA_WIDTH-bit input: Write Data: The input data bus used when + -- writing the FIFO. + + injectdbiterr => '0', -- 1-bit input: Double Bit Error Injection: Injects a double bit error if + -- the ECC feature is used on block RAMs or UltraRAM macros. + + injectsbiterr => '0', -- 1-bit input: Single Bit Error Injection: Injects a single bit error if + -- the ECC feature is used on block RAMs or UltraRAM macros. + + rd_clk => rdclk, -- 1-bit input: Read clock: Used for read operation. rd_clk must be a + -- free running clock. + + rd_en => rdreq, -- 1-bit input: Read Enable: If the FIFO is not empty, asserting this + -- signal causes data (on dout) to be read from the FIFO. Must be held + -- active-low when rd_rst_busy is active high. + + rst => aclr, -- 1-bit input: Reset: Must be synchronous to wr_clk. The clock(s) can be + -- unstable at the time of applying reset, but reset must be released + -- only after the clock(s) is/are stable. + + sleep => '0', -- 1-bit input: Dynamic power saving: If sleep is High, the memory/fifo + -- block is in power saving mode. + + wr_clk => wrclk, -- 1-bit input: Write clock: Used for write operation. wr_clk must be a + -- free running clock. + + wr_en => wrreq -- 1-bit input: Write Enable: If the FIFO is not full, asserting this + -- signal causes data (on din) to be written to the FIFO. Must be held + -- active-low when rst or wr_rst_busy is active high. + ); + + -- End of xpm_fifo_async_inst instantiation +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc_mixed_widths.vhd b/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc_mixed_widths.vhd index 936d086232..757b4f1818 100644 --- a/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc_mixed_widths.vhd +++ b/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc_mixed_widths.vhd @@ -1,178 +1,178 @@ -------------------------------------------------------------------------------- --- --- Copyright 2023 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- -------------------------------------------------------------------------------- --- Purpose: Instantiate FIFO IP with generics --- Description: --- Copied component instantiation from Vivado XPM template - -LIBRARY ieee; -USE ieee.std_logic_1164.all; - -LIBRARY technology_lib; -USE technology_lib.technology_pkg.ALL; - -LIBRARY xpm; -USE xpm.vcomponents.ALL; - -ENTITY ip_ultrascale_fifo_dc_mixed_widths IS - GENERIC ( - g_nof_words : NATURAL := 1024; -- FIFO size in nof wr_dat words - g_wrdat_w : NATURAL := 20; - g_rddat_w : NATURAL := 10 - ); - PORT ( - aclr : IN STD_LOGIC := '0'; - data : IN STD_LOGIC_VECTOR (g_wrdat_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - rdreq : IN STD_LOGIC ; - wrclk : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_rddat_w-1 DOWNTO 0); - rdempty : OUT STD_LOGIC ; - rdusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w)-1 DOWNTO 0); - wrfull : OUT STD_LOGIC ; - wrusedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); -END ip_ultrascale_fifo_dc_mixed_widths; - -ARCHITECTURE SYN OF ip_ultrascale_fifo_dc_mixed_widths IS - -BEGIN - -- xpm_fifo_async: Asynchronous FIFO - -- Xilinx Parameterized Macro, version 2022.1 - - xpm_fifo_async_inst : xpm_fifo_async - generic map ( - CASCADE_HEIGHT => 0, -- DECIMAL - CDC_SYNC_STAGES => 3, -- DECIMAL - DOUT_RESET_VALUE => "0", -- String - ECC_MODE => "no_ecc", -- String - FIFO_MEMORY_TYPE => "auto", -- String - FIFO_READ_LATENCY => 1, -- DECIMAL - FIFO_WRITE_DEPTH => g_nof_words, -- DECIMAL - FULL_RESET_VALUE => 0, -- DECIMAL - PROG_EMPTY_THRESH => 10, -- DECIMAL - PROG_FULL_THRESH => 10, -- DECIMAL - RD_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words*g_wrdat_w/g_rddat_w), -- DECIMAL - READ_DATA_WIDTH => g_rddat_w, -- DECIMAL - READ_MODE => "std", -- String - RELATED_CLOCKS => 0, -- DECIMAL - SIM_ASSERT_CHK => 0, -- DECIMAL; 0=disable simulation messages, 1=enable simulation messages - USE_ADV_FEATURES => "0404", -- String - WAKEUP_TIME => 0, -- DECIMAL - WRITE_DATA_WIDTH => g_wrdat_w, -- DECIMAL - WR_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words) -- DECIMAL - ) - port map ( - almost_empty => OPEN, -- 1-bit output: Almost Empty : When asserted, this signal indicates that - -- only one more read can be performed before the FIFO goes to empty. - - almost_full => OPEN, -- 1-bit output: Almost Full: When asserted, this signal indicates that - -- only one more write can be performed before the FIFO is full. - - data_valid => OPEN, -- 1-bit output: Read Data Valid: When asserted, this signal indicates - -- that valid data is available on the output bus (dout). - - dbiterr => OPEN, -- 1-bit output: Double Bit Error: Indicates that the ECC decoder - -- detected a double-bit error and data in the FIFO core is corrupted. - - dout => q, -- READ_DATA_WIDTH-bit output: Read Data: The output data bus is driven - -- when reading the FIFO. - - empty => rdempty, -- 1-bit output: Empty Flag: When asserted, this signal indicates that - -- the FIFO is empty. Read requests are ignored when the FIFO is empty, - -- initiating a read while empty is not destructive to the FIFO. - - full => wrfull, -- 1-bit output: Full Flag: When asserted, this signal indicates that the - -- FIFO is full. Write requests are ignored when the FIFO is full, - -- initiating a write when the FIFO is full is not destructive to the - -- contents of the FIFO. - - overflow => OPEN, -- 1-bit output: Overflow: This signal indicates that a write request - -- (wren) during the prior clock cycle was rejected, because the FIFO is - -- full. Overflowing the FIFO is not destructive to the contents of the - -- FIFO. - - prog_empty => OPEN, -- 1-bit output: Programmable Empty: This signal is asserted when the - -- number of words in the FIFO is less than or equal to the programmable - -- empty threshold value. It is de-asserted when the number of words in - -- the FIFO exceeds the programmable empty threshold value. - - prog_full => OPEN, -- 1-bit output: Programmable Full: This signal is asserted when the - -- number of words in the FIFO is greater than or equal to the - -- programmable full threshold value. It is de-asserted when the number - -- of words in the FIFO is less than the programmable full threshold - -- value. - - rd_data_count => rdusedw, -- RD_DATA_COUNT_WIDTH-bit output: Read Data Count: This bus indicates - -- the number of words read from the FIFO. - - rd_rst_busy => OPEN, -- 1-bit output: Read Reset Busy: Active-High indicator that the FIFO - -- read domain is currently in a reset state. - - sbiterr => OPEN, -- 1-bit output: Single Bit Error: Indicates that the ECC decoder - -- detected and fixed a single-bit error. - - underflow => OPEN, -- 1-bit output: Underflow: Indicates that the read request (rd_en) - -- during the previous clock cycle was rejected because the FIFO is - -- empty. Under flowing the FIFO is not destructive to the FIFO. - - wr_ack => OPEN, -- 1-bit output: Write Acknowledge: This signal indicates that a write - -- request (wr_en) during the prior clock cycle is succeeded. - - wr_data_count => wrusedw, -- WR_DATA_COUNT_WIDTH-bit output: Write Data Count: This bus indicates - -- the number of words written into the FIFO. - - wr_rst_busy => OPEN, -- 1-bit output: Write Reset Busy: Active-High indicator that the FIFO - -- write domain is currently in a reset state. - - din => data, -- WRITE_DATA_WIDTH-bit input: Write Data: The input data bus used when - -- writing the FIFO. - - injectdbiterr => '0', -- 1-bit input: Double Bit Error Injection: Injects a double bit error if - -- the ECC feature is used on block RAMs or UltraRAM macros. - - injectsbiterr => '0', -- 1-bit input: Single Bit Error Injection: Injects a single bit error if - -- the ECC feature is used on block RAMs or UltraRAM macros. - - rd_clk => rdclk, -- 1-bit input: Read clock: Used for read operation. rd_clk must be a - -- free running clock. - - rd_en => rdreq, -- 1-bit input: Read Enable: If the FIFO is not empty, asserting this - -- signal causes data (on dout) to be read from the FIFO. Must be held - -- active-low when rd_rst_busy is active high. - - rst => aclr, -- 1-bit input: Reset: Must be synchronous to wr_clk. The clock(s) can be - -- unstable at the time of applying reset, but reset must be released - -- only after the clock(s) is/are stable. - - sleep => '0', -- 1-bit input: Dynamic power saving: If sleep is High, the memory/fifo - -- block is in power saving mode. - - wr_clk => wrclk, -- 1-bit input: Write clock: Used for write operation. wr_clk must be a - -- free running clock. - - wr_en => wrreq -- 1-bit input: Write Enable: If the FIFO is not full, asserting this - -- signal causes data (on din) to be written to the FIFO. Must be held - -- active-low when rst or wr_rst_busy is active high. - ); - - -- End of xpm_fifo_async_inst instantiation - -END SYN; +------------------------------------------------------------------------------- +-- +-- Copyright 2023 +-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> +-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +------------------------------------------------------------------------------- +-- Purpose: Instantiate FIFO IP with generics +-- Description: +-- Copied component instantiation from Vivado XPM template + +library ieee; +use ieee.std_logic_1164.all; + +library technology_lib; +use technology_lib.technology_pkg.all; + +library xpm; +use xpm.vcomponents.all; + +entity ip_ultrascale_fifo_dc_mixed_widths is + generic ( + g_nof_words : natural := 1024; -- FIFO size in nof wr_dat words + g_wrdat_w : natural := 20; + g_rddat_w : natural := 10 + ); + port ( + aclr : in std_logic := '0'; + data : in std_logic_vector (g_wrdat_w - 1 downto 0); + rdclk : in std_logic ; + rdreq : in std_logic ; + wrclk : in std_logic ; + wrreq : in std_logic ; + q : out std_logic_vector (g_rddat_w - 1 downto 0); + rdempty : out std_logic ; + rdusedw : out std_logic_vector (tech_ceil_log2(g_nof_words * g_wrdat_w / g_rddat_w) - 1 downto 0); + wrfull : out std_logic ; + wrusedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0) + ); +end ip_ultrascale_fifo_dc_mixed_widths; + +architecture SYN of ip_ultrascale_fifo_dc_mixed_widths is + +begin + -- xpm_fifo_async: Asynchronous FIFO + -- Xilinx Parameterized Macro, version 2022.1 + + xpm_fifo_async_inst : xpm_fifo_async + generic map ( + CASCADE_HEIGHT => 0, -- DECIMAL + CDC_SYNC_STAGES => 3, -- DECIMAL + DOUT_RESET_VALUE => "0", -- String + ECC_MODE => "no_ecc", -- String + FIFO_MEMORY_TYPE => "auto", -- String + FIFO_READ_LATENCY => 1, -- DECIMAL + FIFO_WRITE_DEPTH => g_nof_words, -- DECIMAL + FULL_RESET_VALUE => 0, -- DECIMAL + PROG_EMPTY_THRESH => 10, -- DECIMAL + PROG_FULL_THRESH => 10, -- DECIMAL + RD_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words * g_wrdat_w / g_rddat_w), -- DECIMAL + READ_DATA_WIDTH => g_rddat_w, -- DECIMAL + READ_MODE => "std", -- String + RELATED_CLOCKS => 0, -- DECIMAL + SIM_ASSERT_CHK => 0, -- DECIMAL; 0=disable simulation messages, 1=enable simulation messages + USE_ADV_FEATURES => "0404", -- String + WAKEUP_TIME => 0, -- DECIMAL + WRITE_DATA_WIDTH => g_wrdat_w, -- DECIMAL + WR_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words) -- DECIMAL + ) + port map ( + almost_empty => open, -- 1-bit output: Almost Empty : When asserted, this signal indicates that + -- only one more read can be performed before the FIFO goes to empty. + + almost_full => open, -- 1-bit output: Almost Full: When asserted, this signal indicates that + -- only one more write can be performed before the FIFO is full. + + data_valid => open, -- 1-bit output: Read Data Valid: When asserted, this signal indicates + -- that valid data is available on the output bus (dout). + + dbiterr => open, -- 1-bit output: Double Bit Error: Indicates that the ECC decoder + -- detected a double-bit error and data in the FIFO core is corrupted. + + dout => q, -- READ_DATA_WIDTH-bit output: Read Data: The output data bus is driven + -- when reading the FIFO. + + empty => rdempty, -- 1-bit output: Empty Flag: When asserted, this signal indicates that + -- the FIFO is empty. Read requests are ignored when the FIFO is empty, + -- initiating a read while empty is not destructive to the FIFO. + + full => wrfull, -- 1-bit output: Full Flag: When asserted, this signal indicates that the + -- FIFO is full. Write requests are ignored when the FIFO is full, + -- initiating a write when the FIFO is full is not destructive to the + -- contents of the FIFO. + + overflow => open, -- 1-bit output: Overflow: This signal indicates that a write request + -- (wren) during the prior clock cycle was rejected, because the FIFO is + -- full. Overflowing the FIFO is not destructive to the contents of the + -- FIFO. + + prog_empty => open, -- 1-bit output: Programmable Empty: This signal is asserted when the + -- number of words in the FIFO is less than or equal to the programmable + -- empty threshold value. It is de-asserted when the number of words in + -- the FIFO exceeds the programmable empty threshold value. + + prog_full => open, -- 1-bit output: Programmable Full: This signal is asserted when the + -- number of words in the FIFO is greater than or equal to the + -- programmable full threshold value. It is de-asserted when the number + -- of words in the FIFO is less than the programmable full threshold + -- value. + + rd_data_count => rdusedw, -- RD_DATA_COUNT_WIDTH-bit output: Read Data Count: This bus indicates + -- the number of words read from the FIFO. + + rd_rst_busy => open, -- 1-bit output: Read Reset Busy: Active-High indicator that the FIFO + -- read domain is currently in a reset state. + + sbiterr => open, -- 1-bit output: Single Bit Error: Indicates that the ECC decoder + -- detected and fixed a single-bit error. + + underflow => open, -- 1-bit output: Underflow: Indicates that the read request (rd_en) + -- during the previous clock cycle was rejected because the FIFO is + -- empty. Under flowing the FIFO is not destructive to the FIFO. + + wr_ack => open, -- 1-bit output: Write Acknowledge: This signal indicates that a write + -- request (wr_en) during the prior clock cycle is succeeded. + + wr_data_count => wrusedw, -- WR_DATA_COUNT_WIDTH-bit output: Write Data Count: This bus indicates + -- the number of words written into the FIFO. + + wr_rst_busy => open, -- 1-bit output: Write Reset Busy: Active-High indicator that the FIFO + -- write domain is currently in a reset state. + + din => data, -- WRITE_DATA_WIDTH-bit input: Write Data: The input data bus used when + -- writing the FIFO. + + injectdbiterr => '0', -- 1-bit input: Double Bit Error Injection: Injects a double bit error if + -- the ECC feature is used on block RAMs or UltraRAM macros. + + injectsbiterr => '0', -- 1-bit input: Single Bit Error Injection: Injects a single bit error if + -- the ECC feature is used on block RAMs or UltraRAM macros. + + rd_clk => rdclk, -- 1-bit input: Read clock: Used for read operation. rd_clk must be a + -- free running clock. + + rd_en => rdreq, -- 1-bit input: Read Enable: If the FIFO is not empty, asserting this + -- signal causes data (on dout) to be read from the FIFO. Must be held + -- active-low when rd_rst_busy is active high. + + rst => aclr, -- 1-bit input: Reset: Must be synchronous to wr_clk. The clock(s) can be + -- unstable at the time of applying reset, but reset must be released + -- only after the clock(s) is/are stable. + + sleep => '0', -- 1-bit input: Dynamic power saving: If sleep is High, the memory/fifo + -- block is in power saving mode. + + wr_clk => wrclk, -- 1-bit input: Write clock: Used for write operation. wr_clk must be a + -- free running clock. + + wr_en => wrreq -- 1-bit input: Write Enable: If the FIFO is not full, asserting this + -- signal causes data (on din) to be written to the FIFO. Must be held + -- active-low when rst or wr_rst_busy is active high. + ); + + -- End of xpm_fifo_async_inst instantiation + +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_sc.vhd b/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_sc.vhd index 4184f4ab93..6e0f0be437 100644 --- a/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_sc.vhd +++ b/libraries/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_sc.vhd @@ -1,171 +1,171 @@ -------------------------------------------------------------------------------- --- --- Copyright 2023 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- -------------------------------------------------------------------------------- --- Purpose: Instantiate FIFO IP with generics --- Description: --- Copied component instantiation from Vivado XPM template - -LIBRARY ieee; -USE ieee.std_logic_1164.all; - -LIBRARY technology_lib; -USE technology_lib.technology_pkg.ALL; - -LIBRARY xpm; -USE xpm.vcomponents.ALL; - -ENTITY ip_ultrascale_fifo_sc IS - GENERIC ( - g_dat_w : NATURAL := 20; - g_nof_words : NATURAL := 1024 - ); - PORT ( - aclr : IN STD_LOGIC ; - clock : IN STD_LOGIC ; - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdreq : IN STD_LOGIC ; - wrreq : IN STD_LOGIC ; - empty : OUT STD_LOGIC ; - full : OUT STD_LOGIC ; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) ; - usedw : OUT STD_LOGIC_VECTOR (tech_ceil_log2(g_nof_words)-1 DOWNTO 0) - ); -END ip_ultrascale_fifo_sc; - -ARCHITECTURE SYN OF ip_ultrascale_fifo_sc IS - -BEGIN - -- xpm_fifo_sync: Synchronous FIFO - -- Xilinx Parameterized Macro, version 2022.1 - - xpm_fifo_sync_inst : xpm_fifo_sync - generic map ( - CASCADE_HEIGHT => 0, -- DECIMAL - DOUT_RESET_VALUE => "0", -- String - ECC_MODE => "no_ecc", -- String - FIFO_MEMORY_TYPE => "auto", -- String - FIFO_READ_LATENCY => 1, -- DECIMAL - FIFO_WRITE_DEPTH => g_nof_words, -- DECIMAL - FULL_RESET_VALUE => 0, -- DECIMAL - PROG_EMPTY_THRESH => 10, -- DECIMAL - PROG_FULL_THRESH => 10, -- DECIMAL - RD_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words), -- DECIMAL - READ_DATA_WIDTH => g_dat_w, -- DECIMAL - READ_MODE => "std", -- String - SIM_ASSERT_CHK => 0, -- DECIMAL; 0=disable simulation messages, 1=enable simulation messages - USE_ADV_FEATURES => "0404", -- String - WAKEUP_TIME => 0, -- DECIMAL - WRITE_DATA_WIDTH => g_dat_w, -- DECIMAL - WR_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words) -- DECIMAL - - ) - port map ( - almost_empty => OPEN, -- 1-bit output: Almost Empty : When asserted, this signal indicates that - -- only one more read can be performed before the FIFO goes to empty. - - almost_full => OPEN, -- 1-bit output: Almost Full: When asserted, this signal indicates that - -- only one more write can be performed before the FIFO is full. - - data_valid => OPEN, -- 1-bit output: Read Data Valid: When asserted, this signal indicates - -- that valid data is available on the output bus (dout). - - dbiterr => OPEN, -- 1-bit output: Double Bit Error: Indicates that the ECC decoder - -- detected a double-bit error and data in the FIFO core is corrupted. - - dout => q, -- READ_DATA_WIDTH-bit output: Read Data: The output data bus is driven - -- when reading the FIFO. - - empty => empty, -- 1-bit output: Empty Flag: When asserted, this signal indicates that - -- the FIFO is empty. Read requests are ignored when the FIFO is empty, - -- initiating a read while empty is not destructive to the FIFO. - - full => full, -- 1-bit output: Full Flag: When asserted, this signal indicates that the - -- FIFO is full. Write requests are ignored when the FIFO is full, - -- initiating a write when the FIFO is full is not destructive to the - -- contents of the FIFO. - - overflow => OPEN, -- 1-bit output: Overflow: This signal indicates that a write request - -- (wren) during the prior clock cycle was rejected, because the FIFO is - -- full. Overflowing the FIFO is not destructive to the contents of the - -- FIFO. - - prog_empty => OPEN, -- 1-bit output: Programmable Empty: This signal is asserted when the - -- number of words in the FIFO is less than or equal to the programmable - -- empty threshold value. It is de-asserted when the number of words in - -- the FIFO exceeds the programmable empty threshold value. - - prog_full => OPEN, -- 1-bit output: Programmable Full: This signal is asserted when the - -- number of words in the FIFO is greater than or equal to the - -- programmable full threshold value. It is de-asserted when the number - -- of words in the FIFO is less than the programmable full threshold - -- value. - - rd_data_count => OPEN, -- RD_DATA_COUNT_WIDTH-bit output: Read Data Count: This bus indicates - -- the number of words read from the FIFO. - - rd_rst_busy => OPEN, -- 1-bit output: Read Reset Busy: Active-High indicator that the FIFO - -- read domain is currently in a reset state. - - sbiterr => OPEN, -- 1-bit output: Single Bit Error: Indicates that the ECC decoder - -- detected and fixed a single-bit error. - - underflow => OPEN, -- 1-bit output: Underflow: Indicates that the read request (rd_en) - -- during the previous clock cycle was rejected because the FIFO is - -- empty. Under flowing the FIFO is not destructive to the FIFO. - - wr_ack => OPEN, -- 1-bit output: Write Acknowledge: This signal indicates that a write - -- request (wr_en) during the prior clock cycle is succeeded. - - wr_data_count => usedw, -- WR_DATA_COUNT_WIDTH-bit output: Write Data Count: This bus indicates - -- the number of words written into the FIFO. - - wr_rst_busy => OPEN, -- 1-bit output: Write Reset Busy: Active-High indicator that the FIFO - -- write domain is currently in a reset state. - - din => data, -- WRITE_DATA_WIDTH-bit input: Write Data: The input data bus used when - -- writing the FIFO. - - injectdbiterr => '0', -- 1-bit input: Double Bit Error Injection: Injects a double bit error if - -- the ECC feature is used on block RAMs or UltraRAM macros. - - injectsbiterr => '0', -- 1-bit input: Single Bit Error Injection: Injects a single bit error if - -- the ECC feature is used on block RAMs or UltraRAM macros. - - rd_en => rdreq, -- 1-bit input: Read Enable: If the FIFO is not empty, asserting this - -- signal causes data (on dout) to be read from the FIFO. Must be held - -- active-low when rd_rst_busy is active high. - - rst => aclr, -- 1-bit input: Reset: Must be synchronous to wr_clk. The clock(s) can be - -- unstable at the time of applying reset, but reset must be released - -- only after the clock(s) is/are stable. - - sleep => '0', -- 1-bit input: Dynamic power saving: If sleep is High, the memory/fifo - -- block is in power saving mode. - - wr_clk => clock, -- 1-bit input: Write clock: Used for write operation. wr_clk must be a - -- free running clock. - - wr_en => wrreq -- 1-bit input: Write Enable: If the FIFO is not full, asserting this - -- signal causes data (on din) to be written to the FIFO. Must be held - -- active-low when rst or wr_rst_busy is active high. - ); - - -- End of xpm_fifo_async_inst instantiation - -END SYN; +------------------------------------------------------------------------------- +-- +-- Copyright 2023 +-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> +-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +------------------------------------------------------------------------------- +-- Purpose: Instantiate FIFO IP with generics +-- Description: +-- Copied component instantiation from Vivado XPM template + +library ieee; +use ieee.std_logic_1164.all; + +library technology_lib; +use technology_lib.technology_pkg.all; + +library xpm; +use xpm.vcomponents.all; + +entity ip_ultrascale_fifo_sc is + generic ( + g_dat_w : natural := 20; + g_nof_words : natural := 1024 + ); + port ( + aclr : in std_logic ; + clock : in std_logic ; + data : in std_logic_vector (g_dat_w - 1 downto 0); + rdreq : in std_logic ; + wrreq : in std_logic ; + empty : out std_logic ; + full : out std_logic ; + q : out std_logic_vector (g_dat_w - 1 downto 0) ; + usedw : out std_logic_vector (tech_ceil_log2(g_nof_words) - 1 downto 0) + ); +end ip_ultrascale_fifo_sc; + +architecture SYN of ip_ultrascale_fifo_sc is + +begin + -- xpm_fifo_sync: Synchronous FIFO + -- Xilinx Parameterized Macro, version 2022.1 + + xpm_fifo_sync_inst : xpm_fifo_sync + generic map ( + CASCADE_HEIGHT => 0, -- DECIMAL + DOUT_RESET_VALUE => "0", -- String + ECC_MODE => "no_ecc", -- String + FIFO_MEMORY_TYPE => "auto", -- String + FIFO_READ_LATENCY => 1, -- DECIMAL + FIFO_WRITE_DEPTH => g_nof_words, -- DECIMAL + FULL_RESET_VALUE => 0, -- DECIMAL + PROG_EMPTY_THRESH => 10, -- DECIMAL + PROG_FULL_THRESH => 10, -- DECIMAL + RD_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words), -- DECIMAL + READ_DATA_WIDTH => g_dat_w, -- DECIMAL + READ_MODE => "std", -- String + SIM_ASSERT_CHK => 0, -- DECIMAL; 0=disable simulation messages, 1=enable simulation messages + USE_ADV_FEATURES => "0404", -- String + WAKEUP_TIME => 0, -- DECIMAL + WRITE_DATA_WIDTH => g_dat_w, -- DECIMAL + WR_DATA_COUNT_WIDTH => tech_ceil_log2(g_nof_words) -- DECIMAL + + ) + port map ( + almost_empty => open, -- 1-bit output: Almost Empty : When asserted, this signal indicates that + -- only one more read can be performed before the FIFO goes to empty. + + almost_full => open, -- 1-bit output: Almost Full: When asserted, this signal indicates that + -- only one more write can be performed before the FIFO is full. + + data_valid => open, -- 1-bit output: Read Data Valid: When asserted, this signal indicates + -- that valid data is available on the output bus (dout). + + dbiterr => open, -- 1-bit output: Double Bit Error: Indicates that the ECC decoder + -- detected a double-bit error and data in the FIFO core is corrupted. + + dout => q, -- READ_DATA_WIDTH-bit output: Read Data: The output data bus is driven + -- when reading the FIFO. + + empty => empty, -- 1-bit output: Empty Flag: When asserted, this signal indicates that + -- the FIFO is empty. Read requests are ignored when the FIFO is empty, + -- initiating a read while empty is not destructive to the FIFO. + + full => full, -- 1-bit output: Full Flag: When asserted, this signal indicates that the + -- FIFO is full. Write requests are ignored when the FIFO is full, + -- initiating a write when the FIFO is full is not destructive to the + -- contents of the FIFO. + + overflow => open, -- 1-bit output: Overflow: This signal indicates that a write request + -- (wren) during the prior clock cycle was rejected, because the FIFO is + -- full. Overflowing the FIFO is not destructive to the contents of the + -- FIFO. + + prog_empty => open, -- 1-bit output: Programmable Empty: This signal is asserted when the + -- number of words in the FIFO is less than or equal to the programmable + -- empty threshold value. It is de-asserted when the number of words in + -- the FIFO exceeds the programmable empty threshold value. + + prog_full => open, -- 1-bit output: Programmable Full: This signal is asserted when the + -- number of words in the FIFO is greater than or equal to the + -- programmable full threshold value. It is de-asserted when the number + -- of words in the FIFO is less than the programmable full threshold + -- value. + + rd_data_count => open, -- RD_DATA_COUNT_WIDTH-bit output: Read Data Count: This bus indicates + -- the number of words read from the FIFO. + + rd_rst_busy => open, -- 1-bit output: Read Reset Busy: Active-High indicator that the FIFO + -- read domain is currently in a reset state. + + sbiterr => open, -- 1-bit output: Single Bit Error: Indicates that the ECC decoder + -- detected and fixed a single-bit error. + + underflow => open, -- 1-bit output: Underflow: Indicates that the read request (rd_en) + -- during the previous clock cycle was rejected because the FIFO is + -- empty. Under flowing the FIFO is not destructive to the FIFO. + + wr_ack => open, -- 1-bit output: Write Acknowledge: This signal indicates that a write + -- request (wr_en) during the prior clock cycle is succeeded. + + wr_data_count => usedw, -- WR_DATA_COUNT_WIDTH-bit output: Write Data Count: This bus indicates + -- the number of words written into the FIFO. + + wr_rst_busy => open, -- 1-bit output: Write Reset Busy: Active-High indicator that the FIFO + -- write domain is currently in a reset state. + + din => data, -- WRITE_DATA_WIDTH-bit input: Write Data: The input data bus used when + -- writing the FIFO. + + injectdbiterr => '0', -- 1-bit input: Double Bit Error Injection: Injects a double bit error if + -- the ECC feature is used on block RAMs or UltraRAM macros. + + injectsbiterr => '0', -- 1-bit input: Single Bit Error Injection: Injects a single bit error if + -- the ECC feature is used on block RAMs or UltraRAM macros. + + rd_en => rdreq, -- 1-bit input: Read Enable: If the FIFO is not empty, asserting this + -- signal causes data (on dout) to be read from the FIFO. Must be held + -- active-low when rd_rst_busy is active high. + + rst => aclr, -- 1-bit input: Reset: Must be synchronous to wr_clk. The clock(s) can be + -- unstable at the time of applying reset, but reset must be released + -- only after the clock(s) is/are stable. + + sleep => '0', -- 1-bit input: Dynamic power saving: If sleep is High, the memory/fifo + -- block is in power saving mode. + + wr_clk => clock, -- 1-bit input: Write clock: Used for write operation. wr_clk must be a + -- free running clock. + + wr_en => wrreq -- 1-bit input: Write Enable: If the FIFO is not full, asserting this + -- signal causes data (on din) to be written to the FIFO. Must be held + -- active-low when rst or wr_rst_busy is active high. + ); + + -- End of xpm_fifo_async_inst instantiation + +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_cr_cw.vhd b/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_cr_cw.vhd index a11ea8d428..38c3b04365 100644 --- a/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_cr_cw.vhd +++ b/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_cr_cw.vhd @@ -21,42 +21,42 @@ -- Description: -- Copied component instantiation from Vivado XPM template -LIBRARY ieee; -USE ieee.std_logic_1164.all; -USE ieee.numeric_std.all; - -LIBRARY xpm; -USE xpm.vcomponents.ALL; - -ENTITY ip_ultrascale_ram_cr_cw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "none" +library ieee; +use ieee.std_logic_1164.all; +use ieee.numeric_std.all; + +library xpm; +use xpm.vcomponents.all; + +entity ip_ultrascale_ram_cr_cw is + generic ( + g_inferred : boolean := FALSE; + g_adr_w : natural := 5; + g_dat_w : natural := 8; + g_nof_words : natural := 2**5; + g_rd_latency : natural := 1; -- choose 1 or 2 + g_init_file : string := "none" ); - PORT + port ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclk : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) + data : in std_logic_vector (g_dat_w - 1 downto 0); + rdaddress : in std_logic_vector (g_adr_w - 1 downto 0); + rdclk : in std_logic ; + wraddress : in std_logic_vector (g_adr_w - 1 downto 0); + wrclk : in std_logic := '1'; + wren : in std_logic := '0'; + q : out std_logic_vector (g_dat_w - 1 downto 0) ); -END ip_ultrascale_ram_cr_cw; +end ip_ultrascale_ram_cr_cw; -ARCHITECTURE SYN OF ip_ultrascale_ram_cr_cw IS +architecture SYN of ip_ultrascale_ram_cr_cw is -BEGIN +begin - ASSERT g_rd_latency=1 OR g_rd_latency=2 REPORT "ip_ultrascale_ram_cr_cw : read latency must be 1 (default) or 2" SEVERITY FAILURE; - - ASSERT g_inferred=FALSE REPORT "ip_ultrascale_ram_crw_crw : cannot infer RAM" SEVERITY FAILURE; + assert g_rd_latency = 1 or g_rd_latency = 2 report "ip_ultrascale_ram_cr_cw : read latency must be 1 (default) or 2" severity FAILURE; + + assert g_inferred = FALSE report "ip_ultrascale_ram_crw_crw : cannot infer RAM" severity FAILURE; -- xpm_memory_sdpram: Simple Dual Port RAM -- Xilinx Parameterized Macro, version 2022.1 @@ -91,12 +91,12 @@ BEGIN ) port map ( - dbiterrb => OPEN, -- 1-bit output: Status signal to indicate double bit error occurrence + dbiterrb => open, -- 1-bit output: Status signal to indicate double bit error occurrence -- on the data output of port A. doutb => q, -- READ_DATA_WIDTH_B-bit output: Data output for port B read operations. - sbiterrb => OPEN, -- 1-bit output: Status signal to indicate single bit error occurrence + sbiterrb => open, -- 1-bit output: Status signal to indicate single bit error occurrence -- on the data output of port B. addra => wraddress, -- ADDR_WIDTH_A-bit input: Address for port A write and read operations. @@ -116,7 +116,7 @@ BEGIN enb => '1', -- 1-bit input: Memory enable signal for port B. Must be high on clock -- cycles when read or write operations are initiated. Pipelined -- internally. - + injectdbiterra => '0', -- 1-bit input: Controls double bit error injection on input data when -- ECC enabled (Error injection capability is not available in -- "decode_only" mode). @@ -146,4 +146,4 @@ BEGIN -- End of xpm_memory_sdpram_inst instantiation -END SYN; +end SYN; \ No newline at end of file diff --git a/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_crw_crw.vhd b/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_crw_crw.vhd index ae4ffdc735..5d322fb38d 100644 --- a/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_crw_crw.vhd +++ b/libraries/technology/ip_ultrascale/ram/ip_ultrascale_ram_crw_crw.vhd @@ -21,45 +21,45 @@ -- Description: -- Copied component instantiation from Vivado XPM template -LIBRARY ieee; -USE ieee.std_logic_1164.all; -USE ieee.numeric_std.all; - -LIBRARY xpm; -USE xpm.vcomponents.ALL; - -ENTITY ip_ultrascale_ram_crw_crw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "none" +library ieee; +use ieee.std_logic_1164.all; +use ieee.numeric_std.all; + +library xpm; +use xpm.vcomponents.all; + +entity ip_ultrascale_ram_crw_crw is + generic ( + g_inferred : boolean := FALSE; + g_adr_w : natural := 5; + g_dat_w : natural := 8; + g_nof_words : natural := 2**5; + g_rd_latency : natural := 1; -- choose 1 or 2 + g_init_file : string := "none" ); - PORT + port ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) + address_a : in std_logic_vector (g_adr_w - 1 downto 0); + address_b : in std_logic_vector (g_adr_w - 1 downto 0); + clk_a : in std_logic := '1'; + clk_b : in std_logic ; + data_a : in std_logic_vector (g_dat_w - 1 downto 0); + data_b : in std_logic_vector (g_dat_w - 1 downto 0); + wren_a : in std_logic := '0'; + wren_b : in std_logic := '0'; + q_a : out std_logic_vector (g_dat_w - 1 downto 0); + q_b : out std_logic_vector (g_dat_w - 1 downto 0) ); -END ip_ultrascale_ram_crw_crw; +end ip_ultrascale_ram_crw_crw; -ARCHITECTURE SYN OF ip_ultrascale_ram_crw_crw IS - -BEGIN +architecture SYN of ip_ultrascale_ram_crw_crw is + +begin + + assert g_rd_latency = 1 or g_rd_latency = 2 report "ip_ultrascale_ram_crw_crw : read latency must be 1 (default) or 2" severity FAILURE; + assert g_inferred = FALSE report "ip_ultrascale_ram_crw_crw : cannot infer RAM" severity FAILURE; - ASSERT g_rd_latency=1 OR g_rd_latency=2 REPORT "ip_ultrascale_ram_crw_crw : read latency must be 1 (default) or 2" SEVERITY FAILURE; - ASSERT g_inferred=FALSE REPORT "ip_ultrascale_ram_crw_crw : cannot infer RAM" SEVERITY FAILURE; - -- xpm_memory_tdpram: True Dual Port RAM -- Xilinx Parameterized Macro, version 2022.1 @@ -99,18 +99,18 @@ BEGIN WRITE_PROTECT => 1 -- DECIMAL ) port map ( - dbiterra => OPEN, -- 1-bit output: Status signal to indicate double bit error occurrence + dbiterra => open, -- 1-bit output: Status signal to indicate double bit error occurrence -- on the data output of port A. - dbiterrb => OPEN, -- 1-bit output: Status signal to indicate double bit error occurrence + dbiterrb => open, -- 1-bit output: Status signal to indicate double bit error occurrence -- on the data output of port A. douta => q_a, -- READ_DATA_WIDTH_A-bit output: Data output for port A read operations. doutb => q_b, -- READ_DATA_WIDTH_B-bit output: Data output for port B read operations. - sbiterra => OPEN, -- 1-bit output: Status signal to indicate single bit error occurrence + sbiterra => open, -- 1-bit output: Status signal to indicate single bit error occurrence -- on the data output of port A. - sbiterrb => OPEN, -- 1-bit output: Status signal to indicate single bit error occurrence + sbiterrb => open, -- 1-bit output: Status signal to indicate single bit error occurrence -- on the data output of port B. addra => address_a, -- ADDR_WIDTH_A-bit input: Address for port A write and read operations. @@ -131,7 +131,7 @@ BEGIN enb => '1', -- 1-bit input: Memory enable signal for port B. Must be high on clock -- cycles when read or write operations are initiated. Pipelined -- internally. - + injectdbiterra => '0', -- 1-bit input: Controls double bit error injection on input data when -- ECC enabled (Error injection capability is not available in -- "decode_only" mode). @@ -180,5 +180,5 @@ BEGIN ); -- End of xpm_memory_tdpram_inst instantiation - -END SYN; + +end SYN; \ No newline at end of file diff --git a/libraries/technology/jesd204b/tb_tech_jesd204b.vhd b/libraries/technology/jesd204b/tb_tech_jesd204b.vhd index 59e9475c31..24ab672baa 100644 --- a/libraries/technology/jesd204b/tb_tech_jesd204b.vhd +++ b/libraries/technology/jesd204b/tb_tech_jesd204b.vhd @@ -412,7 +412,7 @@ begin v_count := v_count + 1; end if; - if v_count > c_sysref_period - 1 -c_sysref_pulselength then + if v_count > c_sysref_period - 1 - c_sysref_pulselength then jesd204b_sysref <= '1'; else jesd204b_sysref <= '0'; diff --git a/libraries/technology/mac_10g/tech_mac_10g.vhd b/libraries/technology/mac_10g/tech_mac_10g.vhd index 6ee1d16701..f6838e15b4 100644 --- a/libraries/technology/mac_10g/tech_mac_10g.vhd +++ b/libraries/technology/mac_10g/tech_mac_10g.vhd @@ -297,4 +297,4 @@ begin rx_src_out <= rx_mac_src_out_rl1; end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/memory/tech_memory_component_pkg.vhd b/libraries/technology/memory/tech_memory_component_pkg.vhd index fd8b5ba727..b9a80aae9e 100644 --- a/libraries/technology/memory/tech_memory_component_pkg.vhd +++ b/libraries/technology/memory/tech_memory_component_pkg.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -517,573 +516,52 @@ package tech_memory_component_pkg is ); end component; -end tech_memory_component_pkg; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - --- Purpose: IP components declarations for various devices that get wrapped by the tech components - -LIBRARY IEEE; -USE IEEE.STD_LOGIC_1164.ALL; - -PACKAGE tech_memory_component_pkg IS - - ----------------------------------------------------------------------------- - -- ip_stratixiv - ----------------------------------------------------------------------------- - - COMPONENT ip_stratixiv_ram_crwk_crw IS -- support different port data widths and corresponding address ranges - GENERIC ( - g_adr_a_w : NATURAL := 5; - g_dat_a_w : NATURAL := 32; - g_adr_b_w : NATURAL := 7; - g_dat_b_w : NATURAL := 8; - g_nof_words_a : NATURAL := 2**5; - g_nof_words_b : NATURAL := 2**7; - g_rd_latency : NATURAL := 2; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - address_a : IN STD_LOGIC_VECTOR (g_adr_a_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_b_w-1 DOWNTO 0); - clock_a : IN STD_LOGIC := '1'; - clock_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0); - enable_a : IN STD_LOGIC := '1'; - enable_b : IN STD_LOGIC := '1'; - rden_a : IN STD_LOGIC := '1'; - rden_b : IN STD_LOGIC := '1'; - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_stratixiv_ram_crw_crw IS - GENERIC ( - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 2; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clock_a : IN STD_LOGIC := '1'; - clock_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - enable_a : IN STD_LOGIC := '1'; - enable_b : IN STD_LOGIC := '1'; - rden_a : IN STD_LOGIC := '1'; - rden_b : IN STD_LOGIC := '1'; - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_stratixiv_ram_cr_cw IS - GENERIC ( - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 2; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclock : IN STD_LOGIC ; - rdclocken : IN STD_LOGIC := '1'; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclock : IN STD_LOGIC := '1'; - wrclocken : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_stratixiv_ram_r_w IS - GENERIC ( - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_init_file : STRING := "UNUSED" - ); - PORT ( - clock : IN STD_LOGIC := '1'; - enable : IN STD_LOGIC := '1'; - data : IN STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0); - wraddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0); - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_stratixiv_rom_r IS - GENERIC ( - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_init_file : STRING := "UNUSED" - ); - PORT ( - address : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0); - clock : IN STD_LOGIC := '1'; - clken : IN STD_LOGIC := '1'; - q : OUT STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - - ----------------------------------------------------------------------------- - -- ip_arria10 - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_ram_crwk_crw IS - GENERIC ( - g_adr_a_w : NATURAL := 5; - g_dat_a_w : NATURAL := 32; - g_adr_b_w : NATURAL := 4; - g_dat_b_w : NATURAL := 64; - g_nof_words_a : NATURAL := 2**5; - g_nof_words_b : NATURAL := 2**4; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_a_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_b_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_ram_crw_crw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_ram_cr_cw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclk : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_ram_r_w IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - clk : IN STD_LOGIC := '1'; - data : IN STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) := (OTHERS=>'0'); - rdaddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wraddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_arria10_e3sge3 - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_e3sge3_ram_crwk_crw IS - GENERIC ( - g_adr_a_w : NATURAL := 5; - g_dat_a_w : NATURAL := 32; - g_adr_b_w : NATURAL := 4; - g_dat_b_w : NATURAL := 64; - g_nof_words_a : NATURAL := 2**5; - g_nof_words_b : NATURAL := 2**4; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_a_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_b_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e3sge3_ram_crw_crw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e3sge3_ram_cr_cw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclk : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e3sge3_ram_r_w IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - clk : IN STD_LOGIC := '1'; - data : IN STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) := (OTHERS=>'0'); - rdaddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wraddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_arria10_e1sg - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_e1sg_ram_crwk_crw IS - GENERIC ( - g_adr_a_w : NATURAL := 5; - g_dat_a_w : NATURAL := 32; - g_adr_b_w : NATURAL := 4; - g_dat_b_w : NATURAL := 64; - g_nof_words_a : NATURAL := 2**5; - g_nof_words_b : NATURAL := 2**4; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_a_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_b_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e1sg_ram_crw_crw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e1sg_ram_cr_cw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclk : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e1sg_ram_r_w IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - clk : IN STD_LOGIC := '1'; - data : IN STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) := (OTHERS=>'0'); - rdaddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wraddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_arria10_e2sg - ----------------------------------------------------------------------------- - - COMPONENT ip_arria10_e2sg_ram_crwk_crw IS - GENERIC ( - g_adr_a_w : NATURAL := 5; - g_dat_a_w : NATURAL := 32; - g_adr_b_w : NATURAL := 4; - g_dat_b_w : NATURAL := 64; - g_nof_words_a : NATURAL := 2**5; - g_nof_words_b : NATURAL := 2**4; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_a_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_b_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_a_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_b_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e2sg_ram_crw_crw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e2sg_ram_cr_cw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclk : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_arria10_e2sg_ram_r_w IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT ( - clk : IN STD_LOGIC := '1'; - data : IN STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) := (OTHERS=>'0'); - rdaddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wraddress : IN STD_LOGIC_VECTOR(g_adr_w-1 DOWNTO 0) := (OTHERS=>'0'); - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR(g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - ----------------------------------------------------------------------------- - -- ip_ultrascale - ----------------------------------------------------------------------------- - COMPONENT ip_ultrascale_ram_crw_crw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "none" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clk_a : IN STD_LOGIC := '1'; - clk_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - - COMPONENT ip_ultrascale_ram_cr_cw IS - GENERIC ( - g_inferred : BOOLEAN := FALSE; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 1; -- choose 1 or 2 - g_init_file : STRING := "none" - ); - PORT - ( - data : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - rdaddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - rdclk : IN STD_LOGIC ; - wraddress : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - wrclk : IN STD_LOGIC := '1'; - wren : IN STD_LOGIC := '0'; - q : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); - END COMPONENT; - -END tech_memory_component_pkg; ->>>>>>> master + ----------------------------------------------------------------------------- + -- ip_ultrascale + ----------------------------------------------------------------------------- + component ip_ultrascale_ram_crw_crw is + generic ( + g_inferred : boolean := FALSE; + g_adr_w : natural := 5; + g_dat_w : natural := 8; + g_nof_words : natural := 2**5; + g_rd_latency : natural := 1; -- choose 1 or 2 + g_init_file : string := "none" + ); + port + ( + address_a : in std_logic_vector (g_adr_w - 1 downto 0); + address_b : in std_logic_vector (g_adr_w - 1 downto 0); + clk_a : in std_logic := '1'; + clk_b : in std_logic ; + data_a : in std_logic_vector (g_dat_w - 1 downto 0); + data_b : in std_logic_vector (g_dat_w - 1 downto 0); + wren_a : in std_logic := '0'; + wren_b : in std_logic := '0'; + q_a : out std_logic_vector (g_dat_w - 1 downto 0); + q_b : out std_logic_vector (g_dat_w - 1 downto 0) + ); + end component; + + component ip_ultrascale_ram_cr_cw is + generic ( + g_inferred : boolean := FALSE; + g_adr_w : natural := 5; + g_dat_w : natural := 8; + g_nof_words : natural := 2**5; + g_rd_latency : natural := 1; -- choose 1 or 2 + g_init_file : string := "none" + ); + port + ( + data : in std_logic_vector (g_dat_w - 1 downto 0); + rdaddress : in std_logic_vector (g_adr_w - 1 downto 0); + rdclk : in std_logic ; + wraddress : in std_logic_vector (g_adr_w - 1 downto 0); + wrclk : in std_logic := '1'; + wren : in std_logic := '0'; + q : out std_logic_vector (g_dat_w - 1 downto 0) + ); + end component; + +end tech_memory_component_pkg; \ No newline at end of file diff --git a/libraries/technology/memory/tech_memory_ram_cr_cw.vhd b/libraries/technology/memory/tech_memory_ram_cr_cw.vhd index 129f5a5c4d..cf36d54412 100644 --- a/libraries/technology/memory/tech_memory_ram_cr_cw.vhd +++ b/libraries/technology/memory/tech_memory_ram_cr_cw.vhd @@ -26,20 +26,12 @@ use technology_lib.technology_pkg.all; use technology_lib.technology_select_pkg.all; -- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis. -<<<<<<< HEAD library ip_stratixiv_ram_lib; library ip_arria10_ram_lib; library ip_arria10_e3sge3_ram_lib; library ip_arria10_e1sg_ram_lib; library ip_arria10_e2sg_ram_lib; -======= -LIBRARY ip_stratixiv_ram_lib; -LIBRARY ip_arria10_ram_lib; -LIBRARY ip_arria10_e3sge3_ram_lib; -LIBRARY ip_arria10_e1sg_ram_lib; -LIBRARY ip_arria10_e2sg_ram_lib; -LIBRARY ip_ultrascale_ram_lib; ->>>>>>> master +library ip_ultrascale_ram_lib; entity tech_memory_ram_cr_cw is generic ( @@ -100,15 +92,15 @@ begin end architecture; ======= - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (data, rdaddress, rdclock, wraddress, wrclock, wren, q); - END GENERATE; - - gen_ip_ultrascale : IF g_technology=c_tech_ultrascale GENERATE + generic map (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) + port map (data, rdaddress, rdclock, wraddress, wrclock, wren, q); + end generate; + + gen_ip_ultrascale : if g_technology = c_tech_ultrascale generate u0 : ip_ultrascale_ram_cr_cw - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (data, rdaddress, rdclock, wraddress, wrclock, wren, q); - END GENERATE; + generic map (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) + port map (data, rdaddress, rdclock, wraddress, wrclock, wren, q); + end generate; -END ARCHITECTURE; ->>>>>>> master +end architecture; +>>>>>>> master \ No newline at end of file diff --git a/libraries/technology/memory/tech_memory_ram_crw_crw.vhd b/libraries/technology/memory/tech_memory_ram_crw_crw.vhd index 411fcd3d90..7bdad1a88f 100644 --- a/libraries/technology/memory/tech_memory_ram_crw_crw.vhd +++ b/libraries/technology/memory/tech_memory_ram_crw_crw.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -32,6 +31,7 @@ library ip_arria10_ram_lib; library ip_arria10_e3sge3_ram_lib; library ip_arria10_e1sg_ram_lib; library ip_arria10_e2sg_ram_lib; +library ip_ultrascale_ram_lib; entity tech_memory_ram_crw_crw is generic ( @@ -96,112 +96,11 @@ begin port map (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); end generate; -end architecture; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - -LIBRARY ieee, technology_lib; -USE ieee.std_logic_1164.all; -USE work.tech_memory_component_pkg.ALL; -USE technology_lib.technology_pkg.ALL; -USE technology_lib.technology_select_pkg.ALL; - --- Declare IP libraries to ensure default binding in simulation. The IP library clause is ignored by synthesis. -LIBRARY ip_stratixiv_ram_lib; -LIBRARY ip_arria10_ram_lib; -LIBRARY ip_arria10_e3sge3_ram_lib; -LIBRARY ip_arria10_e1sg_ram_lib; -LIBRARY ip_arria10_e2sg_ram_lib; -LIBRARY ip_ultrascale_ram_lib; - -ENTITY tech_memory_ram_crw_crw IS - GENERIC ( - g_technology : NATURAL := c_tech_select_default; - g_adr_w : NATURAL := 5; - g_dat_w : NATURAL := 8; - g_nof_words : NATURAL := 2**5; - g_rd_latency : NATURAL := 2; -- choose 1 or 2 - g_init_file : STRING := "UNUSED" - ); - PORT - ( - address_a : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - address_b : IN STD_LOGIC_VECTOR (g_adr_w-1 DOWNTO 0); - clock_a : IN STD_LOGIC := '1'; - clock_b : IN STD_LOGIC ; - data_a : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - data_b : IN STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - enable_a : IN STD_LOGIC := '1'; - enable_b : IN STD_LOGIC := '1'; - rden_a : IN STD_LOGIC := '1'; - rden_b : IN STD_LOGIC := '1'; - wren_a : IN STD_LOGIC := '0'; - wren_b : IN STD_LOGIC := '0'; - q_a : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0); - q_b : OUT STD_LOGIC_VECTOR (g_dat_w-1 DOWNTO 0) - ); -END tech_memory_ram_crw_crw; - - -ARCHITECTURE str OF tech_memory_ram_crw_crw IS - -BEGIN - - gen_ip_stratixiv : IF g_technology=c_tech_stratixiv GENERATE - u0 : ip_stratixiv_ram_crw_crw - GENERIC MAP (g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (address_a, address_b, clock_a, clock_b, data_a, data_b, enable_a, enable_b, rden_a, rden_b, wren_a, wren_b, q_a, q_b); - END GENERATE; - - gen_ip_arria10 : IF g_technology=c_tech_arria10_proto GENERATE - u0 : ip_arria10_ram_crw_crw - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); - END GENERATE; - - gen_ip_arria10_e3sge3 : IF g_technology=c_tech_arria10_e3sge3 GENERATE - u0 : ip_arria10_e3sge3_ram_crw_crw - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); - END GENERATE; - - gen_ip_arria10_e1sg : IF g_technology=c_tech_arria10_e1sg GENERATE - u0 : ip_arria10_e1sg_ram_crw_crw - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); - END GENERATE; - - gen_ip_arria10_e2sg : IF g_technology=c_tech_arria10_e2sg GENERATE - u0 : ip_arria10_e2sg_ram_crw_crw - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); - END GENERATE; - - gen_ip_ultrascale : IF g_technology=c_tech_ultrascale GENERATE - u0 : ip_ultrascale_ram_crw_crw - GENERIC MAP (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) - PORT MAP (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); - END GENERATE; - - -END ARCHITECTURE; ->>>>>>> master + gen_ip_ultrascale : if g_technology = c_tech_ultrascale generate + u0 : ip_ultrascale_ram_crw_crw + generic map (FALSE, g_adr_w, g_dat_w, g_nof_words, g_rd_latency, g_init_file) + port map (address_a, address_b, clock_a, clock_b, data_a, data_b, wren_a, wren_b, q_a, q_b); + end generate; + + +end architecture; \ No newline at end of file diff --git a/libraries/technology/mult/tech_complex_mult.vhd b/libraries/technology/mult/tech_complex_mult.vhd index 91a02b3b1a..32769467ab 100644 --- a/libraries/technology/mult/tech_complex_mult.vhd +++ b/libraries/technology/mult/tech_complex_mult.vhd @@ -115,7 +115,7 @@ begin -- IP variants for <= 18 bit ----------------------------------------------------------------------------- - gen_ip_stratixiv_ip : if g_variant ="IP " and g_technology = c_tech_stratixiv and c_dsp_dat_w <= c_dsp_mult_18_w generate + gen_ip_stratixiv_ip : if g_variant ="IP " and g_technology = c_tech_stratixiv and c_dsp_dat_w <= c_dsp_mult_18_w generate -- Adapt DSP input widths ar <= RESIZE_SVEC(in_ar, c_dsp_mult_18_w); ai <= RESIZE_SVEC(in_ai, c_dsp_mult_18_w); @@ -140,7 +140,7 @@ begin result_im <= RESIZE_SVEC(mult_im, g_out_p_w); end generate; - gen_ip_arria10_ip : if g_variant ="IP " and g_technology = c_tech_arria10_proto and c_dsp_dat_w <= c_dsp_mult_18_w generate + gen_ip_arria10_ip : if g_variant ="IP " and g_technology = c_tech_arria10_proto and c_dsp_dat_w <= c_dsp_mult_18_w generate -- Adapt DSP input widths ar <= RESIZE_SVEC(in_ar, c_dsp_mult_18_w); ai <= RESIZE_SVEC(in_ai, c_dsp_mult_18_w); @@ -165,7 +165,7 @@ begin result_im <= RESIZE_SVEC(mult_im, g_out_p_w); end generate; - gen_ip_arria10_e1sg_ip : if g_variant ="IP " and g_technology = c_tech_arria10_e1sg and c_dsp_dat_w <= c_dsp_mult_18_w generate + gen_ip_arria10_e1sg_ip : if g_variant ="IP " and g_technology = c_tech_arria10_e1sg and c_dsp_dat_w <= c_dsp_mult_18_w generate -- Adapt DSP input widths ar <= RESIZE_SVEC(in_ar, c_dsp_mult_18_w); ai <= RESIZE_SVEC(in_ai, c_dsp_mult_18_w); @@ -190,7 +190,7 @@ begin result_im <= RESIZE_SVEC(mult_im, g_out_p_w); end generate; - gen_ip_arria10_e2sg_ip : if g_variant ="IP " and g_technology = c_tech_arria10_e2sg and c_dsp_dat_w <= c_dsp_mult_18_w generate + gen_ip_arria10_e2sg_ip : if g_variant ="IP " and g_technology = c_tech_arria10_e2sg and c_dsp_dat_w <= c_dsp_mult_18_w generate -- Adapt DSP input widths ar <= RESIZE_SVEC(in_ar, c_dsp_mult_18_w); ai <= RESIZE_SVEC(in_ai, c_dsp_mult_18_w); @@ -220,7 +220,7 @@ begin -- IP variants for > 18 bit and <= 27 bit ----------------------------------------------------------------------------- - gen_ip_arria10_e1sg_ip_27b : if g_variant ="IP " and g_technology = c_tech_arria10_e1sg and c_dsp_dat_w > c_dsp_mult_18_w and c_dsp_dat_w <= c_dsp_mult_27_w generate + gen_ip_arria10_e1sg_ip_27b : if g_variant ="IP " and g_technology = c_tech_arria10_e1sg and c_dsp_dat_w > c_dsp_mult_18_w and c_dsp_dat_w <= c_dsp_mult_27_w generate -- Adapt DSP input widths ar <= RESIZE_SVEC(in_ar, c_dsp_mult_27_w); ai <= RESIZE_SVEC(in_ai, c_dsp_mult_27_w); @@ -245,7 +245,7 @@ begin result_im <= RESIZE_SVEC(mult_im, g_out_p_w); end generate; - gen_ip_arria10_e2sg_ip_27b : if g_variant ="IP " and g_technology = c_tech_arria10_e2sg and c_dsp_dat_w > c_dsp_mult_18_w and c_dsp_dat_w <= c_dsp_mult_27_w generate + gen_ip_arria10_e2sg_ip_27b : if g_variant ="IP " and g_technology = c_tech_arria10_e2sg and c_dsp_dat_w > c_dsp_mult_18_w and c_dsp_dat_w <= c_dsp_mult_27_w generate -- Adapt DSP input widths ar <= RESIZE_SVEC(in_ar, c_dsp_mult_27_w); ai <= RESIZE_SVEC(in_ai, c_dsp_mult_27_w); @@ -273,7 +273,7 @@ begin ----------------------------------------------------------------------------- -- RTL variants that can infer multipliers for a technology, fits all widths ----------------------------------------------------------------------------- - gen_ip_stratixiv_rtl : if g_variant ="RTL " and g_technology = c_tech_stratixiv generate + gen_ip_stratixiv_rtl : if g_variant ="RTL " and g_technology = c_tech_stratixiv generate u0 : ip_stratixiv_complex_mult_rtl generic map ( g_in_a_w => g_in_a_w, @@ -299,7 +299,7 @@ begin end generate; -- RTL variant is the same for unb2, unb2a and unb2b - gen_ip_arria10_rtl : if g_variant ="RTL " and (g_technology = c_tech_arria10_proto or + gen_ip_arria10_rtl : if g_variant ="RTL " and (g_technology = c_tech_arria10_proto or g_technology = c_tech_arria10_e3sge3 or g_technology = c_tech_arria10_e1sg or g_technology = c_tech_arria10_e2sg) generate @@ -328,7 +328,7 @@ begin end generate; -- RTL variant is the same for unb2, unb2a and unb2b - gen_ip_arria10_rtl_canonical : if g_variant ="RTL_C " and (g_technology = c_tech_arria10_proto or + gen_ip_arria10_rtl_canonical : if g_variant ="RTL_C " and (g_technology = c_tech_arria10_proto or g_technology = c_tech_arria10_e3sge3 or g_technology = c_tech_arria10_e1sg or g_technology = c_tech_arria10_e2sg) generate @@ -358,4 +358,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/mult/tech_mult.vhd b/libraries/technology/mult/tech_mult.vhd index 2c15254f33..b3fc8b5c5f 100644 --- a/libraries/technology/mult/tech_mult.vhd +++ b/libraries/technology/mult/tech_mult.vhd @@ -64,7 +64,7 @@ architecture str of tech_mult is begin - gen_ip_stratixiv_ip : if (g_technology = c_tech_stratixiv and g_variant ="IP ") generate + gen_ip_stratixiv_ip : if (g_technology = c_tech_stratixiv and g_variant ="IP ") generate u0 : ip_stratixiv_mult generic map( g_in_a_w => g_in_a_w, @@ -85,7 +85,7 @@ begin ); end generate; - gen_ip_stratixiv_rtl : if (g_technology = c_tech_stratixiv and g_variant ="RTL ") generate + gen_ip_stratixiv_rtl : if (g_technology = c_tech_stratixiv and g_variant ="RTL ") generate u0 : ip_stratixiv_mult_rtl generic map( g_in_a_w => g_in_a_w, @@ -107,7 +107,7 @@ begin ); end generate; - gen_ip_arria10_ip : if ((g_technology = c_tech_arria10_proto or g_technology = c_tech_arria10_e3sge3 or g_technology = c_tech_arria10_e1sg or g_technology = c_tech_arria10_e2sg ) and g_variant ="IP ") generate + gen_ip_arria10_ip : if ((g_technology = c_tech_arria10_proto or g_technology = c_tech_arria10_e3sge3 or g_technology = c_tech_arria10_e1sg or g_technology = c_tech_arria10_e2sg ) and g_variant ="IP ") generate u0 : ip_arria10_mult generic map( g_in_a_w => g_in_a_w, @@ -128,7 +128,7 @@ begin ); end generate; - gen_ip_arria10_rtl : if ((g_technology = c_tech_arria10_proto or g_technology = c_tech_arria10_e3sge3 or g_technology = c_tech_arria10_e1sg or g_technology = c_tech_arria10_e2sg ) and g_variant ="RTL ") generate + gen_ip_arria10_rtl : if ((g_technology = c_tech_arria10_proto or g_technology = c_tech_arria10_e3sge3 or g_technology = c_tech_arria10_e1sg or g_technology = c_tech_arria10_e2sg ) and g_variant ="RTL ") generate u0 : ip_arria10_mult_rtl generic map( g_in_a_w => g_in_a_w, @@ -152,8 +152,8 @@ begin gen_trunk : for I in 0 to g_nof_mult - 1 generate -- Truncate MSbits, also for signed (common_pkg.vhd for explanation of RESIZE_SVEC) - out_p((I + 1) * g_out_p_w - 1 downto I * g_out_p_w) <= RESIZE_SVEC(prod((I + 1) * c_prod_w - 1 downto I * c_prod_w), g_out_p_w) when g_representation ="signed " else + out_p((I + 1) * g_out_p_w - 1 downto I * g_out_p_w) <= RESIZE_SVEC(prod((I + 1) * c_prod_w - 1 downto I * c_prod_w), g_out_p_w) when g_representation ="signed " else RESIZE_UVEC(prod((I + 1) * c_prod_w - 1 downto I * c_prod_w), g_out_p_w); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/mult/tech_mult_add2.vhd b/libraries/technology/mult/tech_mult_add2.vhd index c3fbcabeb6..55d535520d 100644 --- a/libraries/technology/mult/tech_mult_add2.vhd +++ b/libraries/technology/mult/tech_mult_add2.vhd @@ -60,7 +60,7 @@ architecture str of tech_mult_add2 is begin - gen_ip_stratixiv_rtl : if (g_technology = c_tech_stratixiv and g_variant ="RTL ") generate + gen_ip_stratixiv_rtl : if (g_technology = c_tech_stratixiv and g_variant ="RTL ") generate u0 : ip_stratixiv_mult_add2_rtl generic map( g_in_a_w => g_in_a_w, @@ -84,7 +84,7 @@ begin ); end generate; - gen_ip_arria10_e1sg_rtl : if (g_technology = c_tech_arria10_e1sg and g_variant ="RTL ") generate + gen_ip_arria10_e1sg_rtl : if (g_technology = c_tech_arria10_e1sg and g_variant ="RTL ") generate u0 : ip_arria10_e1sg_mult_add2_rtl generic map( g_in_a_w => g_in_a_w, @@ -108,7 +108,7 @@ begin ); end generate; - gen_ip_arria10_e2sg_rtl : if (g_technology = c_tech_arria10_e2sg and g_variant ="RTL ") generate + gen_ip_arria10_e2sg_rtl : if (g_technology = c_tech_arria10_e2sg and g_variant ="RTL ") generate u0 : ip_arria10_e2sg_mult_add2_rtl generic map( g_in_a_w => g_in_a_w, @@ -132,4 +132,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/mult/tech_mult_add4.vhd b/libraries/technology/mult/tech_mult_add4.vhd index d9eda2229a..cefd9aa491 100644 --- a/libraries/technology/mult/tech_mult_add4.vhd +++ b/libraries/technology/mult/tech_mult_add4.vhd @@ -63,7 +63,7 @@ architecture str of tech_mult_add4 is begin - gen_ip_stratixiv_rtl : if (g_technology = c_tech_stratixiv and g_variant ="RTL ") generate + gen_ip_stratixiv_rtl : if (g_technology = c_tech_stratixiv and g_variant ="RTL ") generate u0 : ip_stratixiv_mult_add4_rtl generic map( g_in_a_w => g_in_a_w, @@ -89,7 +89,7 @@ begin ); end generate; - gen_ip_arria10_e3sge3_rtl : if (g_technology = c_tech_arria10_e3sge3 and g_variant ="RTL ") generate + gen_ip_arria10_e3sge3_rtl : if (g_technology = c_tech_arria10_e3sge3 and g_variant ="RTL ") generate u0 : ip_arria10_e3sge3_mult_add4_rtl generic map( g_in_a_w => g_in_a_w, @@ -115,7 +115,7 @@ begin ); end generate; - gen_ip_arria10_e1sg_rtl : if (g_technology = c_tech_arria10_e1sg and g_variant ="RTL ") generate + gen_ip_arria10_e1sg_rtl : if (g_technology = c_tech_arria10_e1sg and g_variant ="RTL ") generate u0 : ip_arria10_e1sg_mult_add4_rtl generic map( g_in_a_w => g_in_a_w, @@ -141,7 +141,7 @@ begin ); end generate; - gen_ip_arria10_e2sg_rtl : if (g_technology = c_tech_arria10_e2sg and g_variant ="RTL ") generate + gen_ip_arria10_e2sg_rtl : if (g_technology = c_tech_arria10_e2sg and g_variant ="RTL ") generate u0 : ip_arria10_e2sg_mult_add4_rtl generic map( g_in_a_w => g_in_a_w, @@ -167,4 +167,4 @@ begin ); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/pll/tech_pll_component_pkg.vhd b/libraries/technology/pll/tech_pll_component_pkg.vhd index e53bc0e706..a651456831 100644 --- a/libraries/technology/pll/tech_pll_component_pkg.vhd +++ b/libraries/technology/pll/tech_pll_component_pkg.vhd @@ -336,4 +336,4 @@ package tech_pll_component_pkg is ); end component; -end tech_pll_component_pkg; +end tech_pll_component_pkg; \ No newline at end of file diff --git a/libraries/technology/technology_pkg.vhd b/libraries/technology/technology_pkg.vhd index 6a404d99f8..2d0b552a93 100644 --- a/libraries/technology/technology_pkg.vhd +++ b/libraries/technology/technology_pkg.vhd @@ -1,4 +1,3 @@ -<<<<<<< HEAD ------------------------------------------------------------------------------- -- -- Copyright (C) 2014 @@ -50,7 +49,8 @@ package technology_pkg is constant c_tech_arria10_e3sge3 : integer := 6; -- e.g. used on UniBoard2 second run (7 boards version "01" dec 2015) constant c_tech_arria10_e1sg : integer := 7; -- e.g. used on UniBoard2b third run (5 ARTS boards version "01" feb 2017) constant c_tech_arria10_e2sg : integer := 8; -- e.g. used on UniBoard2c (2 LOFAR2.0 SDP boards version "11" f 2021) - constant c_tech_nof_technologies : integer := 9; + constant c_tech_ultrascale : integer := 9; -- e.g. used on Alveo FPGA platforms + constant c_tech_nof_technologies : integer := 10; -- Functions function tech_sel_a_b(sel : boolean; a, b : string) return string; @@ -130,139 +130,4 @@ package body technology_pkg is return r; end; -end technology_pkg; -======= -------------------------------------------------------------------------------- --- --- Copyright (C) 2014 --- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/> --- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see <http://www.gnu.org/licenses/>. --- -------------------------------------------------------------------------------- - --- Purpose: Define the list of FPGA technology identifiers --- Description: --- The technology dependent IP is organised per FPGA device type. Each FPGA --- type that is supported has a c_tech_<device_name> identifier constant. --- Remark: --- . The package also contains some low level functions that often are copied --- from common_pkg.vhd. They need to be redefined in this technology_pkg.vhd --- because the common_lib also use technology dependent IP like RAM, FIFO, --- DDIO. Therefore common_lib can not be used in the IP wrappers for those --- IP blocks, because common_lib is compiled later. --- . For technology wrappers that are not used by components in common_lib the --- common_pkg.vhd can be used. Similar technology wrappers that are not used --- by components in dp_lib can use the dp_stream_pkg. - -LIBRARY IEEE; -USE IEEE.STD_LOGIC_1164.ALL; -USE IEEE.MATH_REAL.ALL; - -PACKAGE technology_pkg IS - - -- Technology identifiers - CONSTANT c_tech_inferred : INTEGER := 0; - CONSTANT c_tech_virtex4 : INTEGER := 1; -- e.g. used on RSP3 for Lofar - CONSTANT c_tech_stratixiv : INTEGER := 2; -- e.g. used on UniBoard1 - CONSTANT c_tech_virtex6 : INTEGER := 3; -- e.g. used on Roach2 for Casper - CONSTANT c_tech_virtex7 : INTEGER := 4; -- e.g. used on Roach3 for Casper - CONSTANT c_tech_arria10_proto : INTEGER := 5; -- e.g. used on UniBoard2 first proto (1 board version "00" may 2015) - CONSTANT c_tech_arria10_e3sge3 : INTEGER := 6; -- e.g. used on UniBoard2 second run (7 boards version "01" dec 2015) - CONSTANT c_tech_arria10_e1sg : INTEGER := 7; -- e.g. used on UniBoard2b third run (5 ARTS boards version "01" feb 2017) - CONSTANT c_tech_arria10_e2sg : INTEGER := 8; -- e.g. used on UniBoard2c (2 LOFAR2.0 SDP boards version "11" f 2021) - CONSTANT c_tech_ultrascale : INTEGER := 9; -- e.g. used on Alveo FPGA platforms - CONSTANT c_tech_nof_technologies : INTEGER := 10; - - -- Functions - FUNCTION tech_sel_a_b(sel : BOOLEAN; a, b : STRING) RETURN STRING; - FUNCTION tech_sel_a_b(sel : BOOLEAN; a, b : INTEGER) RETURN INTEGER; - - FUNCTION tech_true_log2(n : NATURAL) RETURN NATURAL; -- tech_true_log2(n) = log2(n) - FUNCTION tech_ceil_log2(n : NATURAL) RETURN NATURAL; -- tech_ceil_log2(n) = log2(n), but force tech_ceil_log2(1) = 1 - - FUNCTION tech_ceil_div(n, d : NATURAL) RETURN NATURAL; -- tech_ceil_div = n/d + (n MOD d)/=0 - - FUNCTION tech_nat_to_mbps_str( n : IN NATURAL ) RETURN STRING; - -END technology_pkg; - -PACKAGE BODY technology_pkg IS - - FUNCTION tech_sel_a_b(sel : BOOLEAN; a, b : STRING) RETURN STRING IS - BEGIN - IF sel=TRUE THEN RETURN a; ELSE RETURN b; END IF; - END; - - FUNCTION tech_sel_a_b(sel : BOOLEAN; a, b : INTEGER) RETURN INTEGER IS - BEGIN - IF sel=TRUE THEN RETURN a; ELSE RETURN b; END IF; - END; - - FUNCTION tech_true_log2(n : NATURAL) RETURN NATURAL IS - -- Purpose: For calculating extra vector width of existing vector - -- Description: Return mathematical ceil(log2(n)) - -- n log2() - -- 0 -> -oo --> FAILURE - -- 1 -> 0 - -- 2 -> 1 - -- 3 -> 2 - -- 4 -> 2 - -- 5 -> 3 - -- 6 -> 3 - -- 7 -> 3 - -- 8 -> 3 - -- 9 -> 4 - -- etc, up to n = NATURAL'HIGH = 2**31-1 - BEGIN - RETURN natural(integer(ceil(log2(real(n))))); - END; - - FUNCTION tech_ceil_log2(n : NATURAL) RETURN NATURAL IS - -- Purpose: For calculating vector width of new vector - -- Description: - -- Same as tech_true_log2() except tech_ceil_log2(1) = 1, which is needed to support - -- the vector width width for 1 address, to avoid NULL array for single - -- word register address. - BEGIN - IF n = 1 THEN - RETURN 1; -- avoid NULL array - ELSE - RETURN tech_true_log2(n); - END IF; - END; - - FUNCTION tech_ceil_div(n, d : NATURAL) RETURN NATURAL IS - BEGIN - RETURN n/d + tech_sel_a_b(n MOD d = 0, 0, 1); - END; - - FUNCTION tech_nat_to_mbps_str( n : IN NATURAL ) RETURN STRING IS -- Converts a selection of naturals to Mbps strings, used for edited MegaWizard file in ip_stratixiv_hssi_*_generic.vhd - VARIABLE r : STRING(1 TO 9); - BEGIN - CASE n is - WHEN 2500 => r := "2500 Mbps"; - WHEN 3125 => r := "3125 Mbps"; - WHEN 5000 => r := "5000 Mbps"; - WHEN 6250 => r := "6250 Mbps"; - WHEN OTHERS => - r := "ERROR: tech_nat_to_mbps_str UNSUPPORTED DATA RATE"; -- This too long string will cause an error in Quartus synthesis - REPORT r SEVERITY FAILURE; -- Severity Failure will stop the Modelsim simulation - END CASE; - RETURN r; - END; - -END technology_pkg; ->>>>>>> master +end technology_pkg; \ No newline at end of file diff --git a/libraries/technology/transceiver/sim_transceiver_gx.vhd b/libraries/technology/transceiver/sim_transceiver_gx.vhd index 1644d3fab3..cd32efea2a 100644 --- a/libraries/technology/transceiver/sim_transceiver_gx.vhd +++ b/libraries/technology/transceiver/sim_transceiver_gx.vhd @@ -238,4 +238,4 @@ begin end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/transceiver/tech_transceiver_gx.vhd b/libraries/technology/transceiver/tech_transceiver_gx.vhd index 1125d2eb2b..d39e33031c 100644 --- a/libraries/technology/transceiver/tech_transceiver_gx.vhd +++ b/libraries/technology/transceiver/tech_transceiver_gx.vhd @@ -75,4 +75,4 @@ begin port map (cal_rec_clk, tr_clk, rx_clk, rx_rst, rx_sosi_arr, rx_siso_arr, tx_clk, tx_rst, tx_sosi_arr, tx_siso_arr, rx_datain, tx_dataout, tx_state, tx_align_en, rx_state, rx_align_en); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/transceiver/tech_transceiver_gx_stratixiv.vhd b/libraries/technology/transceiver/tech_transceiver_gx_stratixiv.vhd index 068da0ad4b..fdb9147086 100644 --- a/libraries/technology/transceiver/tech_transceiver_gx_stratixiv.vhd +++ b/libraries/technology/transceiver/tech_transceiver_gx_stratixiv.vhd @@ -498,4 +498,4 @@ begin reconfig_togxb => reconfig_togxb ); -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/transceiver/tech_transceiver_rx_align.vhd b/libraries/technology/transceiver/tech_transceiver_rx_align.vhd index bb2256c669..5fe1e19bec 100644 --- a/libraries/technology/transceiver/tech_transceiver_rx_align.vhd +++ b/libraries/technology/transceiver/tech_transceiver_rx_align.vhd @@ -158,4 +158,4 @@ begin end case; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/transceiver/tech_transceiver_rx_rst.vhd b/libraries/technology/transceiver/tech_transceiver_rx_rst.vhd index 1945c6f918..cdf7e26b7d 100644 --- a/libraries/technology/transceiver/tech_transceiver_rx_rst.vhd +++ b/libraries/technology/transceiver/tech_transceiver_rx_rst.vhd @@ -152,4 +152,4 @@ begin ); end generate; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/transceiver/tech_transceiver_tx_align.vhd b/libraries/technology/transceiver/tech_transceiver_tx_align.vhd index 764a989739..d023bc84a5 100644 --- a/libraries/technology/transceiver/tech_transceiver_tx_align.vhd +++ b/libraries/technology/transceiver/tech_transceiver_tx_align.vhd @@ -124,4 +124,4 @@ begin end case; end process; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/transceiver/tech_transceiver_tx_rst.vhd b/libraries/technology/transceiver/tech_transceiver_tx_rst.vhd index 197297024e..4057c9df47 100644 --- a/libraries/technology/transceiver/tech_transceiver_tx_rst.vhd +++ b/libraries/technology/transceiver/tech_transceiver_tx_rst.vhd @@ -135,4 +135,4 @@ begin ); end generate; -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/xaui/sim_xaui.vhd b/libraries/technology/xaui/sim_xaui.vhd index 2606e846f5..fda78983ea 100644 --- a/libraries/technology/xaui/sim_xaui.vhd +++ b/libraries/technology/xaui/sim_xaui.vhd @@ -177,4 +177,4 @@ begin end generate; -end wrap; +end wrap; \ No newline at end of file diff --git a/libraries/technology/xaui/tech_xaui.vhd b/libraries/technology/xaui/tech_xaui.vhd index 697906390d..c4baadedd3 100644 --- a/libraries/technology/xaui/tech_xaui.vhd +++ b/libraries/technology/xaui/tech_xaui.vhd @@ -97,4 +97,4 @@ begin xaui_tx_arr, xaui_rx_arr); end generate; -end str; +end str; \ No newline at end of file diff --git a/libraries/technology/xaui/tech_xaui_align_dly.vhd b/libraries/technology/xaui/tech_xaui_align_dly.vhd index 7839ddf640..c6acca48b2 100644 --- a/libraries/technology/xaui/tech_xaui_align_dly.vhd +++ b/libraries/technology/xaui/tech_xaui_align_dly.vhd @@ -67,4 +67,4 @@ begin q_out => txc_rx_channelaligned_dly ); -end rtl; +end rtl; \ No newline at end of file diff --git a/libraries/technology/xaui/tech_xaui_stratixiv.vhd b/libraries/technology/xaui/tech_xaui_stratixiv.vhd index 5923eaafd9..aa2530bf1c 100644 --- a/libraries/technology/xaui/tech_xaui_stratixiv.vhd +++ b/libraries/technology/xaui/tech_xaui_stratixiv.vhd @@ -328,4 +328,4 @@ begin miso_arr => xaui_miso_arr ); -end str; +end str; \ No newline at end of file diff --git a/vhdl_style_fix.py b/vhdl_style_fix.py index 4574106bcd..58e189437d 100755 --- a/vhdl_style_fix.py +++ b/vhdl_style_fix.py @@ -133,8 +133,11 @@ class AddSpacesAroundOperators(BaseCheck): operator += ch else: isoperator = True - if new_line[-1] not in [" ", "("]: - new_line.append(' ') + try: + if new_line[-1] not in [" ", "("]: + new_line.append(' ') + except IndexError: + pass operator += ch elif isoperator and ch.isnumeric(): @@ -292,8 +295,6 @@ class CaseResolutions(BaseCheck): for i in range(self.n_data): line = self.data[i] sline = self.splitline(line) - if sline: - print(f"CaseResolution: {sline}") for word in sline: if word[-1] == ';': word = word[:-1] -- GitLab