diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
| commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/mustek_pp_decl.h | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/mustek_pp_decl.h')
| -rw-r--r-- | backend/mustek_pp_decl.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/backend/mustek_pp_decl.h b/backend/mustek_pp_decl.h index 3875f3d..2ccce95 100644 --- a/backend/mustek_pp_decl.h +++ b/backend/mustek_pp_decl.h @@ -23,25 +23,25 @@ static void debug_drv_stop (SANE_Handle hndl); /* CIS drivers for 600CP, 1200CP, and 1200CP+ Version 0.13-beta, author Eddy De Greef */ -static SANE_Status cis600_drv_init (SANE_Int options, +static SANE_Status cis600_drv_init (SANE_Int options, SANE_String_Const port, - SANE_String_Const name, + SANE_String_Const name, SANE_Attach_Callback attach); -static SANE_Status cis1200_drv_init (SANE_Int options, +static SANE_Status cis1200_drv_init (SANE_Int options, SANE_String_Const port, - SANE_String_Const name, + SANE_String_Const name, SANE_Attach_Callback attach); -static SANE_Status cis1200p_drv_init(SANE_Int options, +static SANE_Status cis1200p_drv_init(SANE_Int options, SANE_String_Const port, - SANE_String_Const name, + SANE_String_Const name, SANE_Attach_Callback attach); -static void cis_drv_capabilities(SANE_Int info, +static void cis_drv_capabilities(SANE_Int info, SANE_String *model, - SANE_String *vendor, + SANE_String *vendor, SANE_String *type, - SANE_Int *maxres, + SANE_Int *maxres, SANE_Int *minres, - SANE_Int *maxhsize, + SANE_Int *maxhsize, SANE_Int *maxvsize, SANE_Int *caps); static SANE_Status cis_drv_open (SANE_String port, SANE_Int caps, SANE_Int *fd); @@ -57,17 +57,17 @@ static void cis_drv_stop (SANE_Handle hndl); /* CCD drivers for 300 dpi models Version 0.11-devel, author Jochen Eisinger */ -static SANE_Status ccd300_init (SANE_Int options, +static SANE_Status ccd300_init (SANE_Int options, SANE_String_Const port, - SANE_String_Const name, + SANE_String_Const name, SANE_Attach_Callback attach); -static void ccd300_capabilities(SANE_Int info, +static void ccd300_capabilities(SANE_Int info, SANE_String *model, - SANE_String *vendor, + SANE_String *vendor, SANE_String *type, - SANE_Int *maxres, + SANE_Int *maxres, SANE_Int *minres, - SANE_Int *maxhsize, + SANE_Int *maxhsize, SANE_Int *maxvsize, SANE_Int *caps); static SANE_Status ccd300_open (SANE_String port, SANE_Int caps, SANE_Int *fd); |