From 302c44515c1794a8b5d7e3bd232095be9d6778fc Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Fri, 4 Sep 2015 09:15:02 +0000
Subject: [PATCH] -Replaced avs_eth_0 instance with the RadioHDL-compatible
one.
---
.../src/quartus/sopc_aartfaac_bn_sdo.sopc | 200 +++++++++---------
1 file changed, 100 insertions(+), 100 deletions(-)
diff --git a/applications/aartfaac/designs/aartfaac_bn_sdo/src/quartus/sopc_aartfaac_bn_sdo.sopc b/applications/aartfaac/designs/aartfaac_bn_sdo/src/quartus/sopc_aartfaac_bn_sdo.sopc
index 27a723751a..96947fd33b 100644
--- a/applications/aartfaac/designs/aartfaac_bn_sdo/src/quartus/sopc_aartfaac_bn_sdo.sopc
+++ b/applications/aartfaac/designs/aartfaac_bn_sdo/src/quartus/sopc_aartfaac_bn_sdo.sopc
@@ -22,7 +22,7 @@
{
datum _sortIndex
{
- value = "10";
+ value = "27";
type = "int";
}
}
@@ -100,71 +100,76 @@
type = "String";
}
}
- element reg_stable_monitor.mem
+ element reg_bsn_monitor_subband.mem
{
datum baseAddress
{
- value = "12304";
+ value = "24576";
type = "long";
}
}
- element reg_dp_offload_tx.mem
+ element ram_ss_ss_wide.mem
{
datum baseAddress
{
- value = "12320";
+ value = "262144";
type = "long";
}
}
- element reg_bsn_monitor_beamlet.mem
+ element reg_unb_sens.mem
{
datum baseAddress
{
- value = "1024";
+ value = "928";
type = "long";
}
}
- element ram_ss_reorder_out.mem
+ element ram_ss_reorder_in.mem
{
datum baseAddress
{
- value = "20480";
+ value = "26624";
type = "long";
}
}
- element ram_diag_data_buffer.mem
+ element reg_wdi.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "65536";
+ value = "12288";
type = "long";
}
}
- element reg_bsn_monitor.mem
+ element reg_stable_monitor.mem
{
datum baseAddress
{
- value = "25600";
+ value = "12304";
type = "long";
}
}
- element ram_ss_ss_wide.mem
+ element reg_bsn_monitor_beamlet.mem
{
datum baseAddress
{
- value = "262144";
+ value = "1024";
type = "long";
}
}
- element pio_pps.mem
+ element ram_diag_data_buffer.mem
{
datum baseAddress
{
- value = "2048";
+ value = "65536";
type = "long";
}
}
- element reg_wdi.mem
+ element rom_system_info.mem
{
datum _lockedAddress
{
@@ -173,15 +178,15 @@
}
datum baseAddress
{
- value = "12288";
+ value = "4096";
type = "long";
}
}
- element reg_tr_nonbonded.mem
+ element pio_pps.mem
{
datum baseAddress
{
- value = "768";
+ value = "2048";
type = "long";
}
}
@@ -198,72 +203,67 @@
type = "long";
}
}
- element reg_diag_data_buffer.mem
+ element ram_ss_reorder_out.mem
{
datum baseAddress
{
- value = "128";
+ value = "20480";
type = "long";
}
}
- element reg_bsn_monitor_subband.mem
+ element reg_bsn_monitor_crosslet.mem
{
datum baseAddress
{
- value = "24576";
+ value = "13312";
type = "long";
}
}
- element reg_diagnostics.mem
+ element reg_dp_offload_tx.mem
{
datum baseAddress
{
- value = "256";
+ value = "12320";
type = "long";
}
}
- element reg_bsn_monitor_crosslet.mem
+ element reg_dp_offload_tx_hdr_dat.mem
{
datum baseAddress
{
- value = "13312";
+ value = "512";
type = "long";
}
}
- element ram_ss_reorder_in.mem
+ element reg_tr_nonbonded.mem
{
datum baseAddress
{
- value = "26624";
+ value = "768";
type = "long";
}
}
- element rom_system_info.mem
+ element reg_diagnostics.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "4096";
+ value = "256";
type = "long";
}
}
- element reg_dp_offload_tx_hdr_dat.mem
+ element reg_bsn_monitor.mem
{
datum baseAddress
{
- value = "512";
+ value = "25600";
type = "long";
}
}
- element reg_unb_sens.mem
+ element reg_diag_data_buffer.mem
{
datum baseAddress
{
- value = "928";
+ value = "128";
type = "long";
}
}
@@ -316,7 +316,7 @@
{
datum _sortIndex
{
- value = "27";
+ value = "26";
type = "int";
}
}
@@ -324,7 +324,7 @@
{
datum _sortIndex
{
- value = "13";
+ value = "12";
type = "int";
}
}
@@ -358,7 +358,7 @@
{
datum _sortIndex
{
- value = "19";
+ value = "18";
type = "int";
}
}
@@ -366,7 +366,7 @@
{
datum _sortIndex
{
- value = "22";
+ value = "21";
type = "int";
}
}
@@ -374,7 +374,7 @@
{
datum _sortIndex
{
- value = "23";
+ value = "22";
type = "int";
}
}
@@ -382,7 +382,7 @@
{
datum _sortIndex
{
- value = "21";
+ value = "20";
type = "int";
}
}
@@ -390,7 +390,7 @@
{
datum _sortIndex
{
- value = "20";
+ value = "19";
type = "int";
}
}
@@ -398,7 +398,7 @@
{
datum _sortIndex
{
- value = "15";
+ value = "14";
type = "int";
}
}
@@ -406,7 +406,7 @@
{
datum _sortIndex
{
- value = "16";
+ value = "15";
type = "int";
}
}
@@ -414,7 +414,7 @@
{
datum _sortIndex
{
- value = "17";
+ value = "16";
type = "int";
}
}
@@ -422,7 +422,7 @@
{
datum _sortIndex
{
- value = "18";
+ value = "17";
type = "int";
}
}
@@ -438,7 +438,7 @@
{
datum _sortIndex
{
- value = "26";
+ value = "25";
type = "int";
}
}
@@ -446,7 +446,7 @@
{
datum _sortIndex
{
- value = "25";
+ value = "24";
type = "int";
}
}
@@ -454,7 +454,7 @@
{
datum _sortIndex
{
- value = "24";
+ value = "23";
type = "int";
}
}
@@ -470,7 +470,7 @@
{
datum _sortIndex
{
- value = "12";
+ value = "11";
type = "int";
}
}
@@ -478,7 +478,7 @@
{
datum _sortIndex
{
- value = "14";
+ value = "13";
type = "int";
}
}
@@ -486,23 +486,23 @@
{
datum _sortIndex
{
- value = "11";
+ value = "10";
type = "int";
}
}
- element pio_debug_wave.s1
+ element timer_0.s1
{
datum baseAddress
{
- value = "976";
+ value = "896";
type = "long";
}
}
- element timer_0.s1
+ element pio_debug_wave.s1
{
datum baseAddress
{
- value = "896";
+ value = "976";
type = "long";
}
}
@@ -550,10 +550,10 @@
<parameter name="globalResetBus" value="true" />
<parameter name="hdlLanguage" value="VHDL" />
<parameter name="maxAdditionalLatency" value="0" />
- <parameter name="projectName" value="" />
+ <parameter name="projectName" value="aartfaac_bn_sdo.qpf" />
<parameter name="sopcBorderPoints" value="true" />
<parameter name="systemHash" value="-105761453609" />
- <parameter name="timeStamp" value="1435833898909" />
+ <parameter name="timeStamp" value="1441357659033" />
<parameter name="useTestBenchNamingPattern" value="false" />
<module kind="clock_source" version="11.1" enabled="1" name="clk_0">
<parameter name="clockFrequency" value="25000000" />
@@ -931,9 +931,6 @@ q]]></parameter>
<parameter name="timeoutPulseOutput" value="false" />
<parameter name="timerPreset">SIMPLE_PERIODIC_INTERRUPT</parameter>
</module>
- <module kind="avs_eth_coe" version="1.0" enabled="1" name="avs_eth_0">
- <parameter name="AUTO_MM_CLOCK_RATE" value="125000000" />
- </module>
<module kind="avs_common_mm" version="1.0" enabled="1" name="rom_system_info">
<parameter name="g_adr_w" value="10" />
<parameter name="g_dat_w" value="32" />
@@ -1059,6 +1056,9 @@ q]]></parameter>
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="125000000" />
</module>
+ <module kind="avs2_eth_coe" version="1.0" enabled="1" name="avs_eth_0">
+ <parameter name="AUTO_MM_CLOCK_RATE" value="125000000" />
+ </module>
<connection
kind="avalon"
version="11.1"
@@ -1186,38 +1186,6 @@ q]]></parameter>
<connection kind="interrupt" version="11.1" start="cpu_0.d_irq" end="timer_0.irq">
<parameter name="irqNumber" value="1" />
</connection>
- <connection kind="clock" version="11.1" start="altpll_0.c0" end="avs_eth_0.mm" />
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="avs_eth_0.mms_tse">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x2000" />
- </connection>
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="avs_eth_0.mms_reg">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0340" />
- </connection>
- <connection
- kind="avalon"
- version="11.1"
- start="cpu_0.data_master"
- end="avs_eth_0.mms_ram">
- <parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x4000" />
- </connection>
- <connection
- kind="interrupt"
- version="11.1"
- start="cpu_0.d_irq"
- end="avs_eth_0.interrupt">
- <parameter name="irqNumber" value="2" />
- </connection>
<connection
kind="clock"
version="11.1"
@@ -1431,4 +1399,36 @@ q]]></parameter>
<parameter name="arbitrationPriority" value="1" />
<parameter name="baseAddress" value="0x0800" />
</connection>
+ <connection kind="clock" version="11.1" start="altpll_0.c0" end="avs_eth_0.mm" />
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="avs_eth_0.mms_tse">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x2000" />
+ </connection>
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="avs_eth_0.mms_reg">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x0340" />
+ </connection>
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="avs_eth_0.mms_ram">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x4000" />
+ </connection>
+ <connection
+ kind="interrupt"
+ version="11.1"
+ start="cpu_0.d_irq"
+ end="avs_eth_0.interrupt">
+ <parameter name="irqNumber" value="2" />
+ </connection>
</system>
--
GitLab