kopia lustrzana https://gitlab.com/sane-project/backends
SnapScan backend 1.4.26
Oliver Schwartz
rodzic
9c60c54fe5
commit
590274b705
|
|
@ -1,3 +1,10 @@
|
|||
2003-04-30 Oliver Schwartz <Oliver.Schwartz@gmx.de>
|
||||
|
||||
* backend/snapscan.c backend/snapscan.h backend/snapscan-options.c
|
||||
backend/snapscan-scsi.c doc/descriptions/snapscan.desc: SnapScan
|
||||
backend 1.4.26, added support for Agfa Arcus 1200, better support
|
||||
for Benq 5000.
|
||||
|
||||
2003-04-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* lib/getopt.c: Removed #include again, breaks compilation on
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ static void init_options (SnapScan_Scanner * ps)
|
|||
case PRISA5300:
|
||||
case PRISA1240:
|
||||
case PRISA5000:
|
||||
case ARCUS1200:
|
||||
po[OPT_SCANRES].constraint.word_list = resolutions_1200;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -1387,8 +1388,11 @@ SANE_Status sane_control_option (SANE_Handle h,
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.6 2003/04/02 21:22:53 oliverschwartz
|
||||
* Enabled 1200 DPI for Acer 5000
|
||||
* Revision 1.7 2003/04/30 20:49:39 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
* Revision 1.8 2003/04/30 20:42:18 oliverschwartz
|
||||
* Added support for Agfa Arcus 1200 (supplied by Valtteri Vuorikoski)
|
||||
*
|
||||
* Revision 1.7 2003/04/02 21:17:12 oliverschwartz
|
||||
* Fix for 1200 DPI with Acer 5000
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
/* scanner scsi commands */
|
||||
|
||||
static SANE_Status download_firmware(SnapScan_Scanner * pss);
|
||||
static SANE_Status wait_scanner_ready (SnapScan_Scanner * pss);
|
||||
|
||||
#include "snapscan-usb.h"
|
||||
|
||||
|
|
@ -891,8 +892,15 @@ static SANE_Status set_window (SnapScan_Scanner *pss)
|
|||
pc[SET_WINDOW_P_BLUE_UNDER_COLOR] = 0xff;
|
||||
pc[SET_WINDOW_P_GREEN_UNDER_COLOR] = 0xff;
|
||||
|
||||
do {
|
||||
status = snapscan_cmd (pss->pdev->bus, pss->fd, pss->cmd,
|
||||
SET_WINDOW_TOTAL_LEN, NULL, NULL);
|
||||
if (status == SANE_STATUS_DEVICE_BUSY) {
|
||||
DBG (DL_MINOR_INFO, "%s: waiting for scanner to warm up\n", me);
|
||||
wait_scanner_ready (pss);
|
||||
}
|
||||
} while (status == SANE_STATUS_DEVICE_BUSY);
|
||||
|
||||
CHECK_STATUS (status, me, "snapscan_cmd");
|
||||
return status;
|
||||
}
|
||||
|
|
@ -972,7 +980,9 @@ static SANE_Status send_diagnostic (SnapScan_Scanner *pss)
|
|||
||
|
||||
pss->pdev->model == VUEGO610S
|
||||
||
|
||||
pss->pdev->model == SNAPSCAN1236)
|
||||
pss->pdev->model == SNAPSCAN1236
|
||||
||
|
||||
pss->pdev->model == ARCUS1200)
|
||||
{
|
||||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
|
|
@ -1201,8 +1211,14 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.21 2003/04/02 21:00:47 oliverschwartz
|
||||
* SnapScan backend 1.4.25
|
||||
* Revision 1.22 2003/04/30 20:49:39 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
* Revision 1.37 2003/04/30 20:42:19 oliverschwartz
|
||||
* Added support for Agfa Arcus 1200 (supplied by Valtteri Vuorikoski)
|
||||
*
|
||||
* Revision 1.36 2003/04/02 21:17:13 oliverschwartz
|
||||
* Fix for 1200 DPI with Acer 5000
|
||||
*
|
||||
* Revision 1.35 2003/02/08 10:45:09 oliverschwartz
|
||||
* Use 600 DPI as optical resolution for Benq 5000
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
#define EXPECTED_MAJOR 1
|
||||
#define MINOR_VERSION 4
|
||||
#define BUILD 25
|
||||
#define BUILD 26
|
||||
|
||||
#include "snapscan.h"
|
||||
|
||||
|
|
@ -1762,8 +1762,14 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.28 2003/04/02 21:00:47 oliverschwartz
|
||||
* SnapScan backend 1.4.25
|
||||
* Revision 1.29 2003/04/30 20:49:40 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
* Revision 1.58 2003/04/30 20:43:07 oliverschwartz
|
||||
* Set backend version number to 1.4.26
|
||||
*
|
||||
* Revision 1.57 2003/04/02 21:17:14 oliverschwartz
|
||||
* Fix for 1200 DPI with Acer 5000
|
||||
*
|
||||
* Revision 1.56 2003/02/08 10:45:09 oliverschwartz
|
||||
* Use 600 DPI as optical resolution for Benq 5000
|
||||
|
|
|
|||
|
|
@ -97,7 +97,8 @@ typedef enum
|
|||
PRISA4300_2, /* Acer ScanPrisa 3300/4300 - 600 DPI, 42 bit*/
|
||||
PRISA5000, /* Acer ScanPrisa 5000 - 1200 DPI */
|
||||
PRISA5300, /* Acer ScanPrisa 5300 - 1200 DPI */
|
||||
PERFECTION660 /* Epson Perfection 660 - 1200 DPI */
|
||||
PERFECTION660, /* Epson Perfection 660 - 1200 DPI */
|
||||
ARCUS1200 /* Agfa Arcus 1200 - 1200 DPI (rebadged Acer?) */
|
||||
} SnapScan_Model;
|
||||
|
||||
struct SnapScan_Driver_desc {
|
||||
|
|
@ -128,7 +129,8 @@ static struct SnapScan_Driver_desc drivers[] =
|
|||
{PRISA1240, "Acer1240"},
|
||||
{PRISA5000, "Acer5000"},
|
||||
{PRISA5300, "Acer5300"},
|
||||
{PERFECTION660, "Perfection 660"}
|
||||
{PERFECTION660, "Perfection 660"},
|
||||
{ARCUS1200, "Arcus1200"}
|
||||
};
|
||||
|
||||
#define known_drivers ((int) (sizeof(drivers)/sizeof(drivers[0])))
|
||||
|
|
@ -174,7 +176,8 @@ static struct SnapScan_Model_desc scanners[] =
|
|||
{"SNAPSCAN 600", SNAPSCAN600},
|
||||
{"SnapScan", SNAPSCAN},
|
||||
{"ACERSCAN_A4____1", ACER300F},
|
||||
{"Perfection 660", PERFECTION660}
|
||||
{"Perfection 660", PERFECTION660},
|
||||
{"ARCUS 1200", ARCUS1200}
|
||||
};
|
||||
#define known_scanners ((int) (sizeof(scanners)/sizeof(scanners[0])))
|
||||
|
||||
|
|
@ -374,8 +377,11 @@ struct snapscan_scanner
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.20 2003/04/02 21:00:48 oliverschwartz
|
||||
* SnapScan backend 1.4.25
|
||||
* Revision 1.21 2003/04/30 20:49:40 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
* Revision 1.38 2003/04/30 20:42:22 oliverschwartz
|
||||
* Added support for Agfa Arcus 1200 (supplied by Valtteri Vuorikoski)
|
||||
*
|
||||
* Revision 1.37 2003/02/05 22:11:11 oliverschwartz
|
||||
* Added Epson Perfection 660
|
||||
|
|
|
|||
|
|
@ -39,6 +39,11 @@
|
|||
:status :stable
|
||||
:comment "Optional ADF supported."
|
||||
|
||||
:model "Arcus 1200"
|
||||
:interface "SCSI"
|
||||
:status :stable
|
||||
:comment "Optional transparency unit supported."
|
||||
|
||||
:model "SnapScan 1236s"
|
||||
:interface "SCSI"
|
||||
:status :stable
|
||||
|
|
@ -179,12 +184,17 @@
|
|||
:model "Maxi Scan A4 Deluxe (SCSI)"
|
||||
:interface "SCSI"
|
||||
:status :stable
|
||||
:comment "Seems to be a repackaged SnapScan 310s."
|
||||
:comment "Rebadged SnapScan 310s."
|
||||
|
||||
:model "Scan@home Touch 1248 (USB)"
|
||||
:interface "USB"
|
||||
:status :stable
|
||||
:comment "Seems to be a repackaged Benq 3300."
|
||||
:comment "Rebadged Benq 3300."
|
||||
|
||||
:model "Maxi Scan A4 USB 640U"
|
||||
:interface "USB"
|
||||
:status :stable
|
||||
:comment "Rebadged Benq 640U."
|
||||
|
||||
;------------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -194,12 +204,12 @@
|
|||
:model "Diamondview 648UT"
|
||||
:interface "USB"
|
||||
:status :stable
|
||||
:comment "Seems to be a repackaged Benq 320u."
|
||||
:comment "Rebadged Benq 320u."
|
||||
|
||||
:model "Diamondview 650U"
|
||||
:interface "USB"
|
||||
:status :stable
|
||||
:comment "Seems to be a repackaged Benq 4300."
|
||||
:comment "Rebadged Benq 4300."
|
||||
|
||||
;------------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue