diff --git a/backend/gt68xx.c b/backend/gt68xx.c index f657d42a2..da3996053 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -124,7 +124,7 @@ static const SANE_Device **devlist = 0; static GT68xx_Device **new_dev = 0; /* Length of new_dev array */ static SANE_Int new_dev_len = 0; -/* Number of entries alloced for new_dev */ +/* Number of entries allocated for new_dev */ static SANE_Int new_dev_alloced = 0; /* Is this computer little-endian ?*/ SANE_Bool little_endian; @@ -1527,7 +1527,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle) } /* The firmware check is disabled by default because it may confuse - some scanners: So the firmware is loaded everytime. */ + some scanners: So the firmware is loaded every time. */ #if 0 RIE (gt68xx_device_check_firmware (dev, &firmware_loaded)); firmware_loaded = SANE_FALSE; @@ -2030,7 +2030,7 @@ sane_start (SANE_Handle handle) } while ((i<5) && (document==SANE_FALSE)); if(document==SANE_FALSE) { - DBG (4, "sane_start: no doucment detected after %d s\n",i); + DBG (4, "sane_start: no document detected after %d s\n",i); return SANE_STATUS_NO_DOCS; } } diff --git a/backend/gt68xx.conf.in b/backend/gt68xx.conf.in index af5ebe3cb..5e54f8f2a 100644 --- a/backend/gt68xx.conf.in +++ b/backend/gt68xx.conf.in @@ -5,7 +5,7 @@ # Put the firmware file into "@DATADIR@/sane/gt68xx/". # Manual configuration is necessary for some scanners. Please uncomment the -# override line and optinally the vendor and product lines that apply to your +# override line and optionally the vendor and product lines that apply to your # scanner. For some scanners it's also necessary to change the name of the # firmware file. diff --git a/backend/gt68xx_gt6801.c b/backend/gt68xx_gt6801.c index c0a6288b6..9ca4727c4 100644 --- a/backend/gt68xx_gt6801.c +++ b/backend/gt68xx_gt6801.c @@ -103,7 +103,7 @@ gt6801_check_plustek_firmware (GT68xx_Device * dev, SANE_Bool * loaded) *loaded = SANE_FALSE; /* Until I find out if testing for req[3] & 0x80 is save, load the firmware - everytime */ + every time */ *loaded = SANE_FALSE; return SANE_STATUS_GOOD; diff --git a/backend/gt68xx_high.c b/backend/gt68xx_high.c index 563323c8e..1eaefc7af 100644 --- a/backend/gt68xx_high.c +++ b/backend/gt68xx_high.c @@ -1015,7 +1015,7 @@ struct GT68xx_Afe_Values /** Calculate average black and maximum white * - * This function is used for CCD scanners. The black mark to the left ist used + * This function is used for CCD scanners. The black mark to the left is used * for the calculation of average black. The remaining calibration strip * is used for searching the segment whose white average is the highest. * @@ -2664,7 +2664,7 @@ gt68xx_read_calibration (GT68xx_Scanner * scanner) return SANE_STATUS_IO_ERROR; } - /* TODO we should check endiannes and word alignment in case of a home + /* TODO we should check endianness and word alignment in case of a home * directory used trough different archs */ /* TODO check for errors */ diff --git a/backend/gt68xx_high.h b/backend/gt68xx_high.h index da4ab6a69..ea08ccd31 100644 --- a/backend/gt68xx_high.h +++ b/backend/gt68xx_high.h @@ -356,7 +356,7 @@ static SANE_Status gt68xx_scanner_stop_scan (GT68xx_Scanner * scanner); * This function stores in memory calibration data created at calibration * time into file * @param scanner Scanner object. - * @return SANE_STATUS_GOOD when succesfull + * @return SANE_STATUS_GOOD when successful */ static SANE_Status gt68xx_write_calibration (GT68xx_Scanner * scanner); @@ -365,7 +365,7 @@ static SANE_Status gt68xx_write_calibration (GT68xx_Scanner * scanner); * This function sets in memory calibration data from data saved into file. * * @param scanner Scanner object. - * @return SANE_STATUS_GOOD when succesfull + * @return SANE_STATUS_GOOD when successful */ static SANE_Status gt68xx_read_calibration (GT68xx_Scanner * scanner); diff --git a/backend/gt68xx_low.h b/backend/gt68xx_low.h index 89bd3657e..90e340860 100644 --- a/backend/gt68xx_low.h +++ b/backend/gt68xx_low.h @@ -71,7 +71,7 @@ #define LOBYTE(w) ((SANE_Byte)(w)) -/* return if an error occured while the function was called */ +/* return if an error occurred while the function was called */ #ifdef MAX_DEBUG # define RIE(function) \ @@ -219,7 +219,7 @@ struct GT68xx_Command_Set /*@{ */ SANE_Byte request_type; /**< Request type (should be 0x40, vendor spec) */ - SANE_Byte request; /**< Vendor spec resquest (0x01 or 0x04) */ + SANE_Byte request; /**< Vendor spec request (0x01 or 0x04) */ SANE_Word memory_read_value; /**< Memory read - wValue */ SANE_Word memory_write_value; /**< Memory write - wValue */ SANE_Word send_cmd_value; /**< Send normal command - wValue */ @@ -504,7 +504,7 @@ struct GT68xx_Device SANE_Bool active; /** Device missing to flag devices that are unplugged - * after sane_init and befor sane_exit */ + * after sane_init and before sane_exit */ SANE_Bool missing; /** Scanner model data. */ @@ -588,7 +588,7 @@ struct GT68xx_Scan_Parameters SANE_Int ld_shift_b; SANE_Int ld_shift_double; SANE_Int double_column; - SANE_Int pixel_x0; /**< x start postion */ + SANE_Int pixel_x0; /**< x start position */ }; @@ -763,7 +763,7 @@ static SANE_Status gt68xx_device_deactivate (GT68xx_Device * dev); * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. * * @warning * @a size must be a multiple of 64 (at least with GT6816), otherwise the @@ -782,7 +782,7 @@ gt68xx_device_memory_write (GT68xx_Device * dev, SANE_Word addr, * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. * * @warning * @a size must be a multiple of 64 (at least with GT6816), otherwise the @@ -800,7 +800,7 @@ gt68xx_device_memory_read (GT68xx_Device * dev, SANE_Word addr, * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_req (GT68xx_Device * dev, GT68xx_Packet cmd, GT68xx_Packet res); @@ -813,7 +813,7 @@ gt68xx_device_req (GT68xx_Device * dev, GT68xx_Packet cmd, GT68xx_Packet res); * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_small_req (GT68xx_Device * dev, GT68xx_Packet cmd, @@ -829,7 +829,7 @@ gt68xx_device_small_req (GT68xx_Device * dev, GT68xx_Packet cmd, * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_check_firmware (GT68xx_Device * dev, SANE_Bool * loaded); @@ -850,7 +850,7 @@ gt68xx_device_download_firmware (GT68xx_Device * dev, * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_get_power_status (GT68xx_Device * dev, SANE_Bool * power_ok); @@ -865,7 +865,7 @@ gt68xx_device_get_power_status (GT68xx_Device * dev, SANE_Bool * power_ok); * @return * - #SANE_STATUS_GOOD - success. * - #SANE_STATUS_UNSUPPORTED - the scanner does not support TA connection. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_get_ta_status (GT68xx_Device * dev, SANE_Bool * ta_attached); @@ -878,7 +878,7 @@ gt68xx_device_get_ta_status (GT68xx_Device * dev, SANE_Bool * ta_attached); * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. * - #SANE_STATUS_UNSUPPORTED - unsupported request was made (like attempt to * turn on the TA lamp on a scanner which does not support TA). */ @@ -895,7 +895,7 @@ gt68xx_device_lamp_control (GT68xx_Device * dev, SANE_Bool fb_lamp, * * @return * - #SANE_STATUS_GOOD - success; the status in @a *moving is valid. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_is_moving (GT68xx_Device * dev, SANE_Bool * moving); @@ -912,7 +912,7 @@ gt68xx_device_is_moving (GT68xx_Device * dev, SANE_Bool * moving); * - #SANE_STATUS_GOOD - success; the movement is started. Call * gt68xx_device_is_moving() periodically to determine when the movement is * complete. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_move_relative (GT68xx_Device * dev, SANE_Int distance); @@ -929,7 +929,7 @@ gt68xx_device_move_relative (GT68xx_Device * dev, SANE_Int distance); * * @return * - #SANE_STATUS_GOOD - success; the movement is started. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_carriage_home (GT68xx_Device * dev); @@ -940,7 +940,7 @@ static SANE_Status gt68xx_device_carriage_home (GT68xx_Device * dev); * * @return * - #SANE_STATUS_GOOD - success; the movement is started. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_paperfeed (GT68xx_Device * dev); @@ -958,7 +958,7 @@ static SANE_Status gt68xx_device_paperfeed (GT68xx_Device * dev); * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_start_scan (GT68xx_Device * dev); @@ -977,7 +977,7 @@ static SANE_Status gt68xx_device_start_scan (GT68xx_Device * dev); * * @return * - #SANE_STATUS_GOOD - success; the value in @a *ready is valid. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_read_scanned_data (GT68xx_Device * dev, SANE_Bool * ready); @@ -991,7 +991,7 @@ gt68xx_device_read_scanned_data (GT68xx_Device * dev, SANE_Bool * ready); * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_stop_scan (GT68xx_Device * dev); @@ -1014,7 +1014,7 @@ static SANE_Status gt68xx_device_stop_scan (GT68xx_Device * dev); * are not supported by hardware. * - #SANE_STATUS_INVAL - some of the parameters in @a request, or the @a * action code, are completely invalid. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_setup_scan (GT68xx_Device * dev, @@ -1029,7 +1029,7 @@ gt68xx_device_setup_scan (GT68xx_Device * dev, * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_set_afe (GT68xx_Device * dev, GT68xx_AFE_Parameters * params); @@ -1048,7 +1048,7 @@ gt68xx_device_set_exposure_time (GT68xx_Device * dev, * * @return * - #SANE_STATUS_GOOD - success. - * - #SANE_STATUS_IO_ERROR - a communication error occured. + * - #SANE_STATUS_IO_ERROR - a communication error occurred. */ static SANE_Status gt68xx_device_read_raw (GT68xx_Device * dev, SANE_Byte * buffer, @@ -1085,7 +1085,7 @@ gt68xx_device_get_id (GT68xx_Device * dev); /** Read the device descriptor of the scanner. * * This function should be called before closing the device to make sure - * that the device descriptor is propperly stored in the scanner's memory. + * that the device descriptor is properly stored in the scanner's memory. * If that's not done, the next try to get the config descriptor will * result in a corrupted descriptor. * diff --git a/backend/gt68xx_mid.c b/backend/gt68xx_mid.c index 1d6a5c68f..bbc52ff0d 100644 --- a/backend/gt68xx_mid.c +++ b/backend/gt68xx_mid.c @@ -81,7 +81,7 @@ gt68xx_delay_buffer_init (GT68xx_Delay_Buffer * delay, DBG (3, "gt68xx_delay_buffer_init: no memory for delay block\n"); return SANE_STATUS_NO_MEM; } - /* make sure that we will see if one of the unitialized lines get displayed */ + /* make sure that we will see if one of the uninitialized lines get displayed */ for (i = 0; i < bytes_per_line * line_count; i++) delay->mem_block[i] = i % 256; diff --git a/backend/gt68xx_mid.h b/backend/gt68xx_mid.h index 2bbaac258..e8c2abf2b 100644 --- a/backend/gt68xx_mid.h +++ b/backend/gt68xx_mid.h @@ -143,7 +143,7 @@ static SANE_Status gt68xx_line_reader_free (GT68xx_Line_Reader * reader); * * @return * - SANE_STATUS_GOOD - read completed successfully - * - other error value - an error occured + * - other error value - an error occurred */ static SANE_Status gt68xx_line_reader_read (GT68xx_Line_Reader * reader, diff --git a/backend/gt68xx_shm_channel.c b/backend/gt68xx_shm_channel.c index 496a959ba..ae8d19d57 100644 --- a/backend/gt68xx_shm_channel.c +++ b/backend/gt68xx_shm_channel.c @@ -342,7 +342,7 @@ shm_channel_writer_init (Shm_Channel * shm_channel) * This function may block waiting for a free buffer (if the reader process * does not process the data fast enough). * - * After successfull call to this function the writer process should fill the + * After successful call to this function the writer process should fill the * buffer with the data and pass the buffer identifier from @a buffer_id_return * to shm_channel_writer_put_buffer() to give the buffer to the reader process. * @@ -355,7 +355,7 @@ shm_channel_writer_init (Shm_Channel * shm_channel) * waiting for it); @a buffer_id_return and @a buffer_addr_return are filled * with valid values. * - SANE_STATUS_EOF - the reader process has closed its half of the channel. - * - SANE_STATUS_IO_ERROR - an I/O error occured. + * - SANE_STATUS_IO_ERROR - an I/O error occurred. */ SANE_Status shm_channel_writer_get_buffer (Shm_Channel * shm_channel, @@ -399,7 +399,7 @@ shm_channel_writer_get_buffer (Shm_Channel * shm_channel, * @return * - SANE_STATUS_GOOD - the buffer was successfully queued. * - SANE_STATUS_IO_ERROR - the reader process has closed its half of the - * channel, or another I/O error occured. + * channel, or another I/O error occurred. */ SANE_Status shm_channel_writer_put_buffer (Shm_Channel * shm_channel, @@ -573,7 +573,7 @@ shm_channel_reader_start (Shm_Channel * shm_channel) * Otherwise, @a *buffer_id_return, @a *buffer_addr_return and @a * *buffer_bytes return are filled with valid values. * - SANE_STATUS_EOF - the writer process has closed its half of the channel. - * - SANE_STATUS_IO_ERROR - an I/O error occured. + * - SANE_STATUS_IO_ERROR - an I/O error occurred. */ SANE_Status shm_channel_reader_get_buffer (Shm_Channel * shm_channel, @@ -627,7 +627,7 @@ shm_channel_reader_get_buffer (Shm_Channel * shm_channel, * @return * - SANE_STATUS_GOOD - the buffer was successfully released. * - SANE_STATUS_IO_ERROR - the writer process has closed its half of the - * channel, or an unexpected I/O error occured. + * channel, or an unexpected I/O error occurred. */ SANE_Status shm_channel_reader_put_buffer (Shm_Channel * shm_channel, SANE_Int buffer_id) diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index f101cd1ea..b911e989f 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -473,6 +473,6 @@ :interface "USB" :usbid "0x04a7" "0x0444" :status :good -:comment "Works upto 1200 dpi and 12 bits/color." +:comment "Works up to 1200 dpi and 12 bits/color." ; ----------------------------------------------------------------------------- diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES index aa8750463..074c1c9b7 100644 --- a/doc/gt68xx/gt68xx.CHANGES +++ b/doc/gt68xx/gt68xx.CHANGES @@ -80,7 +80,7 @@ V 1.0.73 (2005-08-19) V 1.0.72 (2005-08-18) * Finally fixed the problem concerning scanning on *BSD. Scanning only worked - once. After that, the scanner wasn't even detected anymore beacuse the config + once. After that, the scanner wasn't even detected anymore because the config descriptor returned by the device was corrupted. This is a hardware bug. When filling the internal memory of the scanner completely, the config descriptor is overwritten. The work-around is to ask the scanner for the device @@ -205,7 +205,7 @@ V 1.0-61 (2004-06-18) * Check for status of read_scanned_data every 10 ms. Avoids short stops before scan data comes in. * Added resolution limit for using backtracking. - * Reduced deafult CCD backtracking to 0x10 lines. + * Reduced default CCD backtracking to 0x10 lines. * CCD coarse calibration: * Check if calib has succeeded per color now (fewer loops). * Added loop detection now. @@ -399,7 +399,7 @@ V 1.0-40 (2003-02-22) - Added indormation about Medion 4394. - Mention ma1509 backend. - Fix segfault when calling sane_open with an empty device name. -- Explicitely initialize global variables to avoid segfaults when calling +- Explicitly initialize global variables to avoid segfaults when calling sane_init/sane_exit more than once. V 1.0-39 (2003-02-16) @@ -416,7 +416,7 @@ V 1.0-38 (2003-02-05) - Increase the lowest black for CCD coarse calibration to avoid too much black. - Adjusted internal gamma correction to avoid getting 0 for high gamma values. - CCD scanners use color mode for coarse+quality cal now. This fixes the - problem with extremly high gains and terrible quality cal in gray mode at + problem with extremely high gains and terrible quality cal in gray mode at least for the BearPaw 1200 TA. --> Thanks to Alexei V. Mezin for reporting these bugs. - Preview isn't always in 8 bit mode now (can be selected by option). @@ -533,8 +533,8 @@ V 1.0-26 (2002-10-22) - Several fixes for Medion MD-9385 and Artec Ultima 2000 based scanners. The Cytron MD 9385 works now. -- Diabled Plustek-like firmware check again, didn't work for MD 9385. -- Splitted flags for mirror_x and sset_home. +- Disabled Plustek-like firmware check again, didn't work for MD 9385. +- Split flags for mirror_x and sset_home. V 1.0-25 (2002-10-20) @@ -575,7 +575,7 @@ V 1.0-22 (2002-10-07), - Line calibration uses the bit depth of the main scan now. - Vendor, product ids and other information is printed when debugging is active - Fixed segfault in attach (). -- Fixed endianess issues (untested). +- Fixed endianness issues (untested). - Code cleanup. V 1.0-21 (2002-10-07), @@ -612,7 +612,7 @@ V 1.0-18 (2002-10-01) - Added detection of Artec Ultima 2000. - Updated Lexmark X70 settings. -- Fixed segfault that occured when no device was detected. +- Fixed segfault that occurred when no device was detected. - Changed test for loaded firmware for GT-6801 scanners. V 1.0-17 (2002-10-01) @@ -699,7 +699,7 @@ V 1.0-9 (2002-09-17) - Added option to disable automatic gain (->less ugly colors for GT-6801 based models) -- Fixed segfault that occured when a scan was cancelled +- Fixed segfault that occurred when a scan was cancelled - Preview uses slow but safe (?) 300 dpi 8 bit modes now - Fixed bug concerning X0/Y0 coordinates - Started implementing dpeth option (doesn't work yet) diff --git a/doc/gt68xx/gt68xx.TODO b/doc/gt68xx/gt68xx.TODO index 74aeb17c8..4909b0811 100644 --- a/doc/gt68xx/gt68xx.TODO +++ b/doc/gt68xx/gt68xx.TODO @@ -33,7 +33,7 @@ Mustek BearPaw 2448 TA Plus: - Sometimes there is a USB protocol error when cancelling the scan? - top borders move with resolution (happened in the early days with 2400 TA!) - gray scans have different brightness -- scan motor is bumpy and freezes sometimes, looks like accelaration is too big +- scan motor is bumpy and freezes sometimes, looks like acceleration is too big (firmware problem?) - vertical stripes - TA settings are wrong @@ -93,7 +93,7 @@ Mustek ScanExpress 1248 UB ok Plustek OpticSlim 2400 -- only upto 1200 dpi vertical works +- only up to 1200 dpi vertical works - only 8 and 12 bit work, 16 doesn't (check Windows) - exposure is extremely high and seems to have similar problems as with other CIS scanners (reaches limit also) @@ -102,4 +102,4 @@ Mustek ScanExpress 2400 USB - make it work (nobody seems to have this device) Visioneer OneTouch 7300 -- 16 bit doesn't seem to work despite beeing advertized +- 16 bit doesn't seem to work despite being advertized