move interrupt capturer to 0x0000_0f00

the-snowwhite · the-snowwhite · commit 40f00ab2f34e · 2018-06-01T16:42:45.000+02:00
Signed-off-by: Michael Brown &lt;producer@holotronic.dk&gt;
diff --git a/HW/QuartusProjects/DE0_Nano_SoC_Cramps/soc_system.qsys b/HW/QuartusProjects/DE0_Nano_SoC_Cramps/soc_system.qsys
@@ -13,7 +13,7 @@
    {
       datum _sortIndex
       {
-         value = "9";
+         value = "10";
          type = "int";
       }
    }
@@ -26,7 +26,7 @@
       }
       datum baseAddress
       {
-         value = "20672";
+         value = "20480";
          type = "String";
       }
    }
@@ -42,7 +42,7 @@
    {
       datum _sortIndex
       {
-         value = "8";
+         value = "9";
          type = "int";
       }
    }
@@ -124,7 +124,7 @@
    {
       datum _sortIndex
       {
-         value = "11";
+         value = "5";
          type = "int";
       }
    }
@@ -142,15 +142,15 @@
       }
       datum baseAddress
       {
-         value = "196608";
+         value = "3840";
          type = "String";
       }
    }
    element jtag_uart
    {
       datum _sortIndex
       {
-         value = "6";
+         value = "7";
          type = "int";
       }
    }
@@ -171,7 +171,7 @@
    {
       datum _sortIndex
       {
-         value = "7";
+         value = "8";
          type = "int";
       }
    }
@@ -184,7 +184,7 @@
       }
       datum baseAddress
       {
-         value = "12352";
+         value = "12288";
          type = "String";
       }
    }
@@ -208,7 +208,7 @@
    {
       datum _sortIndex
       {
-         value = "10";
+         value = "11";
          type = "int";
       }
    }
@@ -365,7 +365,7 @@
    {
       datum _sortIndex
       {
-         value = "5";
+         value = "6";
          type = "int";
       }
    }
@@ -1173,7 +1173,7 @@
    start="mm_bridge_0.m0"
    end="button_pio.s1">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x50c0" />
+  <parameter name="baseAddress" value="0x5000" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
@@ -1187,7 +1187,7 @@
  </connection>
  <connection kind="avalon" version="15.1" start="mm_bridge_0.m0" end="led_pio.s1">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x3040" />
+  <parameter name="baseAddress" value="0x3000" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
@@ -1223,7 +1223,7 @@
    start="fpga_only_master.master"
    end="intr_capturer_0.avalon_slave_0">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00030000" />
+  <parameter name="baseAddress" value="0x0f00" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
@@ -1250,7 +1250,7 @@
    start="fpga_only_master.master"
    end="led_pio.s1">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x3040" />
+  <parameter name="baseAddress" value="0x3000" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
@@ -1268,7 +1268,7 @@
    start="fpga_only_master.master"
    end="button_pio.s1">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x50c0" />
+  <parameter name="baseAddress" value="0x5000" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
diff --git a/HW/QuartusProjects/DE0_Nano_SoC_DB25/soc_system.qsys b/HW/QuartusProjects/DE0_Nano_SoC_DB25/soc_system.qsys
@@ -13,7 +13,7 @@
    {
       datum _sortIndex
       {
-         value = "9";
+         value = "10";
          type = "int";
       }
    }
@@ -42,7 +42,7 @@
    {
       datum _sortIndex
       {
-         value = "8";
+         value = "9";
          type = "int";
       }
    }
@@ -124,7 +124,7 @@
    {
       datum _sortIndex
       {
-         value = "11";
+         value = "5";
          type = "int";
       }
    }
@@ -142,15 +142,15 @@
       }
       datum baseAddress
       {
-         value = "196608";
+         value = "3840";
          type = "String";
       }
    }
    element jtag_uart
    {
       datum _sortIndex
       {
-         value = "6";
+         value = "7";
          type = "int";
       }
    }
@@ -171,7 +171,7 @@
    {
       datum _sortIndex
       {
-         value = "7";
+         value = "8";
          type = "int";
       }
    }
@@ -208,7 +208,7 @@
    {
       datum _sortIndex
       {
-         value = "10";
+         value = "11";
          type = "int";
       }
    }
@@ -365,7 +365,7 @@
    {
       datum _sortIndex
       {
-         value = "5";
+         value = "6";
          type = "int";
       }
    }
@@ -1234,7 +1234,7 @@
    start="fpga_only_master.master"
    end="intr_capturer_0.avalon_slave_0">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00030000" />
+  <parameter name="baseAddress" value="0x0f00" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
diff --git a/HW/QuartusProjects/DE10_Nano_FB_Cramps/soc_system.qsys b/HW/QuartusProjects/DE10_Nano_FB_Cramps/soc_system.qsys
@@ -63,7 +63,7 @@
    {
       datum _sortIndex
       {
-         value = "10";
+         value = "11";
          type = "int";
       }
       datum sopceditor_expanded
@@ -102,7 +102,7 @@
    {
       datum _sortIndex
       {
-         value = "9";
+         value = "10";
          type = "int";
       }
       datum sopceditor_expanded
@@ -212,7 +212,7 @@
    {
       datum _sortIndex
       {
-         value = "11";
+         value = "6";
          type = "int";
       }
    }
@@ -225,15 +225,15 @@
       }
       datum baseAddress
       {
-         value = "24576";
+         value = "28416";
          type = "String";
       }
    }
    element jtag_uart
    {
       datum _sortIndex
       {
-         value = "7";
+         value = "8";
          type = "int";
       }
       datum sopceditor_expanded
@@ -259,7 +259,7 @@
    {
       datum _sortIndex
       {
-         value = "8";
+         value = "9";
          type = "int";
       }
       datum sopceditor_expanded
@@ -349,7 +349,7 @@
    {
       datum _sortIndex
       {
-         value = "6";
+         value = "7";
          type = "int";
       }
       datum sopceditor_expanded
@@ -1424,7 +1424,7 @@
    start="mm_bridge_0.m0"
    end="intr_capturer_0.avalon_slave_0">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x6000" />
+  <parameter name="baseAddress" value="0x6f00" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
@@ -1501,7 +1501,7 @@
    start="fpga_only_master.master"
    end="intr_capturer_0.avalon_slave_0">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x6000" />
+  <parameter name="baseAddress" value="0x6f00" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection
diff --git a/HW/QuartusProjects/DE10_Nano_SoC_FB_DB25/soc_system.qsys b/HW/QuartusProjects/DE10_Nano_SoC_FB_DB25/soc_system.qsys
@@ -42,7 +42,7 @@
    {
       datum _sortIndex
       {
-         value = "11";
+         value = "12";
          type = "int";
       }
       datum sopceditor_expanded
@@ -89,7 +89,7 @@
    {
       datum _sortIndex
       {
-         value = "10";
+         value = "11";
          type = "int";
       }
       datum sopceditor_expanded
@@ -196,7 +196,7 @@
    {
       datum _sortIndex
       {
-         value = "13";
+         value = "7";
          type = "int";
       }
    }
@@ -209,15 +209,15 @@
       }
       datum baseAddress
       {
-         value = "196608";
+         value = "3840";
          type = "String";
       }
    }
    element jtag_uart
    {
       datum _sortIndex
       {
-         value = "8";
+         value = "9";
          type = "int";
       }
       datum sopceditor_expanded
@@ -243,7 +243,7 @@
    {
       datum _sortIndex
       {
-         value = "9";
+         value = "10";
          type = "int";
       }
       datum sopceditor_expanded
@@ -285,7 +285,7 @@
    {
       datum _sortIndex
       {
-         value = "12";
+         value = "13";
          type = "int";
       }
    }
@@ -322,7 +322,7 @@
    {
       datum _sortIndex
       {
-         value = "7";
+         value = "8";
          type = "int";
       }
       datum sopceditor_expanded
@@ -1482,7 +1482,7 @@
    start="fpga_only_master.master"
    end="intr_capturer_0.avalon_slave_0">
   <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00030000" />
+  <parameter name="baseAddress" value="0x0f00" />
   <parameter name="defaultConnection" value="false" />
  </connection>
  <connection

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`{`
`14`	`14`	`datum _sortIndex`
`15`	`15`	`{`
`16`		`- value = "9";`
	`16`	`+ value = "10";`
`17`	`17`	`type = "int";`
`18`	`18`	`}`
`19`	`19`	`}`
`@@ -26,7 +26,7 @@`
`26`	`26`	`}`
`27`	`27`	`datum baseAddress`
`28`	`28`	`{`
`29`		`- value = "20672";`
	`29`	`+ value = "20480";`
`30`	`30`	`type = "String";`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -42,7 +42,7 @@`
`42`	`42`	`{`
`43`	`43`	`datum _sortIndex`
`44`	`44`	`{`
`45`		`- value = "8";`
	`45`	`+ value = "9";`
`46`	`46`	`type = "int";`
`47`	`47`	`}`
`48`	`48`	`}`
`@@ -124,7 +124,7 @@`
`124`	`124`	`{`
`125`	`125`	`datum _sortIndex`
`126`	`126`	`{`
`127`		`- value = "11";`
	`127`	`+ value = "5";`
`128`	`128`	`type = "int";`
`129`	`129`	`}`
`130`	`130`	`}`
`@@ -142,15 +142,15 @@`
`142`	`142`	`}`
`143`	`143`	`datum baseAddress`
`144`	`144`	`{`
`145`		`- value = "196608";`
	`145`	`+ value = "3840";`
`146`	`146`	`type = "String";`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`element jtag_uart`
`150`	`150`	`{`
`151`	`151`	`datum _sortIndex`
`152`	`152`	`{`
`153`		`- value = "6";`
	`153`	`+ value = "7";`
`154`	`154`	`type = "int";`
`155`	`155`	`}`
`156`	`156`	`}`
`@@ -171,7 +171,7 @@`
`171`	`171`	`{`
`172`	`172`	`datum _sortIndex`
`173`	`173`	`{`
`174`		`- value = "7";`
	`174`	`+ value = "8";`
`175`	`175`	`type = "int";`
`176`	`176`	`}`
`177`	`177`	`}`
`@@ -184,7 +184,7 @@`
`184`	`184`	`}`
`185`	`185`	`datum baseAddress`
`186`	`186`	`{`
`187`		`- value = "12352";`
	`187`	`+ value = "12288";`
`188`	`188`	`type = "String";`
`189`	`189`	`}`
`190`	`190`	`}`
`@@ -208,7 +208,7 @@`
`208`	`208`	`{`
`209`	`209`	`datum _sortIndex`
`210`	`210`	`{`
`211`		`- value = "10";`
	`211`	`+ value = "11";`
`212`	`212`	`type = "int";`
`213`	`213`	`}`
`214`	`214`	`}`
`@@ -365,7 +365,7 @@`
`365`	`365`	`{`
`366`	`366`	`datum _sortIndex`
`367`	`367`	`{`
`368`		`- value = "5";`
	`368`	`+ value = "6";`
`369`	`369`	`type = "int";`
`370`	`370`	`}`
`371`	`371`	`}`
`@@ -1173,7 +1173,7 @@`
`1173`	`1173`	`start="mm_bridge_0.m0"`
`1174`	`1174`	`end="button_pio.s1">`
`1175`	`1175`	`<parameter name="arbitrationPriority" value="1" />`
`1176`		`- <parameter name="baseAddress" value="0x50c0" />`
	`1176`	`+ <parameter name="baseAddress" value="0x5000" />`
`1177`	`1177`	`<parameter name="defaultConnection" value="false" />`
`1178`	`1178`	`</connection>`
`1179`	`1179`	`<connection`
`@@ -1187,7 +1187,7 @@`
`1187`	`1187`	`</connection>`
`1188`	`1188`	`<connection kind="avalon" version="15.1" start="mm_bridge_0.m0" end="led_pio.s1">`
`1189`	`1189`	`<parameter name="arbitrationPriority" value="1" />`
`1190`		`- <parameter name="baseAddress" value="0x3040" />`
	`1190`	`+ <parameter name="baseAddress" value="0x3000" />`
`1191`	`1191`	`<parameter name="defaultConnection" value="false" />`
`1192`	`1192`	`</connection>`
`1193`	`1193`	`<connection`
`@@ -1223,7 +1223,7 @@`
`1223`	`1223`	`start="fpga_only_master.master"`
`1224`	`1224`	`end="intr_capturer_0.avalon_slave_0">`
`1225`	`1225`	`<parameter name="arbitrationPriority" value="1" />`
`1226`		`- <parameter name="baseAddress" value="0x00030000" />`
	`1226`	`+ <parameter name="baseAddress" value="0x0f00" />`
`1227`	`1227`	`<parameter name="defaultConnection" value="false" />`
`1228`	`1228`	`</connection>`
`1229`	`1229`	`<connection`
`@@ -1250,7 +1250,7 @@`
`1250`	`1250`	`start="fpga_only_master.master"`
`1251`	`1251`	`end="led_pio.s1">`
`1252`	`1252`	`<parameter name="arbitrationPriority" value="1" />`
`1253`		`- <parameter name="baseAddress" value="0x3040" />`
	`1253`	`+ <parameter name="baseAddress" value="0x3000" />`
`1254`	`1254`	`<parameter name="defaultConnection" value="false" />`
`1255`	`1255`	`</connection>`
`1256`	`1256`	`<connection`
`@@ -1268,7 +1268,7 @@`
`1268`	`1268`	`start="fpga_only_master.master"`
`1269`	`1269`	`end="button_pio.s1">`
`1270`	`1270`	`<parameter name="arbitrationPriority" value="1" />`
`1271`		`- <parameter name="baseAddress" value="0x50c0" />`
	`1271`	`+ <parameter name="baseAddress" value="0x5000" />`
`1272`	`1272`	`<parameter name="defaultConnection" value="false" />`
`1273`	`1273`	`</connection>`
`1274`	`1274`	`<connection`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`{`
`64`	`64`	`datum _sortIndex`
`65`	`65`	`{`
`66`		`- value = "10";`
	`66`	`+ value = "11";`
`67`	`67`	`type = "int";`
`68`	`68`	`}`
`69`	`69`	`datum sopceditor_expanded`
`@@ -102,7 +102,7 @@`
`102`	`102`	`{`
`103`	`103`	`datum _sortIndex`
`104`	`104`	`{`
`105`		`- value = "9";`
	`105`	`+ value = "10";`
`106`	`106`	`type = "int";`
`107`	`107`	`}`
`108`	`108`	`datum sopceditor_expanded`
`@@ -212,7 +212,7 @@`
`212`	`212`	`{`
`213`	`213`	`datum _sortIndex`
`214`	`214`	`{`
`215`		`- value = "11";`
	`215`	`+ value = "6";`
`216`	`216`	`type = "int";`
`217`	`217`	`}`
`218`	`218`	`}`
`@@ -225,15 +225,15 @@`
`225`	`225`	`}`
`226`	`226`	`datum baseAddress`
`227`	`227`	`{`
`228`		`- value = "24576";`
	`228`	`+ value = "28416";`
`229`	`229`	`type = "String";`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`element jtag_uart`
`233`	`233`	`{`
`234`	`234`	`datum _sortIndex`
`235`	`235`	`{`
`236`		`- value = "7";`
	`236`	`+ value = "8";`
`237`	`237`	`type = "int";`
`238`	`238`	`}`
`239`	`239`	`datum sopceditor_expanded`
`@@ -259,7 +259,7 @@`
`259`	`259`	`{`
`260`	`260`	`datum _sortIndex`
`261`	`261`	`{`
`262`		`- value = "8";`
	`262`	`+ value = "9";`
`263`	`263`	`type = "int";`
`264`	`264`	`}`
`265`	`265`	`datum sopceditor_expanded`
`@@ -349,7 +349,7 @@`
`349`	`349`	`{`
`350`	`350`	`datum _sortIndex`
`351`	`351`	`{`
`352`		`- value = "6";`
	`352`	`+ value = "7";`
`353`	`353`	`type = "int";`
`354`	`354`	`}`
`355`	`355`	`datum sopceditor_expanded`
`@@ -1424,7 +1424,7 @@`
`1424`	`1424`	`start="mm_bridge_0.m0"`
`1425`	`1425`	`end="intr_capturer_0.avalon_slave_0">`
`1426`	`1426`	`<parameter name="arbitrationPriority" value="1" />`
`1427`		`- <parameter name="baseAddress" value="0x6000" />`
	`1427`	`+ <parameter name="baseAddress" value="0x6f00" />`
`1428`	`1428`	`<parameter name="defaultConnection" value="false" />`
`1429`	`1429`	`</connection>`
`1430`	`1430`	`<connection`
`@@ -1501,7 +1501,7 @@`
`1501`	`1501`	`start="fpga_only_master.master"`
`1502`	`1502`	`end="intr_capturer_0.avalon_slave_0">`
`1503`	`1503`	`<parameter name="arbitrationPriority" value="1" />`
`1504`		`- <parameter name="baseAddress" value="0x6000" />`
	`1504`	`+ <parameter name="baseAddress" value="0x6f00" />`
`1505`	`1505`	`<parameter name="defaultConnection" value="false" />`
`1506`	`1506`	`</connection>`
`1507`	`1507`	`<connection`