kopia lustrzana https://gitlab.com/sane-project/backends
Scanner ID cleanup
Oliver Schwartz
rodzic
eaff639e8f
commit
a66b94a915
|
|
@ -1,3 +1,10 @@
|
|||
2003-07-22 Oliver Schwartz <Oliver.Schwartz@gmx.de>
|
||||
|
||||
* backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
|
||||
backend/snapscan-options.c backend/snapscan.conf: Backend version
|
||||
1.4.27 (ID cleanup, fix for firmware download of Acer 310/320,
|
||||
new USB ID for Acer 310)
|
||||
|
||||
2003-08-17 Stéphane Voltz <svoltz@wanadoo.fr>
|
||||
|
||||
* backend/umax_pp.c backend/umax_pp.h: revert change for UTA
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ static void init_options (SnapScan_Scanner * ps)
|
|||
switch (ps->pdev->model)
|
||||
{
|
||||
case SNAPSCAN310:
|
||||
case VUEGO310S: /* WG changed */
|
||||
case PRISA310: /* WG changed */
|
||||
po[OPT_SCANRES].constraint.word_list = resolutions_300;
|
||||
break;
|
||||
case SNAPSCANE50:
|
||||
|
|
@ -265,7 +265,7 @@ static void init_options (SnapScan_Scanner * ps)
|
|||
switch (ps->pdev->model)
|
||||
{
|
||||
case SNAPSCAN310:
|
||||
case VUEGO310S:
|
||||
case PRISA310:
|
||||
po[OPT_MODE].constraint.string_list = names_basic;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -291,7 +291,7 @@ static void init_options (SnapScan_Scanner * ps)
|
|||
switch (ps->pdev->model)
|
||||
{
|
||||
case SNAPSCAN310:
|
||||
case VUEGO310S:
|
||||
case PRISA310:
|
||||
po[OPT_PREVIEW_MODE].constraint.string_list = preview_names_basic;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -1388,6 +1388,9 @@ SANE_Status sane_control_option (SANE_Handle h,
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.8 2003/08/19 21:05:08 oliverschwartz
|
||||
* Scanner ID cleanup
|
||||
*
|
||||
* Revision 1.7 2003/04/30 20:49:39 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
|
|
|
|||
|
|
@ -866,9 +866,9 @@ static SANE_Status set_window (SnapScan_Scanner *pss)
|
|||
&&
|
||||
pss->pdev->model != SNAPSCAN310
|
||||
&&
|
||||
pss->pdev->model != VUEGO310S
|
||||
pss->pdev->model != PRISA310
|
||||
&&
|
||||
pss->pdev->model != VUEGO610S
|
||||
pss->pdev->model != PRISA610
|
||||
) {
|
||||
pc[SET_WINDOW_P_DEBUG_MODE] = 2; /* use full 128k buffer */
|
||||
pc[SET_WINDOW_P_GAMMA_NO] = 0x01; /* downloaded table */
|
||||
|
|
@ -976,9 +976,9 @@ static SANE_Status send_diagnostic (SnapScan_Scanner *pss)
|
|||
u_char cmd[] = {SEND_DIAGNOSTIC, 0x04, 0, 0, 0, 0}; /* self-test */
|
||||
SANE_Status status;
|
||||
|
||||
if (pss->pdev->model == PRISA620S
|
||||
if (pss->pdev->model == PRISA620
|
||||
||
|
||||
pss->pdev->model == VUEGO610S
|
||||
pss->pdev->model == PRISA610
|
||||
||
|
||||
pss->pdev->model == SNAPSCAN1236
|
||||
||
|
||||
|
|
@ -1157,9 +1157,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
|
|||
{
|
||||
switch (pss->pdev->model)
|
||||
{
|
||||
case VUEGO610S:
|
||||
case VUEGO310S:
|
||||
case PRISA620S:
|
||||
case PRISA610:
|
||||
case PRISA310:
|
||||
case PRISA620:
|
||||
case PRISA1240:
|
||||
case PRISA640:
|
||||
case PRISA4300:
|
||||
|
|
@ -1211,6 +1211,9 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.23 2003/08/19 21:05:08 oliverschwartz
|
||||
* Scanner ID cleanup
|
||||
*
|
||||
* Revision 1.22 2003/04/30 20:49:39 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
#define EXPECTED_MAJOR 1
|
||||
#define MINOR_VERSION 4
|
||||
#define BUILD 26
|
||||
#define BUILD 27
|
||||
|
||||
#include "snapscan.h"
|
||||
|
||||
|
|
@ -497,7 +497,7 @@ static SANE_Status snapscani_init_device_structure(
|
|||
case SNAPSCAN300:
|
||||
(*pd)->depths = depths8;
|
||||
break;
|
||||
case PRISA620S:
|
||||
case PRISA620:
|
||||
(*pd)->depths = depths12;
|
||||
break;
|
||||
case PRISA4300_2:
|
||||
|
|
@ -1178,13 +1178,13 @@ static SANE_Status start_reader (SnapScan_Scanner *pss)
|
|||
pss->rpipe[0] = pss->rpipe[1] = -1;
|
||||
pss->child = -1;
|
||||
|
||||
if (pss->pdev->model == VUEGO610S
|
||||
if (pss->pdev->model == PRISA610
|
||||
||
|
||||
pss->pdev->model == ACER300F
|
||||
||
|
||||
pss->pdev->model == SNAPSCAN310
|
||||
||
|
||||
pss->pdev->model == VUEGO310S
|
||||
pss->pdev->model == PRISA310
|
||||
||
|
||||
pss->pdev->model == SNAPSCANE20
|
||||
||
|
||||
|
|
@ -1762,6 +1762,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.30 2003/08/19 21:05:08 oliverschwartz
|
||||
* Scanner ID cleanup
|
||||
*
|
||||
* Revision 1.29 2003/04/30 20:49:40 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ scsi ACERPERI * Scanner
|
|||
|
||||
# Benq/Acer/Vuego 310U
|
||||
usb 0x04a5 0x1a20
|
||||
usb 0x04a5 0x1a26
|
||||
|
||||
# Benq/Acer/Vuego 320U
|
||||
usb 0x04a5 0x2022
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
If you submit changes to SANE to the maintainers to be included in
|
||||
a subsequent release, you agree by submitting the changes that
|
||||
those changes may be distributed with this exception intact.
|
||||
|
||||
|
||||
If you write modifications of your own for SANE, it is your choice
|
||||
whether to permit this exception to apply to your modifications.
|
||||
If you do not wish that, delete this exception notice.
|
||||
|
|
@ -88,9 +88,9 @@ typedef enum
|
|||
SNAPSCANE50, /* SnapScan e40/e50, 1200 DPI */
|
||||
SNAPSCANE52, /* SnapScan e52, 1200 DPI, no quality calibration */
|
||||
ACER300F,
|
||||
VUEGO310S, /* Vuego-Version of SnapScan 310 WG changed */
|
||||
VUEGO610S, /* Vuego 610S and 610plus SJU changed */
|
||||
PRISA620S, /* Acer ScanPrisa 620 - 600 DPI */
|
||||
PRISA310, /* Acer ScanPrisa 310 - 300 DPI */
|
||||
PRISA610, /* Acer ScanPrisa 610 - 600 DPI */
|
||||
PRISA620, /* Acer ScanPrisa 620 - 600 DPI */
|
||||
PRISA640, /* Acer ScanPrisa 640 - 600 DPI */
|
||||
PRISA1240, /* Acer ScanPrisa 1240 - 1200 DPI */
|
||||
PRISA4300, /* Acer ScanPrisa 3300/4300 - 600 DPI */
|
||||
|
|
@ -120,9 +120,9 @@ static struct SnapScan_Driver_desc drivers[] =
|
|||
{SNAPSCANE50, "SnapScanE50"},
|
||||
{SNAPSCANE52, "SnapScanE52"},
|
||||
{ACER300F, "Acer300"},
|
||||
{VUEGO310S, "Acer310"},
|
||||
{VUEGO610S, "Acer610"},
|
||||
{PRISA620S, "Acer620"},
|
||||
{PRISA310, "Acer310"},
|
||||
{PRISA610, "Acer610"},
|
||||
{PRISA620, "Acer620"},
|
||||
{PRISA640, "Acer640"},
|
||||
{PRISA4300, "Acer4300"},
|
||||
{PRISA4300_2, "Acer4300 (42 bit)"},
|
||||
|
|
@ -144,14 +144,15 @@ struct SnapScan_Model_desc
|
|||
static struct SnapScan_Model_desc scanners[] =
|
||||
{
|
||||
/* SCSI model name -> enum value */
|
||||
{"FlatbedScanner_2", VUEGO310S},
|
||||
{"FlatbedScanner_4", VUEGO610S},
|
||||
{"FlatbedScanner_5", PRISA620S},
|
||||
{"FlatbedScanner_9", PRISA620S},
|
||||
{"FlatbedScanner13", PRISA620S},
|
||||
{"FlatbedScanner16", PRISA620S},
|
||||
{"FlatbedScanner17", PRISA620S},
|
||||
{"FlatbedScanner18", PRISA620S},
|
||||
{"FlatbedScanner_2", PRISA310},
|
||||
{"FlatbedScanner_4", PRISA610},
|
||||
{"FlatbedScanner_5", PRISA620},
|
||||
{"FlatbedScanner_7", PRISA310},
|
||||
{"FlatbedScanner_9", PRISA620},
|
||||
{"FlatbedScanner13", PRISA620},
|
||||
{"FlatbedScanner16", PRISA620},
|
||||
{"FlatbedScanner17", PRISA620},
|
||||
{"FlatbedScanner18", PRISA620},
|
||||
{"FlatbedScanner19", PRISA1240},
|
||||
{"FlatbedScanner20", PRISA640},
|
||||
{"FlatbedScanner21", PRISA4300},
|
||||
|
|
@ -210,8 +211,8 @@ struct SnapScan_USB_Model_desc
|
|||
|
||||
static struct SnapScan_USB_Model_desc usb_scanners[] =
|
||||
{
|
||||
{0x04a5, 0x1a20, SNAPSCAN310}, /* Acer 310U */
|
||||
{0x04a5, 0x2022, SNAPSCAN310} /* Acer 320U */
|
||||
{0x04a5, 0x1a20, PRISA310}, /* Acer 310U */
|
||||
{0x04a5, 0x2022, PRISA310} /* Acer 320U */
|
||||
};
|
||||
#define known_usb_scanners ((int) (sizeof(usb_scanners)/sizeof(usb_scanners[0])))
|
||||
|
||||
|
|
@ -377,6 +378,9 @@ struct snapscan_scanner
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.22 2003/08/19 21:05:08 oliverschwartz
|
||||
* Scanner ID cleanup
|
||||
*
|
||||
* Revision 1.21 2003/04/30 20:49:40 oliverschwartz
|
||||
* SnapScan backend 1.4.26
|
||||
*
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue