mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

plustek-pp: Reuse sanei_directio for inb/outb

pixma-add-canon-ts-3400-series
Thierry HUCHARD 2021-12-15 22:37:02 +02:00 zatwierdzone przez Povilas Kanapickas
rodzic 8a2a81a83c
commit c7575b3679
2 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
backend/plustek-pp_io.c
Wyświetl plik

@ -959,37 +959,37 @@ _LOC void IOReadScannerImageData( pScanData ps, pUChar pBuf, ULong size )
*/ */
_LOC void IOOut( Byte data, UShort port ) _LOC void IOOut( Byte data, UShort port )
{ {
DBG( DBG_IOF, "outb(0x%04x, 0x%02x)\n", port, data ); DBG( DBG_IOF, "sanei_outb(0x%04x, 0x%02x)\n", port, data );
outb( data, port ); sanei_outb( port, data );
} }
_LOC void IOOutDelayed( Byte data, UShort port ) _LOC void IOOutDelayed( Byte data, UShort port )
{ {
DBG( DBG_IOF, "outb_p(0x%04x, 0x%02x)\n", port, data ); DBG( DBG_IOF, "sanei_outb_p(0x%04x, 0x%02x)\n", port, data );
outb_p( data, port ); sanei_outb_p( port, data );
} }
_LOC Byte IOIn( UShort port ) _LOC Byte IOIn( UShort port )
{ {
#ifdef DEBUG #ifdef DEBUG
Byte data = inb( port ); Byte data = sani_inb( port );
DBG( DBG_IOF, "inb(0x%04x) = 0x%02x\n", port, data ); DBG( DBG_IOF, "sanei_inb(0x%04x) = 0x%02x\n", port, data );
return data; return data;
#else #else
return inb( port ); return sanei_inb( port );
#endif #endif
} }
_LOC Byte IOInDelayed( UShort port ) _LOC Byte IOInDelayed( UShort port )
{ {
#ifdef DEBUG #ifdef DEBUG
Byte data = inb_p( port ); Byte data = sanei_inb_p( port );
DBG( DBG_IOF, "inb_p(0x%04x) = 0x%02x\n", port, data ); DBG( DBG_IOF, "sanei_inb_p(0x%04x) = 0x%02x\n", port, data );
return data; return data;
#else #else
return inb_p( port ); return sanei_inb_p( port );
#endif #endif
} }
#endif /* guard __KERNEL__ */ #endif /* guard __KERNEL__ */

2
backend/plustek-pp_misc.c
Wyświetl plik

@ -320,7 +320,7 @@ static int miscSetFastMode( pScanData ps )
_OUTB_DATA(ps,0x55); _OUTB_DATA(ps,0x55);
_DO_UDELAY(1); _DO_UDELAY(1);
if ((inb(ps->IO.portBase)) != 0x55) /* read data */ if ((sanei_inb(ps->IO.portBase)) != 0x55) /* read data */
a++; a++;
_OUTB_DATA(ps,0xAA); _OUTB_DATA(ps,0xAA);