Fixed compilation problem for kernel module with gcc-3.4 compiler.

merge-requests/1/head
Gerhard Jaeger 2005-04-25 09:53:08 +00:00
rodzic b4b0163175
commit 885b787ee1
3 zmienionych plików z 7 dodań i 9 usunięć

Wyświetl plik

@ -377,7 +377,7 @@ static void ioRestoreParallelMode( pScanData ps )
/** try to connect to scanner (ASIC 9600x and 98001)
*/
_LOC _INL void ioP98001EstablishScannerConnection( pScanData ps, ULong delTime )
_LOC void ioP98001EstablishScannerConnection( pScanData ps, ULong delTime )
{
_OUTB_DATA( ps, _ID_TO_PRINTER );
_DO_UDELAY( delTime );

Wyświetl plik

@ -601,7 +601,7 @@ _LOC void MiscRestorePort( pScanData ps )
* @param timer - pointer to the timer to start
* @param us - timeout value in micro-seconds
*/
_LOC _INL void MiscStartTimer( pTimerDef timer , unsigned long us)
_LOC void MiscStartTimer( pTimerDef timer , unsigned long us)
{
struct timeval start_time;
@ -620,7 +620,7 @@ _LOC _INL void MiscStartTimer( pTimerDef timer , unsigned long us)
* @return Function returns _E_TIMEOUT when the timer has been expired,
* otherwise _OK;
*/
_LOC _INL int MiscCheckTimer( pTimerDef timer )
_LOC int MiscCheckTimer( pTimerDef timer )
{
struct timeval current_time;

Wyświetl plik

@ -75,10 +75,8 @@
#ifdef _BACKEND_ENABLED
# define _LOC static
# define _INL
#else
# define _LOC
# define _INL inline
#endif
/*
@ -87,10 +85,10 @@
_LOC pScanData MiscAllocAndInitStruct( void );
_LOC int MiscReinitStruct ( pScanData ps );
_LOC int MiscInitPorts ( pScanData ps, int port );
_LOC void MiscRestorePort ( pScanData ps );
_LOC _INL void MiscStartTimer ( pTimerDef timer, unsigned long us );
_LOC _INL int MiscCheckTimer ( pTimerDef timer );
_LOC int MiscInitPorts ( pScanData ps, int port );
_LOC void MiscRestorePort( pScanData ps );
_LOC void MiscStartTimer ( pTimerDef timer, unsigned long us );
_LOC int MiscCheckTimer ( pTimerDef timer );
_LOC int MiscRegisterPort ( pScanData ps, int portAddr );
_LOC void MiscUnregisterPort ( pScanData ps );