summaryrefslogtreecommitdiff
path: root/sanei/sanei_scsi.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /sanei/sanei_scsi.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'sanei/sanei_scsi.c')
-rw-r--r--sanei/sanei_scsi.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
index b69f78f..53736ca 100644
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@@ -14,9 +14,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -173,7 +171,7 @@
# include <sys/scsi/targets/scgio.h>
#elif defined (HAVE_SYS_SCSI_SCSI_H)
/*
- * the "offical" solaris uscsi(7I) interface; comes last, so that users
+ * the "official" solaris uscsi(7I) interface; comes last, so that users
* installing the SCG/SG driver can still use these generic scsi interfaces
*/
# define USE SOLARIS_USCSI_INTERFACE
@@ -347,7 +345,7 @@ int sanei_scsi_max_request_size = MAX_DATA;
#endif
/* the struct returned by the SG ioctl call SG_GET_SCSI_ID changed
- from version 2.1.34 to 2.1.35, and we need the informations from
+ from version 2.1.34 to 2.1.35, and we need the information from
the field s_queue_depth, which was introduced in 2.1.35.
To get this file compiling also with older versions of sg.h, the
struct is re-defined here.
@@ -383,7 +381,7 @@ typedef struct req
{
struct sg_header hdr;
/* Make sure this is the last element, the real size is
- SG_BIG_BUFF and machine dependant */
+ SG_BIG_BUFF and machine dependent */
u_int8_t data[1];
}
cdb;
@@ -2298,7 +2296,7 @@ issue (struct req *req)
/* this is messy... Sometimes it happens that we have
a valid looking sense buffer, but the DRIVER_SENSE
bit is not set. Moreover, we can check this only for
- not tooo old SG drivers
+ not too old SG drivers
*/
&& (req->sgdata.cdb.hdr.driver_status & DRIVER_SENSE)
#endif
@@ -2347,7 +2345,7 @@ issue (struct req *req)
status = SANE_STATUS_DEVICE_BUSY;
else if (handler)
/* sense handler should return SANE_STATUS_GOOD if it
- decided all was ok afterall */
+ decided all was ok after all */
status =
(*handler) (req->fd, req->sgdata.cdb.hdr.sense_buffer,
arg);
@@ -2415,7 +2413,7 @@ issue (struct req *req)
status = SANE_STATUS_DEVICE_BUSY;
else if (handler && req->sgdata.sg3.hdr.sb_len_wr)
/* sense handler should return SANE_STATUS_GOOD if it
- decided all was ok afterall */
+ decided all was ok after all */
status =
(*handler) (req->fd, req->sgdata.sg3.sense_buffer,
arg);
@@ -3833,12 +3831,12 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
* (c) R=I+S Rapp Informatik System Germany
* Email: wolfgang@rapp-informatik.de
*
- * The driver version should run with other scsi componets like disk
+ * The driver version should run with other scsi components like disk
* attached to the same controller at the same time.
*
* Attention : This port needs a sane kernel driver for Unixware 2.x
* The driver is available in binary pkgadd format
- * Plese mail me.
+ * Please mail me.
*
*/
SANE_Status
@@ -3978,7 +3976,7 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
#ifdef UWSUPPORTED /* at this time not supported by driver */
if (sb_ptr->SCB.sc_comp_code != SDI_ASW)
{
- DBG (1, "sanei_scsi_cmd: scsi_cmd failture %x\n",
+ DBG (1, "sanei_scsi_cmd: scsi_cmd failure %x\n",
sb_ptr->SCB.sc_comp_code);
if (sb_ptr->SCB.sc_comp_code == SDI_CKSTAT
&& sb_ptr->SCB.sc_status == S_CKCON)