Skip to content
Snippets Groups Projects
Commit 444713ad authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Merge branch 'L2SDP-133' into 'master'

Resolve L2SDP-133

Closes L2SDP-133

See merge request desp/hdl!48
parents 90d15c36 7f0fc211
No related branches found
No related tags found
2 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!48Resolve L2SDP-133
Showing
with 22085 additions and 20265 deletions
...@@ -208,7 +208,7 @@ BEGIN ...@@ -208,7 +208,7 @@ BEGIN
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Diagnostic Data Buffer (Records 8192 raw ADC samples after the PPS) -- Diagnostic Data Buffer (Records 1024 raw ADC samples after the PPS)
-- ToDo: Remove this JESD DB when the second (BSN) data buffer is working correctly -- ToDo: Remove this JESD DB when the second (BSN) data buffer is working correctly
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
...@@ -217,7 +217,7 @@ BEGIN ...@@ -217,7 +217,7 @@ BEGIN
g_technology => g_technology, g_technology => g_technology,
g_nof_streams => c_nof_streams_db, g_nof_streams => c_nof_streams_db,
g_data_w => c_data_w, g_data_w => c_data_w,
g_buf_nof_data => 8192, g_buf_nof_data => 1024,
g_buf_use_sync => TRUE -- when TRUE start filling the buffer at the in_sync, else after the last word was read g_buf_use_sync => TRUE -- when TRUE start filling the buffer at the in_sync, else after the last word was read
) )
PORT MAP ( PORT MAP (
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<spirit:parameter> <spirit:parameter>
<spirit:name>addressSpan</spirit:name> <spirit:name>addressSpan</spirit:name>
<spirit:displayName>Address span</spirit:displayName> <spirit:displayName>Address span</spirit:displayName>
<spirit:value spirit:format="string" spirit:id="addressSpan">8192</spirit:value> <spirit:value spirit:format="string" spirit:id="addressSpan">65536</spirit:value>
</spirit:parameter> </spirit:parameter>
<spirit:parameter> <spirit:parameter>
<spirit:name>addressUnits</spirit:name> <spirit:name>addressUnits</spirit:name>
...@@ -607,7 +607,7 @@ ...@@ -607,7 +607,7 @@
<spirit:direction>in</spirit:direction> <spirit:direction>in</spirit:direction>
<spirit:vector> <spirit:vector>
<spirit:left>0</spirit:left> <spirit:left>0</spirit:left>
<spirit:right>10</spirit:right> <spirit:right>13</spirit:right>
</spirit:vector> </spirit:vector>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
<spirit:wireTypeDef> <spirit:wireTypeDef>
...@@ -703,7 +703,7 @@ ...@@ -703,7 +703,7 @@
<spirit:direction>out</spirit:direction> <spirit:direction>out</spirit:direction>
<spirit:vector> <spirit:vector>
<spirit:left>0</spirit:left> <spirit:left>0</spirit:left>
<spirit:right>10</spirit:right> <spirit:right>13</spirit:right>
</spirit:vector> </spirit:vector>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
<spirit:wireTypeDef> <spirit:wireTypeDef>
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
<spirit:parameter> <spirit:parameter>
<spirit:name>g_adr_w</spirit:name> <spirit:name>g_adr_w</spirit:name>
<spirit:displayName>g_adr_w</spirit:displayName> <spirit:displayName>g_adr_w</spirit:displayName>
<spirit:value spirit:format="long" spirit:id="g_adr_w">11</spirit:value> <spirit:value spirit:format="long" spirit:id="g_adr_w">14</spirit:value>
</spirit:parameter> </spirit:parameter>
<spirit:parameter> <spirit:parameter>
<spirit:name>g_dat_w</spirit:name> <spirit:name>g_dat_w</spirit:name>
...@@ -846,7 +846,7 @@ ...@@ -846,7 +846,7 @@
<name>coe_address_export</name> <name>coe_address_export</name>
<role>export</role> <role>export</role>
<direction>Output</direction> <direction>Output</direction>
<width>11</width> <width>14</width>
<lowerBound>0</lowerBound> <lowerBound>0</lowerBound>
<vhdlType>STD_LOGIC_VECTOR</vhdlType> <vhdlType>STD_LOGIC_VECTOR</vhdlType>
</port> </port>
...@@ -910,7 +910,7 @@ ...@@ -910,7 +910,7 @@
<name>avs_mem_address</name> <name>avs_mem_address</name>
<role>address</role> <role>address</role>
<direction>Input</direction> <direction>Input</direction>
<width>11</width> <width>14</width>
<lowerBound>0</lowerBound> <lowerBound>0</lowerBound>
<vhdlType>STD_LOGIC_VECTOR</vhdlType> <vhdlType>STD_LOGIC_VECTOR</vhdlType>
</port> </port>
...@@ -979,7 +979,7 @@ ...@@ -979,7 +979,7 @@
</entry> </entry>
<entry> <entry>
<key>addressSpan</key> <key>addressSpan</key>
<value>8192</value> <value>65536</value>
</entry> </entry>
<entry> <entry>
<key>addressUnits</key> <key>addressUnits</key>
...@@ -1374,11 +1374,11 @@ ...@@ -1374,11 +1374,11 @@
<consumedSystemInfos> <consumedSystemInfos>
<entry> <entry>
<key>ADDRESS_MAP</key> <key>ADDRESS_MAP</key>
<value>&lt;address-map&gt;&lt;slave name='mem' start='0x0' end='0x2000' datawidth='32' /&gt;&lt;/address-map&gt;</value> <value>&lt;address-map&gt;&lt;slave name='mem' start='0x0' end='0x10000' datawidth='32' /&gt;&lt;/address-map&gt;</value>
</entry> </entry>
<entry> <entry>
<key>ADDRESS_WIDTH</key> <key>ADDRESS_WIDTH</key>
<value>13</value> <value>16</value>
</entry> </entry>
<entry> <entry>
<key>MAX_SLAVE_DATA_WIDTH</key> <key>MAX_SLAVE_DATA_WIDTH</key>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment