kopia lustrzana https://gitlab.com/sane-project/backends
* sanei/sanei_scsi.c: Fixed retrieval of HZ.
rodzic
9c31766111
commit
3766614f83
|
@ -1,3 +1,7 @@
|
||||||
|
2007-02-07 Gerhard Jaeger <gerhard@gjaeger.de>
|
||||||
|
|
||||||
|
* sanei/sanei_scsi.c: Fixed retrieval of HZ.
|
||||||
|
|
||||||
2007-01-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
2007-01-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||||
|
|
||||||
* backend/gt68xx.c backend/gt68xx_devices.c
|
* backend/gt68xx.c backend/gt68xx_devices.c
|
||||||
|
@ -14,6 +18,7 @@
|
||||||
* doc/descriptions/fujitsu.desc: version number update
|
* doc/descriptions/fujitsu.desc: version number update
|
||||||
|
|
||||||
2007-01-27 oliver rauch <oliver.rauch@rauch-domain.de>
|
2007-01-27 oliver rauch <oliver.rauch@rauch-domain.de>
|
||||||
|
|
||||||
* backend/umax.c
|
* backend/umax.c
|
||||||
removed bug in highlight blue using green value
|
removed bug in highlight blue using green value
|
||||||
* doc/umax/umax.CHANGES
|
* doc/umax/umax.CHANGES
|
||||||
|
|
|
@ -281,6 +281,20 @@ static char lastrcmd[16]; /* hold command block of last read command */
|
||||||
# define MAX_DATA (32*1024)
|
# define MAX_DATA (32*1024)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef SG_SET_TIMEOUT
|
||||||
|
# ifdef _SC_CLK_TCK
|
||||||
|
# define GNU_HZ sysconf(_SC_CLK_TCK)
|
||||||
|
# else
|
||||||
|
# ifdef HZ
|
||||||
|
# define GNU_HZ HZ
|
||||||
|
# else
|
||||||
|
# ifdef CLOCKS_PER_SEC
|
||||||
|
# define GNU_HZ CLOCKS_PER_SEC
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* default timeout value: 120 seconds */
|
/* default timeout value: 120 seconds */
|
||||||
static int sane_scsicmd_timeout = 120;
|
static int sane_scsicmd_timeout = 120;
|
||||||
int sanei_scsi_max_request_size = MAX_DATA;
|
int sanei_scsi_max_request_size = MAX_DATA;
|
||||||
|
@ -1273,7 +1287,7 @@ sanei_scsi_open (const char *dev, int *fdp,
|
||||||
disconnect... ;-( */
|
disconnect... ;-( */
|
||||||
{
|
{
|
||||||
int timeout;
|
int timeout;
|
||||||
timeout = sane_scsicmd_timeout * HZ;
|
timeout = sane_scsicmd_timeout * GNU_HZ;
|
||||||
ioctl (fd, SG_SET_TIMEOUT, &timeout);
|
ioctl (fd, SG_SET_TIMEOUT, &timeout);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Ładowanie…
Reference in New Issue