Fix sbttons for values > 2s
Add test against negative times. Add code to cope with larger values properly. Discussed with: bde@ (quite some time ago, for an earlier version)
This commit is contained in:
parent
f20b149b45
commit
6758096403
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=346176
@ -184,8 +184,18 @@ sbttobt(sbintime_t _sbt)
|
||||
static __inline int64_t
|
||||
sbttons(sbintime_t _sbt)
|
||||
{
|
||||
uint64_t ns;
|
||||
|
||||
return ((1000000000 * _sbt) >> 32);
|
||||
#ifdef KASSERT
|
||||
KASSERT(_sbt >= 0, ("Negative values illegal for sbttons: %jx", _sbt));
|
||||
#endif
|
||||
ns = _sbt;
|
||||
if (ns >= SBT_1S)
|
||||
ns = (ns >> 32) * 1000000000;
|
||||
else
|
||||
ns = 0;
|
||||
|
||||
return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32));
|
||||
}
|
||||
|
||||
static __inline sbintime_t
|
||||
|
Loading…
Reference in New Issue
Block a user