diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
| commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/u12-motor.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/u12-motor.c')
| -rw-r--r-- | backend/u12-motor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/u12-motor.c b/backend/u12-motor.c index c3d5120..5f28236 100644 --- a/backend/u12-motor.c +++ b/backend/u12-motor.c @@ -91,7 +91,7 @@ static void u12motor_Force16Steps( U12_Device *dev, int dir ) static void u12motor_ModuleFreeRun( U12_Device *dev, u_long steps ) { SANE_Byte rb[6]; - + rb[0] = REG_MOTORFREERUNCOUNT1; rb[1] = _HIBYTE(steps); rb[2] = REG_MOTORFREERUNCOUNT0; rb[3] = _LOBYTE(steps); rb[4] = REG_MOTORFREERUNTRIGGER; rb[5] = 0; @@ -124,7 +124,7 @@ static SANE_Status u12motor_PositionYProc( U12_Device *dev, u_long steps ) if( u12io_IsEscPressed()) { DBG( _DBG_INFO, "* CANCEL detected!\n" ); return SANE_STATUS_CANCELLED; - } + } } while( !u12io_CheckTimer( &timer )); DBG( _DBG_INFO, "u12motor_PositionYProc() - done\n" ); @@ -289,7 +289,7 @@ static SANE_Status u12motor_ModuleToHome( U12_Device *dev ) res = u12motor_PositionYProc( dev, 40 ); if( SANE_STATUS_GOOD != res ) return res; - + res = u12motor_BackToHomeSensor( dev ); if( SANE_STATUS_GOOD != res ) return res; @@ -382,7 +382,7 @@ static SANE_Status u12motor_WaitForPositionY( U12_Device *dev ) while(( u12io_GetExtendedStatus( dev ) & _STILL_FREE_RUNNING) && !u12io_CheckTimer(&timer)); - u12io_DataToRegister( dev, REG_MODECONTROL, _ModeScan ); + u12io_DataToRegister( dev, REG_MODECONTROL, _ModeScan ); } else { u12motor_PositionYProc( dev, dwBeginY ); u12io_RegisterToScanner( dev, REG_REFRESHSCANSTATE ); @@ -425,7 +425,7 @@ static SANE_Status u12motor_GotoShadingPosition( U12_Device *dev ) SANE_Byte rb[20]; SANE_Status res; int c; - + DBG( _DBG_INFO, "u12motor_GotoShadingPosition()\n" ); res = u12motor_ModuleToHome( dev ); if( SANE_STATUS_GOOD == res ) |