diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
| commit | ee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch) | |
| tree | 58f05092be1a17a939e861f8cadcda1b6ca2ecef /backend/plustek-pp_misc.c | |
| parent | 0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff) | |
| parent | fef76e17ed4c607ea73b81279f9ef1d7121be900 (diff) | |
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'backend/plustek-pp_misc.c')
| -rw-r--r-- | backend/plustek-pp_misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/plustek-pp_misc.c b/backend/plustek-pp_misc.c index d0c1ce7..a0ce200 100644 --- a/backend/plustek-pp_misc.c +++ b/backend/plustek-pp_misc.c @@ -280,7 +280,7 @@ static int miscSetFastMode( pScanData ps ) ps->IO.lastPortMode = a; /* save it for restoring later */ /* set to Fast Centronics/bi-directional/PS2 */ - a = (a & 0x1F) | 0x20; + a = (a & 0x1F) | 0x20; _OUTB_ECTL(ps,a); /* write it back */ _DO_UDELAY(1); @@ -335,7 +335,7 @@ static int miscSetFastMode( pScanData ps ) DBG(DBG_LOW, "Port is set to PS2 bidirectional mode.\n"); ps->IO.portMode = _PORT_BIDI; return _OK; - + } else { DBG(DBG_LOW, "Port could not be set to PS2 mode. " "Using SPP mode.\n"); @@ -458,7 +458,7 @@ _LOC pScanData MiscAllocAndInitStruct( void ) } DBG( DBG_HIGH, "ScanData = 0x%08lx\n", (unsigned long)ps ); - return ps; + return ps; } /** re-initialize the memory for the scanner structure @@ -610,7 +610,7 @@ _LOC void MiscStartTimer( TimerDef *timer , unsigned long us) #ifdef __KERNEL__ _GET_TIME( &start_time ); #else - gettimeofday(&start_time, NULL); + gettimeofday(&start_time, NULL); #endif *timer = (TimerDef)start_time.tv_sec * 1000000 + (TimerDef)start_time.tv_usec + us; @@ -635,7 +635,7 @@ _LOC int MiscCheckTimer( TimerDef *timer ) if ((TimerDef)current_time.tv_sec * 1000000 + (TimerDef)current_time.tv_usec > *timer) { return _E_TIMEOUT; } else { -#ifdef __KERNEL__ +#ifdef __KERNEL__ schedule(); /*#else sched_yield(); @@ -739,7 +739,7 @@ _LOC int MiscRegisterPort( pScanData ps, int portAddr ) return _OK; } -/** unregisters the port from driver +/** unregisters the port from driver */ _LOC void MiscUnregisterPort( pScanData ps ) { |