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

use sizeof(Genesys_Register_Set) instead of 2

merge-requests/1/head
Pierre Willenbrock 2007-10-13 14:36:49 +00:00
rodzic e510006077
commit d60b98bfca
3 zmienionych plików z 19 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2007-10-13 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c backend/genesys_gl646.c: use
sizeof(Genesys_Register_Set) instead of 2
2007-10-07 Bertrik Sikken <bertrik@sikken.nl> 2007-10-07 Bertrik Sikken <bertrik@sikken.nl>
* doc/descriptions/unsupported.desc: updated with info from * doc/descriptions/unsupported.desc: updated with info from
'FormularDaten' e-mails up to 2007/9/29 'FormularDaten' e-mails up to 2007/9/29

12
backend/genesys_gl646.c
Wyświetl plik

@ -1568,7 +1568,7 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
usleep (200000UL); usleep (200000UL);
} }
memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * 2); memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof(Genesys_Register_Set));
prepare_steps = 4; prepare_steps = 4;
exposure_time = 6 * MOTOR_SPEED_MAX; exposure_time = 6 * MOTOR_SPEED_MAX;
@ -1926,7 +1926,7 @@ gl646_search_start_position (Genesys_Device * dev)
DBG (DBG_proc, "gl646_search_start_position\n"); DBG (DBG_proc, "gl646_search_start_position\n");
memset (local_reg, 0, sizeof (local_reg)); memset (local_reg, 0, sizeof (local_reg));
memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * 2); memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof(Genesys_Register_Set));
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
/* is scanner warm enough ? */ /* is scanner warm enough ? */
@ -2176,7 +2176,7 @@ gl646_search_start_position (Genesys_Device * dev)
/* update regs to copy ASIC internal state */ /* update regs to copy ASIC internal state */
dev->reg[reg_0x01].value = local_reg[reg_0x01].value; dev->reg[reg_0x01].value = local_reg[reg_0x01].value;
dev->reg[reg_0x02].value = local_reg[reg_0x02].value; dev->reg[reg_0x02].value = local_reg[reg_0x02].value;
memcpy (dev->reg, local_reg, (GENESYS_GL646_MAX_REGS + 1) * 2); memcpy (dev->reg, local_reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof(Genesys_Register_Set));
status = status =
sanei_genesys_search_reference_point (dev, data, start_pixel, dpi, pixels, sanei_genesys_search_reference_point (dev, data, start_pixel, dpi, pixels,
@ -3846,7 +3846,7 @@ gl646_init_regs_for_warmup (Genesys_Device * dev,
DBG (DBG_proc, "gl646_warmup_lamp\n"); DBG (DBG_proc, "gl646_warmup_lamp\n");
memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * 2); memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof(Genesys_Register_Set));
*total_size = num_pixels * 3 * 2 * 1; /* colors * bytes_per_color * scan lines */ *total_size = num_pixels * 3 * 2 * 1; /* colors * bytes_per_color * scan lines */
/* ST12: 0x01 0x00 0x02 0x41 0x03 0x1f 0x04 0x53 0x05 0x10 0x06 0x10 0x08 0x02 0x09 0x00 0x0a 0x06 0x0b 0x04 */ /* ST12: 0x01 0x00 0x02 0x41 0x03 0x1f 0x04 0x53 0x05 0x10 0x06 0x10 0x08 0x02 0x09 0x00 0x0a 0x06 0x0b 0x04 */
@ -4037,7 +4037,7 @@ gl646_repark_head (Genesys_Device * dev)
DBG (DBG_proc, "gl646_repark_head\n"); DBG (DBG_proc, "gl646_repark_head\n");
memset (local_reg, 0, sizeof (local_reg)); memset (local_reg, 0, sizeof (local_reg));
memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * 2); memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof(Genesys_Register_Set));
local_reg[reg_0x01].value = local_reg[reg_0x01].value =
local_reg[reg_0x01].value & ~REG01_DVDSET & ~REG01_FASTMOD & ~REG01_SCAN; local_reg[reg_0x01].value & ~REG01_DVDSET & ~REG01_FASTMOD & ~REG01_SCAN;
@ -4402,7 +4402,7 @@ gl646_init (Genesys_Device * dev)
} }
/* initial calibration reg values */ /* initial calibration reg values */
memcpy (dev->calib_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * 2); memcpy (dev->calib_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof(Genesys_Register_Set));
/* Set powersaving (default = 15 minutes) */ /* Set powersaving (default = 15 minutes) */
RIE (gl646_set_powersaving (dev, 15)); RIE (gl646_set_powersaving (dev, 15));

16
backend/genesys_gl841.c
Wyświetl plik

@ -3300,7 +3300,7 @@ gl841_feed (Genesys_Device * dev, int steps)
DBG (DBG_proc, "gl841_feed (steps = %d)\n", DBG (DBG_proc, "gl841_feed (steps = %d)\n",
steps); steps);
memset (local_reg, 0, sizeof (Genesys_Register_Set)*(GENESYS_GL841_MAX_REGS+1)); memset (local_reg, 0, sizeof(local_reg));
val = 0; val = 0;
/* stop motor if needed */ /* stop motor if needed */
@ -3418,7 +3418,7 @@ gl841_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
DBG (DBG_proc, "gl841_slow_back_home (wait_until_home = %d)\n", DBG (DBG_proc, "gl841_slow_back_home (wait_until_home = %d)\n",
wait_until_home); wait_until_home);
memset (local_reg, 0, sizeof (Genesys_Register_Set)*(GENESYS_GL841_MAX_REGS+1)); memset (local_reg, 0, sizeof (local_reg));
val = 0; val = 0;
status = sanei_genesys_get_status (dev, &val); status = sanei_genesys_get_status (dev, &val);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
@ -3576,7 +3576,7 @@ gl841_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
DBG (DBG_proc, "gl841_park_head (wait_until_home = %d)\n", DBG (DBG_proc, "gl841_park_head (wait_until_home = %d)\n",
wait_until_home); wait_until_home);
memset (local_reg, 0, sizeof (Genesys_Register_Set)*(GENESYS_GL841_MAX_REGS+1)); memset (local_reg, 0, sizeof (local_reg));
/* read status */ /* read status */
status = sanei_genesys_get_status (dev, &val); status = sanei_genesys_get_status (dev, &val);
@ -3709,7 +3709,7 @@ gl841_search_start_position (Genesys_Device * dev)
DBG (DBG_proc, "gl841_search_start_position\n"); DBG (DBG_proc, "gl841_search_start_position\n");
memset (local_reg, 0, sizeof (local_reg)); memset (local_reg, 0, sizeof (local_reg));
memcpy (local_reg, dev->reg, (GENESYS_GL841_MAX_REGS +1) * 2); memcpy (local_reg, dev->reg, (GENESYS_GL841_MAX_REGS +1) * sizeof (Genesys_Register_Set));
/* sets for a 200 lines * 600 pixels */ /* sets for a 200 lines * 600 pixels */
/* normal scan with no shading */ /* normal scan with no shading */
@ -3794,7 +3794,7 @@ gl841_search_start_position (Genesys_Device * dev)
} }
/* update regs to copy ASIC internal state */ /* update regs to copy ASIC internal state */
memcpy (dev->reg, local_reg, (GENESYS_GL841_MAX_REGS + 1) * 2); memcpy (dev->reg, local_reg, (GENESYS_GL841_MAX_REGS + 1) * sizeof (Genesys_Register_Set));
/*TODO: find out where sanei_genesys_search_reference_point /*TODO: find out where sanei_genesys_search_reference_point
stores information, and use that correctly*/ stores information, and use that correctly*/
@ -4903,7 +4903,7 @@ gl841_init_regs_for_warmup (Genesys_Device * dev,
DBG (DBG_proc, "sanei_gl841_warmup_lamp\n"); DBG (DBG_proc, "sanei_gl841_warmup_lamp\n");
memcpy (local_reg, dev->reg, (GENESYS_GL841_MAX_REGS + 1) * 2); memcpy (local_reg, dev->reg, (GENESYS_GL841_MAX_REGS + 1) * sizeof (Genesys_Register_Set));
/* okay.. these should be defaults stored somewhere */ /* okay.. these should be defaults stored somewhere */
dev->frontend.gain[0] = 0x00; dev->frontend.gain[0] = 0x00;
@ -5114,7 +5114,7 @@ gl841_init (Genesys_Device * dev)
} }
/* initial calibration reg values */ /* initial calibration reg values */
memcpy (dev->calib_reg, dev->reg, (GENESYS_GL841_MAX_REGS + 1) * 2); memcpy (dev->calib_reg, dev->reg, (GENESYS_GL841_MAX_REGS + 1) * sizeof (Genesys_Register_Set));
status = gl841_init_scan_regs (dev, status = gl841_init_scan_regs (dev,
dev->calib_reg, dev->calib_reg,
@ -5158,7 +5158,7 @@ gl841_init (Genesys_Device * dev)
free(line); free(line);
memcpy (dev->calib_reg, dev->reg, (GENESYS_GL841_MAX_REGS + 1) * 2); memcpy (dev->calib_reg, dev->reg, (GENESYS_GL841_MAX_REGS + 1) * sizeof (Genesys_Register_Set));
/* Set powersaving (default = 15 minutes) */ /* Set powersaving (default = 15 minutes) */
RIE (gl841_set_powersaving (dev, 15)); RIE (gl841_set_powersaving (dev, 15));