summaryrefslogtreecommitdiff
path: root/backend/pixma/pixma_bjnp_private.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
commit9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch)
treec9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/pixma/pixma_bjnp_private.h
parent446e9454b8cbe5b689149415d11d36e88442ca88 (diff)
parent154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff)
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/pixma/pixma_bjnp_private.h')
-rw-r--r--backend/pixma/pixma_bjnp_private.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/pixma/pixma_bjnp_private.h b/backend/pixma/pixma_bjnp_private.h
index 19ba496..c759fc7 100644
--- a/backend/pixma/pixma_bjnp_private.h
+++ b/backend/pixma/pixma_bjnp_private.h
@@ -26,8 +26,8 @@
License for more details.
You should have received a copy of the GNU General Public License
- along with sane; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with sane; see the file COPYING.
+ 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.
@@ -80,7 +80,7 @@
/* timers */
#define BJNP_BROADCAST_INTERVAL 10 /* ms between broadcasts */
#define BJNP_BC_RESPONSE_TIMEOUT 500 /* waiting time for broadc. responses */
-#define BJNP_TIMEOUT_DEFAULT 10000 /* minimum tiemout value for network operations */
+#define BJNP_TIMEOUT_DEFAULT 10000 /* minimum timeout value for network operations */
#define BJNP_TIMEOUT_TCP_CONNECT 2000 /* timeout for tcp connect attempts in ms */
#define BJNP_USLEEP_MS 1000 /* sleep for 1 msec */
#define BJNP_TCP_CONNECT_INTERVAL 100 /* TCP retry interval in ms */
@@ -187,7 +187,7 @@ struct __attribute__ ((__packed__)) BJNP_command
struct __attribute__ ((__packed__)) DISCOVER_RESPONSE
{
- struct BJNP_command response; /* reponse header */
+ struct BJNP_command response; /* response header */
char unknown1[4]; /* 00 01 08 00 */
char mac_len; /* length of mac address */
char addr_len; /* length of address field */
@@ -354,7 +354,7 @@ typedef struct device_s
/* sockets */
- int tcp_socket; /* open tcp socket for communcation to scannner */
+ int tcp_socket; /* open tcp socket for communication to scannner */
int16_t serial; /* sequence number of command */
/* communication state */