JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sbttons for values > 2s

Browse Source 
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:
imp 2019-04-13 04:46:35 +00:00 committed by Sebastian Huber
parent 57640bee75
commit 7346e14d44
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
newlib/libc/include/sys/time.h
View File

@ -33,7 +33,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)time.h 8.5 (Berkeley) 5/4/95 * @(#)time.h 8.5 (Berkeley) 5/4/95
* $FreeBSD: head/sys/sys/time.h 340664 2018-11-20 07:11:23Z imp $ * $FreeBSD: head/sys/sys/time.h 346176 2019-04-13 04:46:35Z imp $
*/ */
#ifndef _SYS_TIME_H_ #ifndef _SYS_TIME_H_
@ -191,8 +191,15 @@ sbttobt(sbintime_t _sbt)
static __inline int64_t static __inline int64_t
sbttons(sbintime_t _sbt) sbttons(sbintime_t _sbt)
{ {
uint64_t ns;
return ((1000000000 * _sbt) >> 32); ns = _sbt;
if (ns >= SBT_1S)
ns = (ns >> 32) * 1000000000;
else
ns = 0;
return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32));
} }
static __inline sbintime_t static __inline sbintime_t