kopia lustrzana https://gitlab.com/sane-project/backends
Applied patch (see bug #301605).
rodzic
e9152e5879
commit
8c78f8fcc2
|
@ -601,7 +601,7 @@ _LOC void MiscRestorePort( pScanData ps )
|
||||||
* @param timer - pointer to the timer to start
|
* @param timer - pointer to the timer to start
|
||||||
* @param us - timeout value in micro-seconds
|
* @param us - timeout value in micro-seconds
|
||||||
*/
|
*/
|
||||||
_LOC void MiscStartTimer( pTimerDef timer , unsigned long us)
|
_LOC void MiscStartTimer( TimerDef *timer , unsigned long us)
|
||||||
{
|
{
|
||||||
struct timeval start_time;
|
struct timeval start_time;
|
||||||
|
|
||||||
|
@ -611,7 +611,7 @@ _LOC void MiscStartTimer( pTimerDef timer , unsigned long us)
|
||||||
gettimeofday(&start_time, NULL);
|
gettimeofday(&start_time, NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
*timer = start_time.tv_sec * 1000000 + start_time.tv_usec + us;
|
*timer = (TimerDef)start_time.tv_sec * 1000000 + (TimerDef)start_time.tv_usec + us;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Checks if a timer has been expired or not. In Kernel-mode, the scheduler
|
/** Checks if a timer has been expired or not. In Kernel-mode, the scheduler
|
||||||
|
@ -620,7 +620,7 @@ _LOC void MiscStartTimer( pTimerDef timer , unsigned long us)
|
||||||
* @return Function returns _E_TIMEOUT when the timer has been expired,
|
* @return Function returns _E_TIMEOUT when the timer has been expired,
|
||||||
* otherwise _OK;
|
* otherwise _OK;
|
||||||
*/
|
*/
|
||||||
_LOC int MiscCheckTimer( pTimerDef timer )
|
_LOC int MiscCheckTimer( TimerDef *timer )
|
||||||
{
|
{
|
||||||
struct timeval current_time;
|
struct timeval current_time;
|
||||||
|
|
||||||
|
@ -630,7 +630,7 @@ _LOC int MiscCheckTimer( pTimerDef timer )
|
||||||
gettimeofday(¤t_time, NULL);
|
gettimeofday(¤t_time, NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (current_time.tv_sec * 1000000 + current_time.tv_usec > *timer) {
|
if ((TimerDef)current_time.tv_sec * 1000000 + (TimerDef)current_time.tv_usec > *timer) {
|
||||||
return _E_TIMEOUT;
|
return _E_TIMEOUT;
|
||||||
} else {
|
} else {
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
|
|
Ładowanie…
Reference in New Issue