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

Merge branch 'genesys-remove-static' into 'master' 

genesys: Remove uses of GENESYS_STATIC

See merge request sane-project/backends!68
merge-requests/70/head
Povilas Kanapickas 2019-05-19 12:02:50 +00:00
rodzic 8cdd5ae22e a4ab69376c
commit 71bf2daec6
9 zmienionych plików z 32 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/genesys.c
Wyświetl plik

@ -2726,7 +2726,7 @@ compute_shifted_coefficients (Genesys_Device * dev,
} }
} }
GENESYS_STATIC SANE_Status static SANE_Status
genesys_send_shading_coefficient (Genesys_Device * dev) genesys_send_shading_coefficient (Genesys_Device * dev)
{ {
SANE_Status status; SANE_Status status;
@ -3194,7 +3194,7 @@ genesys_save_calibration (Genesys_Device * dev)
* @param dev device to calibrate * @param dev device to calibrate
* @return SANE_STATUS_GOOD if everything when all right, else the error code. * @return SANE_STATUS_GOOD if everything when all right, else the error code.
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
genesys_flatbed_calibration (Genesys_Device * dev) genesys_flatbed_calibration (Genesys_Device * dev)
{ {
SANE_Status status; SANE_Status status;
@ -5191,7 +5191,7 @@ SANE_Range *range=NULL;
* @param currdev current scanner device * @param currdev current scanner device
* @return an allocated string containing a file name * @return an allocated string containing a file name
*/ */
GENESYS_STATIC char *calibration_filename(Genesys_Device *currdev) static char *calibration_filename(Genesys_Device *currdev)
{ {
char *tmpstr; char *tmpstr;
char *ptr; char *ptr;
@ -5923,7 +5923,7 @@ check_present (SANE_String_Const devname)
* Insert the given device into the backend list of devices. * Insert the given device into the backend list of devices.
* @param dev device to add * @param dev device to add
*/ */
GENESYS_STATIC void add_device(Genesys_Device *dev) static void add_device(Genesys_Device *dev)
{ {
++num_devices; ++num_devices;
dev->next = first_dev; dev->next = first_dev;

8
backend/genesys_gl124.c
Wyświetl plik

@ -530,7 +530,7 @@ gl124_init_registers (Genesys_Device * dev)
* @param slope_table pointer to 16 bit values array of the slope table * @param slope_table pointer to 16 bit values array of the slope table
* @param steps number of elemnts in the slope table * @param steps number of elemnts in the slope table
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
gl124_send_slope_table (Genesys_Device * dev, int table_nr, gl124_send_slope_table (Genesys_Device * dev, int table_nr,
uint16_t * slope_table, int steps) uint16_t * slope_table, int steps)
{ {
@ -1334,7 +1334,7 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
* *
* this function sets up the scanner to scan in normal or single line mode * this function sets up the scanner to scan in normal or single line mode
*/ */
GENESYS_STATIC static
SANE_Status SANE_Status
gl124_init_scan_regs (Genesys_Device * dev, gl124_init_scan_regs (Genesys_Device * dev,
Genesys_Register_Set * reg, Genesys_Register_Set * reg,
@ -2022,7 +2022,7 @@ gl124_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg,
* @param dev device to rewind * @param dev device to rewind
* @returns SANE_STATUS_GOOD on success * @returns SANE_STATUS_GOOD on success
*/ */
GENESYS_STATIC static
SANE_Status gl124_rewind(Genesys_Device * dev) SANE_Status gl124_rewind(Genesys_Device * dev)
{ {
SANE_Status status; SANE_Status status;
@ -2060,7 +2060,7 @@ SANE_Status gl124_rewind(Genesys_Device * dev)
* @param wait_until_home true to make the function waiting for head * @param wait_until_home true to make the function waiting for head
* to be home before returning, if fals returne immediately * to be home before returning, if fals returne immediately
* @returns SANE_STATUS_GOO on success */ * @returns SANE_STATUS_GOO on success */
GENESYS_STATIC static
SANE_Status SANE_Status
gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home) gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
{ {

6
backend/genesys_gl124.h
Wyświetl plik

@ -685,7 +685,7 @@ static Motor_Profile motors[]={
{0, 0, 0, NULL}, {0, 0, 0, NULL},
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
GENESYS_STATIC static
SANE_Status gl124_init_scan_regs (Genesys_Device * dev, SANE_Status gl124_init_scan_regs (Genesys_Device * dev,
Genesys_Register_Set * reg, Genesys_Register_Set * reg,
float xres, /*dpi */ float xres, /*dpi */
@ -715,10 +715,10 @@ static SANE_Status gl124_send_shading_data (Genesys_Device * dev, uint8_t * data
static SANE_Status gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse); static SANE_Status gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse);
GENESYS_STATIC SANE_Status static SANE_Status
gl124_stop_action (Genesys_Device * dev); gl124_stop_action (Genesys_Device * dev);
GENESYS_STATIC SANE_Status static SANE_Status
gl124_send_slope_table (Genesys_Device * dev, int table_nr, gl124_send_slope_table (Genesys_Device * dev, int table_nr,
uint16_t * slope_table, int steps); uint16_t * slope_table, int steps);

10
backend/genesys_gl646.c
Wyświetl plik

@ -1850,7 +1850,7 @@ gl646_set_lamp_power (Genesys_Device * dev,
* @param enable SANE_TRUE to enable power saving, SANE_FALSE to leave it * @param enable SANE_TRUE to enable power saving, SANE_FALSE to leave it
* @return allways SANE_STATUS_GOOD * @return allways SANE_STATUS_GOOD
*/ */
GENESYS_STATIC static
SANE_Status SANE_Status
gl646_save_power (Genesys_Device * dev, SANE_Bool enable) gl646_save_power (Genesys_Device * dev, SANE_Bool enable)
{ {
@ -2532,7 +2532,7 @@ gl646_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg,
* @param dev scanner's device * @param dev scanner's device
* @param wait_until_home true if the function waits until head parked * @param wait_until_home true if the function waits until head parked
*/ */
GENESYS_STATIC static
SANE_Status SANE_Status
gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home) gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
{ {
@ -2953,7 +2953,7 @@ gl646_init_regs_for_scan (Genesys_Device * dev)
* @param xcorrection take x geometry correction into account (fixed and detected offsets) * @param xcorrection take x geometry correction into account (fixed and detected offsets)
* @param ycorrection take y geometry correction into account * @param ycorrection take y geometry correction into account
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
setup_for_scan (Genesys_Device * dev, setup_for_scan (Genesys_Device * dev,
Genesys_Register_Set *regs, Genesys_Register_Set *regs,
Genesys_Settings settings, Genesys_Settings settings,
@ -4415,7 +4415,7 @@ gl646_init (Genesys_Device * dev)
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;
} }
GENESYS_STATIC static
SANE_Status SANE_Status
gl646_move_to_ta (Genesys_Device * dev) gl646_move_to_ta (Genesys_Device * dev)
{ {
@ -4444,7 +4444,7 @@ gl646_move_to_ta (Genesys_Device * dev)
* @param shading SANE_TRUE to enable shading correction * @param shading SANE_TRUE to enable shading correction
* @param data pointer for the data * @param data pointer for the data
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
simple_scan (Genesys_Device * dev, Genesys_Settings settings, SANE_Bool move, simple_scan (Genesys_Device * dev, Genesys_Settings settings, SANE_Bool move,
SANE_Bool forward, SANE_Bool shading, unsigned char **data) SANE_Bool forward, SANE_Bool shading, unsigned char **data)
{ {

8
backend/genesys_gl646.h
Wyświetl plik

@ -255,15 +255,15 @@ static SANE_Status gl646_set_fe (Genesys_Device * dev, uint8_t set, int dpi);
static SANE_Status gl646_public_set_fe (Genesys_Device * dev, uint8_t set); static SANE_Status gl646_public_set_fe (Genesys_Device * dev, uint8_t set);
GENESYS_STATIC static
SANE_Status SANE_Status
gl646_save_power (Genesys_Device * dev, SANE_Bool enable); gl646_save_power (Genesys_Device * dev, SANE_Bool enable);
GENESYS_STATIC static
SANE_Status SANE_Status
gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home); gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home);
GENESYS_STATIC static
SANE_Status SANE_Status
gl646_move_to_ta (Genesys_Device * dev); gl646_move_to_ta (Genesys_Device * dev);
@ -279,7 +279,7 @@ gl646_move_to_ta (Genesys_Device * dev);
* @param ycorrection true if scanner's Y geometry must be taken into account to * @param ycorrection true if scanner's Y geometry must be taken into account to
* compute Y, ie add top margins * compute Y, ie add top margins
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
setup_for_scan (Genesys_Device *device, setup_for_scan (Genesys_Device *device,
Genesys_Register_Set *regs, Genesys_Register_Set *regs,
Genesys_Settings settings, Genesys_Settings settings,

18
backend/genesys_gl841.c
Wyświetl plik

@ -788,7 +788,7 @@ gl841_init_registers (Genesys_Device * dev)
/* Send slope table for motor movement /* Send slope table for motor movement
slope_table in machine byte order slope_table in machine byte order
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
gl841_send_slope_table (Genesys_Device * dev, int table_nr, gl841_send_slope_table (Genesys_Device * dev, int table_nr,
uint16_t * slope_table, int steps) uint16_t * slope_table, int steps)
{ {
@ -1277,7 +1277,7 @@ gl841_init_motor_regs_off(Genesys_Register_Set * reg,
* @param ydpi motor target resolution * @param ydpi motor target resolution
* @return SANE_STATUS_GOOD on success * @return SANE_STATUS_GOOD on success
*/ */
GENESYS_STATIC SANE_Status gl841_write_freq(Genesys_Device *dev, unsigned int ydpi) static SANE_Status gl841_write_freq(Genesys_Device *dev, unsigned int ydpi)
{ {
SANE_Status status; SANE_Status status;
/**< fast table */ /**< fast table */
@ -2125,7 +2125,7 @@ gl841_get_led_exposure(Genesys_Device * dev)
* Compute exposure time for the device and the given scan resolution, * Compute exposure time for the device and the given scan resolution,
* also compute scan_power_mode * also compute scan_power_mode
*/ */
GENESYS_STATIC int static int
gl841_exposure_time(Genesys_Device *dev, gl841_exposure_time(Genesys_Device *dev,
float slope_dpi, float slope_dpi,
int scan_step_type, int scan_step_type,
@ -2170,7 +2170,7 @@ int led_exposure;
* @param dev device * @param dev device
* @param yres motor resolution * @param yres motor resolution
*/ */
GENESYS_STATIC int static int
gl841_scan_step_type(Genesys_Device *dev, int yres) gl841_scan_step_type(Genesys_Device *dev, int yres)
{ {
int scan_step_type=0; int scan_step_type=0;
@ -2204,7 +2204,7 @@ int scan_step_type=0;
* *
* this function sets up the scanner to scan in normal or single line mode * this function sets up the scanner to scan in normal or single line mode
*/ */
GENESYS_STATIC static
SANE_Status SANE_Status
gl841_init_scan_regs (Genesys_Device * dev, gl841_init_scan_regs (Genesys_Device * dev,
Genesys_Register_Set * reg, Genesys_Register_Set * reg,
@ -4108,7 +4108,7 @@ gl841_send_gamma_table (Genesys_Device * dev)
-needs working coarse/gain -needs working coarse/gain
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
gl841_led_calibration (Genesys_Device * dev) gl841_led_calibration (Genesys_Device * dev)
{ {
int num_pixels; int num_pixels;
@ -4460,7 +4460,7 @@ ad_fe_offset_calibration (Genesys_Device * dev)
this function expects the slider to be where? this function expects the slider to be where?
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
gl841_offset_calibration (Genesys_Device * dev) gl841_offset_calibration (Genesys_Device * dev)
{ {
int num_pixels; int num_pixels;
@ -4857,7 +4857,7 @@ gl841_offset_calibration (Genesys_Device * dev)
a reasonable shape. the fine calibration of the upper and lower bounds will a reasonable shape. the fine calibration of the upper and lower bounds will
be done with shading. be done with shading.
*/ */
GENESYS_STATIC SANE_Status static SANE_Status
gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi) gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi)
{ {
int num_pixels; int num_pixels;
@ -5649,7 +5649,7 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
* Send shading calibration data. The buffer is considered to always hold values * Send shading calibration data. The buffer is considered to always hold values
* for all the channels. * for all the channels.
*/ */
GENESYS_STATIC static
SANE_Status SANE_Status
gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size) gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
{ {

2
backend/genesys_gl841.h
Wyświetl plik

@ -373,7 +373,7 @@ enum
* prototypes declaration in case of unit testing * prototypes declaration in case of unit testing
*/ */
GENESYS_STATIC static
int gl841_exposure_time(Genesys_Device *dev, int gl841_exposure_time(Genesys_Device *dev,
float slope_dpi, float slope_dpi,
int scan_step_type, int scan_step_type,

4
backend/genesys_gl847.c
Wyświetl plik

@ -1756,7 +1756,7 @@ gl847_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg,
* @returns SANE_STATUS_GOOD on success * @returns SANE_STATUS_GOOD on success
*/ */
#if 0 /* disabled to fix #7 */ #if 0 /* disabled to fix #7 */
GENESYS_STATIC static
SANE_Status gl847_rewind(Genesys_Device * dev) SANE_Status gl847_rewind(Genesys_Device * dev)
{ {
SANE_Status status; SANE_Status status;
@ -1795,7 +1795,7 @@ SANE_Status gl847_rewind(Genesys_Device * dev)
* @param wait_until_home true to make the function waiting for head * @param wait_until_home true to make the function waiting for head
* to be home before returning, if fals returne immediately * to be home before returning, if fals returne immediately
* @returns SANE_STATUS_GOO on success */ * @returns SANE_STATUS_GOO on success */
GENESYS_STATIC static
SANE_Status SANE_Status
gl847_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home) gl847_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
{ {

2
backend/genesys_low.h
Wyświetl plik

@ -81,8 +81,6 @@
#include "../include/_stdint.h" #include "../include/_stdint.h"
#define GENESYS_STATIC static
#define DBG_error0 0 /* errors/warnings printed even with devuglevel 0 */ #define DBG_error0 0 /* errors/warnings printed even with devuglevel 0 */
#define DBG_error 1 /* fatal errors */ #define DBG_error 1 /* fatal errors */
#define DBG_init 2 /* initialization and scanning time messages */ #define DBG_init 2 /* initialization and scanning time messages */