Update upstream source from tag 'upstream/1.0.29'

Update to upstream version '1.0.29'
with Debian dir 2d358af604988ebe4348e38096245d66036fe5ed

1 files changed, 118 insertions, 0 deletions

diff --git a/backend/genesys/usb_device.h b/backend/genesys/usb_device.h
new file mode 100644
index 0000000..265c57c
--- /dev/null
+++ b/backend/genesys/usb_device.h
@@ -0,0 +1,118 @@
+/* sane - Scanner Access Now Easy.
+
+   Copyright (C) 2019 Povilas Kanapickas <povilas@radix.lt>
+
+   This file is part of the SANE package.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.
+
+   As a special exception, the authors of SANE give permission for
+   additional uses of the libraries contained in this release of SANE.
+
+   The exception is that, if you link a SANE library with other files
+   to produce an executable, this does not by itself cause the
+   resulting executable to be covered by the GNU General Public
+   License.  Your use of that executable is in no way restricted on
+   account of linking the SANE library code into it.
+
+   This exception does not, however, invalidate any other reasons why
+   the executable file might be covered by the GNU General Public
+   License.
+
+   If you submit changes to SANE to the maintainers to be included in
+   a subsequent release, you agree by submitting the changes that
+   those changes may be distributed with this exception intact.
+
+   If you write modifications of your own for SANE, it is your choice
+   whether to permit this exception to apply to your modifications.
+   If you do not wish that, delete this exception notice.
+*/
+
+#ifndef BACKEND_GENESYS_USB_DEVICE_H
+#define BACKEND_GENESYS_USB_DEVICE_H
+
+#include "error.h"
+#include "../include/sane/sanei_usb.h"
+
+#include <cstdint>
+#include <string>
+
+namespace genesys {
+
+class IUsbDevice {
+public:
+    IUsbDevice() = default;
+
+    IUsbDevice(const IUsbDevice& other) = delete;
+    IUsbDevice& operator=(const IUsbDevice&) = delete;
+
+    virtual ~IUsbDevice();
+
+    virtual bool is_open() const = 0;
+
+    virtual const std::string& name() const = 0;
+
+    virtual void open(const char* dev_name) = 0;
+
+    virtual void clear_halt() = 0;
+    virtual void reset() = 0;
+    virtual void close() = 0;
+
+    virtual void get_vendor_product(int& vendor, int& product) = 0;
+
+    virtual void control_msg(int rtype, int reg, int value, int index, int length,
+                             std::uint8_t* data) = 0;
+    virtual void bulk_read(std::uint8_t* buffer, std::size_t* size) = 0;
+    virtual void bulk_write(const std::uint8_t* buffer, std::size_t* size) = 0;
+
+};
+
+class UsbDevice : public IUsbDevice {
+public:
+    UsbDevice() = default;
+
+    ~UsbDevice() override;
+
+    bool is_open() const override { return is_open_; }
+
+    const std::string& name() const override { return name_; }
+
+    void open(const char* dev_name) override;
+
+    void clear_halt() override;
+    void reset() override;
+    void close() override;
+
+    void get_vendor_product(int& vendor, int& product) override;
+
+    void control_msg(int rtype, int reg, int value, int index, int length,
+                     std::uint8_t* data) override;
+    void bulk_read(std::uint8_t* buffer, std::size_t* size) override;
+    void bulk_write(const std::uint8_t* buffer, std::size_t* size) override;
+
+private:
+
+    void assert_is_open() const;
+    void set_not_open();
+
+    std::string name_;
+    bool is_open_ = false;
+    int device_num_ = 0;
+};
+
+} // namespace genesys
+
+#endif // BACKEND_GENESYS_USB_DEVICE_H