Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Software for White Rabbit PTP Core
Manage
Activity
Members
Labels
Plan
Issues
39
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
Software for White Rabbit PTP Core
Commits
629e1750
Commit
629e1750
authored
5 years ago
by
Maciej Lipinski
Browse files
Options
Downloads
Patches
Plain Diff
wr_streamers: update header of streamers, bump up version, allow version mismatch, with warning
parent
1e5be7e9
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/hw/wr_streamers.h
+90
-3
90 additions, 3 deletions
include/hw/wr_streamers.h
tools/wr-streamers.c
+3
-2
3 additions, 2 deletions
tools/wr-streamers.c
with
93 additions
and
5 deletions
include/hw/wr_streamers.h
+
90
−
3
View file @
629e1750
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
* File : ./doc/wr_streamers.h
* File : ./doc/wr_streamers.h
* Author : auto-generated by wbgen2 from wr_streamers_wb.wb
* Author : auto-generated by wbgen2 from wr_streamers_wb.wb
* Created : T
ue Jun 20 08:53:54
201
7
* Created : T
hu May 23 10:58:36
201
9
* Version : 0x0000000
1
* Version : 0x0000000
2
* Standard : ANSI C
* Standard : ANSI C
THIS FILE WAS GENERATED BY wbgen2 FROM SOURCE FILE wr_streamers_wb.wb
THIS FILE WAS GENERATED BY wbgen2 FROM SOURCE FILE wr_streamers_wb.wb
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
#endif
#endif
/* version definition */
/* version definition */
#define WBGEN2_WR_STREAMERS_VERSION 0x0000000
1
#define WBGEN2_WR_STREAMERS_VERSION 0x0000000
2
/* definitions for register: Version register */
/* definitions for register: Version register */
...
@@ -359,6 +359,75 @@
...
@@ -359,6 +359,75 @@
#define WR_STREAMERS_DUMMY_DUMMY_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_DUMMY_DUMMY_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_DUMMY_DUMMY_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
#define WR_STREAMERS_DUMMY_DUMMY_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Reset Register */
/* definitions for field: Software reset streamers in reg: Reset Register */
#define WR_STREAMERS_RSTR_RST_SW WBGEN2_GEN_MASK(0, 1)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX Buffer Overflow Count in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT14_RX_BUF_OVERFLOW_CNT_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT14_RX_BUF_OVERFLOW_CNT_SHIFT 0
#define WR_STREAMERS_RX_STAT14_RX_BUF_OVERFLOW_CNT_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT14_RX_BUF_OVERFLOW_CNT_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX Late Frames Count (LSB) in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT15_RX_LATE_FRAMES_CNT_LSB_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT15_RX_LATE_FRAMES_CNT_LSB_SHIFT 0
#define WR_STREAMERS_RX_STAT15_RX_LATE_FRAMES_CNT_LSB_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT15_RX_LATE_FRAMES_CNT_LSB_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX Late Frames Count (MSB) in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT16_RX_LATE_FRAMES_CNT_MSB_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT16_RX_LATE_FRAMES_CNT_MSB_SHIFT 0
#define WR_STREAMERS_RX_STAT16_RX_LATE_FRAMES_CNT_MSB_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT16_RX_LATE_FRAMES_CNT_MSB_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX Timed-out Frames Count (LSB) in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT17_RX_TIMEOUT_FRAMES_CNT_LSB_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT17_RX_TIMEOUT_FRAMES_CNT_LSB_SHIFT 0
#define WR_STREAMERS_RX_STAT17_RX_TIMEOUT_FRAMES_CNT_LSB_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT17_RX_TIMEOUT_FRAMES_CNT_LSB_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX Timed-out Frames Count (MSB) in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT18_RX_TIMEOUT_FRAMES_CNT_MSB_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT18_RX_TIMEOUT_FRAMES_CNT_MSB_SHIFT 0
#define WR_STREAMERS_RX_STAT18_RX_TIMEOUT_FRAMES_CNT_MSB_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT18_RX_TIMEOUT_FRAMES_CNT_MSB_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX OK Frames Count (LSB) in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT19_RX_MATCH_FRAMES_CNT_LSB_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT19_RX_MATCH_FRAMES_CNT_LSB_SHIFT 0
#define WR_STREAMERS_RX_STAT19_RX_MATCH_FRAMES_CNT_LSB_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT19_RX_MATCH_FRAMES_CNT_LSB_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx statistics */
/* definitions for field: WR Streamer RX OK Frames Count (MSB) in reg: Rx statistics */
#define WR_STREAMERS_RX_STAT20_RX_MATCH_FRAMES_CNT_MSB_MASK WBGEN2_GEN_MASK(0, 32)
#define WR_STREAMERS_RX_STAT20_RX_MATCH_FRAMES_CNT_MSB_SHIFT 0
#define WR_STREAMERS_RX_STAT20_RX_MATCH_FRAMES_CNT_MSB_W(value) WBGEN2_GEN_WRITE(value, 0, 32)
#define WR_STREAMERS_RX_STAT20_RX_MATCH_FRAMES_CNT_MSB_R(reg) WBGEN2_GEN_READ(reg, 0, 32)
/* definitions for register: Rx Config Reg 6 */
/* definitions for field: RX Fixed Latency Timeout (Default: 0x1000000=~134ms) in reg: Rx Config Reg 6 */
#define WR_STREAMERS_RX_CFG6_RX_FIXED_LATENCY_TIMEOUT_MASK WBGEN2_GEN_MASK(0, 28)
#define WR_STREAMERS_RX_CFG6_RX_FIXED_LATENCY_TIMEOUT_SHIFT 0
#define WR_STREAMERS_RX_CFG6_RX_FIXED_LATENCY_TIMEOUT_W(value) WBGEN2_GEN_WRITE(value, 0, 28)
#define WR_STREAMERS_RX_CFG6_RX_FIXED_LATENCY_TIMEOUT_R(reg) WBGEN2_GEN_READ(reg, 0, 28)
PACKED
struct
WR_STREAMERS_WB
{
PACKED
struct
WR_STREAMERS_WB
{
/* [0x0]: REG Version register */
/* [0x0]: REG Version register */
uint32_t
VER
;
uint32_t
VER
;
...
@@ -428,6 +497,24 @@ PACKED struct WR_STREAMERS_WB {
...
@@ -428,6 +497,24 @@ PACKED struct WR_STREAMERS_WB {
uint32_t
DBG_DATA
;
uint32_t
DBG_DATA
;
/* [0x84]: REG Test value */
/* [0x84]: REG Test value */
uint32_t
DUMMY
;
uint32_t
DUMMY
;
/* [0x88]: REG Reset Register */
uint32_t
RSTR
;
/* [0x8c]: REG Rx statistics */
uint32_t
RX_STAT14
;
/* [0x90]: REG Rx statistics */
uint32_t
RX_STAT15
;
/* [0x94]: REG Rx statistics */
uint32_t
RX_STAT16
;
/* [0x98]: REG Rx statistics */
uint32_t
RX_STAT17
;
/* [0x9c]: REG Rx statistics */
uint32_t
RX_STAT18
;
/* [0xa0]: REG Rx statistics */
uint32_t
RX_STAT19
;
/* [0xa4]: REG Rx statistics */
uint32_t
RX_STAT20
;
/* [0xa8]: REG Rx Config Reg 6 */
uint32_t
RX_CFG6
;
};
};
#endif
#endif
This diff is collapsed.
Click to expand it.
tools/wr-streamers.c
+
3
−
2
View file @
629e1750
...
@@ -700,9 +700,10 @@ int main(int argc, char *argv[])
...
@@ -700,9 +700,10 @@ int main(int argc, char *argv[])
ret
=
verify_reg_version
();
ret
=
verify_reg_version
();
if
(
ret
)
{
if
(
ret
)
{
fprintf
(
stderr
,
"============== !!! WARNING !!! ===============
\n
"
);
fprintf
(
stderr
,
"Register version in FPGA and SW does not match
\n
"
);
fprintf
(
stderr
,
"Register version in FPGA and SW does not match
\n
"
);
dev_unmap
(
wrstm
);
fprintf
(
stderr
,
" Using SW at your own risk
\n
"
);
return
-
1
;
fprintf
(
stderr
,
"============== !!! WARNING !!! ===============
\n
"
)
;
}
}
ret
=
extest_register_user_cmd
(
wrstm_cmd
,
WRSTM_CMD_NB
);
ret
=
extest_register_user_cmd
(
wrstm_cmd
,
WRSTM_CMD_NB
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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