summaryrefslogtreecommitdiff
path: root/sanei/sanei_pa4s2.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_pa4s2.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'sanei/sanei_pa4s2.c')
-rw-r--r--sanei/sanei_pa4s2.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c
index 282e6fd..5e59743 100644
--- a/sanei/sanei_pa4s2.c
+++ b/sanei/sanei_pa4s2.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.
@@ -150,11 +148,9 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
#endif /* NDEBUG */
-#if defined(STDC_HEADERS)
-# include <errno.h>
-# include <stdio.h>
-# include <stdlib.h>
-#endif
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#if defined(HAVE_STRING_H)
# include <string.h>
#elif defined(HAVE_STRINGS_H)
@@ -202,7 +198,7 @@ typedef struct
#endif
u_int in_use; /* port in use? */
u_int enabled; /* port enabled? */
- u_int mode; /* protocoll */
+ u_int mode; /* protocol */
u_char prelock[3]; /* state of port */
#ifdef HAVE_LIBIEEE1284
int caps;
@@ -750,7 +746,7 @@ pa4s2_writebyte_any (int fd, u_char reg, u_char val)
/* somebody from Mustek asked me once, why I was writing the same
value repeatedly to a port. Well, actually I don't know, it just
works. Maybe the repeated writes could be replaced by appropriate
- delays or even left out completly.
+ delays or even left out completely.
*/
#if defined(HAVE_LIBIEEE1284)
DBG (6, "pa4s2_writebyte_any: writing value 0x%02x"
@@ -1922,7 +1918,7 @@ sanei_pa4s2_open (const char *dev, int *fd)
DBG (6, "sanei_pa4s2_open: basically, this backend does only compile\n");
DBG (6, "sanei_pa4s2_open: on x86 architectures. Furthermore it\n");
DBG (6, "sanei_pa4s2_open: needs ioperm() and inb()/outb() calls.\n");
- DBG (6, "sanei_pa4s2_open: alternativly it makes use of libieee1284\n");
+ DBG (6, "sanei_pa4s2_open: alternatively it makes use of libieee1284\n");
DBG (6, "sanei_pa4s2_open: (which isn't present either)\n");
DBG (5, "sanei_pa4s2_open: returning SANE_STATUS_INVAL\n");