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

- fix blocking bug due to scanner sharing enabled by default 

- fix wrong waiting time for warming up
	- copyright notices and version updates
merge-requests/1/head
Stéphane Voltz 2009-04-27 15:29:35 +00:00
rodzic 8d67bccbdc
commit 79348f194e
8 zmienionych plików z 22 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
ChangeLog
Wyświetl plik

@ -1,3 +1,9 @@
2009-04-27 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c backend/rts8891.h backend/rts8891_devices.c
backend/rts8891_low.c backend/rts8891_low.h backend/rts88xx_lib.c
backend/rts88xx_lib.h: turn off scanner sharing option to off by default
to keep on the safe side, copyright and internal version updates.
2009-04-27 Stéphane Voltz <stef.dev@free.fr> 2009-04-27 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c: * backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
shading calibration fixes for HP2300 shading calibration fixes for HP2300

12
backend/rts8891.c
Wyświetl plik

@ -118,7 +118,7 @@
/* #define FAST_INIT 1 */ /* #define FAST_INIT 1 */
#define BUILD 20 #define BUILD 30
#define MOVE_DPI 100 #define MOVE_DPI 100
@ -1115,11 +1115,15 @@ sane_start (SANE_Handle handle)
if ((current.tv_sec - dev->start_time.tv_sec) < 15) if ((current.tv_sec - dev->start_time.tv_sec) < 15)
{ {
#ifdef SANE_STATUS_WARMING_UP #ifdef SANE_STATUS_WARMING_UP
if (dev->conf.allowsharing == SANE_TRUE)
{
sanei_usb_release_interface (dev->devnum, 0);
}
return SANE_STATUS_WARMING_UP; return SANE_STATUS_WARMING_UP;
#else #else
DBG (DBG_info, DBG (DBG_info,
"sane_start: waiting to let lamp get warm enough ...\n"); "sane_start: waiting to let lamp get warm enough ...\n");
sleep(current.tv_sec - dev->start_time.tv_sec); sleep(15 - (current.tv_sec - dev->start_time.tv_sec));
#endif #endif
} }
#else #else
@ -2254,8 +2258,8 @@ probe_rts8891_devices (void)
DBG (DBG_proc, "probe_rts8891_devices: start\n"); DBG (DBG_proc, "probe_rts8891_devices: start\n");
/* sharing is on by default and no model option */ /* sharing is off by default and no model option */
rtscfg.allowsharing = SANE_TRUE; rtscfg.allowsharing = SANE_FALSE;
rtscfg.modelnumber = -1; rtscfg.modelnumber = -1;
rtscfg.sensornumber = -1; rtscfg.sensornumber = -1;

2
backend/rts8891.h
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2007-2008 stef.dev@free.fr Copyright (C) 2007-2009 stef.dev@free.fr
This file is part of the SANE package. This file is part of the SANE package.

2
backend/rts8891_devices.c
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2007-2008 stef.dev@free.fr Copyright (C) 2007-2009 stef.dev@free.fr
This file is part of the SANE package. This file is part of the SANE package.

4
backend/rts8891_low.c
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2007-2008 stef.dev@free.fr Copyright (C) 2007-2009 stef.dev@free.fr
This file is part of the SANE package. This file is part of the SANE package.
@ -57,7 +57,7 @@
#endif #endif
#include "rts8891_low.h" #include "rts8891_low.h"
#define RTS8891_BUILD 12 #define RTS8891_BUILD 30
#define RTS8891_MAX_REGISTERS 244 #define RTS8891_MAX_REGISTERS 244
/* init rts8891 library */ /* init rts8891 library */

2
backend/rts8891_low.h
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2007-2008 stef.dev@free.fr Copyright (C) 2007-2009 stef.dev@free.fr
This file is part of the SANE package. This file is part of the SANE package.

4
backend/rts88xx_lib.c
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2007-2008 stef.dev@free.fr Copyright (C) 2007-2009 stef.dev@free.fr
This file is part of the SANE package. This file is part of the SANE package.
@ -57,7 +57,7 @@
#include "_stdint.h" #include "_stdint.h"
#define RTS88XX_LIB_BUILD 5 #define RTS88XX_LIB_BUILD 30
/* init rts88xx library */ /* init rts88xx library */
void void

2
backend/rts88xx_lib.h
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 2007-2008 stef.dev@free.fr Copyright (C) 2007-2009 stef.dev@free.fr
This file is part of the SANE package. This file is part of the SANE package.