Fixed compiler warnings, using now sanei_pp_udelay() and

made the backend work with libieee1284.
merge-requests/1/head
Gerhard Jaeger 2003-10-26 10:58:36 +00:00
rodzic edfe46590a
commit fb3ccaefb4
3 zmienionych plików z 21 dodań i 7 usunięć

Wyświetl plik

@ -521,6 +521,9 @@ _LOC int MiscInitPorts( pScanData ps, int port )
return _E_NOSUPP;
}
DBG(DBG_HIGH, "SPP mode used (WORKAROUND)!!!\n" );
ps->IO.portMode = _PORT_SPP;
_VAR_NOT_USED( port );
#endif
return _OK;

Wyświetl plik

@ -73,7 +73,6 @@
# include <string.h>
# include <stdio.h>
# include <unistd.h>
/*# include <sched.h>*/
# include <sys/time.h>
# include <sys/signal.h>
# include <sys/ioctl.h>
@ -152,21 +151,26 @@
* they are for use the the MiscStartTimer function and the _DO_UDELAY macro
*/
#ifndef __KERNEL__
typedef long long TimerDef, *pTimerDef;
typedef double TimerDef, *pTimerDef;
#else
typedef long long TimerDef, *pTimerDef;
#endif
#define _MSECOND 1000 /* based on 1 us */
#define _SECOND (1000*_MSECOND)
#define _MSECOND 1000 /* based on 1 us */
#define _SECOND (1000*_MSECOND)
/*.............................................................................
* timer topics
*/
#ifndef __KERNEL__
# define _DO_UDELAY(usecs) { int i,j; for( i = usecs; i--; ) j+=i*3; }
# define _DODELAY(msecs) { int i; for( i = msecs; i--; ) usleep(1000); }
#if 0
# warning "outb as delay!!!!"
# define _DO_UDELAY(usecs) { int i; for( i = usecs; i--; ) outb(0, 0x80); }
#else
# define _DO_UDELAY(usecs) sanei_pp_udelay(usecs)
#endif
# define _DODELAY(msecs) { int i; for( i = msecs; i--; ) _DO_UDELAY(1000); }
#else
# define _DO_UDELAY(usecs) udelay(usecs)
# define _DODELAY(msecs) mdelay(msecs)

Wyświetl plik

@ -1143,9 +1143,16 @@ SANE_Status sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
CnfDef config;
size_t len;
FILE *fp;
SANE_Status res;
DBG_INIT();
sanei_thread_init();
res = sanei_pp_init();
if( SANE_STATUS_GOOD != res ) {
DBG( _DBG_ERROR, "Could not initialize Parport library!\n" );
return res;
}
#if defined PACKAGE && defined VERSION
DBG( _DBG_SANE_INIT, "PlustekPP backend V"BACKEND_VERSION", part of "