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

pixma_bjnp.c: remove code and sanei_bjnp_activate/deactivate to make ADF scan work on MFNP protocol 

Code is moved to sanei_bjnp_open/close instead. The FINISH command killed ADF scan
merge-requests/1/head
Louis Lagendijk 2014-02-12 00:16:34 +01:00
rodzic bd851f2a3e
commit ff7faa7964
1 zmienionych plików z 26 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

51
backend/pixma_bjnp.c
Wyświetl plik

@ -2098,6 +2098,9 @@ extern SANE_Status
sanei_bjnp_open (SANE_String_Const devname, SANE_Int * dn)
{
int result;
char hostname[256];
char pid_str[64];
PDBG (bjnp_dbg (LOG_INFO, "sanei_bjnp_open(%s, %d):\n", devname, *dn));
@ -2105,7 +2108,19 @@ sanei_bjnp_open (SANE_String_Const devname, SANE_Int * dn)
if ( (result != BJNP_STATUS_GOOD) && (result != BJNP_STATUS_ALREADY_ALLOCATED ) )
return SANE_STATUS_INVAL;
return sanei_bjnp_activate( *dn);;
/* return sanei_bjnp_activate( *dn); */
gethostname (hostname, 256);
hostname[255] = '\0';
sprintf (pid_str, "Process ID = %d", getpid ());
bjnp_send_job_details (*dn, hostname, getusername (), pid_str);
if (bjnp_open_tcp (*dn) != 0)
{
return SANE_STATUS_INVAL;
}
return SANE_STATUS_GOOD;
}
/** Close a BJNP device.
@ -2117,7 +2132,13 @@ void
sanei_bjnp_close (SANE_Int dn)
{
PDBG (bjnp_dbg (LOG_INFO, "sanei_bjnp_close(%d):\n", dn));
sanei_bjnp_deactivate(dn);
bjnp_finish_job (dn);
if ( device[dn].tcp_socket != -1)
{
close (device[dn].tcp_socket);
device[dn].tcp_socket = -1;
}
device[dn].open = 0;
}
@ -2129,22 +2150,7 @@ sanei_bjnp_close (SANE_Int dn)
SANE_Status
sanei_bjnp_activate (SANE_Int dn)
{
char hostname[256];
char pid_str[64];
PDBG (bjnp_dbg (LOG_INFO, "sanei_bjnp_activate (%d)\n", dn));
gethostname (hostname, 256);
hostname[255] = '\0';
sprintf (pid_str, "Process ID = %d", getpid ());
bjnp_send_job_details (dn, hostname, getusername (), pid_str);
if (bjnp_open_tcp (dn) != 0)
{
return SANE_STATUS_INVAL;
}
return SANE_STATUS_GOOD;
}
@ -2157,14 +2163,6 @@ SANE_Status
sanei_bjnp_deactivate (SANE_Int dn)
{
PDBG (bjnp_dbg (LOG_INFO, "sanei_bjnp_deactivate (%d)\n", dn));
bjnp_finish_job (dn);
if ( device[dn].tcp_socket != -1)
{
close (device[dn].tcp_socket);
device[dn].tcp_socket = -1;
}
return SANE_STATUS_GOOD;
}
@ -2457,8 +2455,11 @@ sanei_bjnp_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
/* this is a bit of a hack, but the scanner does not like */
/* us to continue using the existing tcp socket */
/* No longer required? Does not work anymore now we moved code from sanei_bjnp_activate/sanei_bjnp_deactivate
to the isanei_bjnp_open and sanei_bjnp_close
sanei_bjnp_deactivate(dn);
sanei_bjnp_activate(dn);
*/
return SANE_STATUS_GOOD;
}