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

fixed long standing bug in last fragment handling in bulk data read

merge-requests/1/head
Stphane Voltz 2010-05-25 22:40:10 +02:00
rodzic d6c2184999
commit 661933ecdb
1 zmienionych plików z 5 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
backend/genesys_gl847.c
Wyświetl plik

@ -192,7 +192,7 @@ gl847_bulk_read_data (Genesys_Device * dev, uint8_t addr,
uint8_t * data, size_t len) uint8_t * data, size_t len)
{ {
SANE_Status status; SANE_Status status;
size_t size, target, read; size_t size, target, read, done;
uint8_t outdata[8], value; uint8_t outdata[8], value;
DBG (DBG_io, "gl847_bulk_read_data: requesting %lu bytes\n", (u_long) len); DBG (DBG_io, "gl847_bulk_read_data: requesting %lu bytes\n", (u_long) len);
@ -260,11 +260,12 @@ gl847_bulk_read_data (Genesys_Device * dev, uint8_t addr,
/* read less than 512 bytes remainder */ /* read less than 512 bytes remainder */
if (read < size) if (read < size)
{ {
done=read;
read = size - read; read = size - read;
DBG (DBG_io2, DBG (DBG_io2,
"gl847_bulk_read_data: trying to read %lu bytes of data\n", "gl847_bulk_read_data: trying to read %lu bytes of data\n",
(u_long) read); (u_long) read);
status = sanei_usb_read_bulk (dev->dn, data, &read); status = sanei_usb_read_bulk (dev->dn, data+done, &read);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
DBG (DBG_error, DBG (DBG_error,
@ -871,7 +872,7 @@ gl847_init_motor_regs (Genesys_Device * dev, Genesys_Register_Set * reg, unsigne
fast_slope_table, fast_slope_table,
256, 256,
fast_slope_steps, fast_slope_steps,
0, dev->sensor.dummy_pixel + 1 + dev->sensor.CCD_start_xoffset+dev->sensor.sensor_pixels,
fast_exposure, fast_exposure,
dev->motor.base_ydpi / dev->motor.base_ydpi /
4, &fast_slope_steps, 4, &fast_slope_steps,
@ -1123,7 +1124,7 @@ gl847_init_motor_regs_scan (Genesys_Device * dev, Genesys_Register_Set * reg, un
fast_slope_table, fast_slope_table,
256, 256,
fast_slope_steps, fast_slope_steps,
0, dev->sensor.dummy_pixel + 1 + dev->sensor.CCD_start_xoffset+dev->sensor.sensor_pixels,
fast_exposure, fast_exposure,
dev->motor.base_ydpi / dev->motor.base_ydpi /
4, &fast_slope_steps, 4, &fast_slope_steps,
@ -1174,10 +1175,6 @@ gl847_init_motor_regs_scan (Genesys_Device * dev, Genesys_Register_Set * reg, un
else else
feedl = (feed_steps << scan_step_type) - slow_slope_steps; feedl = (feed_steps << scan_step_type) - slow_slope_steps;
/* XXX STEF XXX no 2 tables */
feedl=0;
use_fast_fed=0;
/* all needed slopes available. we did even decide which mode to use. /* all needed slopes available. we did even decide which mode to use.
what next? */ what next? */
r = sanei_genesys_get_address (reg, 0x3d); r = sanei_genesys_get_address (reg, 0x3d);