mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

sane_control_option(): perform options reload if asked by the remote backend and the frontend doesn't care (info == NULL)

merge-requests/1/head
Julien BLACHE 2008-07-20 10:28:14 +00:00
rodzic cc60422d01
commit 154bea9618
2 zmienionych plików z 24 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
ChangeLog
Wyświetl plik

@ -1,3 +1,9 @@
2008-07-20 Julien Blache <jb@jblache.org>
* backend/net.c: sane_control_option: when the frontend doesn't
care (info == NULL) and the remote backend asks for a reload,
perform the reload. Hopefully this brings the behaviour back in
line with standard backends.
2008-07-15 Nicolas Martin <nicols-guest at users.alioth.debian.org> 2008-07-15 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c: * backend/pixma_mp150.c:
Changed page scan end condition to handle correctly PIXMA ADF. Changed page scan end condition to handle correctly PIXMA ADF.

19
backend/net.c
Wyświetl plik

@ -1705,6 +1705,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
SANE_Status status; SANE_Status status;
size_t value_size; size_t value_size;
int need_auth; int need_auth;
SANE_Word local_info;
DBG (3, "sane_control_option: option %d, action %d\n", option, action); DBG (3, "sane_control_option: option %d, action %d\n", option, action);
@ -1755,6 +1756,8 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
req.value_size = value_size; req.value_size = value_size;
req.value = value; req.value = value;
local_info = 0;
DBG (3, "sane_control_option: remote control option\n"); DBG (3, "sane_control_option: remote control option\n");
sanei_w_call (&s->hw->wire, SANE_NET_CONTROL_OPTION, sanei_w_call (&s->hw->wire, SANE_NET_CONTROL_OPTION,
(WireCodecFunc) sanei_w_control_option_req, &req, (WireCodecFunc) sanei_w_control_option_req, &req,
@ -1779,6 +1782,8 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
} }
else if (status == SANE_STATUS_GOOD) else if (status == SANE_STATUS_GOOD)
{ {
local_info = reply.info;
if (info) if (info)
*info = reply.info; *info = reply.info;
if (value_size > 0) if (value_size > 0)
@ -1800,7 +1805,19 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
} }
while (need_auth); while (need_auth);
DBG (2, "sane_control_option: done (%s)\n", sane_strstatus (status)); DBG (2, "sane_control_option: remote done (%s, info %x)\n", sane_strstatus (status), local_info);
if ((status == SANE_STATUS_GOOD) && (info == NULL) && (local_info & SANE_INFO_RELOAD_OPTIONS))
{
DBG (2, "sane_control_option: reloading options as frontend does not care\n");
status = fetch_options (s);
DBG (2, "sane_control_option: reload done (%s)\n", sane_strstatus (status));
}
DBG (2, "sane_control_option: done (%s, info %x)\n", sane_strstatus (status), local_info);
return status; return status;
} }