diff --git a/libraries/technology/ddr/tech_ddr.vhd b/libraries/technology/ddr/tech_ddr.vhd index cbfdf0d8ce557b4e771b0be36c2cfa31bb81f5fc..fb6a8b88cdab9d6b86fee02053a2b4a546372ac8 100644 --- a/libraries/technology/ddr/tech_ddr.vhd +++ b/libraries/technology/ddr/tech_ddr.vhd @@ -44,8 +44,8 @@ ENTITY tech_ddr IS ctlr_init_done : OUT STD_LOGIC; - ctrl_mosi : IN t_tech_ddr_mosi; - ctrl_miso : OUT t_tech_ddr_miso; + ctlr_mosi : IN t_tech_ddr_mosi; + ctlr_miso : OUT t_tech_ddr_miso; -- PHY interface phy_in : IN t_tech_ddr_phy_in; @@ -65,7 +65,7 @@ BEGIN PORT MAP (ctlr_ref_clk, ctlr_ref_rst, ctlr_gen_clk, ctlr_gen_rst, ctlr_gen_clk_2x, ctlr_gen_rst_2x, ctlr_init_done, - ctrl_mosi, ctrl_miso, + ctlr_mosi, ctlr_miso, phy_in, phy_io, phy_ou); END GENERATE; diff --git a/libraries/technology/ddr/tech_ddr_stratixiv.vhd b/libraries/technology/ddr/tech_ddr_stratixiv.vhd index 449fdee280a84acbfeeb0c81cc971ba9afca5703..a5837f0c05d40e15ac97d8de0f6c42a8b53311c3 100644 --- a/libraries/technology/ddr/tech_ddr_stratixiv.vhd +++ b/libraries/technology/ddr/tech_ddr_stratixiv.vhd @@ -47,8 +47,8 @@ ENTITY tech_ddr_stratixiv IS ctlr_init_done : OUT STD_LOGIC; - ctrl_mosi : IN t_tech_ddr_mosi; - ctrl_miso : OUT t_tech_ddr_miso; + ctlr_mosi : IN t_tech_ddr_mosi; + ctlr_miso : OUT t_tech_ddr_miso; -- PHY interface phy_in : IN t_tech_ddr_phy_in; @@ -100,16 +100,16 @@ BEGIN mem_dqs => phy_io.dqs(g_tech_ddr.dqs_w-1 DOWNTO 0), -- .mem_dqs mem_dqs_n => phy_io.dqs_n(g_tech_ddr.dqs_w-1 DOWNTO 0), -- .mem_dqs_n mem_odt => phy_ou.odt(g_tech_ddr.odt_w-1 DOWNTO 0), -- .mem_odt - avl_ready => ctrl_miso.waitrequest_n, -- avl.waitrequest_n - avl_burstbegin => ctrl_mosi.burstbegin, -- .beginbursttransfer - avl_addr => ctrl_mosi.address(c_ctlr_address_w-1 DOWNTO 0), -- .address - avl_rdata_valid => ctrl_miso.rdval, -- .readdatavalid - avl_rdata => ctrl_miso.rddata(c_ctlr_data_w-1 DOWNTO 0), -- .readdata - avl_wdata => ctrl_mosi.wrdata(c_ctlr_data_w-1 DOWNTO 0), -- .writedata + avl_ready => ctlr_miso.waitrequest_n, -- avl.waitrequest_n + avl_burstbegin => ctlr_mosi.burstbegin, -- .beginbursttransfer + avl_addr => ctlr_mosi.address(c_ctlr_address_w-1 DOWNTO 0), -- .address + avl_rdata_valid => ctlr_miso.rdval, -- .readdatavalid + avl_rdata => ctlr_miso.rddata(c_ctlr_data_w-1 DOWNTO 0), -- .readdata + avl_wdata => ctlr_mosi.wrdata(c_ctlr_data_w-1 DOWNTO 0), -- .writedata avl_be => (OTHERS=>'1'), -- .byteenable - avl_read_req => ctrl_mosi.rd, -- .read - avl_write_req => ctrl_mosi.wr, -- .write - avl_size => ctrl_mosi.burstsize(g_tech_ddr.maxburstsize_w-1 DOWNTO 0), -- .burstcount + avl_read_req => ctlr_mosi.rd, -- .read + avl_write_req => ctlr_mosi.wr, -- .write + avl_size => ctlr_mosi.burstsize(g_tech_ddr.maxburstsize_w-1 DOWNTO 0), -- .burstcount local_init_done => ctlr_init_done, -- status.local_init_done local_cal_success => OPEN, -- .local_cal_success local_cal_fail => OPEN, -- .local_cal_fail @@ -152,16 +152,16 @@ BEGIN mem_dqs => phy_io.dqs(g_tech_ddr.dqs_w-1 DOWNTO 0), -- .mem_dqs mem_dqs_n => phy_io.dqs_n(g_tech_ddr.dqs_w-1 DOWNTO 0), -- .mem_dqs_n mem_odt => phy_ou.odt(g_tech_ddr.odt_w-1 DOWNTO 0), -- .mem_odt - avl_ready => ctrl_miso.waitrequest_n, -- avl.waitrequest_n - avl_burstbegin => ctrl_mosi.burstbegin, -- .beginbursttransfer - avl_addr => ctrl_mosi.address(c_ctlr_address_w-1 DOWNTO 0), -- .address - avl_rdata_valid => ctrl_miso.rdval, -- .readdatavalid - avl_rdata => ctrl_miso.rddata(c_ctlr_data_w-1 DOWNTO 0), -- .readdata - avl_wdata => ctrl_mosi.wrdata(c_ctlr_data_w-1 DOWNTO 0), -- .writedata + avl_ready => ctlr_miso.waitrequest_n, -- avl.waitrequest_n + avl_burstbegin => ctlr_mosi.burstbegin, -- .beginbursttransfer + avl_addr => ctlr_mosi.address(c_ctlr_address_w-1 DOWNTO 0), -- .address + avl_rdata_valid => ctlr_miso.rdval, -- .readdatavalid + avl_rdata => ctlr_miso.rddata(c_ctlr_data_w-1 DOWNTO 0), -- .readdata + avl_wdata => ctlr_mosi.wrdata(c_ctlr_data_w-1 DOWNTO 0), -- .writedata avl_be => (OTHERS=>'1'), -- .byteenable - avl_read_req => ctrl_mosi.rd, -- .read - avl_write_req => ctrl_mosi.wr, -- .write - avl_size => ctrl_mosi.burstsize(g_tech_ddr.maxburstsize_w-1 DOWNTO 0), -- .burstcount + avl_read_req => ctlr_mosi.rd, -- .read + avl_write_req => ctlr_mosi.wr, -- .write + avl_size => ctlr_mosi.burstsize(g_tech_ddr.maxburstsize_w-1 DOWNTO 0), -- .burstcount local_init_done => ctlr_init_done, -- status.local_init_done local_cal_success => OPEN, -- .local_cal_success local_cal_fail => OPEN, -- .local_cal_fail