Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Show more breadcrumbs
cm-projects
RIOT
Commits
8217e493
Commit
8217e493
authored
8 years ago
by
Joakim Nohlgård
Browse files
Options
Downloads
Patches
Plain Diff
sys/xtimer: avoid C99 initializer list to make file C++11 compatible
parent
a23bfc64
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sys/include/xtimer/implementation.h
+19
-10
19 additions, 10 deletions
sys/include/xtimer/implementation.h
with
19 additions
and
10 deletions
sys/include/xtimer/implementation.h
+
19
−
10
View file @
8217e493
...
@@ -110,13 +110,15 @@ static inline uint32_t _xtimer_now(void)
...
@@ -110,13 +110,15 @@ static inline uint32_t _xtimer_now(void)
static
inline
xtimer_ticks32_t
xtimer_now
(
void
)
static
inline
xtimer_ticks32_t
xtimer_now
(
void
)
{
{
xtimer_ticks32_t
ret
=
{
.
ticks32
=
_xtimer_now
()
};
xtimer_ticks32_t
ret
;
ret
.
ticks32
=
_xtimer_now
();
return
ret
;
return
ret
;
}
}
static
inline
xtimer_ticks64_t
xtimer_now64
(
void
)
static
inline
xtimer_ticks64_t
xtimer_now64
(
void
)
{
{
xtimer_ticks64_t
ret
=
{
.
ticks64
=
_xtimer_now64
()
};
xtimer_ticks64_t
ret
;
ret
.
ticks64
=
_xtimer_now64
();
return
ret
;
return
ret
;
}
}
...
@@ -226,13 +228,15 @@ static inline int xtimer_msg_receive_timeout64(msg_t *msg, uint64_t timeout)
...
@@ -226,13 +228,15 @@ static inline int xtimer_msg_receive_timeout64(msg_t *msg, uint64_t timeout)
static
inline
xtimer_ticks32_t
xtimer_ticks_from_usec
(
uint32_t
usec
)
static
inline
xtimer_ticks32_t
xtimer_ticks_from_usec
(
uint32_t
usec
)
{
{
xtimer_ticks32_t
ticks
=
{
.
ticks32
=
_xtimer_ticks_from_usec
(
usec
)
};
xtimer_ticks32_t
ticks
;
ticks
.
ticks32
=
_xtimer_ticks_from_usec
(
usec
);
return
ticks
;
return
ticks
;
}
}
static
inline
xtimer_ticks64_t
xtimer_ticks_from_usec64
(
uint64_t
usec
)
static
inline
xtimer_ticks64_t
xtimer_ticks_from_usec64
(
uint64_t
usec
)
{
{
xtimer_ticks64_t
ticks
=
{
.
ticks64
=
_xtimer_ticks_from_usec64
(
usec
)
};
xtimer_ticks64_t
ticks
;
ticks
.
ticks64
=
_xtimer_ticks_from_usec64
(
usec
);
return
ticks
;
return
ticks
;
}
}
...
@@ -248,32 +252,37 @@ static inline uint64_t xtimer_usec_from_ticks64(xtimer_ticks64_t ticks)
...
@@ -248,32 +252,37 @@ static inline uint64_t xtimer_usec_from_ticks64(xtimer_ticks64_t ticks)
static
inline
xtimer_ticks32_t
xtimer_ticks
(
uint32_t
ticks
)
static
inline
xtimer_ticks32_t
xtimer_ticks
(
uint32_t
ticks
)
{
{
xtimer_ticks32_t
ret
=
{
.
ticks32
=
ticks
};
xtimer_ticks32_t
ret
;
ret
.
ticks32
=
ticks
;
return
ret
;
return
ret
;
}
}
static
inline
xtimer_ticks64_t
xtimer_ticks64
(
uint64_t
ticks
)
static
inline
xtimer_ticks64_t
xtimer_ticks64
(
uint64_t
ticks
)
{
{
xtimer_ticks64_t
ret
=
{
.
ticks64
=
ticks
};
xtimer_ticks64_t
ret
;
ret
.
ticks64
=
ticks
;
return
ret
;
return
ret
;
}
}
static
inline
xtimer_ticks32_t
xtimer_diff
(
xtimer_ticks32_t
a
,
xtimer_ticks32_t
b
)
static
inline
xtimer_ticks32_t
xtimer_diff
(
xtimer_ticks32_t
a
,
xtimer_ticks32_t
b
)
{
{
xtimer_ticks32_t
ret
=
{
.
ticks32
=
(
a
.
ticks32
-
b
.
ticks32
)
};
xtimer_ticks32_t
ret
;
ret
.
ticks32
=
a
.
ticks32
-
b
.
ticks32
;
return
ret
;
return
ret
;
}
}
static
inline
xtimer_ticks64_t
xtimer_diff64
(
xtimer_ticks64_t
a
,
xtimer_ticks64_t
b
)
static
inline
xtimer_ticks64_t
xtimer_diff64
(
xtimer_ticks64_t
a
,
xtimer_ticks64_t
b
)
{
{
xtimer_ticks64_t
ret
=
{
.
ticks64
=
(
a
.
ticks64
-
b
.
ticks64
)
};
xtimer_ticks64_t
ret
;
ret
.
ticks64
=
a
.
ticks64
-
b
.
ticks64
;
return
ret
;
return
ret
;
}
}
static
inline
xtimer_ticks32_t
xtimer_diff32_64
(
xtimer_ticks64_t
a
,
xtimer_ticks64_t
b
)
static
inline
xtimer_ticks32_t
xtimer_diff32_64
(
xtimer_ticks64_t
a
,
xtimer_ticks64_t
b
)
{
{
uint64_t
diff
=
(
a
.
ticks64
-
b
.
ticks64
);
uint64_t
diff
=
a
.
ticks64
-
b
.
ticks64
;
xtimer_ticks32_t
ret
=
{
.
ticks32
=
(
uint32_t
)
diff
};
xtimer_ticks32_t
ret
;
ret
.
ticks32
=
diff
;
return
ret
;
return
ret
;
}
}
...
...
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