kopia lustrzana https://gitlab.com/sane-project/backends
spelling fixes for plustek backend
rodzic
e3f20a932c
commit
9afda64c42
|
@ -435,10 +435,10 @@ static void usbDev_shutdown( Plustek_Device *dev )
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This function checks wether a device, described by a given
|
* This function checks whether a device, described by a given
|
||||||
* string(vendor and product ID), is support by this backend or not
|
* string(vendor and product ID), is support by this backend or not
|
||||||
*
|
*
|
||||||
* @param usbIdStr - sting consisting out of product and vendor ID
|
* @param usbIdStr - string consisting out of product and vendor ID
|
||||||
* format: "0xVVVVx0xPPPP" VVVV = Vendor ID, PPP = Product ID
|
* format: "0xVVVVx0xPPPP" VVVV = Vendor ID, PPP = Product ID
|
||||||
* @returns; SANE_TRUE if supported, SANE_FALSE if not
|
* @returns; SANE_TRUE if supported, SANE_FALSE if not
|
||||||
*/
|
*/
|
||||||
|
@ -902,7 +902,7 @@ usbDev_setScanEnv( Plustek_Device *dev, ScanInfo *si )
|
||||||
scan->sParam.dMCLK = dMCLK_ADF;
|
scan->sParam.dMCLK = dMCLK_ADF;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save necessary informations */
|
/* Save necessary information */
|
||||||
scan->fGrayFromColor = 0;
|
scan->fGrayFromColor = 0;
|
||||||
|
|
||||||
/* for some devices and settings, we tweak the physical settings
|
/* for some devices and settings, we tweak the physical settings
|
||||||
|
@ -1346,7 +1346,7 @@ usbDev_Prepare( Plustek_Device *dev, SANE_Byte *buf )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set a funtion to process the RAW data... */
|
/* set a function to process the RAW data... */
|
||||||
usb_GetImageProc( dev );
|
usb_GetImageProc( dev );
|
||||||
|
|
||||||
if( scan->sParam.bSource == SOURCE_ADF )
|
if( scan->sParam.bSource == SOURCE_ADF )
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
* - added MODEL_QSCAN_A6 (thanks to Hiroshi Miura)
|
* - added MODEL_QSCAN_A6 (thanks to Hiroshi Miura)
|
||||||
* - changed DCapsDef, lamp -> misc_io
|
* - changed DCapsDef, lamp -> misc_io
|
||||||
* - bPCB is now ushort to be "missused" by non Plustek
|
* - bPCB is now ushort to be "missused" by non Plustek
|
||||||
* devices (as threshhold for resetting sensor order)
|
* devices (as threshold for resetting sensor order)
|
||||||
* - added _WAF_LOFF_ON_START and _WAF_ONLY_8BIT
|
* - added _WAF_LOFF_ON_START and _WAF_ONLY_8BIT
|
||||||
* - added MODEL_TSCAN_A4
|
* - added MODEL_TSCAN_A4
|
||||||
* - added attribute packed for data access structs
|
* - added attribute packed for data access structs
|
||||||
|
@ -426,7 +426,7 @@ typedef struct DevCaps
|
||||||
} DCapsDef;
|
} DCapsDef;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* for keeping intial illumination settings
|
* for keeping initial illumination settings
|
||||||
*/
|
*/
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
@ -569,7 +569,7 @@ typedef struct
|
||||||
|
|
||||||
/** Driver Info */
|
/** Driver Info */
|
||||||
u_long dwValidPixels; /**< only valid pixels, not incl. pad pix(B/W,Gray)*/
|
u_long dwValidPixels; /**< only valid pixels, not incl. pad pix(B/W,Gray)*/
|
||||||
u_long dwPhyPixels; /**< inlcude pad pixels for ASIC (B/W, Gray) */
|
u_long dwPhyPixels; /**< include pad pixels for ASIC (B/W, Gray) */
|
||||||
u_long dwPhyBytes; /**< bytes to read from ASIC */
|
u_long dwPhyBytes; /**< bytes to read from ASIC */
|
||||||
u_long dwPhyLines; /**< should include the extra lines accord to the */
|
u_long dwPhyLines; /**< should include the extra lines accord to the */
|
||||||
/* request dpi (CCD lines distance) */
|
/* request dpi (CCD lines distance) */
|
||||||
|
@ -616,7 +616,7 @@ typedef struct
|
||||||
|
|
||||||
struct Plustek_Device;
|
struct Plustek_Device;
|
||||||
|
|
||||||
/** structure to hold all necessary buffer informations for current scan
|
/** structure to hold all necessary buffer information for current scan
|
||||||
*/
|
*/
|
||||||
typedef struct ScanDef
|
typedef struct ScanDef
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* The basic premise: The stock Plustek-usbshading.c in the plustek
|
* The basic premise: The stock Plustek-usbshading.c in the plustek
|
||||||
* driver is effectively nonfunctional for Canon CanoScan scanners.
|
* driver is effectively nonfunctional for Canon CanoScan scanners.
|
||||||
* These scanners rely heavily on all calibration steps, especially
|
* These scanners rely heavily on all calibration steps, especially
|
||||||
* fine white, to produce acceptible scan results. However, to make
|
* fine white, to produce acceptable scan results. However, to make
|
||||||
* autocalibration work and make it work well involves some
|
* autocalibration work and make it work well involves some
|
||||||
* substantial mucking aobut in code that supports thirty other
|
* substantial mucking aobut in code that supports thirty other
|
||||||
* scanners with widely varying characteristics... none of which I own
|
* scanners with widely varying characteristics... none of which I own
|
||||||
|
@ -102,7 +102,7 @@
|
||||||
static int strip_state = 0;
|
static int strip_state = 0;
|
||||||
|
|
||||||
/** depending on the strip state, the sensor is moved to the shading position
|
/** depending on the strip state, the sensor is moved to the shading position
|
||||||
* and the lamp ist switched on
|
* and the lamp is switched on
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
cano_PrepareToReadWhiteCal( Plustek_Device *dev, SANE_Bool mv2shading_pos )
|
cano_PrepareToReadWhiteCal( Plustek_Device *dev, SANE_Bool mv2shading_pos )
|
||||||
|
|
|
@ -94,7 +94,7 @@ static u_short a_wDarkShading[_SHADING_BUF] = {0};
|
||||||
|
|
||||||
/** function to read a text file and returns the string which starts which
|
/** function to read a text file and returns the string which starts which
|
||||||
* 'id' string.
|
* 'id' string.
|
||||||
* no duplicate entries where detected, always the first occurance will be
|
* no duplicate entries where detected, always the first occurrence will be
|
||||||
* red.
|
* red.
|
||||||
* @param fp - file pointer of file to read
|
* @param fp - file pointer of file to read
|
||||||
* @param id - what to search for
|
* @param id - what to search for
|
||||||
|
|
|
@ -2835,7 +2835,7 @@ static SetDef Settings[] =
|
||||||
* it's used by the driver to select the device settings. For other devices
|
* it's used by the driver to select the device settings. For other devices
|
||||||
* than those of Plustek, you'll not need to add the second '-' part
|
* than those of Plustek, you'll not need to add the second '-' part
|
||||||
*
|
*
|
||||||
* The second entry decribes the capabilities of the device, you may find
|
* The second entry describes the capabilities of the device, you may find
|
||||||
* one suitable for your scanner, for a better description of the entries
|
* one suitable for your scanner, for a better description of the entries
|
||||||
* have a look at the beginning of this file at Cap0x07B3_0x0017_0 for
|
* have a look at the beginning of this file at Cap0x07B3_0x0017_0 for
|
||||||
* the UT12
|
* the UT12
|
||||||
|
|
|
@ -1693,7 +1693,7 @@ static void usb_GrayScalePseudo16( Plustek_Device *dev )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** function to select the apropriate pixel copy function
|
/** function to select the appropriate pixel copy function
|
||||||
*/
|
*/
|
||||||
static void usb_GetImageProc( Plustek_Device *dev )
|
static void usb_GetImageProc( Plustek_Device *dev )
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* - 0.42 - no changes
|
* - 0.42 - no changes
|
||||||
* - 0.43 - no changes
|
* - 0.43 - no changes
|
||||||
* - 0.44 - added dump registers and dumpPic functions
|
* - 0.44 - added dump registers and dumpPic functions
|
||||||
* - beautyfied output of ASIC detection
|
* - beautified output of ASIC detection
|
||||||
* - 0.45 - fixed dumpRegs
|
* - 0.45 - fixed dumpRegs
|
||||||
* - added dimension stuff to dumpPic
|
* - added dimension stuff to dumpPic
|
||||||
* - 0.46 - disabled reset prior to the detection of Merlin
|
* - 0.46 - disabled reset prior to the detection of Merlin
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
|
|
||||||
static SANE_Byte a_bMap[_MAP_SIZE * 3];
|
static SANE_Byte a_bMap[_MAP_SIZE * 3];
|
||||||
|
|
||||||
/** adjust acording to brightness and contrast
|
/** adjust according to brightness and contrast
|
||||||
*/
|
*/
|
||||||
static void usb_MapAdjust( Plustek_Device *dev )
|
static void usb_MapAdjust( Plustek_Device *dev )
|
||||||
{
|
{
|
||||||
|
|
|
@ -348,7 +348,7 @@ usb_GetPhyPixels( Plustek_Device *dev, ScanParam *sp )
|
||||||
sp->Size.dwPhyPixels = (sp->Size.dwValidPixels + 1UL) & 0xfffffffeUL;
|
sp->Size.dwPhyPixels = (sp->Size.dwValidPixels + 1UL) & 0xfffffffeUL;
|
||||||
sp->Size.dwPhyBytes = sp->Size.dwPhyPixels * sp->bChannels + 2UL;
|
sp->Size.dwPhyBytes = sp->Size.dwPhyPixels * sp->bChannels + 2UL;
|
||||||
|
|
||||||
/* need to be adjusted fo CIS devices in color mode */
|
/* need to be adjusted for CIS devices in color mode */
|
||||||
if(usb_IsCISDevice( dev ) && (sp->bDataType == SCANDATATYPE_Color)) {
|
if(usb_IsCISDevice( dev ) && (sp->bDataType == SCANDATATYPE_Color)) {
|
||||||
sp->Size.dwPhyBytes *= 3;
|
sp->Size.dwPhyBytes *= 3;
|
||||||
}
|
}
|
||||||
|
@ -358,7 +358,7 @@ usb_GetPhyPixels( Plustek_Device *dev, ScanParam *sp )
|
||||||
sp->Size.dwPhyPixels = sp->Size.dwValidPixels;
|
sp->Size.dwPhyPixels = sp->Size.dwValidPixels;
|
||||||
sp->Size.dwPhyBytes = sp->Size.dwPhyPixels * 2 * sp->bChannels + 2UL;
|
sp->Size.dwPhyBytes = sp->Size.dwPhyPixels * 2 * sp->bChannels + 2UL;
|
||||||
|
|
||||||
/* need to be adjusted fo CIS devices in color mode */
|
/* need to be adjusted for CIS devices in color mode */
|
||||||
if(usb_IsCISDevice( dev ) && (sp->bDataType == SCANDATATYPE_Color)) {
|
if(usb_IsCISDevice( dev ) && (sp->bDataType == SCANDATATYPE_Color)) {
|
||||||
sp->Size.dwPhyBytes *= 3;
|
sp->Size.dwPhyBytes *= 3;
|
||||||
}
|
}
|
||||||
|
@ -1443,7 +1443,7 @@ usb_IsDataAvailableInDRAM( Plustek_Device *dev )
|
||||||
{
|
{
|
||||||
/* Compute polling timeout
|
/* Compute polling timeout
|
||||||
* Height (Inches) / MaxScanSpeed (Inches/Second) = Seconds to move the
|
* Height (Inches) / MaxScanSpeed (Inches/Second) = Seconds to move the
|
||||||
* module from top to bottom. Then convert the seconds to miliseconds
|
* module from top to bottom. Then convert the seconds to milliseconds
|
||||||
* by multiply 1000. We add extra 2 seconds to get some tolerance.
|
* by multiply 1000. We add extra 2 seconds to get some tolerance.
|
||||||
*/
|
*/
|
||||||
u_char a_bBand[3];
|
u_char a_bBand[3];
|
||||||
|
|
|
@ -1188,7 +1188,7 @@ decodeVal( char *src, char *opt, int what, void *result, void *def )
|
||||||
|
|
||||||
if( tmp ) {
|
if( tmp ) {
|
||||||
|
|
||||||
/* on success, compare wiht the given one */
|
/* on success, compare with the given one */
|
||||||
if( 0 == strcmp( tmp, opt )) {
|
if( 0 == strcmp( tmp, opt )) {
|
||||||
|
|
||||||
DBG( _DBG_SANE_INIT, "Decoding option >%s<\n", opt );
|
DBG( _DBG_SANE_INIT, "Decoding option >%s<\n", opt );
|
||||||
|
@ -1235,7 +1235,7 @@ decodeVal( char *src, char *opt, int what, void *result, void *def )
|
||||||
return SANE_FALSE;
|
return SANE_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** function to retrive the device name of a given string
|
/** function to retrieve the device name of a given string
|
||||||
* @param src - string that keeps the option name to check src for
|
* @param src - string that keeps the option name to check src for
|
||||||
* @param dest - pointer to the string, that should receive the detected
|
* @param dest - pointer to the string, that should receive the detected
|
||||||
* devicename
|
* devicename
|
||||||
|
@ -1296,7 +1296,7 @@ attach( const char *dev_name, CnfDef *cnf, Plustek_Device **devp )
|
||||||
if( NULL == dev )
|
if( NULL == dev )
|
||||||
return SANE_STATUS_NO_MEM;
|
return SANE_STATUS_NO_MEM;
|
||||||
|
|
||||||
/* assign all the stuff we need fo this device... */
|
/* assign all the stuff we need for this device... */
|
||||||
|
|
||||||
memset(dev, 0, sizeof (*dev));
|
memset(dev, 0, sizeof (*dev));
|
||||||
|
|
||||||
|
@ -1429,7 +1429,7 @@ init_config_struct( CnfDef *cnf )
|
||||||
cnf->adj.bgamma = 1.0;
|
cnf->adj.bgamma = 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** intialize the backend
|
/** initialize the backend
|
||||||
*/
|
*/
|
||||||
SANE_Status
|
SANE_Status
|
||||||
sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
|
sane_init( SANE_Int *version_code, SANE_Auth_Callback authorize )
|
||||||
|
|
|
@ -111,7 +111,7 @@ SOLUTION:
|
||||||
---------
|
---------
|
||||||
Simply load the parport module. You can add this dependency to
|
Simply load the parport module. You can add this dependency to
|
||||||
your /etc/modules.conf (or /etc/conf.modules) file (see INSTALL).
|
your /etc/modules.conf (or /etc/conf.modules) file (see INSTALL).
|
||||||
Then everytime you load pt_drv with modprobe, parport will be loaded
|
Then every time you load pt_drv with modprobe, parport will be loaded
|
||||||
automatically. After modifying this file, call
|
automatically. After modifying this file, call
|
||||||
depmod -va
|
depmod -va
|
||||||
|
|
||||||
|
@ -339,7 +339,7 @@ A: I recommend to uninstall the previous one.
|
||||||
|
|
||||||
rpm -e sane-1.0.1-94
|
rpm -e sane-1.0.1-94
|
||||||
|
|
||||||
After theses steps, sane should be removed.
|
After these steps, sane should be removed.
|
||||||
I'm not sure, but you might have to remove the /etc/sane.d manually...
|
I'm not sure, but you might have to remove the /etc/sane.d manually...
|
||||||
Now got to your sane-1.0.3 stuff and reinstall this
|
Now got to your sane-1.0.3 stuff and reinstall this
|
||||||
as described. Before using, you might have a look
|
as described. Before using, you might have a look
|
||||||
|
|
|
@ -195,7 +195,7 @@ When using libusb with SANE, then you should also use the hotplug utilities to
|
||||||
automatically setup your device nodes (at least the permissions) and prevent
|
automatically setup your device nodes (at least the permissions) and prevent
|
||||||
scanner.o from loading.
|
scanner.o from loading.
|
||||||
|
|
||||||
Assuming, that these utilites are properly installed on your box, you have
|
Assuming, that these utilities are properly installed on your box, you have
|
||||||
to tweak and add some files.
|
to tweak and add some files.
|
||||||
|
|
||||||
In directory (where of course the config files reside):
|
In directory (where of course the config files reside):
|
||||||
|
@ -292,7 +292,7 @@ it.
|
||||||
If you have carried out all of the above steps, then sane-find-scanner should
|
If you have carried out all of the above steps, then sane-find-scanner should
|
||||||
be able to recognise your scanner correctly.
|
be able to recognise your scanner correctly.
|
||||||
|
|
||||||
sane-find-scanner probes all of the devices on the SCSI and USB busses, and
|
sane-find-scanner probes all of the devices on the SCSI and USB buses, and
|
||||||
so you may find that it outputs "unable to get minor data" errors or similar
|
so you may find that it outputs "unable to get minor data" errors or similar
|
||||||
to your terminal, or to your error logs, you can safely ignore these as long
|
to your terminal, or to your error logs, you can safely ignore these as long
|
||||||
as it does that, and has recognised your scanner.
|
as it does that, and has recognised your scanner.
|
||||||
|
@ -339,7 +339,7 @@ log, as well as (where possible) the output of the scanimage command (if
|
||||||
you can't capture it directly, an as-accurate-as-possible description is
|
you can't capture it directly, an as-accurate-as-possible description is
|
||||||
MUCH better than nothing!), and try and get all of the activity that
|
MUCH better than nothing!), and try and get all of the activity that
|
||||||
your scanner did as well (light
|
your scanner did as well (light
|
||||||
came on? didnt? motors came on? etc?) and email that to the plustek list
|
came on? didn't? motors came on? etc?) and email that to the plustek list
|
||||||
(<plustek@linuxhacker.org>).
|
(<plustek@linuxhacker.org>).
|
||||||
|
|
||||||
For the particularly adventurous only...
|
For the particularly adventurous only...
|
||||||
|
|
|
@ -279,7 +279,7 @@ m/PID | 0x1000 | 0x1001
|
||||||
option invertNegatives b
|
option invertNegatives b
|
||||||
.RS
|
.RS
|
||||||
.I b
|
.I b
|
||||||
0 --> do not invert the picture during negativ scans,
|
0 --> do not invert the picture during negative scans,
|
||||||
.br
|
.br
|
||||||
1 --> invert picture
|
1 --> invert picture
|
||||||
.RE
|
.RE
|
||||||
|
|
Ładowanie…
Reference in New Issue