diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 |
| commit | 9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch) | |
| tree | c9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/hs2p-scsi.c | |
| parent | 446e9454b8cbe5b689149415d11d36e88442ca88 (diff) | |
| parent | 154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff) | |
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/hs2p-scsi.c')
| -rw-r--r-- | backend/hs2p-scsi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/backend/hs2p-scsi.c b/backend/hs2p-scsi.c index 6063acd..4924c19 100644 --- a/backend/hs2p-scsi.c +++ b/backend/hs2p-scsi.c @@ -16,9 +16,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. @@ -609,7 +607,7 @@ sense_handler (int __sane_unused__ scsi_fd, u_char * sense_buffer, void *sd) case 0x2C02: /* Invalid combination of windows specified */ status = SANE_STATUS_INVAL; break; - case 0x3700: /* (Rounded paramter) */ + case 0x3700: /* (Rounded parameter) */ status = SANE_STATUS_INVAL; break; case 0x3900: /* (Saving parameters not supported) */ @@ -928,7 +926,7 @@ mode_sense (int fd, MP * buf, SANE_Byte page_code) cmd.dbd &= ~(1 << 3); /* Disable Block Description (bit3) is set to 0 */ cmd.pc = (page_code & 0x3F); /* bits 5-0 */ cmd.pc &= ~(0x03 << 6); /* unset PC Field (bits7-6) - * 00 Curent Value is the only effective value + * 00 Current Value is the only effective value * 01 Changeable Value * 10 Default Value * 11 Saved Value */ @@ -1014,7 +1012,7 @@ set_window (int fd, SWD * swd) DBG (DBG_error, "set_window: error with memcpy\n"); } - /* Set Window Data Header: 0-5:reserved; 6-7:Window Descriptor Lenght=640 */ + /* Set Window Data Header: 0-5:reserved; 6-7:Window Descriptor Length=640 */ wdl = sizeof (win.swd) - sizeof (win.swd.hdr); _lto2b (wdl, &win.swd.hdr.len[0]); DBG (DBG_info, |