genesys: Move backend files to a separate directory

backend/Makefile.am

@@ -34,7 +34,7 @@ EXTRA_DIST += stubs.c
 	$(AM_V_at)rm -f $@
 	$(AM_V_at)$(LN_S) $(srcdir)/stubs.c $@
 
-%-s.cc: $(srcdir)/stubs.c
+%-s.cpp: $(srcdir)/stubs.c
 	$(AM_V_at)rm -f $@
 	$(AM_V_at)$(LN_S) $(srcdir)/stubs.c $@
 
@@ -68,7 +68,7 @@ BACKEND_CONFS= abaton.conf agfafocus.conf apple.conf artec.conf \
 	       canon_pp.conf cardscan.conf coolscan2.conf coolscan3.conf \
 	       coolscan.conf dc210.conf dc240.conf dc25.conf \
 	       dell1600n_net.conf dmc.conf epjitsu.conf epson2.conf \
-	       epson.conf epsonds.conf fujitsu.conf genesys.conf gphoto2.conf \
+           epson.conf epsonds.conf fujitsu.conf genesys.conf gphoto2.conf \
 	       gt68xx.conf hp3900.conf hp4200.conf hp5400.conf \
 	       hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf kodakaio.conf\
 	       kvs1025.conf \
@@ -485,47 +485,47 @@ libsane_fujitsu_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_fujitsu_la_LIBADD = $(COMMON_LIBS) libfujitsu.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
 EXTRA_DIST += fujitsu.conf.in
 
-libgenesys_la_SOURCES = genesys.cc genesys.h \
-    genesys_buffer.h genesys_buffer.cc \
-    genesys_calibration.h \
-    genesys_command_set.h \
-    genesys_device.h genesys_device.cc \
-    genesys_enums.h \
-    genesys_error.h genesys_error.cc \
-    genesys_gl646.cc genesys_gl646.h genesys_gl646_registers.h \
-    genesys_gl124.cc genesys_gl124.h genesys_gl124_registers.h \
-    genesys_gl841.cc genesys_gl841.h genesys_gl841_registers.h \
-    genesys_gl843.cc genesys_gl843.h genesys_gl843_registers.h \
-    genesys_gl846.cc genesys_gl846.h genesys_gl846_registers.h \
-    genesys_gl847.cc genesys_gl847.h genesys_gl847_registers.h \
-    genesys_row_buffer.h \
-    genesys_image_buffer.h genesys_image_buffer.cc \
-    genesys_image_pipeline.h genesys_image_pipeline.cc \
-    genesys_image_pixel.h genesys_image_pixel.cc \
-    genesys_image.h genesys_image.cc \
-    genesys_motor.h \
-    genesys_register.h \
-    genesys_sanei.h genesys_sanei.cc \
-    genesys_sensor.h \
-    genesys_settings.h \
-    genesys_serialize.h \
-    genesys_tables_frontend.cc \
-    genesys_tables_gpo.cc \
-    genesys_tables_model.cc \
-    genesys_tables_motor.cc \
-    genesys_tables_motor_profile.cc \
-    genesys_tables_sensor.cc \
-    genesys_low.cc genesys_low.h
+libgenesys_la_SOURCES = genesys/genesys.cpp genesys/genesys.h \
+    genesys/buffer.h genesys/buffer.cpp \
+    genesys/calibration.h \
+    genesys/command_set.h \
+    genesys/device.h genesys/device.cpp \
+    genesys/enums.h \
+    genesys/error.h genesys/error.cpp \
+    genesys/gl646.cpp genesys/gl646.h genesys/gl646_registers.h \
+    genesys/gl124.cpp genesys/gl124.h genesys/gl124_registers.h \
+    genesys/gl841.cpp genesys/gl841.h genesys/gl841_registers.h \
+    genesys/gl843.cpp genesys/gl843.h genesys/gl843_registers.h \
+    genesys/gl846.cpp genesys/gl846.h genesys/gl846_registers.h \
+    genesys/gl847.cpp genesys/gl847.h genesys/gl847_registers.h \
+    genesys/row_buffer.h \
+    genesys/image_buffer.h genesys/image_buffer.cpp \
+    genesys/image_pipeline.h genesys/image_pipeline.cpp \
+    genesys/image_pixel.h genesys/image_pixel.cpp \
+    genesys/image.h genesys/image.cpp \
+    genesys/motor.h \
+    genesys/register.h \
+    genesys/sanei.h genesys/sanei.cpp \
+    genesys/sensor.h \
+    genesys/settings.h \
+    genesys/serialize.h \
+    genesys/tables_frontend.cpp \
+    genesys/tables_gpo.cpp \
+    genesys/tables_model.cpp \
+    genesys/tables_motor.cpp \
+    genesys/tables_motor_profile.cpp \
+    genesys/tables_sensor.cpp \
+    genesys/low.cpp genesys/low.h
 
 libgenesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
 
-nodist_libsane_genesys_la_SOURCES = genesys-s.cc
+nodist_libsane_genesys_la_SOURCES = genesys-s.cpp
 libsane_genesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
 libsane_genesys_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_genesys_la_LIBADD = $(COMMON_LIBS) libgenesys.la  ../sanei/sanei_magic.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
 EXTRA_DIST += genesys.conf.in
 # TODO: Why are this distributed but not compiled?
-EXTRA_DIST += genesys_conv.cc
+EXTRA_DIST += genesys/conv.cpp
 
 libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
 libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) $(GPHOTO2_CPPFLAGS) -DBACKEND_NAME=gphoto2

backend/genesys/buffer.cpp

@@ -41,7 +41,7 @@
    If you do not wish that, delete this exception notice.
 */
 
-#include "genesys_buffer.h"
+#include "buffer.h"
 #include <cstring>
 #include <stdexcept>
 

backend/genesys/calibration.h

@@ -44,8 +44,8 @@
 #ifndef BACKEND_GENESYS_CALIBRATION_H
 #define BACKEND_GENESYS_CALIBRATION_H
 
-#include "genesys_sensor.h"
-#include "genesys_settings.h"
+#include "sensor.h"
+#include "settings.h"
 
 struct Genesys_Calibration_Cache
 {

backend/genesys/command_set.h

@@ -44,7 +44,7 @@
 #ifndef BACKEND_GENESYS_COMMAND_SET_H
 #define BACKEND_GENESYS_COMMAND_SET_H
 
-#include "genesys_device.h"
+#include "device.h"
 #include <cstdint>
 
 class Genesys_Device;

backend/genesys/device.cpp

@@ -43,9 +43,9 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_device.h"
-#include "genesys_command_set.h"
-#include "genesys_low.h"
+#include "device.h"
+#include "command_set.h"
+#include "low.h"
 
 Genesys_Device::~Genesys_Device()
 {

backend/genesys/device.h

@@ -44,16 +44,16 @@
 #ifndef BACKEND_GENESYS_DEVICE_H
 #define BACKEND_GENESYS_DEVICE_H
 
-#include "genesys_calibration.h"
-#include "genesys_command_set.h"
-#include "genesys_buffer.h"
-#include "genesys_enums.h"
-#include "genesys_image_pipeline.h"
-#include "genesys_motor.h"
-#include "genesys_settings.h"
-#include "genesys_sensor.h"
-#include "genesys_register.h"
-#include "genesys_sanei.h"
+#include "calibration.h"
+#include "command_set.h"
+#include "buffer.h"
+#include "enums.h"
+#include "image_pipeline.h"
+#include "motor.h"
+#include "settings.h"
+#include "sensor.h"
+#include "register.h"
+#include "sanei.h"
 #include <vector>
 
 struct Genesys_Gpo

backend/genesys/enums.h

@@ -45,7 +45,7 @@
 #define BACKEND_GENESYS_ENUMS_H
 
 #include <iostream>
-#include "genesys_serialize.h"
+#include "serialize.h"
 
 enum class ScanMethod : unsigned {
     // normal scan method

backend/genesys/error.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_error.h"
+#include "error.h"
 #include <cstdarg>
 #include <cstdio>
 

backend/genesys/genesys.cpp

@@ -61,7 +61,7 @@
 #define DEBUG_NOT_STATIC
 
 #include "genesys.h"
-#include "genesys_sanei.h"
+#include "sanei.h"
 #include "../include/sane/sanei_config.h"
 #include "../include/sane/sanei_magic.h"
 
@@ -3327,7 +3327,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off)
     }
 }
 
-#include "genesys_conv.cc"
+#include "conv.cpp"
 
 /**
  *

backend/genesys/genesys.h

@@ -51,7 +51,7 @@
 # define BACKEND_NAME genesys
 #endif
 
-#include "genesys_low.h"
+#include "low.h"
 #include <queue>
 
 #ifndef PATH_MAX

backend/genesys/gl124.cpp

@@ -44,8 +44,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_gl124.h"
-#include "genesys_gl124_registers.h"
+#include "gl124.h"
+#include "gl124_registers.h"
 
 #include <vector>
 

backend/genesys/gl124.h

@@ -45,7 +45,7 @@
 #define BACKEND_GENESYS_GL124_H
 
 #include "genesys.h"
-#include "genesys_command_set.h"
+#include "command_set.h"
 
 #define SETREG(adr,val) { dev->reg.init_reg(adr, val); }
 

backend/genesys/gl646.cpp

@@ -50,8 +50,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_gl646.h"
-#include "genesys_gl646_registers.h"
+#include "gl646.h"
+#include "gl646_registers.h"
 
 #include <vector>
 

backend/genesys/gl646.h

@@ -48,7 +48,7 @@
 #define BACKEND_GENESYS_GL646_H
 
 #include "genesys.h"
-#include "genesys_command_set.h"
+#include "command_set.h"
 
 static void gl646_set_fe(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t set, int dpi);
 

backend/genesys/gl841.cpp

@@ -52,8 +52,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_gl841.h"
-#include "genesys_gl841_registers.h"
+#include "gl841.h"
+#include "gl841_registers.h"
 
 #include <vector>
 

backend/genesys/gl841.h

@@ -42,7 +42,7 @@
 */
 
 #include "genesys.h"
-#include "genesys_command_set.h"
+#include "command_set.h"
 
 #ifndef BACKEND_GENESYS_GL841_H
 #define BACKEND_GENESYS_GL841_H

backend/genesys/gl843.cpp

@@ -44,8 +44,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_gl843_registers.h"
-#include "genesys_gl843.h"
+#include "gl843_registers.h"
+#include "gl843.h"
 
 #include <string>
 #include <vector>

backend/genesys/gl843.h

@@ -42,7 +42,7 @@
 */
 
 #include "genesys.h"
-#include "genesys_command_set.h"
+#include "command_set.h"
 
 #ifndef BACKEND_GENESYS_GL843_H
 #define BACKEND_GENESYS_GL843_H

backend/genesys/gl846.cpp

@@ -49,8 +49,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_gl846.h"
-#include "genesys_gl846_registers.h"
+#include "gl846.h"
+#include "gl846_registers.h"
 
 #include <vector>
 

backend/genesys/gl846.h

@@ -42,7 +42,7 @@
 */
 
 #include "genesys.h"
-#include "genesys_command_set.h"
+#include "command_set.h"
 
 #ifndef BACKEND_GENESYS_GL846_H
 #define BACKEND_GENESYS_GL846_H

backend/genesys/gl847.cpp

@@ -44,8 +44,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_gl847.h"
-#include "genesys_gl847_registers.h"
+#include "gl847.h"
+#include "gl847_registers.h"
 
 #include <vector>
 

backend/genesys/gl847.h

@@ -45,7 +45,7 @@
 #define BACKEND_GENESYS_GL847_H
 
 #include "genesys.h"
-#include "genesys_command_set.h"
+#include "command_set.h"
 
 /** @brief moves the slider to steps at motor base dpi
  * @param dev device to work on

backend/genesys/image.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_image.h"
+#include "image.h"
 
 #include <array>
 

backend/genesys/image.h

@@ -44,7 +44,7 @@
 #ifndef BACKEND_GENESYS_IMAGE_H
 #define BACKEND_GENESYS_IMAGE_H
 
-#include "genesys_image_pixel.h"
+#include "image_pixel.h"
 #include <vector>
 
 class Image

backend/genesys/image_buffer.cpp

@@ -43,8 +43,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_image_buffer.h"
-#include "genesys_image.h"
+#include "image_buffer.h"
+#include "image.h"
 
 ImageBuffer::ImageBuffer(std::size_t size, ProducerCallback producer) :
     producer_{producer},

backend/genesys/image_buffer.h

@@ -44,8 +44,8 @@
 #ifndef BACKEND_GENESYS_IMAGE_BUFFER_H
 #define BACKEND_GENESYS_IMAGE_BUFFER_H
 
-#include "genesys_enums.h"
-#include "genesys_row_buffer.h"
+#include "enums.h"
+#include "row_buffer.h"
 #include <algorithm>
 #include <functional>
 

backend/genesys/image_pipeline.cpp

@@ -43,9 +43,9 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_image_pipeline.h"
-#include "genesys_image.h"
-#include "genesys_low.h"
+#include "image_pipeline.h"
+#include "image.h"
+#include "low.h"
 #include <numeric>
 
 ImagePipelineNode::~ImagePipelineNode() {}

backend/genesys/image_pipeline.h

@@ -44,9 +44,9 @@
 #ifndef BACKEND_GENESYS_IMAGE_PIPELINE_H
 #define BACKEND_GENESYS_IMAGE_PIPELINE_H
 
-#include "genesys_image.h"
-#include "genesys_image_pixel.h"
-#include "genesys_image_buffer.h"
+#include "image.h"
+#include "image_pixel.h"
+#include "image_buffer.h"
 
 #include <algorithm>
 #include <functional>

backend/genesys/image_pixel.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_image.h"
+#include "image.h"
 
 #include <array>
 

backend/genesys/image_pixel.h

@@ -44,7 +44,7 @@
 #ifndef BACKEND_GENESYS_IMAGE_PIXEL_H
 #define BACKEND_GENESYS_IMAGE_PIXEL_H
 
-#include "genesys_enums.h"
+#include "enums.h"
 #include <algorithm>
 #include <cstdint>
 #include <cstddef>

backend/genesys/low.cpp

@@ -44,7 +44,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 #include "assert.h"
 
 #include <vector>

backend/genesys/low.h

@@ -81,14 +81,14 @@
 
 #include "../include/_stdint.h"
 
-#include "genesys_device.h"
-#include "genesys_enums.h"
-#include "genesys_error.h"
-#include "genesys_sanei.h"
-#include "genesys_sensor.h"
-#include "genesys_serialize.h"
-#include "genesys_settings.h"
-#include "genesys_register.h"
+#include "device.h"
+#include "enums.h"
+#include "error.h"
+#include "sanei.h"
+#include "sensor.h"
+#include "serialize.h"
+#include "settings.h"
+#include "register.h"
 
 #include <algorithm>
 #include <array>

backend/genesys/motor.h

@@ -46,7 +46,7 @@
 
 #include <cstdint>
 #include <vector>
-#include "genesys_enums.h"
+#include "enums.h"
 
 struct Genesys_Motor_Slope
 {

backend/genesys/row_buffer.h

@@ -44,7 +44,7 @@
 #ifndef BACKEND_GENESYS_LINE_BUFFER_H
 #define BACKEND_GENESYS_LINE_BUFFER_H
 
-#include "genesys_error.h"
+#include "error.h"
 
 #include <algorithm>
 #include <cstdint>

backend/genesys/sanei.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_sanei.h"
+#include "sanei.h"
 
 UsbDevice::~UsbDevice()
 {

backend/genesys/sanei.h

@@ -44,7 +44,7 @@
 #ifndef BACKEND_GENESYS_SANEI_H
 #define BACKEND_GENESYS_SANEI_H
 
-#include "genesys_error.h"
+#include "error.h"
 #include "../include/sane/sanei_usb.h"
 
 #include <cstdint>

backend/genesys/sensor.h

@@ -44,9 +44,9 @@
 #ifndef BACKEND_GENESYS_SENSOR_H
 #define BACKEND_GENESYS_SENSOR_H
 
-#include "genesys_enums.h"
-#include "genesys_register.h"
-#include "genesys_serialize.h"
+#include "enums.h"
+#include "register.h"
+#include "serialize.h"
 #include <array>
 #include <functional>
 

backend/genesys/serialize.h

@@ -44,7 +44,7 @@
 #ifndef BACKEND_GENESYS_SERIALIZE_H
 #define BACKEND_GENESYS_SERIALIZE_H
 
-#include "genesys_error.h"
+#include "error.h"
 #include <array>
 #include <iostream>
 #include <limits>

backend/genesys/settings.h

@@ -44,8 +44,8 @@
 #ifndef BACKEND_GENESYS_SETTINGS_H
 #define BACKEND_GENESYS_SETTINGS_H
 
-#include "genesys_enums.h"
-#include "genesys_serialize.h"
+#include "enums.h"
+#include "serialize.h"
 
 struct Genesys_Settings
 {

backend/genesys/tables_frontend.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 
 StaticInit<std::vector<Genesys_Frontend>> s_frontends;
 

backend/genesys/tables_gpo.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 
 StaticInit<std::vector<Genesys_Gpo>> s_gpo;
 

backend/genesys/tables_model.cpp

@@ -54,7 +54,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 
 StaticInit<std::vector<Genesys_USB_Device_Entry>> s_usb_devices;
 

backend/genesys/tables_motor.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 
 StaticInit<std::vector<Genesys_Motor>> s_motors;
 

backend/genesys/tables_motor_profile.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 
 // This file contains reference motor slope tables.
 // The tables are directly extracted from USB logs, with a termination value of 0

backend/genesys/tables_sensor.cpp

@@ -43,7 +43,7 @@
 
 #define DEBUG_DECLARE_ONLY
 
-#include "genesys_low.h"
+#include "low.h"
 
 inline unsigned default_get_logical_hwdpi(const Genesys_Sensor& sensor, unsigned xres)
 {