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

Change sanei_debug-interface 

Allocate accessor only once (for fixed size accessors)
DEVEL_2_0_BRANCH-1
Peter Kirchgessner 2000-10-23 18:32:37 +00:00
rodzic 3f3911fdb8
commit fcf012d292
8 zmienionych plików z 162 dodań i 50 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
backend/hp-accessor.c
Wyświetl plik

@ -42,8 +42,10 @@
HP Scanner Control Language (SCL).
*/
#define STUBS
extern int sanei_debug_hp;
/* #define STUBS
extern int sanei_debug_hp; */
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include <assert.h>

5
backend/hp-device.c
Wyświetl plik

@ -42,8 +42,9 @@
HP Scanner Control Language (SCL).
*/
#define STUBS
extern int sanei_debug_hp;
/*#define STUBS
extern int sanei_debug_hp;*/
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include <stdlib.h>

7
backend/hp-handle.c
Wyświetl plik

@ -42,8 +42,9 @@
HP Scanner Control Language (SCL).
*/
#define STUBS
extern int sanei_debug_hp;
/* #define STUBS
extern int sanei_debug_hp; */
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#ifdef HAVE_UNISTD_H
@ -441,12 +442,14 @@ sanei_hp_handle_startScan (HpHandle this)
!= SANE_STATUS_GOOD )
{
DBG(1, "start: Error checking if ADF is ready\n");
sanei_hp_scsi_destroy(scsi,0);
return SANE_STATUS_UNSUPPORTED;
}
if ( adfstat != 1 )
{
DBG(1, "start: ADF scan requested without paper. Finished.\n");
sanei_hp_scsi_destroy(scsi,0);
return SANE_STATUS_NO_DOCS;
}
}

5
backend/hp-hpmem.c
Wyświetl plik

@ -41,9 +41,10 @@
This file is part of a SANE backend for HP Scanners supporting
HP Scanner Control Language (SCL).
*/
/*
#define STUBS
extern int sanei_debug_hp;
extern int sanei_debug_hp;*/
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include <stdlib.h>

100
backend/hp-option.c
Wyświetl plik

@ -49,11 +49,14 @@
#endif
#endif
/* To be done: dont reallocate choice accessors */
/* #define HP_ALLOC_CHOICEACC_ONCE 1 */
/*
#define HP_EXPERIMENTAL
*/
*/ /*
#define STUBS
extern int sanei_debug_hp;
extern int sanei_debug_hp; */
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include <lalloca.h>
@ -742,8 +745,12 @@ _probe_int (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if (minval >= maxval)
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_int_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_size(this, data, sizeof(SANE_Int));
return _set_range(this, data, minval, 1, maxval);
@ -779,8 +786,13 @@ _probe_int_brightness (_HpOption this, HpScsi scsi, HpOptSet optset,
if (minval >= maxval)
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_int_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_size(this, data, sizeof(SANE_Int));
return _set_range(this, data, minval, 1, maxval);
@ -851,8 +863,13 @@ _probe_bool (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if (scl)
RETURN_IF_FAIL( sanei_hp_scl_inquire(scsi, scl, &val, 0, 0) );
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_bool_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_size(this, data, sizeof(SANE_Bool));
return SANE_STATUS_GOOD;
@ -877,8 +894,13 @@ _probe_change_doc (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if ( status != SANE_STATUS_GOOD )
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_bool_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, cap);
_set_size(this, data, sizeof(SANE_Bool));
@ -907,8 +929,13 @@ _probe_unload (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if ( status != SANE_STATUS_GOOD )
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_bool_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, cap);
_set_size(this, data, sizeof(SANE_Bool));
@ -947,8 +974,13 @@ _probe_calibrate (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
/* And the desired ID of 10963 does not work. So we have to trust */
/* the evaluated HP model number. */
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_bool_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_size(this, data, sizeof(SANE_Bool));
@ -1075,6 +1107,10 @@ _probe_choice (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if (!choices)
return SANE_STATUS_UNSUPPORTED;
/* If no accessor, create one here. */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!(this->data_acsr))
#endif
this->data_acsr = sanei_hp_accessor_choice_new(data, choices,
this->descriptor->may_change);
@ -1118,9 +1154,16 @@ _probe_each_choice (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if (!choices)
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
if (!(this->data_acsr = sanei_hp_accessor_choice_new(data, choices,
this->descriptor->may_change )))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_stringlist(this, data,
@ -1146,9 +1189,16 @@ _probe_ps_exposure_time (_HpOption this, HpScsi scsi, HpOptSet optset,
info = sanei_hp_device_info_get ( sanei_hp_scsi_devicename (scsi) );
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
if (!(this->data_acsr = sanei_hp_accessor_choice_new(data, choices,
this->descriptor->may_change )))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_stringlist(this, data,
@ -1211,9 +1261,16 @@ _probe_scan_type (_HpOption this, HpScsi scsi, HpOptSet optset,
info = sanei_hp_device_info_get ( sanei_hp_scsi_devicename (scsi) );
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
if (!(this->data_acsr = sanei_hp_accessor_choice_new(data, choices,
this->descriptor->may_change )))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_stringlist(this, data,
@ -1248,9 +1305,16 @@ _probe_mirror_horiz (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if (!choices)
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
if (!(this->data_acsr = sanei_hp_accessor_choice_new(data, choices,
this->descriptor->may_change )))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_stringlist(this, data,
@ -1284,9 +1348,16 @@ _probe_mirror_vert (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
if (!choices)
return SANE_STATUS_UNSUPPORTED;
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
if (!(this->data_acsr = sanei_hp_accessor_choice_new(data, choices,
this->descriptor->may_change )))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_stringlist(this, data,
@ -1309,8 +1380,12 @@ static SANE_Status _probe_front_button(_HpOption this, HpScsi scsi,
_set_size(this, data, sizeof(SANE_Bool));
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if ( !(this->data_acsr = sanei_hp_accessor_bool_new(data)) )
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, 0);
@ -1422,8 +1497,13 @@ _probe_custom_gamma (_HpOption this, HpScsi scsi, HpOptSet optset,
RETURN_IF_FAIL( sanei_hp_scl_inquire(scsi, scl, &val, 0, 0) );
}
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_bool_new(data)))
return SANE_STATUS_NO_MEM;
}
sanei_hp_accessor_setint(this->data_acsr, data, val);
_set_size(this, data, sizeof(SANE_Bool));
return SANE_STATUS_GOOD;
@ -1479,8 +1559,14 @@ _probe_vector (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
assert(type->scl);
RETURN_IF_FAIL ( _probe_download_type (scl, scsi) );
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
this->data_acsr = (*type->creator)(data, type->length, type->depth);
}
}
else
{
struct subvector_type_s *type;
@ -1494,9 +1580,15 @@ _probe_vector (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
super = hp_optset_get(optset, type->super);
assert(super);
/* If we dont have an accessor, get one */
#ifdef HP_ALLOC_CHOICEACC_ONCE
if (!this->data_acsr)
#endif
{
this->data_acsr = sanei_hp_accessor_subvector_new(
(HpAccessorVector) super->data_acsr, type->nchan, type->chan);
}
}
if (!this->data_acsr)
return SANE_STATUS_NO_MEM;
@ -1575,8 +1667,12 @@ _probe_matrix (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
static SANE_Status
_probe_num_options (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
{
/* If we dont have an accessor, get one */
if (!this->data_acsr)
{
if (!(this->data_acsr = sanei_hp_accessor_int_new(data)))
return SANE_STATUS_NO_MEM;
}
_set_size(this, data, sizeof(SANE_Int));
return SANE_STATUS_GOOD;
}

5
backend/hp-scl.c
Wyświetl plik

@ -42,8 +42,10 @@
HP Scanner Control Language (SCL).
*/
/*
#define STUBS
extern int sanei_debug_hp;
extern int sanei_debug_hp;*/
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include <lalloca.h> /* Must be first */
@ -51,6 +53,7 @@ extern int sanei_debug_hp;
# include <unistd.h>
#endif
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <assert.h>

7
backend/hp.c
Wyświetl plik

@ -43,9 +43,14 @@
HP Scanner Control Language (SCL).
*/
static char *hp_backend_version = "0.91";
static char *hp_backend_version = "0.92";
/* Changes:
V 0.92, 03-Oct-2000, Rupert W. Curwen (rcurwen@uk.research.att.com):
- try to not allocate accessors twice (only for accessors
that have fixed length)
- fix problem with leaving connection open for some error conditions
V 0.91, 04-Sep-2000, David Paschal (paschal@rcsis.com):
- Added support for flatbed HP OfficeJets
- (PK) fix problem with cancel preview

1
backend/hp.h
Wyświetl plik

@ -50,6 +50,7 @@
#undef BACKEND_NAME
#define BACKEND_NAME hp
#define DEBUG_NOT_STATIC
#include "sane/sanei_debug.h"
/* FIXME: these should be options? */