Skip to content

Commit 3bfae3c

Browse files
jynikjynik
committed
nios: Redesign and rewrite of NIOS II code
The NIOS II code that handles requests/response from the host (via the FX3 UART) has been redesigned and rewritten to improve its readability and extensibility. Many, many thanks go out to Cameron Karlsson for providing his NIOS II code re-design and feedback, upon which this effort was based.
1 parent c4ad251 commit 3bfae3c

32 files changed

+5069
-2729
lines changed

‎CONTRIBUTORS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ I: engidea
3131
G: Engidea
3232
D: si5338 sample rate functionality, misc. bugfixes
3333

34+
N: Cameron Karlsson
35+
D: NIOS II redesign, refactoring, and clean-up
36+
3437
N: Robert Ghilduta
3538
E: robert.ghilduta@nuand.com
3639
F: robertghilduta

hdl/fpga/ip/altera/nios_system/software/lms_spi_controller/.cproject renamed to hdl/fpga/ip/altera/nios_system/software/bladeRF_nios/.cproject

Lines changed: 508 additions & 508 deletions
Large diffs are not rendered by default.

hdl/fpga/ip/altera/nios_system/software/lms_spi_controller/.project renamed to hdl/fpga/ip/altera/nios_system/software/bladeRF_nios/.project

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>lms_spi_controller</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>com.altera.sbtgui.project.makefileBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>com.altera.sbtgui.project.makefileBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
20-
<triggers>clean,full,incremental,</triggers>
21-
<arguments>
22-
<dictionary>
23-
<key>?name?</key>
24-
<value></value>
25-
</dictionary>
26-
<dictionary>
27-
<key>org.eclipse.cdt.make.core.append_environment</key>
28-
<value>true</value>
29-
</dictionary>
30-
<dictionary>
31-
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
32-
<value>all</value>
33-
</dictionary>
34-
<dictionary>
35-
<key>org.eclipse.cdt.make.core.buildArguments</key>
36-
<value></value>
37-
</dictionary>
38-
<dictionary>
39-
<key>org.eclipse.cdt.make.core.buildCommand</key>
40-
<value>make</value>
41-
</dictionary>
42-
<dictionary>
43-
<key>org.eclipse.cdt.make.core.buildLocation</key>
44-
<value>${workspace_loc://lms_spi_controller}</value>
45-
</dictionary>
46-
<dictionary>
47-
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
48-
<value>clean</value>
49-
</dictionary>
50-
<dictionary>
51-
<key>org.eclipse.cdt.make.core.contents</key>
52-
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
53-
</dictionary>
54-
<dictionary>
55-
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
56-
<value>false</value>
57-
</dictionary>
58-
<dictionary>
59-
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
60-
<value>true</value>
61-
</dictionary>
62-
<dictionary>
63-
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
64-
<value>true</value>
65-
</dictionary>
66-
<dictionary>
67-
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
68-
<value>all</value>
69-
</dictionary>
70-
<dictionary>
71-
<key>org.eclipse.cdt.make.core.stopOnError</key>
72-
<value>true</value>
73-
</dictionary>
74-
<dictionary>
75-
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
76-
<value>true</value>
77-
</dictionary>
78-
</arguments>
79-
</buildCommand>
80-
<buildCommand>
81-
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
82-
<triggers>full,incremental,</triggers>
83-
<arguments>
84-
</arguments>
85-
</buildCommand>
86-
</buildSpec>
87-
<natures>
88-
<nature>org.eclipse.cdt.core.cnature</nature>
89-
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
90-
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
91-
<nature>org.eclipse.cdt.core.ccnature</nature>
92-
<nature>com.altera.sbtgui.project.SBTGUINature</nature>
93-
<nature>com.altera.sbtgui.project.SBTGUIAppNature</nature>
94-
<nature>com.altera.sbtgui.project.SBTGUIManagedNature</nature>
95-
</natures>
96-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>bladeRF_nios</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.altera.sbtgui.project.makefileBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.altera.sbtgui.project.makefileBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
20+
<triggers>clean,full,incremental,</triggers>
21+
<arguments>
22+
<dictionary>
23+
<key>?name?</key>
24+
<value></value>
25+
</dictionary>
26+
<dictionary>
27+
<key>org.eclipse.cdt.make.core.append_environment</key>
28+
<value>true</value>
29+
</dictionary>
30+
<dictionary>
31+
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
32+
<value>all</value>
33+
</dictionary>
34+
<dictionary>
35+
<key>org.eclipse.cdt.make.core.buildArguments</key>
36+
<value></value>
37+
</dictionary>
38+
<dictionary>
39+
<key>org.eclipse.cdt.make.core.buildCommand</key>
40+
<value>make</value>
41+
</dictionary>
42+
<dictionary>
43+
<key>org.eclipse.cdt.make.core.buildLocation</key>
44+
<value>${workspace_loc://bladeRF_nios}</value>
45+
</dictionary>
46+
<dictionary>
47+
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
48+
<value>clean</value>
49+
</dictionary>
50+
<dictionary>
51+
<key>org.eclipse.cdt.make.core.contents</key>
52+
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
53+
</dictionary>
54+
<dictionary>
55+
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
56+
<value>false</value>
57+
</dictionary>
58+
<dictionary>
59+
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
60+
<value>true</value>
61+
</dictionary>
62+
<dictionary>
63+
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
64+
<value>true</value>
65+
</dictionary>
66+
<dictionary>
67+
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
68+
<value>all</value>
69+
</dictionary>
70+
<dictionary>
71+
<key>org.eclipse.cdt.make.core.stopOnError</key>
72+
<value>true</value>
73+
</dictionary>
74+
<dictionary>
75+
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
76+
<value>true</value>
77+
</dictionary>
78+
</arguments>
79+
</buildCommand>
80+
<buildCommand>
81+
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
82+
<triggers>full,incremental,</triggers>
83+
<arguments>
84+
</arguments>
85+
</buildCommand>
86+
</buildSpec>
87+
<natures>
88+
<nature>org.eclipse.cdt.core.cnature</nature>
89+
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
90+
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
91+
<nature>org.eclipse.cdt.core.ccnature</nature>
92+
<nature>com.altera.sbtgui.project.SBTGUINature</nature>
93+
<nature>com.altera.sbtgui.project.SBTGUIAppNature</nature>
94+
<nature>com.altera.sbtgui.project.SBTGUIManagedNature</nature>
95+
</natures>
96+
</projectDescription>

0 commit comments

Comments
 (0)