Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
wr-nic
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
white-rabbit
wr-nic
Commits
a58b4bf1
Commit
a58b4bf1
authored
Apr 03, 2013
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update components
parent
a20529b4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
67 deletions
+67
-67
wrnic_sdb_pkg.vhd
modules/wrsw_dio/wrnic_sdb_pkg.vhd
+45
-45
xwrsw_dio.vhd
modules/wrsw_dio/xwrsw_dio.vhd
+8
-8
wr_nic_sdb_top.vhd
top/spec/wr_nic_sdb_top.vhd
+14
-14
No files found.
modules/wrsw_dio/wrnic_sdb_pkg.vhd
View file @
a58b4bf1
...
...
@@ -116,62 +116,62 @@ package wrnic_sdb_pkg is
-- The definition need to be unique and be included into wishbone_pkg
-------------------------------------------------------------------------------
constant
c_xwb_onewire_master_sdb
:
t_sdb_device
:
=
(
abi_class
=>
x"0000"
,
-- undocumented device
abi_ver_major
=>
x"01"
,
abi_ver_minor
=>
x"01"
,
wbd_endian
=>
c_sdb_endian_big
,
wbd_width
=>
x"7"
,
-- 8/16/32-bit port granularity
sdb_component
=>
(
addr_first
=>
x"0000000000000000"
,
addr_last
=>
x"00000000000000ff"
,
product
=>
(
vendor_id
=>
x"000000000000CE42"
,
-- CERN
device_id
=>
x"779c5443"
,
version
=>
x"00000001"
,
date
=>
x"20120305"
,
name
=>
"WR-1Wire-master "
)));
--
constant c_xwb_onewire_master_sdb : t_sdb_device := (
--
abi_class => x"0000", -- undocumented device
--
abi_ver_major => x"01",
--
abi_ver_minor => x"01",
--
wbd_endian => c_sdb_endian_big,
--
wbd_width => x"7", -- 8/16/32-bit port granularity
--
sdb_component => (
--
addr_first => x"0000000000000000",
--
addr_last => x"00000000000000ff",
--
product => (
--
vendor_id => x"000000000000CE42", -- CERN
--
device_id => x"779c5443",
--
version => x"00000001",
--
date => x"20120305",
--
name => "WR-1Wire-master ")));
-------------------------------------------------------------------------------
-- WB I2C MASTER --> TBD: move to wishbone_pkg
-------------------------------------------------------------------------------
constant
c_xwb_i2c_master_sdb
:
t_sdb_device
:
=
(
abi_class
=>
x"0000"
,
-- undocumented device
abi_ver_major
=>
x"01"
,
abi_ver_minor
=>
x"01"
,
wbd_endian
=>
c_sdb_endian_big
,
wbd_width
=>
x"7"
,
-- 8/16/32-bit port granularity
sdb_component
=>
(
addr_first
=>
x"0000000000000000"
,
addr_last
=>
x"00000000000000ff"
,
product
=>
(
vendor_id
=>
x"000000000000CE42"
,
-- CERN
device_id
=>
x"123c5443"
,
version
=>
x"00000001"
,
date
=>
x"20000101"
,
-- UNKNOWN
name
=>
"WB-I2C-Master "
)));
--
constant c_xwb_i2c_master_sdb : t_sdb_device := (
--
abi_class => x"0000", -- undocumented device
--
abi_ver_major => x"01",
--
abi_ver_minor => x"01",
--
wbd_endian => c_sdb_endian_big,
--
wbd_width => x"7", -- 8/16/32-bit port granularity
--
sdb_component => (
--
addr_first => x"0000000000000000",
--
addr_last => x"00000000000000ff",
--
product => (
--
vendor_id => x"000000000000CE42", -- CERN
--
device_id => x"123c5443",
--
version => x"00000001",
--
date => x"20000101", -- UNKNOWN
--
name => "WB-I2C-Master ")));
-------------------------------------------------------------------------------
-- WB GPIO --> TBD: move to wishbone_pkg
-------------------------------------------------------------------------------
constant
c_xwb_gpio_port_sdb
:
t_sdb_device
:
=
(
abi_class
=>
x"0000"
,
-- undocumented device
abi_ver_major
=>
x"01"
,
abi_ver_minor
=>
x"01"
,
wbd_endian
=>
c_sdb_endian_big
,
wbd_width
=>
x"7"
,
-- 8/16/32-bit port granularity
sdb_component
=>
(
addr_first
=>
x"0000000000000000"
,
addr_last
=>
x"00000000000000ff"
,
product
=>
(
vendor_id
=>
x"000000000000CE42"
,
-- CERN
device_id
=>
x"441c5143"
,
version
=>
x"00000001"
,
date
=>
x"20000101"
,
-- UNKNOWN
name
=>
"WB-GPIO-Port "
)));
--
constant c_xwb_gpio_port_sdb : t_sdb_device := (
--
abi_class => x"0000", -- undocumented device
--
abi_ver_major => x"01",
--
abi_ver_minor => x"01",
--
wbd_endian => c_sdb_endian_big,
--
wbd_width => x"7", -- 8/16/32-bit port granularity
--
sdb_component => (
--
addr_first => x"0000000000000000",
--
addr_last => x"00000000000000ff",
--
product => (
--
vendor_id => x"000000000000CE42", -- CERN
--
device_id => x"441c5143",
--
version => x"00000001",
--
date => x"20000101", -- UNKNOWN
--
name => "WB-GPIO-Port ")));
------------------------------------------------------------------------------
-- SDB re-declaration of bridges function to include product info
...
...
modules/wrsw_dio/xwrsw_dio.vhd
View file @
a58b4bf1
...
...
@@ -157,17 +157,17 @@ architecture rtl of xwrsw_dio is
-- 1: time given on tm_seconds_i and tm_cycles_i is valid (otherwise, don't timestamp)
tm_time_valid_i
:
in
std_logic
;
-- number of seconds
tm_
utc
_i
:
in
std_logic_vector
(
39
downto
0
);
tm_
tai
_i
:
in
std_logic_vector
(
39
downto
0
);
-- number of clk_ref_i cycles
tm_cycles_i
:
in
std_logic_vector
(
27
downto
0
);
---------------------------------------------------------------------------
-- Time tag output (clk_sys_i domain)
---------------------------------------------------------------------------
tag_
utc_o
:
out
std_logic_vector
(
39
downto
0
);
tag_cycles_o
:
out
std_logic_vector
(
27
downto
0
);
tag_
tai_o
:
out
std_logic_vector
(
39
downto
0
);
tag_cycles_o
:
out
std_logic_vector
(
27
downto
0
);
-- single-cycle pulse: strobe tag on tag_seconds_o and tag_cycles_o
tag_valid_
p1_o
:
out
std_logic
tag_valid_
o
:
out
std_logic
);
end
component
;
...
...
@@ -456,12 +456,12 @@ begin
-- tm_utc_i => tm_seconds,
-- tm_cycles_i => tm_cycles,
tm_time_valid_i
=>
tm_time_valid_i
,
tm_
utc
_i
=>
tm_seconds_i
,
tm_
tai
_i
=>
tm_seconds_i
,
tm_cycles_i
=>
tm_cycles_i
,
tag_
utc_o
=>
tag_seconds
(
i
),
tag_cycles_o
=>
tag_cycles
(
i
),
tag_valid_
p1_
o
=>
tag_valid_p1
(
i
));
tag_
tai_o
=>
tag_seconds
(
i
),
tag_cycles_o
=>
tag_cycles
(
i
),
tag_valid_o
=>
tag_valid_p1
(
i
));
end
generate
gen_pulse_modules
;
...
...
top/spec/wr_nic_sdb_top.vhd
View file @
a58b4bf1
...
...
@@ -872,19 +872,19 @@ begin
phy_rst_o
=>
phy_rst
,
phy_loopen_o
=>
phy_loopen
,
led_
red_o
=>
LED_RED
,
led_
green
_o
=>
LED_GREEN
,
scl_o
=>
wrc_scl_o
,
scl_i
=>
wrc_scl_i
,
sda_o
=>
wrc_sda_o
,
sda_i
=>
wrc_sda_i
,
sfp_scl_o
=>
sfp_scl_o
,
sfp_scl_i
=>
sfp_scl_i
,
sfp_sda_o
=>
sfp_sda_o
,
sfp_sda_i
=>
sfp_sda_i
,
sfp_det_i
=>
sfp_mod_def0_b
,
btn1_i
=>
button1_i
,
btn2_i
=>
button2_i
,
led_
act_o
=>
LED_RED
,
led_
link
_o
=>
LED_GREEN
,
scl_o
=>
wrc_scl_o
,
scl_i
=>
wrc_scl_i
,
sda_o
=>
wrc_sda_o
,
sda_i
=>
wrc_sda_i
,
sfp_scl_o
=>
sfp_scl_o
,
sfp_scl_i
=>
sfp_scl_i
,
sfp_sda_o
=>
sfp_sda_o
,
sfp_sda_i
=>
sfp_sda_i
,
sfp_det_i
=>
sfp_mod_def0_b
,
btn1_i
=>
button1_i
,
btn2_i
=>
button2_i
,
uart_rxd_i
=>
uart_rxd_i
,
uart_txd_o
=>
uart_txd_o
,
...
...
@@ -908,7 +908,7 @@ begin
tm_clk_aux_lock_en_i
=>
'0'
,
tm_clk_aux_locked_o
=>
open
,
tm_time_valid_o
=>
tm_time_valid
,
tm_
utc
_o
=>
tm_seconds
,
tm_
tai
_o
=>
tm_seconds
,
tm_cycles_o
=>
tm_cycles
,
pps_p_o
=>
pps
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment