Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sdptr
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
sdptr
Commits
19d0cb5d
Commit
19d0cb5d
authored
Sep 22, 2021
by
Pieter Donker
Browse files
Options
Downloads
Patches
Plain Diff
L2SDP-355
, add point FPGA_signal_input_data_buffer_R
parent
1d88a719
No related branches found
No related tags found
1 merge request
!27
Resolve L2SDP-355
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/constants.h
+2
-0
2 additions, 0 deletions
src/constants.h
src/fpga.cpp
+2
-0
2 additions, 0 deletions
src/fpga.cpp
src/periph/fpga.cpp
+21
-0
21 additions, 0 deletions
src/periph/fpga.cpp
src/periph/fpga.h
+2
-0
2 additions, 0 deletions
src/periph/fpga.h
with
27 additions
and
0 deletions
src/constants.h
+
2
−
0
View file @
19d0cb5d
...
...
@@ -52,6 +52,8 @@
#define C_N_pol 2 // Number of antenna polarizations, X and Y.
#define C_A_pn 6 // Number of dual polarization antennas per Processing Node (PN) FPGA.
// #define C_N_beamlets 976 // Number of beamlets per antenna band 488, 976
#define C_V_si_db 1024 // Size of the databuffer per signal input (SI), to capture
// a snapshot of the signal input data (ADC JESD204B data or WG data)
#define C_200MHZ_1_CNT_NS 5 // Time of one cnt in nS
#define C_N_CLK_PER_PPS 200000000
...
...
This diff is collapsed.
Click to expand it.
src/fpga.cpp
+
2
−
0
View file @
19d0cb5d
...
...
@@ -141,6 +141,8 @@ Fpga::Fpga(list<class Node*>& nodelist, const int32_t n_beamsets):
pointMap
->
add_register
(
"FPGA_weights_R"
,
"fpga/weights"
,
nodes
.
size
(),
C_S_pn
*
nBeamsets
*
C_N_sub_bf
,
"RO"
,
REG_FORMAT_INT16
);
pointMap
->
add_register
(
"FPGA_weights_RW"
,
"fpga/weights"
,
nodes
.
size
(),
C_S_pn
*
nBeamsets
*
C_N_sub_bf
,
"RW"
,
REG_FORMAT_INT16
);
pointMap
->
add_register
(
"FPGA_signal_input_data_buffer_R"
,
"fpga/signal_input_data_buffer"
,
nodes
.
size
(),
C_S_pn
*
C_V_si_db
,
"RO"
,
REG_FORMAT_INT16
);
}
Fpga
::~
Fpga
()
...
...
This diff is collapsed.
Click to expand it.
src/periph/fpga.cpp
+
21
−
0
View file @
19d0cb5d
...
...
@@ -300,6 +300,9 @@ bool Periph_fpga::read(TermOutput& termout, const string addr,
else
if
(
addr
==
"fpga/subband_weights"
)
{
retval
=
read_subband_weights
(
termout
,
format
);
}
else
if
(
addr
==
"fpga/signal_input_data_buffer"
)
{
retval
=
read_signal_input_data_buffer
(
termout
,
format
);
}
else
{
throw
runtime_error
(
"address "
+
addr
+
" not found!"
);
}
...
...
@@ -2375,6 +2378,24 @@ bool Periph_fpga::read_subband_weights(TermOutput& termout, int format) {
return
retval
;
}
bool
Periph_fpga
::
read_signal_input_data_buffer
(
TermOutput
&
termout
,
int
format
)
{
bool
retval
=
true
;
uint32_t
*
_ptr
=
(
uint32_t
*
)
termout
.
val
;
string
regname
;
uint32_t
span
;
for
(
uint
i
=
0
;
i
<
C_S_pn
;
i
++
)
{
regname
=
"mm/0/RAM_DIAG_DATA_BUFFER_BSN/"
+
to_string
(
i
)
+
"/data"
;
span
=
mmap
->
getSpan
((
regname
));
retval
=
Read
(
regname
,
_ptr
);
_ptr
+=
span
;
}
termout
.
nof_vals
=
C_S_pn
*
C_V_si_db
;
termout
.
datatype
=
format
;
return
retval
;
}
bool
Periph_fpga
::
read_time_since_last_pps
(
TermOutput
&
termout
,
int
format
,
int
mode
)
{
bool
retval
=
true
;
if
(
mode
==
R_UCP
)
{
...
...
This diff is collapsed.
Click to expand it.
src/periph/fpga.h
+
2
−
0
View file @
19d0cb5d
...
...
@@ -187,6 +187,8 @@ private:
bool
write_subband_weights
(
const
char
*
data
);
bool
read_subband_weights
(
TermOutput
&
termout
,
int
format
);
bool
read_signal_input_data_buffer
(
TermOutput
&
termout
,
int
format
);
bool
read_sdp_info_block_period
(
TermOutput
&
termout
,
int
format
);
bool
read_time_since_last_pps
(
TermOutput
&
termout
,
int
format
,
int
mode
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment