Added some regs definitions for LFR instrument. Added memory size measurement.
jeandet -
r73:680fae912f57 default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -0,0 +1,23
1 <?xml version='1.0' encoding='utf-8'?>
2 <soc name="Leon">
3 <peripheral vid="32" name="SRCTRLS-0WS" pid="1">
4 <register name="EDAC Control" addOffset="0">
5 <bitField size="4" offset="0" name="BTOS" mode="3" desc="write or read busy to scrub delay configuration"/>
6 <bitField size="4" offset="4" name="SCRUBRATE" mode="3" desc="write or read scrub rate period configuration"/>
7 <bitField name="RUN" offset="8" size="1" mode="3" desc="when set run the memory configuration"/>
8 <bitField name="BPBUSYN" offset="9" size="1" mode="3" desc="make controller to ignore busy signal"/>
9 <bitField name="WENSRAM" offset="12" size="8" mode="3" desc="when set write configuration to chip 8 to 1, else read configuration"/>
10 <bitField name="BYPASSEDAC" offset="20" size="8" mode="3" desc="bypass edac (for chips 8 to 1)"/>
11 <bitField name="WASHMEM" offset="31" size="1" mode="3" desc="Frame error (FE) - indicates that a framing error was detected. Reset value: ‘0’"/>
12 </register>
13 </peripheral>
14 </soc>
15
16
17
18
19
20
21
22
23
@@ -0,0 +1,71
1 <?xml version='1.0' encoding='utf-8'?>
2 <soc name="Leon">
3 <peripheral vid="25" name="LPP_APB_DAC" pid="7">
4 <register name="DAC Control" addOffset="0">
5 <bitField size="2" offset="0" name="Dac config" mode="3" desc="Set the two configuration bits of the DAC ‘00’ mean normal operation, ‘01’ mean 1kOhms connected to GND, ‘10’ mean 100kOhms connected to GND, ‘11’ mean high impedance"/>
6 <bitField size="1" offset="4" name="Reload" mode="3" desc="Reload freq divider to the value N, can be used also to stop dac"/>
7 <bitField name="Interleavde" offset="5" size="1" mode="3" desc="Set interleaved mode"/>
8 </register>
9 <register name="Prescaller" addOffset="4">
10 <bitField size="32" offset="0" name="Pre" mode="3" desc="Set the prescaller division"/>
11 </register>
12 <register name="Div" addOffset="8">
13 <bitField size="32" offset="0" name="N" mode="3" desc="Set the division factor"/>
14 </register>
15 <register name="Address" addOffset="12">
16 <bitField size="32" offset="0" name="Address" mode="3" desc="Set the DAC RAM buffer address pointer"/>
17 </register>
18 <register name="DATA" addOffset="16">
19 <bitField size="32" offset="0" name="DATA" mode="3" desc="DATA to be written in the DAC RAM buffer"/>
20 </register>
21 </peripheral>
22 <peripheral vid="25" name="LPP_LFR_MANAGEMENT" pid="34">
23 <register name="CONTROL" addOffset="0">
24 <bitField size="1" offset="0" name="ctrl" mode="3" desc="NC"/>
25 <bitField size="1" offset="1" name="Soft Reset" mode="3" desc="NC "/>
26 <bitField name="LFR Soft Reset" offset="5" size="1" mode="3" desc="NC"/>
27 </register>
28 <register name="COARSE TIME LOAD" addOffset="4">
29 <bitField size="31" offset="0" name="Coarse Time Load" mode="3" desc="NC"/>
30 </register>
31 <register name="COARSE TIME" addOffset="8">
32 <bitField size="31" offset="0" name="Coarse Time" mode="1" desc="NC"/>
33 </register>
34 <register name="TEMP0" addOffset="12">
35 <bitField size="16" offset="0" name="HK Temperature 0" mode="1" desc="NC"/>
36 </register>
37 <register name="TEMP1" addOffset="16">
38 <bitField size="16" offset="0" name="HK Temperature 1" mode="1" desc="NC"/>
39 </register>
40 <register name="TEMP2" addOffset="20">
41 <bitField size="16" offset="0" name="HK Temperature 2" mode="1" desc="NC"/>
42 </register>
43 <register name="DAC Control" addOffset="24">
44 <bitField size="2" offset="0" name="Dac config" mode="3" desc="Set the two configuration bits of the DAC ‘00’ mean normal operation, ‘01’ mean 1kOhms connected to GND, ‘10’ mean 100kOhms connected to GND, ‘11’ mean high impedance"/>
45 <bitField size="1" offset="4" name="Reload" mode="3" desc="Reload freq divider to the value N, can be used also to stop dac"/>
46 <bitField name="Interleavde" offset="5" size="1" mode="3" desc="Set interleaved mode"/>
47 <bitField name="Enable" offset="6" size="1" mode="3" desc="Scm cal enable, drives the multiplexer"/>
48 </register>
49 <register name="Prescaller" addOffset="28">
50 <bitField size="32" offset="0" name="Pre" mode="3" desc="Set the prescaller division"/>
51 </register>
52 <register name="Div" addOffset="32">
53 <bitField size="32" offset="0" name="N" mode="3" desc="Set the division factor"/>
54 </register>
55 <register name="Address" addOffset="36">
56 <bitField size="32" offset="0" name="Address" mode="3" desc="Set the DAC RAM buffer address pointer"/>
57 </register>
58 <register name="DATA" addOffset="40">
59 <bitField size="32" offset="0" name="DATA" mode="3" desc="DATA to be written in the DAC RAM buffer"/>
60 </register>
61 </peripheral>
62 </soc>
63
64
65
66
67
68
69
70
71
@@ -0,0 +1,75
1 #include "memtester.h"
2 #include <socexplorerengine.h>
3 #include <socexplorerproxy.h>
4
5 MemTester::MemTester(QObject* parent)
6 :QObject(parent)
7 {
8
9 }
10
11 MemTester::~MemTester()
12 {
13
14 }
15
16
17 unsigned int p_pow2(unsigned int v)
18 {
19 static const char LogTable256[256] =
20 {
21 #define LT(n) n, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n
22 -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
23 LT(4), LT(5), LT(5), LT(6), LT(6), LT(6), LT(6),
24 LT(7), LT(7), LT(7), LT(7), LT(7), LT(7), LT(7), LT(7)
25 };
26
27 unsigned int r; // r will be lg(v)
28 register unsigned int t, tt; // temporaries
29
30 if (tt = v >> 16)
31 {
32 r = (t = tt >> 8) ? 24 + LogTable256[t] : 16 + LogTable256[tt];
33 }
34 else
35 {
36 r = (t = v >> 8) ? 8 + LogTable256[t] : LogTable256[v];
37 }
38 return r;
39 }
40
41 unsigned int MemTester::measureMemSize(socexplorerplugin *plugin, unsigned int address, unsigned int maxSize)
42 {
43 unsigned int curVal=1,testAddress=address;
44 unsigned int size=0;
45 if(Q_UNLIKELY(!plugin || !plugin->isConnected()))return 0;
46 plugin->Write(&curVal,1,testAddress);
47 plugin->Read(&curVal,1,testAddress);
48 if(Q_UNLIKELY(curVal!=1))
49 return size;
50 unsigned int max= p_pow2((0xFFFFFFFFFFFFFFFF - address))+1;
51 register unsigned int maxSizeLg=p_pow2(maxSize)-1;
52 if(max>maxSizeLg)
53 max=maxSizeLg;
54 if(max>32)max=32;
55 for(size=2;size<max;size++) //check each address bit
56 {
57 testAddress = (unsigned int)(address+(1<<size));
58 curVal = (unsigned int)(1<<size);
59 plugin->Write(&curVal,1,testAddress);
60 plugin->Read(&curVal,1,testAddress);
61 if((unsigned int)curVal!=(unsigned int)(1<<size))
62 return (1<<(size));
63 plugin->Read(&curVal,1,address);
64 if((curVal==(unsigned int)(1<<size)) && (size!=0))
65 return (1<<(size));
66 }
67 return (1<<(size+1));
68 }
69
70 unsigned int MemTester::measureMemSize(const QString &plugin, unsigned int address, unsigned int maxSize)
71 {
72 return measureMemSize(socexplorerproxy::findPlugin(plugin),address,maxSize);
73 }
74
75
@@ -0,0 +1,19
1 #ifndef MEMTESTER_H
2 #define MEMTESTER_H
3 #include <socexplorerplugin.h>
4 #include <QObject>
5
6 class MemTester : public QObject
7 {
8 Q_OBJECT
9 public:
10 MemTester(QObject *parent=0);
11 ~MemTester();
12
13 static unsigned int measureMemSize(socexplorerplugin* plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF);
14 static unsigned int measureMemSize(const QString& plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF);
15 public slots:
16
17 };
18
19 #endif // MEMTESTER_H
@@ -0,0 +1,325
1 %global upstream_name socexplorer-0.4
2
3 Name: socexplorer
4 Version: 0.4
5 Release: 6%{?dist}
6 Summary: SocExplorer is an open source generic System On Chip testing software/framework.
7 Group: Development/Tools
8 License: GPLv2+
9 URL: https://hephaistos.lpp.polytechnique.fr/redmine/projects/socexplorer
10 Source0: https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/376/socexplorer-0.4.zip
11 #
12 #Patch0: socexplorer_desktop.patch
13
14
15 BuildRequires: python2-devel
16 BuildRequires: qt5-qtbase-devel
17 BuildRequires: qt5-qtwebkit-devel
18 BuildRequires: qt5-qttools-static
19 BuildRequires: qt5-qttools-devel
20 BuildRequires: qt5-qtsvg-devel
21 BuildRequires: qt5-qtxmlpatterns-devel
22 BuildRequires: qt5-qtmultimedia-devel
23 BuildRequires: elfutils-libelf-devel
24 BuildRequires: qt5-pythonqt-devel
25 BuildRequires: mercurial
26 BuildRequires: appdata-tools
27 BuildRequires: desktop-file-utils
28
29 Requires(post): python2
30 Requires(post): qt5-qtbase
31 Requires(post): qt5-qtwebkit
32 Requires(post): qt5-qtsvg
33 Requires(post): qt5-qtxmlpatterns
34 Requires(post): elfutils-libelf
35 Requires(post): qt5-pythonqt
36
37 Provides: socexplorer = 0.4-6
38 Obsoletes: socexplorer < 0.4-5
39
40 %description
41 SocExplorer is an open source generic System On Chip testing software/framework. We write this software for the development and the validation of our instrument, the Low Frequency Receiver(LFR) for the Solar Orbiter mission. This instrument is based on an actel FPGA hosting a LEON3FT processor and some peripherals. To make it more collaborative, we use a plugin based system, the main executable is SocExplorer then all the functionality are provided by plugins. Like this everybody can provide his set of plugins to handle a new SOC or just a new peripheral. SocExplorer uses PythonQt to allow user to automate some tasks such as loading some plugins, configuring them and talking with his device.
42
43 %package devel
44 Summary: SocExplorer is an open source generic System On Chip testing software/framework.
45 Group: Development/Tools
46 Requires: %{name}%{?_isa} = %{version}-%{release}
47
48 %description devel
49 Header files and development libraries for SocExplorer package. SocExplorer is an open source generic System On Chip testing software/framework.
50
51 %prep
52 %setup -q -n %{upstream_name}
53 #%patch0 -p1 -b .desktop
54
55
56
57 %build
58 %{_qt5_qmake}
59
60 make %{?_smp_mflags}
61
62 %install
63 make install INSTALL_ROOT=%{buildroot}
64 appdata-validate --nonet %{buildroot}/%{_datadir}/appdata/socexplorer.appdata.xml
65 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/socexplorer.desktop
66
67 %post -p /sbin/ldconfig
68
69 %postun -p /sbin/ldconfig
70
71 %files
72 /etc/SocExplorer/python/PygmentsHighlighter.py
73 /etc/SocExplorer/python/PygmentsHighlighter.pyc
74 /etc/SocExplorer/python/PygmentsHighlighter.pyo
75 /etc/SocExplorer/python/PythonCompleter.py
76 /etc/SocExplorer/python/PythonCompleter.pyc
77 /etc/SocExplorer/python/PythonCompleter.pyo
78 /etc/SocExplorer/python/module_completion.py
79 /etc/SocExplorer/python/module_completion.pyc
80 /etc/SocExplorer/python/module_completion.pyo
81 /etc/SocExplorer/python/pygments/__init__.py
82 /etc/SocExplorer/python/pygments/__init__.pyc
83 /etc/SocExplorer/python/pygments/__init__.pyo
84 /etc/SocExplorer/python/pygments/cmdline.py
85 /etc/SocExplorer/python/pygments/cmdline.pyc
86 /etc/SocExplorer/python/pygments/cmdline.pyo
87 /etc/SocExplorer/python/pygments/console.py
88 /etc/SocExplorer/python/pygments/console.pyc
89 /etc/SocExplorer/python/pygments/console.pyo
90 /etc/SocExplorer/python/pygments/filter.py
91 /etc/SocExplorer/python/pygments/filter.pyc
92 /etc/SocExplorer/python/pygments/filter.pyo
93 /etc/SocExplorer/python/pygments/filters/__init__.py
94 /etc/SocExplorer/python/pygments/filters/__init__.pyc
95 /etc/SocExplorer/python/pygments/filters/__init__.pyo
96 /etc/SocExplorer/python/pygments/formatter.py
97 /etc/SocExplorer/python/pygments/formatter.pyc
98 /etc/SocExplorer/python/pygments/formatter.pyo
99 /etc/SocExplorer/python/pygments/formatters/__init__.py
100 /etc/SocExplorer/python/pygments/formatters/__init__.pyc
101 /etc/SocExplorer/python/pygments/formatters/__init__.pyo
102 /etc/SocExplorer/python/pygments/formatters/_mapping.py
103 /etc/SocExplorer/python/pygments/formatters/_mapping.pyc
104 /etc/SocExplorer/python/pygments/formatters/_mapping.pyo
105 /etc/SocExplorer/python/pygments/formatters/bbcode.py
106 /etc/SocExplorer/python/pygments/formatters/bbcode.pyc
107 /etc/SocExplorer/python/pygments/formatters/bbcode.pyo
108 /etc/SocExplorer/python/pygments/formatters/html.py
109 /etc/SocExplorer/python/pygments/formatters/html.pyc
110 /etc/SocExplorer/python/pygments/formatters/html.pyo
111 /etc/SocExplorer/python/pygments/formatters/img.py
112 /etc/SocExplorer/python/pygments/formatters/img.pyc
113 /etc/SocExplorer/python/pygments/formatters/img.pyo
114 /etc/SocExplorer/python/pygments/formatters/latex.py
115 /etc/SocExplorer/python/pygments/formatters/latex.pyc
116 /etc/SocExplorer/python/pygments/formatters/latex.pyo
117 /etc/SocExplorer/python/pygments/formatters/other.py
118 /etc/SocExplorer/python/pygments/formatters/other.pyc
119 /etc/SocExplorer/python/pygments/formatters/other.pyo
120 /etc/SocExplorer/python/pygments/formatters/rtf.py
121 /etc/SocExplorer/python/pygments/formatters/rtf.pyc
122 /etc/SocExplorer/python/pygments/formatters/rtf.pyo
123 /etc/SocExplorer/python/pygments/formatters/svg.py
124 /etc/SocExplorer/python/pygments/formatters/svg.pyc
125 /etc/SocExplorer/python/pygments/formatters/svg.pyo
126 /etc/SocExplorer/python/pygments/formatters/terminal.py
127 /etc/SocExplorer/python/pygments/formatters/terminal.pyc
128 /etc/SocExplorer/python/pygments/formatters/terminal.pyo
129 /etc/SocExplorer/python/pygments/formatters/terminal256.py
130 /etc/SocExplorer/python/pygments/formatters/terminal256.pyc
131 /etc/SocExplorer/python/pygments/formatters/terminal256.pyo
132 /etc/SocExplorer/python/pygments/lexer.py
133 /etc/SocExplorer/python/pygments/lexer.pyc
134 /etc/SocExplorer/python/pygments/lexer.pyo
135 /etc/SocExplorer/python/pygments/lexers/__init__.py
136 /etc/SocExplorer/python/pygments/lexers/__init__.pyc
137 /etc/SocExplorer/python/pygments/lexers/__init__.pyo
138 /etc/SocExplorer/python/pygments/lexers/_asybuiltins.py
139 /etc/SocExplorer/python/pygments/lexers/_asybuiltins.pyc
140 /etc/SocExplorer/python/pygments/lexers/_asybuiltins.pyo
141 /etc/SocExplorer/python/pygments/lexers/_clbuiltins.py
142 /etc/SocExplorer/python/pygments/lexers/_clbuiltins.pyc
143 /etc/SocExplorer/python/pygments/lexers/_clbuiltins.pyo
144 /etc/SocExplorer/python/pygments/lexers/_luabuiltins.py
145 /etc/SocExplorer/python/pygments/lexers/_luabuiltins.pyc
146 /etc/SocExplorer/python/pygments/lexers/_luabuiltins.pyo
147 /etc/SocExplorer/python/pygments/lexers/_mapping.py
148 /etc/SocExplorer/python/pygments/lexers/_mapping.pyc
149 /etc/SocExplorer/python/pygments/lexers/_mapping.pyo
150 /etc/SocExplorer/python/pygments/lexers/_phpbuiltins.py
151 /etc/SocExplorer/python/pygments/lexers/_phpbuiltins.pyc
152 /etc/SocExplorer/python/pygments/lexers/_phpbuiltins.pyo
153 /etc/SocExplorer/python/pygments/lexers/_postgres_builtins.py
154 /etc/SocExplorer/python/pygments/lexers/_postgres_builtins.pyc
155 /etc/SocExplorer/python/pygments/lexers/_postgres_builtins.pyo
156 /etc/SocExplorer/python/pygments/lexers/_scilab_builtins.py
157 /etc/SocExplorer/python/pygments/lexers/_scilab_builtins.pyc
158 /etc/SocExplorer/python/pygments/lexers/_scilab_builtins.pyo
159 /etc/SocExplorer/python/pygments/lexers/_vimbuiltins.py
160 /etc/SocExplorer/python/pygments/lexers/_vimbuiltins.pyc
161 /etc/SocExplorer/python/pygments/lexers/_vimbuiltins.pyo
162 /etc/SocExplorer/python/pygments/lexers/agile.py
163 /etc/SocExplorer/python/pygments/lexers/agile.pyc
164 /etc/SocExplorer/python/pygments/lexers/agile.pyo
165 /etc/SocExplorer/python/pygments/lexers/asm.py
166 /etc/SocExplorer/python/pygments/lexers/asm.pyc
167 /etc/SocExplorer/python/pygments/lexers/asm.pyo
168 /etc/SocExplorer/python/pygments/lexers/compiled.py
169 /etc/SocExplorer/python/pygments/lexers/compiled.pyc
170 /etc/SocExplorer/python/pygments/lexers/compiled.pyo
171 /etc/SocExplorer/python/pygments/lexers/dotnet.py
172 /etc/SocExplorer/python/pygments/lexers/dotnet.pyc
173 /etc/SocExplorer/python/pygments/lexers/dotnet.pyo
174 /etc/SocExplorer/python/pygments/lexers/functional.py
175 /etc/SocExplorer/python/pygments/lexers/functional.pyc
176 /etc/SocExplorer/python/pygments/lexers/functional.pyo
177 /etc/SocExplorer/python/pygments/lexers/hdl.py
178 /etc/SocExplorer/python/pygments/lexers/hdl.pyc
179 /etc/SocExplorer/python/pygments/lexers/hdl.pyo
180 /etc/SocExplorer/python/pygments/lexers/jvm.py
181 /etc/SocExplorer/python/pygments/lexers/jvm.pyc
182 /etc/SocExplorer/python/pygments/lexers/jvm.pyo
183 /etc/SocExplorer/python/pygments/lexers/math.py
184 /etc/SocExplorer/python/pygments/lexers/math.pyc
185 /etc/SocExplorer/python/pygments/lexers/math.pyo
186 /etc/SocExplorer/python/pygments/lexers/other.py
187 /etc/SocExplorer/python/pygments/lexers/other.pyc
188 /etc/SocExplorer/python/pygments/lexers/other.pyo
189 /etc/SocExplorer/python/pygments/lexers/parsers.py
190 /etc/SocExplorer/python/pygments/lexers/parsers.pyc
191 /etc/SocExplorer/python/pygments/lexers/parsers.pyo
192 /etc/SocExplorer/python/pygments/lexers/shell.py
193 /etc/SocExplorer/python/pygments/lexers/shell.pyc
194 /etc/SocExplorer/python/pygments/lexers/shell.pyo
195 /etc/SocExplorer/python/pygments/lexers/special.py
196 /etc/SocExplorer/python/pygments/lexers/special.pyc
197 /etc/SocExplorer/python/pygments/lexers/special.pyo
198 /etc/SocExplorer/python/pygments/lexers/sql.py
199 /etc/SocExplorer/python/pygments/lexers/sql.pyc
200 /etc/SocExplorer/python/pygments/lexers/sql.pyo
201 /etc/SocExplorer/python/pygments/lexers/templates.py
202 /etc/SocExplorer/python/pygments/lexers/templates.pyc
203 /etc/SocExplorer/python/pygments/lexers/templates.pyo
204 /etc/SocExplorer/python/pygments/lexers/text.py
205 /etc/SocExplorer/python/pygments/lexers/text.pyc
206 /etc/SocExplorer/python/pygments/lexers/text.pyo
207 /etc/SocExplorer/python/pygments/lexers/web.py
208 /etc/SocExplorer/python/pygments/lexers/web.pyc
209 /etc/SocExplorer/python/pygments/lexers/web.pyo
210 /etc/SocExplorer/python/pygments/plugin.py
211 /etc/SocExplorer/python/pygments/plugin.pyc
212 /etc/SocExplorer/python/pygments/plugin.pyo
213 /etc/SocExplorer/python/pygments/scanner.py
214 /etc/SocExplorer/python/pygments/scanner.pyc
215 /etc/SocExplorer/python/pygments/scanner.pyo
216 /etc/SocExplorer/python/pygments/style.py
217 /etc/SocExplorer/python/pygments/style.pyc
218 /etc/SocExplorer/python/pygments/style.pyo
219 /etc/SocExplorer/python/pygments/styles/__init__.py
220 /etc/SocExplorer/python/pygments/styles/__init__.pyc
221 /etc/SocExplorer/python/pygments/styles/__init__.pyo
222 /etc/SocExplorer/python/pygments/styles/autumn.py
223 /etc/SocExplorer/python/pygments/styles/autumn.pyc
224 /etc/SocExplorer/python/pygments/styles/autumn.pyo
225 /etc/SocExplorer/python/pygments/styles/borland.py
226 /etc/SocExplorer/python/pygments/styles/borland.pyc
227 /etc/SocExplorer/python/pygments/styles/borland.pyo
228 /etc/SocExplorer/python/pygments/styles/bw.py
229 /etc/SocExplorer/python/pygments/styles/bw.pyc
230 /etc/SocExplorer/python/pygments/styles/bw.pyo
231 /etc/SocExplorer/python/pygments/styles/colorful.py
232 /etc/SocExplorer/python/pygments/styles/colorful.pyc
233 /etc/SocExplorer/python/pygments/styles/colorful.pyo
234 /etc/SocExplorer/python/pygments/styles/default.py
235 /etc/SocExplorer/python/pygments/styles/default.pyc
236 /etc/SocExplorer/python/pygments/styles/default.pyo
237 /etc/SocExplorer/python/pygments/styles/emacs.py
238 /etc/SocExplorer/python/pygments/styles/emacs.pyc
239 /etc/SocExplorer/python/pygments/styles/emacs.pyo
240 /etc/SocExplorer/python/pygments/styles/friendly.py
241 /etc/SocExplorer/python/pygments/styles/friendly.pyc
242 /etc/SocExplorer/python/pygments/styles/friendly.pyo
243 /etc/SocExplorer/python/pygments/styles/fruity.py
244 /etc/SocExplorer/python/pygments/styles/fruity.pyc
245 /etc/SocExplorer/python/pygments/styles/fruity.pyo
246 /etc/SocExplorer/python/pygments/styles/manni.py
247 /etc/SocExplorer/python/pygments/styles/manni.pyc
248 /etc/SocExplorer/python/pygments/styles/manni.pyo
249 /etc/SocExplorer/python/pygments/styles/monokai.py
250 /etc/SocExplorer/python/pygments/styles/monokai.pyc
251 /etc/SocExplorer/python/pygments/styles/monokai.pyo
252 /etc/SocExplorer/python/pygments/styles/murphy.py
253 /etc/SocExplorer/python/pygments/styles/murphy.pyc
254 /etc/SocExplorer/python/pygments/styles/murphy.pyo
255 /etc/SocExplorer/python/pygments/styles/native.py
256 /etc/SocExplorer/python/pygments/styles/native.pyc
257 /etc/SocExplorer/python/pygments/styles/native.pyo
258 /etc/SocExplorer/python/pygments/styles/pastie.py
259 /etc/SocExplorer/python/pygments/styles/pastie.pyc
260 /etc/SocExplorer/python/pygments/styles/pastie.pyo
261 /etc/SocExplorer/python/pygments/styles/perldoc.py
262 /etc/SocExplorer/python/pygments/styles/perldoc.pyc
263 /etc/SocExplorer/python/pygments/styles/perldoc.pyo
264 /etc/SocExplorer/python/pygments/styles/rrt.py
265 /etc/SocExplorer/python/pygments/styles/rrt.pyc
266 /etc/SocExplorer/python/pygments/styles/rrt.pyo
267 /etc/SocExplorer/python/pygments/styles/tango.py
268 /etc/SocExplorer/python/pygments/styles/tango.pyc
269 /etc/SocExplorer/python/pygments/styles/tango.pyo
270 /etc/SocExplorer/python/pygments/styles/trac.py
271 /etc/SocExplorer/python/pygments/styles/trac.pyc
272 /etc/SocExplorer/python/pygments/styles/trac.pyo
273 /etc/SocExplorer/python/pygments/styles/vim.py
274 /etc/SocExplorer/python/pygments/styles/vim.pyc
275 /etc/SocExplorer/python/pygments/styles/vim.pyo
276 /etc/SocExplorer/python/pygments/styles/vs.py
277 /etc/SocExplorer/python/pygments/styles/vs.pyc
278 /etc/SocExplorer/python/pygments/styles/vs.pyo
279 /etc/SocExplorer/python/pygments/token.py
280 /etc/SocExplorer/python/pygments/token.pyc
281 /etc/SocExplorer/python/pygments/token.pyo
282 /etc/SocExplorer/python/pygments/unistring.py
283 /etc/SocExplorer/python/pygments/unistring.pyc
284 /etc/SocExplorer/python/pygments/unistring.pyo
285 /etc/SocExplorer/python/pygments/util.py
286 /etc/SocExplorer/python/pygments/util.pyc
287 /etc/SocExplorer/python/pygments/util.pyo
288 /etc/SocExplorer/plugin.conf.d/plugins.conf
289 %{_bindir}/SocExplorer_TCP_Terminal
290 %{_bindir}/socexplorer
291 %{_datadir}/SocExplorer/icon.png
292 %{_datadir}/SocExplorer/Grlib.xml
293 %{_datadir}/SocExplorer/LPP.xml
294 %{_datadir}/SocExplorer/IAP.xml
295 %{_datadir}/applications/socexplorer.desktop
296 %{_datadir}/appdata/socexplorer.appdata.xml
297 %{_qt5_libdir}/libsocexplorercommon.so*
298 %{_qt5_libdir}/libsocexplorerengine.so*
299
300
301 %files devel
302 %{_qt5_headerdir}/SocExplorer/
303 %{_qt5_archdatadir}/mkspecs/features/socexplorerplugin.prf
304 /usr/share/qtcreator/templates/wizards/SocExplorerPlugin/plugin.cpp
305 /usr/share/qtcreator/templates/wizards/SocExplorerPlugin/plugin.h
306 /usr/share/qtcreator/templates/wizards/SocExplorerPlugin/project.pro
307 /usr/share/qtcreator/templates/wizards/SocExplorerPlugin/wizard.xml
308
309
310 %changelog
311 * Fri Feb 6 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
312 - Reseted patches uses r73 as source.
313 * Tue Dec 30 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
314 - Reseted patches uses r72 as source.
315
316 * Sun Jun 29 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
317 - Reseted patches uses r69 as source.
318
319 * Sat Jun 28 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
320 - Applied patch r65 to install also plugin as RPM
321 - Applied patch r66 to install xml soc descriptions in /usr/share/SocExplorer
322 - Applied patch r67 to add appdata for gnome-software visibility
323
324 * Tue Jun 24 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
325 - Initial Fedora packaging
@@ -28,7 +28,10
28 PluginConfPath.files = unixcfg/plugins.conf
28 PluginConfPath.files = unixcfg/plugins.conf
29 share.path = /usr/share/SocExplorer
29 share.path = /usr/share/SocExplorer
30 share.files = ressources/images/icon.png \
30 share.files = ressources/images/icon.png \
31 ressources/Grlib.xml
31 ressources/Grlib.xml \
32 ressources/LPP.xml \
33 ressources/IAP.xml
34
32 Wizard.path = /usr/share/qtcreator/templates/wizards/SocExplorerPlugin
35 Wizard.path = /usr/share/qtcreator/templates/wizards/SocExplorerPlugin
33 Wizard.files = Qt_Creator_Wizard/SocExplorerPlugin/logo-lpp-cutted.png \
36 Wizard.files = Qt_Creator_Wizard/SocExplorerPlugin/logo-lpp-cutted.png \
34 Qt_Creator_Wizard/SocExplorerPlugin/plugin.cpp \
37 Qt_Creator_Wizard/SocExplorerPlugin/plugin.cpp \
@@ -37,9 +37,15
37
37
38 void PythonConsole::addObject(const QString& name, QObject* object)
38 void PythonConsole::addObject(const QString& name, QObject* object)
39 {
39 {
40 this->mainContext->addObject(name, object);
40 this->mainContext->addObject(name, object);
41 }
41 }
42
42
43 void PythonConsole::removeVariable(const QString& name)
44 {
45 this->mainContext->removeVariable(name);
46 }
47
48
43 void PythonConsole::setBussDriver(socexplorerplugin *driver)
49 void PythonConsole::setBussDriver(socexplorerplugin *driver)
44 {
50 {
45 this->bussdriver = driver;
51 this->bussdriver = driver;
@@ -57,6 +57,7
57 void registerObject(QObject* object,const QString& instanceName);
57 void registerObject(QObject* object,const QString& instanceName);
58 void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName);
58 void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName);
59 void addObject(const QString& name, QObject* object);
59 void addObject(const QString& name, QObject* object);
60 void removeVariable(const QString& name);
60 protected:
61 protected:
61 QSize sizeHint();
62 QSize sizeHint();
62
63
@@ -1,4 +1,3
1 #include <QtCore/QObject>
1 #include <QtCore/QObject>
2 #include <QtWidgets/QtWidgets>
2 #include <QtWidgets/QtWidgets>
3 #include "plugins/socexplorerplugin.h"
3 #include "plugins/socexplorerplugin.h"
4
@@ -10,7 +10,7
10
10
11 SOCEXPLORER_CHAGESETNUM=$$system(hg id)
11 SOCEXPLORER_CHAGESETNUM=$$system(hg id)
12 isEmpty(SOCEXPLORER_CHAGESETNUM){
12 isEmpty(SOCEXPLORER_CHAGESETNUM){
13 SOCEXPLORER_CHAGESETNUM=6e5eaa13fad9
13 SOCEXPLORER_CHAGESETNUM=c4b98d42ee59
14 }
14 }
15 SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
15 SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
16 SOCEXPLORER_BRANCH=$$system(hg branch)
16 SOCEXPLORER_BRANCH=$$system(hg branch)
@@ -19,7 +19,7
19 }
19 }
20 SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"'
20 SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"'
21
21
22 DEFINES += SOCEXPLORER_VERSION="\"\\\"0.4.4"\\\"\"
22 DEFINES += SOCEXPLORER_VERSION="\"\\\"0.4.5"\\\"\"
23 DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
23 DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
24 DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
24 DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
25
25
@@ -66,7 +66,8
66 SOC/socclk.h \
66 SOC/socclk.h \
67 PeripheralWidget/src/peripheralwidget.h \
67 PeripheralWidget/src/peripheralwidget.h \
68 PeripheralWidget/src/registerwidget.h \
68 PeripheralWidget/src/registerwidget.h \
69 PeripheralWidget/src/socregsviewer.h
69 PeripheralWidget/src/socregsviewer.h \
70 memtester/memtester.h
70
71
71
72
72
73
@@ -94,7 +95,8
94 RegisterMVS \
95 RegisterMVS \
95 XmlEngine \
96 XmlEngine \
96 SOC \
97 SOC \
97 PeripheralWidget/src
98 PeripheralWidget/src \
99 memtester
98
100
99
101
100 HEADERS += \
102 HEADERS += \
@@ -121,7 +123,8
121 pluginsInterface/socexplorerplugininterface_global.h \
123 pluginsInterface/socexplorerplugininterface_global.h \
122 proxy/socexplorerproxy.h \
124 proxy/socexplorerproxy.h \
123 SOC/socexplorerenumdevice.h \
125 SOC/socexplorerenumdevice.h \
124 PySocExplorerEngine.h
126 PySocExplorerEngine.h \
127 memtester/memtester.h
125
128
126
129
127
130
@@ -149,7 +152,8
149 engine/socexplorerxmlfile.cpp \
152 engine/socexplorerxmlfile.cpp \
150 proxy/socexplorerproxy.cpp \
153 proxy/socexplorerproxy.cpp \
151 SOC/socexplorerenumdevice.cpp \
154 SOC/socexplorerenumdevice.cpp \
152 plugins/socexplorerplugin.cpp
155 plugins/socexplorerplugin.cpp \
156 memtester/memtester.cpp
153
157
154
158
155 OTHER_FILES += \
159 OTHER_FILES += \
@@ -183,6 +183,16
183 return 1;
183 return 1;
184 }
184 }
185
185
186 unsigned int SocExplorerEngine::memMeasureSize(socexplorerplugin *plugin, unsigned int address, unsigned int maxSize)
187 {
188 return MemTester::measureMemSize(plugin,address,maxSize);
189 }
190
191 unsigned int SocExplorerEngine::memMeasureSize(const QString &plugin, unsigned int address, unsigned int maxSize)
192 {
193 return MemTester::measureMemSize(plugin,address,maxSize);
194 }
195
186
196
187 QString SocExplorerEngine::getDevName(int VID, int PID)
197 QString SocExplorerEngine::getDevName(int VID, int PID)
188 {
198 {
@@ -41,6 +41,7
41 #include <peripheralwidget.h>
41 #include <peripheralwidget.h>
42 #include <registerwidget.h>
42 #include <registerwidget.h>
43 #include <socmodel.h>
43 #include <socmodel.h>
44 #include <memtester.h>
44
45
45 #if defined(SOCEXPLORER_SDK_BUILD)
46 #if defined(SOCEXPLORER_SDK_BUILD)
46 # define SOCEXPLORER_SDK_EXPORT Q_DECL_EXPORT
47 # define SOCEXPLORER_SDK_EXPORT Q_DECL_EXPORT
@@ -119,6 +120,8
119 qint32 getEnumDeviceCount(socexplorerplugin* plugin,int VID,int PID);
120 qint32 getEnumDeviceCount(socexplorerplugin* plugin,int VID,int PID);
120 qint32 getEnumDeviceCount(const QString& rootPlugin,int VID,int PID);
121 qint32 getEnumDeviceCount(const QString& rootPlugin,int VID,int PID);
121 int addEnumDevice(const QString& rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
122 int addEnumDevice(const QString& rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
123 unsigned int memMeasureSize(socexplorerplugin* plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF);
124 unsigned int memMeasureSize(const QString& plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF);
122
125
123 private:
126 private:
124 static SOCModel* plugin2Soc(socexplorerplugin* plugin);
127 static SOCModel* plugin2Soc(socexplorerplugin* plugin);
@@ -257,7 +257,7
257 if(!_self)init();
257 if(!_self)init();
258 for(int k=0;k<linearDriverList->count();k++)
258 for(int k=0;k<linearDriverList->count();k++)
259 {
259 {
260 if(linearDriverList->at(k)->instanceName().compare(instanceName))
260 if(!linearDriverList->at(k)->instanceName().compare(instanceName))
261 return linearDriverList->at(k);
261 return linearDriverList->at(k);
262 }
262 }
263 return NULL;
263 return NULL;
This diff has been collapsed as it changes many lines, (830 lines changed) Show them Hide them
@@ -2,9 +2,9
2 #include <PythonQtConversion.h>
2 #include <PythonQtConversion.h>
3 #include <PythonQtMethodInfo.h>
3 #include <PythonQtMethodInfo.h>
4 #include <PythonQtSignalReceiver.h>
4 #include <PythonQtSignalReceiver.h>
5 #include <QIconEngine>
6 #include <QVariant>
5 #include <QVariant>
7 #include <qaction.h>
6 #include <qaction.h>
7 #include <qbackingstore.h>
8 #include <qbitmap.h>
8 #include <qbitmap.h>
9 #include <qbytearray.h>
9 #include <qbytearray.h>