Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
HDL
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RTSD
HDL
Commits
4e8812c6
Commit
4e8812c6
authored
3 years ago
by
Eric Kooistra
Committed by
Pieter Donker
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Made antenne_band_index RW. Remove O_si, N_si because not used. Move O_rn, N_rn to ring_info.
parent
4a5fbf13
No related branches found
No related tags found
1 merge request
!207
Made antenne_band_index RW in sdp_info. Removed O_si, N_si from sdp_info...
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd
+6
-15
6 additions, 15 deletions
applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd
with
6 additions
and
15 deletions
applications/lofar2/libraries/sdp/src/vhdl/sdp_info_reg.vhd
+
6
−
15
View file @
4e8812c6
...
...
@@ -60,18 +60,14 @@ END sdp_info_reg;
ARCHITECTURE
str
OF
sdp_info_reg
IS
CONSTANT
c_field_arr
:
t_common_field_arr
(
11
DOWNTO
0
)
:
=
CONSTANT
c_field_arr
:
t_common_field_arr
(
7
DOWNTO
0
)
:
=
(
(
field_name_pad
(
"station_id"
),
"RW"
,
16
,
field_default
(
0
)),
(
field_name_pad
(
"antenna_band_index"
),
"R
O
"
,
1
,
field_default
(
0
)),
(
field_name_pad
(
"antenna_band_index"
),
"R
W
"
,
1
,
field_default
(
0
)),
(
field_name_pad
(
"observation_id"
),
"RW"
,
32
,
field_default
(
0
)),
(
field_name_pad
(
"nyquist_zone_index"
),
"RW"
,
2
,
field_default
(
0
)),
(
field_name_pad
(
"f_adc"
),
"RO"
,
1
,
field_default
(
0
)),
(
field_name_pad
(
"fsub_type"
),
"RO"
,
1
,
field_default
(
0
)),
(
field_name_pad
(
"beam_repositioning_flag"
),
"RW"
,
1
,
field_default
(
0
)),
(
field_name_pad
(
"O_si"
),
"RW"
,
8
,
field_default
(
0
)),
(
field_name_pad
(
"N_si"
),
"RW"
,
8
,
field_default
(
0
)),
(
field_name_pad
(
"O_rn"
),
"RW"
,
8
,
field_default
(
0
)),
(
field_name_pad
(
"N_rn"
),
"RW"
,
8
,
field_default
(
0
)),
(
field_name_pad
(
"block_period"
),
"RO"
,
16
,
field_default
(
0
))
);
SIGNAL
mm_fields_in
:
STD_LOGIC_VECTOR
(
field_slv_in_len
(
c_field_arr
)
-1
DOWNTO
0
);
...
...
@@ -90,7 +86,6 @@ BEGIN
sdp_info_rd
<=
sdp_info_wr
;
-- overrule the read only fields
sdp_info_rd
.
antenna_band_index
<=
sdp_info_ro
.
antenna_band_index
;
sdp_info_rd
.
f_adc
<=
sdp_info_ro
.
f_adc
;
sdp_info_rd
.
fsub_type
<=
sdp_info_ro
.
fsub_type
;
sdp_info_rd
.
block_period
<=
sdp_info_ro
.
block_period
;
...
...
@@ -119,19 +114,15 @@ BEGIN
);
-- add "RO" fields to mm_fields
mm_fields_in
(
field_hi
(
c_field_arr
,
"antenna_band_index"
)
DOWNTO
field_lo
(
c_field_arr
,
"antenna_band_index"
))
<=
slv
(
sdp_info_rd
.
antenna_band_index
);
mm_fields_in
(
field_hi
(
c_field_arr
,
"f_adc"
)
DOWNTO
field_lo
(
c_field_arr
,
"f_adc"
))
<=
slv
(
sdp_info_rd
.
f_adc
);
mm_fields_in
(
field_hi
(
c_field_arr
,
"fsub_type"
)
DOWNTO
field_lo
(
c_field_arr
,
"fsub_type"
))
<=
slv
(
sdp_info_rd
.
fsub_type
);
mm_fields_in
(
field_hi
(
c_field_arr
,
"block_period"
)
DOWNTO
field_lo
(
c_field_arr
,
"block_period"
))
<=
sdp_info_rd
.
block_period
;
mm_fields_in
(
field_hi
(
c_field_arr
,
"f_adc"
)
DOWNTO
field_lo
(
c_field_arr
,
"f_adc"
))
<=
slv
(
sdp_info_rd
.
f_adc
);
mm_fields_in
(
field_hi
(
c_field_arr
,
"fsub_type"
)
DOWNTO
field_lo
(
c_field_arr
,
"fsub_type"
))
<=
slv
(
sdp_info_rd
.
fsub_type
);
mm_fields_in
(
field_hi
(
c_field_arr
,
"block_period"
)
DOWNTO
field_lo
(
c_field_arr
,
"block_period"
))
<=
sdp_info_rd
.
block_period
;
-- get "RW" fields from mm_fields
sdp_info_wr
.
station_id
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"station_id"
)
DOWNTO
field_lo
(
c_field_arr
,
"station_id"
));
sdp_info_wr
.
antenna_band_index
<=
sl
(
mm_fields_out
(
field_hi
(
c_field_arr
,
"antenna_band_index"
)
DOWNTO
field_lo
(
c_field_arr
,
"antenna_band_index"
)));
sdp_info_wr
.
observation_id
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"observation_id"
)
DOWNTO
field_lo
(
c_field_arr
,
"observation_id"
));
sdp_info_wr
.
nyquist_zone_index
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"nyquist_zone_index"
)
DOWNTO
field_lo
(
c_field_arr
,
"nyquist_zone_index"
));
sdp_info_wr
.
beam_repositioning_flag
<=
sl
(
mm_fields_out
(
field_hi
(
c_field_arr
,
"beam_repositioning_flag"
)
DOWNTO
field_lo
(
c_field_arr
,
"beam_repositioning_flag"
)));
sdp_info_wr
.
O_si
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"O_si"
)
DOWNTO
field_lo
(
c_field_arr
,
"O_si"
));
sdp_info_wr
.
N_si
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"N_si"
)
DOWNTO
field_lo
(
c_field_arr
,
"N_si"
));
sdp_info_wr
.
O_rn
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"O_rn"
)
DOWNTO
field_lo
(
c_field_arr
,
"O_rn"
));
sdp_info_wr
.
N_rn
<=
mm_fields_out
(
field_hi
(
c_field_arr
,
"N_rn"
)
DOWNTO
field_lo
(
c_field_arr
,
"N_rn"
));
END
str
;
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