Skip to content

P
Platform-independent core collection
Commit b6448210 authored by Piotr Miedzik's avatar Piotr Miedzik Committed by Dimitris Lampridis
Browse files
Options

sdb_crossbar: generate more descriptive SDB 

- sdb_rom: add parameter g_sdb_name
- xwb_sdb_crossbar: add parameter g_sdb_name
- wishbone_pkg: f_string_fix_len add parameter justify_right
- wishbone_pkg: f_sdb_auto_device add parameter name
- wishbone_pkg: f_sdb_auto_bridge add parameter name
parent 1e91b239
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 22 deletions
modules/wishbone/wb_crossbar/sdb_rom.vhd
View file @ b6448210
......@@ -5,9 +5,10 @@ use work.wishbone_pkg.all;
entity sdb_rom is
generic(
g_layout : t_sdb_record_array;
g_masters : natural;
g_bus_end : unsigned(63 downto 0));
g_layout : t_sdb_record_array;
g_masters : natural;
g_bus_end : unsigned(63 downto 0);
g_sdb_name : string := "WB4-Crossbar-GSI ");
port(
clk_sys_i : in std_logic;
master_i : in std_logic_vector(g_masters-1 downto 0);
......@@ -25,6 +26,7 @@ architecture rtl of sdb_rom is
constant c_rom_words : natural := c_rom_entries * c_sdb_words;
constant c_rom_depth : natural := f_ceil_log2(c_rom_words);
constant c_rom_lowbits : natural := f_ceil_log2(c_wishbone_data_width / 8);
constant c_sdb_name : string := f_string_fix_len(g_sdb_name , 19, ' ', false);
-- Index of the MSI entry in SDB
type t_nat_array is array(g_masters-1 downto 0) of natural;
......@@ -97,7 +99,7 @@ architecture rtl of sdb_rom is
sdb_component.product.device_id := x"e6a542c9";
sdb_component.product.version := x"00000003";
sdb_component.product.date := x"20120511";
sdb_component.product.name := "WB4-Crossbar-GSI ";
sdb_component.product.name := c_sdb_name;
sdb_record(447 downto 8) := f_sdb_embed_component(sdb_component, (others => '0'));
for i in 0 to c_sdb_words-1 loop
......
modules/wishbone/wb_crossbar/xwb_sdb_crossbar.vhd
View file @ b6448210
......@@ -10,7 +10,8 @@ entity xwb_sdb_crossbar is
g_registered : boolean := false;
g_wraparound : boolean := true;
g_layout : t_sdb_record_array;
g_sdb_addr : t_wishbone_address);
g_sdb_addr : t_wishbone_address;
g_sdb_name : string := "WB4-Crossbar-GSI ");
port(
clk_sys_i : in std_logic;
rst_n_i : in std_logic;
......@@ -188,7 +189,8 @@ begin
generic map(
g_layout => c_layout,
g_masters => g_num_masters,
g_bus_end => c_bus_last)
g_bus_end => c_bus_last,
g_sdb_name => g_sdb_name)
port map(
clk_sys_i => clk_sys_i,
master_i => sdb_sel,
......
modules/wishbone/wishbone_pkg.vhd
View file @ b6448210
......@@ -111,7 +111,7 @@ package wishbone_pkg is
function f_string2svl (s : string) return std_logic_vector;
function f_slv2string (slv : std_logic_vector) return string;
function f_string_fix_len( s : string; ret_len : natural := 10; fill_char : character := '0' ) return string;
function f_string_fix_len( s : string; ret_len : natural := 10; fill_char : character := '0'; justify_right : boolean := true ) return string;
function f_hot_to_bin(x : std_logic_vector) return natural;
-- *** Wishbone slave interface functions ***
......@@ -226,8 +226,8 @@ package wishbone_pkg is
function f_sdb_extract_synthesis(sdb_record : t_sdb_record) return t_sdb_synthesis;
-- Automatic crossbar mapping functions
function f_sdb_auto_device(device : t_sdb_device; enable : boolean := true) return t_sdb_record;
function f_sdb_auto_bridge(bridge : t_sdb_bridge; enable : boolean := true) return t_sdb_record;
function f_sdb_auto_device(device : t_sdb_device; enable : boolean := true; name: string := "") return t_sdb_record;
function f_sdb_auto_bridge(bridge : t_sdb_bridge; enable : boolean := true; name: string := "") return t_sdb_record;
function f_sdb_auto_msi (msi : t_sdb_msi; enable : boolean := true) return t_sdb_record;
function f_sdb_auto_layout(records: t_sdb_record_array) return t_sdb_record_array;
function f_sdb_auto_layout(slaves : t_sdb_record_array; masters : t_sdb_record_array) return t_sdb_record_array;
......@@ -354,7 +354,8 @@ package wishbone_pkg is
g_num_slaves : integer;
g_registered : boolean;
g_address : t_wishbone_address_array;
g_mask : t_wishbone_address_array);
g_mask : t_wishbone_address_array;
g_sdb_name : string := "WB4-Crossbar-GSI ");
port (
clk_sys_i : in std_logic;
rst_n_i : in std_logic;
......@@ -442,7 +443,8 @@ package wishbone_pkg is
generic(
g_layout : t_sdb_record_array;
g_masters : natural;
g_bus_end : unsigned(63 downto 0));
g_bus_end : unsigned(63 downto 0);
g_sdb_name : string := "WB4-Crossbar-GSI ");
port(
clk_sys_i : in std_logic;
master_i : in std_logic_vector(g_masters-1 downto 0);
......@@ -1454,32 +1456,38 @@ package body wishbone_pkg is
return result;
end;
function f_sdb_auto_device(device : t_sdb_device; enable : boolean := true)
function f_sdb_auto_device(device : t_sdb_device; enable : boolean := true; name: string := "")
return t_sdb_record
is
constant c_zero : t_wishbone_address := (others => '0');
variable v_device: t_sdb_device := device;
variable v_empty : t_sdb_record := (others => '0');
begin
v_empty(7 downto 0) := x"f1";
if name /= "" then
v_device.sdb_component.product.name := f_string_fix_len(name , 19, ' ', false);
end if;
if enable then
return f_sdb_embed_device(device, c_zero);
else
return v_empty;
v_empty := f_sdb_embed_device(v_device, c_zero);
end if;
return v_empty;
end f_sdb_auto_device;
function f_sdb_auto_bridge(bridge : t_sdb_bridge; enable : boolean := true)
function f_sdb_auto_bridge(bridge : t_sdb_bridge; enable : boolean := true; name: string := "")
return t_sdb_record
is
constant c_zero : t_wishbone_address := (others => '0');
variable v_bridge: t_sdb_bridge := bridge;
variable v_empty : t_sdb_record := (others => '0');
begin
v_empty(7 downto 0) := x"f2";
if name /= "" then
v_bridge.sdb_component.product.name := f_string_fix_len(name , 19, ' ', false);
end if;
if enable then
return f_sdb_embed_bridge(bridge, c_zero);
else
return v_empty;
v_empty := f_sdb_embed_bridge(v_bridge, c_zero);
end if;
return v_empty;
end f_sdb_auto_bridge;
function f_sdb_auto_msi(msi : t_sdb_msi; enable : boolean := true)
......@@ -2065,16 +2073,20 @@ package body wishbone_pkg is
end f_slv2string;
-- pads a string of unknown length to a given length (useful for integer'image)
function f_string_fix_len ( s : string; ret_len : natural := 10; fill_char : character := '0' ) return string is
function f_string_fix_len ( s : string; ret_len : natural := 10; fill_char : character := '0'; justify_right : boolean := true ) return string is
variable ret_v : string (1 to ret_len);
constant pad_len : integer := ret_len - s'length ;
variable pad_v : string (1 to abs(pad_len));
begin
if pad_len < 1 then
if pad_len < 1 then
ret_v := s(ret_v'range);
else
pad_v := (others => fill_char);
ret_v := pad_v & s;
if justify_right then
ret_v := pad_v & s;
else
ret_v := s & pad_v ;
end if;
end if;
return ret_v;
end f_string_fix_len;
......
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