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
14834a47
Commit
14834a47
authored
12 years ago
by
Wesley W. Terpstra
Browse files
Options
Downloads
Patches
Plain Diff
Fix two latent bugs reading undefined register bits.
parent
cac1837b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dev/minic.c
+1
-1
1 addition, 1 deletion
dev/minic.c
dev/pps_gen.c
+1
-1
1 addition, 1 deletion
dev/pps_gen.c
with
2 additions
and
2 deletions
dev/minic.c
+
1
−
1
View file @
14834a47
...
...
@@ -250,7 +250,7 @@ int minic_rx_frame(uint8_t *hdr, uint8_t *payload, uint32_t buf_size, struct hw_
minic_rxbuf_free
(
num_words
);
minic
.
rx_head
=
(
uint32_t
*
)((
uint32_t
)
minic
.
rx_base
+
((
uint32_t
)
minic
.
rx_head
+
(
num_words
<<
2
)
-
(
uint32_t
)
minic
.
rx_base
)
%
(
minic
.
rx_size
<<
2
));
cur_avail
=
minic_readl
(
MINIC_REG_RX_AVAIL
)
;
cur_avail
=
minic_readl
(
MINIC_REG_RX_AVAIL
)
&
0xFFFFFF
;
/* 24-bit field */
/*empty buffer->no more received packets, or packet reception in progress but not done*/
if
(
!
RX_DESC_VALID
(
*
minic
.
rx_head
))
...
...
This diff is collapsed.
Click to expand it.
dev/pps_gen.c
+
1
−
1
View file @
14834a47
...
...
@@ -92,7 +92,7 @@ void pps_gen_get_time(uint64_t *seconds, uint32_t *nanoseconds)
do
{
sec1
=
pps_get_utc
();
ns_cnt
=
ppsg_read
(
CNTR_NSEC
)
;
ns_cnt
=
ppsg_read
(
CNTR_NSEC
)
&
0xFFFFFFFUL
;
/* 28-bit wide register */
sec2
=
pps_get_utc
();
}
while
(
sec2
!=
sec1
);
...
...
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