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

qcam: Reuse sanei_directio

merge-requests/521/head
Thierry HUCHARD 2021-12-15 22:36:57 +02:00 zatwierdzone przez Povilas Kanapickas
rodzic 79e470cf9a
commit abbc93df1a
2 zmienionych plików z 10 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
backend/Makefile.am
Wyświetl plik

@ -1538,7 +1538,8 @@ libsane_qcam_la_LIBADD = $(COMMON_LIBS) \
../sanei/sanei_constrain_value.lo \
../sanei/sanei_config.lo \
sane_strstatus.lo \
../sanei/sanei_pio.lo
../sanei/sanei_pio.lo \
../sanei/sanei_directio.lo
EXTRA_DIST += qcam.conf.in

26
backend/qcam.c
Wyświetl plik

@ -191,23 +191,13 @@ static const SANE_Range odd_bw_x_range = { 1, 335, 2 };
static const SANE_Range bw_y_range = { 0, 241, 1 };
static const SANE_Range odd_bw_y_range = { 1, 242, 1 };
#if defined(HAVE_SYS_IO_H) || defined(HAVE_ASM_IO_H) || defined (HAVE_SYS_HW_H)
#include "../include/sane/sanei_directio.h"
#ifdef HAVE_SYS_IO_H
# include <sys/io.h> /* GNU libc based OS */
#elif HAVE_ASM_IO_H
# include <asm/io.h> /* older Linux */
#elif HAVE_SYS_HW_H
# include <sys/hw.h> /* OS/2 */
#endif
#endif /* <sys/io.h> || <asm/io.h> || <sys/hw.h> */
#define read_lpdata(d) inb ((d)->port)
#define read_lpstatus(d) inb ((d)->port + 1)
#define read_lpcontrol(d) inb ((d)->port + 2)
#define write_lpdata(d,v) outb ((v), (d)->port)
#define write_lpcontrol(d,v) outb ((v), (d)->port + 2)
#define read_lpdata(d) sanei_inb ((d)->port)
#define read_lpstatus(d) sanei_inb ((d)->port + 1)
#define read_lpcontrol(d) sanei_inb ((d)->port + 2)
#define write_lpdata(d,v) sanei_outb ((d)->port, (v))
#define write_lpcontrol(d,v) sanei_outb ((d)->port + 2, (v))
static SANE_Status
@ -217,7 +207,7 @@ enable_ports (QC_Device * q)
if (q->port < 0x278 || q->port > 0x3bc)
return SANE_STATUS_INVAL;
if (ioperm (q->port, 3, 1) < 0)
if (sanei_ioperm (q->port, 3, 1) < 0)
return SANE_STATUS_INVAL;
return SANE_STATUS_GOOD;
@ -226,7 +216,7 @@ enable_ports (QC_Device * q)
static SANE_Status
disable_ports (QC_Device * q)
{
if (ioperm (q->port, 3, 0) < 0)
if (sanei_ioperm (q->port, 3, 0) < 0)
return SANE_STATUS_INVAL;
return SANE_STATUS_GOOD;