Skip to content

B
Beam Positoning Monitor - Gateware
Commit 2071e175 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

wb_fmc150/*: trivial fix for slave address decoding

parent e5835cfb
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 211 deletions
hdl/modules/custom_wishbone/wb_fmc150/Makefile deleted 100644 → 0
View file @ e5835cfb
########################################
# This file was generated by hdlmake #
# http://ohwr.org/projects/hdl-make/ #
########################################
## variables #############################
PWD := $(shell pwd)
TOP_MODULE :=
FUSE_OUTPUT ?= isim_proj
XILINX_INI_PATH := /opt/Xilinx/13.4/ISE_DS/ISE/vhdl/hdp/lin64
VHPCOMP_FLAGS := -intstyle default -incremental -initfile xilinxsim.ini
ISIM_FLAGS :=
VLOGCOMP_FLAGS := -intstyle default -incremental -initfile xilinxsim.ini
VERILOG_SRC :=
VERILOG_OBJ :=
VHDL_SRC := wb_fmc150.vhd \
xwb_fmc150.vhd \
xfmc150_regs_pkg.vhd \
wb_fmc150_port.vhd \
adc/adc_channel_lvds_ddr.vhd \
adc/adc_pkg.vhd \
adc/strobe_lvds.vhd \
fmc150/ads62p49_ctrl.vhd \
fmc150/amc7823_ctrl.vhd \
fmc150/cdce72010_ctrl.vhd \
fmc150/dac3283_ctrl.vhd \
fmc150/fmc150_adc_if.vhd \
fmc150/fmc150_dac_if.vhd \
fmc150/fmc150_pkg.vhd \
fmc150/fmc150_spi_ctrl.vhd \
fmc150/fmc150_stellar_cmd.vhd \
fmc150/fmc150_testbench.vhd \
fmc150/pulse2pulse.vhd \
VHDL_OBJ := work/wb_fmc150/.wb_fmc150_vhd \
work/xwb_fmc150/.xwb_fmc150_vhd \
work/xfmc150_regs_pkg/.xfmc150_regs_pkg_vhd \
work/wb_fmc150_port/.wb_fmc150_port_vhd \
work/adc_channel_lvds_ddr/.adc_channel_lvds_ddr_vhd \
work/adc_pkg/.adc_pkg_vhd \
work/strobe_lvds/.strobe_lvds_vhd \
work/ads62p49_ctrl/.ads62p49_ctrl_vhd \
work/amc7823_ctrl/.amc7823_ctrl_vhd \
work/cdce72010_ctrl/.cdce72010_ctrl_vhd \
work/dac3283_ctrl/.dac3283_ctrl_vhd \
work/fmc150_adc_if/.fmc150_adc_if_vhd \
work/fmc150_dac_if/.fmc150_dac_if_vhd \
work/fmc150_pkg/.fmc150_pkg_vhd \
work/fmc150_spi_ctrl/.fmc150_spi_ctrl_vhd \
work/fmc150_stellar_cmd/.fmc150_stellar_cmd_vhd \
work/fmc150_testbench/.fmc150_testbench_vhd \
work/pulse2pulse/.pulse2pulse_vhd \
LIBS := work
LIB_IND := work/.work
## rules #################################
sim: xilinxsim.ini $(LIB_IND) $(VERILOG_OBJ) $(VHDL_OBJ)
$(VERILOG_OBJ): $(VHDL_OBJ)
$(VHDL_OBJ): $(LIB_IND) xilinxsim.ini
xilinxsim.ini: $(XILINX_INI_PATH)/xilinxsim.ini
cp $< .
fuse: ;
ifeq ($(TOP_MODULE),)
@echo "Environment variable TOP_MODULE not set!"
else
fuse work.$(TOP_MODULE) -intstyle ise -incremental -o $(FUSE_OUTPUT)
endif
clean:
rm -rf ./xilinxsim.ini $(LIBS) fuse.xmsgs fuse.log fuseRelaunch.cmd isim isim.log isim.wdb
.PHONY: clean
work/.work:
(mkdir work && touch work/.work && echo "work=work" >> xilinxsim.ini) || rm -rf work
work/wb_fmc150/.wb_fmc150_vhd: wb_fmc150.vhd work/wb_fmc150/.wb_fmc150
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/wb_fmc150/.wb_fmc150:
work/xwb_fmc150/.xwb_fmc150_vhd: xwb_fmc150.vhd work/xwb_fmc150/.xwb_fmc150
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/xwb_fmc150/.xwb_fmc150:
work/xfmc150_regs_pkg/.xfmc150_regs_pkg_vhd: xfmc150_regs_pkg.vhd work/xfmc150_regs_pkg/.xfmc150_regs_pkg
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/xfmc150_regs_pkg/.xfmc150_regs_pkg:
work/wb_fmc150_port/.wb_fmc150_port_vhd: wb_fmc150_port.vhd work/wb_fmc150_port/.wb_fmc150_port
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/wb_fmc150_port/.wb_fmc150_port: \
work/xfmc150_regs_pkg/.xfmc150_regs_pkg_vhd
work/adc_channel_lvds_ddr/.adc_channel_lvds_ddr_vhd: adc/adc_channel_lvds_ddr.vhd work/adc_channel_lvds_ddr/.adc_channel_lvds_ddr
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/adc_channel_lvds_ddr/.adc_channel_lvds_ddr:
work/adc_pkg/.adc_pkg_vhd: adc/adc_pkg.vhd work/adc_pkg/.adc_pkg
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/adc_pkg/.adc_pkg:
work/strobe_lvds/.strobe_lvds_vhd: adc/strobe_lvds.vhd work/strobe_lvds/.strobe_lvds
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/strobe_lvds/.strobe_lvds:
work/ads62p49_ctrl/.ads62p49_ctrl_vhd: fmc150/ads62p49_ctrl.vhd work/ads62p49_ctrl/.ads62p49_ctrl
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/ads62p49_ctrl/.ads62p49_ctrl:
work/amc7823_ctrl/.amc7823_ctrl_vhd: fmc150/amc7823_ctrl.vhd work/amc7823_ctrl/.amc7823_ctrl
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/amc7823_ctrl/.amc7823_ctrl:
work/cdce72010_ctrl/.cdce72010_ctrl_vhd: fmc150/cdce72010_ctrl.vhd work/cdce72010_ctrl/.cdce72010_ctrl
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/cdce72010_ctrl/.cdce72010_ctrl:
work/dac3283_ctrl/.dac3283_ctrl_vhd: fmc150/dac3283_ctrl.vhd work/dac3283_ctrl/.dac3283_ctrl
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/dac3283_ctrl/.dac3283_ctrl:
work/fmc150_adc_if/.fmc150_adc_if_vhd: fmc150/fmc150_adc_if.vhd work/fmc150_adc_if/.fmc150_adc_if
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/fmc150_adc_if/.fmc150_adc_if: \
work/adc_pkg/.adc_pkg_vhd
work/fmc150_dac_if/.fmc150_dac_if_vhd: fmc150/fmc150_dac_if.vhd work/fmc150_dac_if/.fmc150_dac_if
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/fmc150_dac_if/.fmc150_dac_if:
work/fmc150_pkg/.fmc150_pkg_vhd: fmc150/fmc150_pkg.vhd work/fmc150_pkg/.fmc150_pkg
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/fmc150_pkg/.fmc150_pkg:
work/fmc150_spi_ctrl/.fmc150_spi_ctrl_vhd: fmc150/fmc150_spi_ctrl.vhd work/fmc150_spi_ctrl/.fmc150_spi_ctrl
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/fmc150_spi_ctrl/.fmc150_spi_ctrl:
work/fmc150_stellar_cmd/.fmc150_stellar_cmd_vhd: fmc150/fmc150_stellar_cmd.vhd work/fmc150_stellar_cmd/.fmc150_stellar_cmd
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/fmc150_stellar_cmd/.fmc150_stellar_cmd:
work/fmc150_testbench/.fmc150_testbench_vhd: fmc150/fmc150_testbench.vhd work/fmc150_testbench/.fmc150_testbench
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/fmc150_testbench/.fmc150_testbench: \
work/fmc150_pkg/.fmc150_pkg_vhd
work/pulse2pulse/.pulse2pulse_vhd: fmc150/pulse2pulse.vhd work/pulse2pulse/.pulse2pulse
vhpcomp $(VHPCOMP_FLAGS) -work work=./work $<
@mkdir -p $(dir $@) && touch $@
work/pulse2pulse/.pulse2pulse:
hdl/modules/custom_wishbone/wb_fmc150/wb_fmc150.vhd
View file @ 2071e175
......@@ -401,7 +401,7 @@ begin
rst_n_i => rst_n_i,
master_i => wb_out,
master_o => wb_in,
sl_adr_i => wb_adr_i,--resized_addr,
sl_adr_i => resized_addr,--wb_adr_i,
sl_dat_i => wb_dat_i,
sl_sel_i => wb_sel_i,
sl_cyc_i => wb_cyc_i,
......@@ -412,9 +412,13 @@ begin
sl_stall_o => wb_stall_o
);
--resized_addr(2 downto 0) <= wb_adr_i(2 downto 0);
--resized_addr(c_wishbone_address_width-1 downto 3)
-- <= (others => '0');
-- Decode only the LSB bits. In this case, at most, 5 LSB must be decoded
-- (if byte addresses) or 3 LSB (if word addressed). We have to consider
-- the biggest value in order not to mismatch register addresses.
-- See wb_fmc150_port.vhd for register bank addresses.
resized_addr(4 downto 0) <= wb_adr_i(4 downto 0);
resized_addr(c_wishbone_address_width-1 downto 5)
<= (others => '0');
-- Register Bank / Wishbone Interface
cmp_wb_fmc150_port : wb_fmc150_port
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment