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

Move sanei_genesys_{start,stop}_motor into chip specific sources

merge-requests/1/head
Pierre Willenbrock 2009-02-23 14:16:56 +00:00
rodzic 271e9cf317
commit 3251c06fb4
4 zmienionych plików z 55 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -2,6 +2,9 @@
* backend/genesys_devices.c, backend/genesys_gl841.c,
backend/genesys_low.h: Add post_scan and eject_feed to struct
Genesys_Model
* backend/genesys.c, backend/genesys_gl646.c,
backend/genesys_gl841.c: Move sanei_genesys_{start,stop}_motor into
chip specific sources
2009-02-23 Jonathan Bravo Lopez <jkdsoft@gmail.com>
backend/hp3900_config.c: Fix area of negative/slide scans for

12
backend/genesys.c
Wyświetl plik

@ -527,18 +527,6 @@ sanei_genesys_get_address (Genesys_Register_Set * regs, SANE_Byte addr)
return NULL;
}
SANE_Status
sanei_genesys_start_motor (Genesys_Device * dev)
{
return sanei_genesys_write_register (dev, 0x0f, 0x01);
}
SANE_Status
sanei_genesys_stop_motor (Genesys_Device * dev)
{
return sanei_genesys_write_register (dev, 0x0f, 0x00);
}
/* main function for slope creation */
/**
* This function generates a slope table using the given slope

35
backend/genesys_gl646.c
Wyświetl plik

@ -2260,6 +2260,17 @@ gl646_set_powersaving (Genesys_Device * dev, int delay /* in minutes */ )
return status;
}
static SANE_Status
gl646_start_motor (Genesys_Device * dev)
{
return sanei_genesys_write_register (dev, 0x0f, 0x01);
}
static SANE_Status
gl646_stop_motor (Genesys_Device * dev)
{
return sanei_genesys_write_register (dev, 0x0f, 0x00);
}
/**
* loads document into scanner
@ -2386,7 +2397,7 @@ gl646_load_document (Genesys_Device * dev)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -2641,7 +2652,7 @@ gl646_eject_document (Genesys_Device * dev)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -2820,7 +2831,7 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
/* stop motor if needed */
if (val & REG41_MOTMFLG)
{
status = sanei_genesys_stop_motor (dev);
status = gl646_stop_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -2945,13 +2956,13 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl646_slow_back_home: Failed to start motor: %s\n",
sane_strstatus (status));
sanei_genesys_stop_motor (dev);
gl646_stop_motor (dev);
/* send original registers */
gl646_bulk_write_register (dev, dev->reg, GENESYS_GL646_MAX_REGS);
return status;
@ -2982,7 +2993,7 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
}
/* when we come here then the scanner needed too much time for this, so we better stop the motor */
sanei_genesys_stop_motor (dev);
gl646_stop_motor (dev);
DBG (DBG_error,
"gl646_slow_back_home: timeout while waiting for scanhead to go home\n");
return SANE_STATUS_IO_ERROR;
@ -3032,7 +3043,7 @@ gl646_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
/* stop motor if needed */
if (val & REG41_MOTMFLG)
{
status = sanei_genesys_stop_motor (dev);
status = gl646_stop_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -3109,12 +3120,12 @@ gl646_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
}
/* start motor */
status = sanei_genesys_start_motor (dev);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error, "gl646_park_head: failed to start motor: %s\n",
sane_strstatus (status));
sanei_genesys_stop_motor (dev);
gl646_stop_motor (dev);
/* restore original registers */
gl646_bulk_write_register (dev, reg, GENESYS_GL646_MAX_REGS);
return status;
@ -3147,7 +3158,7 @@ gl646_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
if (!(val & REG41_MOTMFLG))
{
DBG (DBG_info, "gl646_park_head: restarting motor\n");
status = sanei_genesys_start_motor (dev);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -3161,7 +3172,7 @@ gl646_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
/* when we come here then the scanner needed too much time for this,
so we better stop the motor */
sanei_genesys_start_motor (dev);
gl646_start_motor (dev);
DBG (DBG_error,
"gl646_park_head: timeout while waiting for scanhead to go home\n");
return SANE_STATUS_IO_ERROR;
@ -5667,7 +5678,7 @@ gl646_repark_head (Genesys_Device * dev)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error, "gl646_repark_head: failed to start motor: %s\n",

46
backend/genesys_gl841.c
Wyświetl plik

@ -3314,6 +3314,18 @@ gl841_set_powersaving (Genesys_Device * dev,
return status;
}
static SANE_Status
gl841_start_motor (Genesys_Device * dev)
{
return sanei_genesys_write_register (dev, 0x0f, 0x01);
}
static SANE_Status
gl841_stop_motor (Genesys_Device * dev)
{
return sanei_genesys_write_register (dev, 0x0f, 0x00);
}
static SANE_Status
gl841_get_paper_sensor(Genesys_Device * dev, SANE_Bool * paper_loaded)
{
@ -3371,7 +3383,7 @@ gl841_eject_document (Genesys_Device * dev)
/* stop motor if needed */
if (val & REG41_MOTORENB)
{
status = sanei_genesys_stop_motor (dev);
status = gl841_stop_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -3428,13 +3440,13 @@ gl841_eject_document (Genesys_Device * dev)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl841_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl841_eject_document: Failed to start motor: %s\n",
sane_strstatus (status));
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
/* send original registers */
gl841_bulk_write_register (dev, dev->reg, GENESYS_GL841_MAX_REGS);
return status;
@ -3469,7 +3481,7 @@ gl841_eject_document (Genesys_Device * dev)
if (loop == 0)
{
/* when we come here then the scanner needed too much time for this, so we better stop the motor */
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
DBG (DBG_error,
"gl841_eject_document: timeout while waiting for scanhead to go home\n");
return SANE_STATUS_IO_ERROR;
@ -3772,7 +3784,7 @@ gl841_feed (Genesys_Device * dev, int steps)
/* stop motor if needed */
if (val & REG41_MOTORENB)
{
status = sanei_genesys_stop_motor (dev);
status = gl841_stop_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -3831,13 +3843,13 @@ gl841_feed (Genesys_Device * dev, int steps)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl841_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl841_feed: Failed to start motor: %s\n",
sane_strstatus (status));
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
/* send original registers */
gl841_bulk_write_register (dev, dev->reg,
GENESYS_GL841_MAX_REGS);
@ -3866,7 +3878,7 @@ gl841_feed (Genesys_Device * dev, int steps)
}
/* when we come here then the scanner needed too much time for this, so we better stop the motor */
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
DBG (DBG_error,
"gl841_slow_back_home: timeout while waiting for scanhead to go home\n");
@ -3916,7 +3928,7 @@ gl841_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
/* stop motor if needed */
if (val & REG41_MOTORENB)
{
status = sanei_genesys_stop_motor (dev);
status = gl841_stop_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -3981,13 +3993,13 @@ gl841_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
return status;
}
status = sanei_genesys_start_motor (dev);
status = gl841_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl841_slow_back_home: Failed to start motor: %s\n",
sane_strstatus (status));
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
/* send original registers */
gl841_bulk_write_register (dev, dev->reg, GENESYS_GL841_MAX_REGS);
return status;
@ -4020,7 +4032,7 @@ gl841_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
}
/* when we come here then the scanner needed too much time for this, so we better stop the motor */
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
DBG (DBG_error,
"gl841_slow_back_home: timeout while waiting for scanhead to go home\n");
return SANE_STATUS_IO_ERROR;
@ -4071,7 +4083,7 @@ gl841_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
/* stop motor if needed */
if (val & REG41_MOTORENB)
{
status = sanei_genesys_stop_motor (dev);
status = gl841_stop_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -4100,12 +4112,12 @@ gl841_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
}
/* start motor */
status = sanei_genesys_start_motor (dev);
status = gl841_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error, "gl841_park_head: failed to start motor: %s\n",
sane_strstatus (status));
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
/* restore original registers */
gl841_bulk_write_register (dev, reg, GENESYS_GL841_MAX_REGS);
return status;
@ -4139,7 +4151,7 @@ gl841_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
if (!(val & REG41_MOTORENB))
{
DBG (DBG_info, "gl841_park_head: restarting motor\n");
status = sanei_genesys_start_motor (dev);
status = gl841_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -4158,7 +4170,7 @@ gl841_park_head (Genesys_Device * dev, Genesys_Register_Set * reg,
/* when we come here then the scanner needed too much time for this,
so we better stop the motor */
sanei_genesys_stop_motor (dev);
gl841_stop_motor (dev);
DBG (DBG_error,
"gl841_park_head: timeout while waiting for scanhead to go home\n");
return SANE_STATUS_IO_ERROR;