From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- backend/kvs20xx_cmd.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'backend/kvs20xx_cmd.c') diff --git a/backend/kvs20xx_cmd.c b/backend/kvs20xx_cmd.c index 7579701..d0f18ee 100644 --- a/backend/kvs20xx_cmd.c +++ b/backend/kvs20xx_cmd.c @@ -187,7 +187,7 @@ kvs20xx_set_timeout (struct scanner * s, int timeout) }; c.cmd[0] = SET_TIMEOUT; c.cmd[2] = 0x8d; - *((u16 *) (c.cmd + 7)) = cpu2be16 (sizeof (t)); + copy16 (c.cmd + 7, cpu2be16 (sizeof (t))); c.data = &t; c.data_size = sizeof (t); @@ -210,7 +210,7 @@ kvs20xx_set_window (struct scanner * s, int wnd_id) CMD_OUT }; c.cmd[0] = SET_WINDOW; - *((u16 *) (c.cmd + 7)) = cpu2be16 (sizeof (wnd)); + copy16 (c.cmd + 7, cpu2be16 (sizeof (wnd))); c.data = &wnd; c.data_size = sizeof (wnd); @@ -301,29 +301,6 @@ kvs20xx_read_picture_element (struct scanner * s, unsigned side, return SANE_STATUS_GOOD; } -static SANE_Status -get_buffer_status (struct scanner * s, unsigned *data_avalible) -{ - SANE_Status status; - struct cmd c = { - {0}, - 10, - 0, - 12, - CMD_IN - }; - u32 *data; - c.cmd[0] = GET_BUFFER_STATUS; - c.cmd[7] = 12; - - status = send_command (s, &c); - if (status) - return status; - data = (u32 *) c.data; - *data_avalible = be2cpu32 (data[3]); - return SANE_STATUS_GOOD; -} - SANE_Status kvs20xx_read_image_data (struct scanner * s, unsigned page, unsigned side, void *buf, unsigned max_size, unsigned *size) -- cgit v1.2.3