From a849f32f6205079e3e4caefc18bc15cfdbb3fd14 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Fri, 5 Aug 2022 11:16:50 +0800
Subject: [PATCH] =?UTF-8?q?v4.15;=20=E5=87=86=E5=A4=87=E6=8A=BD=E8=B1=A1IO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 device/scanner.rc                |  8 ++++----
 device/scanner.vcxproj           |  2 ++
 device/scanner.vcxproj.filters   |  9 +++++++++
 device/scanner_io/scanner_io.cpp |  2 ++
 device/scanner_io/scanner_io.h   | 29 +++++++++++++++++++++++++++++
 sane/sane.rc                     |  8 ++++----
 6 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 device/scanner_io/scanner_io.cpp
 create mode 100644 device/scanner_io/scanner_io.h

diff --git a/device/scanner.rc b/device/scanner.rc
index 232295c..fffa2d6 100644
--- a/device/scanner.rc
+++ b/device/scanner.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,14,10000,22216
- PRODUCTVERSION 4,14,10000,22216
+ FILEVERSION 4,15,10000,22217
+ PRODUCTVERSION 4,15,10000,22217
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾"
             VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò"
-            VALUE "FileVersion", "4.14.10000.22216"
+            VALUE "FileVersion", "4.15.10000.22217"
             VALUE "InternalName", "scanner.dll"
             VALUE "LegalCopyright", "Copyright (C) 10000"
             VALUE "OriginalFilename", "scanner.dll"
             VALUE "ProductName", "HUAGOScan"
-            VALUE "ProductVersion", "4.14.10000.22216"
+            VALUE "ProductVersion", "4.15.10000.22217"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj
index 196a22a..9eb218f 100644
--- a/device/scanner.vcxproj
+++ b/device/scanner.vcxproj
@@ -268,6 +268,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageProcess_Public.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\IMulti.cpp" />
     <ClCompile Include="..\..\code_device\hgdriver\wrapper\ini_file.cpp" />
+    <ClCompile Include="scanner_io\scanner_io.cpp" />
     <ClCompile Include="win_usb\usbview\devnode.c" />
     <ClCompile Include="win_usb\usbview\enum.c" />
     <ClCompile Include="win_usb\win_usb.cpp" />
@@ -343,6 +344,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
     <ClInclude Include="..\..\sdk\include\sane\sane_ex.h" />
     <ClInclude Include="..\..\sdk\include\sane\sane_option_definitions.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="scanner_io\scanner_io.h" />
     <ClInclude Include="win_usb\usbview\enum.h" />
     <ClInclude Include="win_usb\usbview\usbdesc.h" />
     <ClInclude Include="win_usb\usbview\uvcdesc.h" />
diff --git a/device/scanner.vcxproj.filters b/device/scanner.vcxproj.filters
index 42eab1b..c1710e4 100644
--- a/device/scanner.vcxproj.filters
+++ b/device/scanner.vcxproj.filters
@@ -25,6 +25,9 @@
     <Filter Include="usb\usbview">
       <UniqueIdentifier>{06629bf8-5d3e-4855-916b-260169824839}</UniqueIdentifier>
     </Filter>
+    <Filter Include="IO">
+      <UniqueIdentifier>{3d22771d-a2cc-4972-ab37-f1979d973a4f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\code_device\hgdriver\wrapper\huagaoxxx_warraper_ex.cpp">
@@ -198,6 +201,9 @@
     <ClCompile Include="..\..\code_device\hgdriver\hgdev\hg_scanner_439.cpp">
       <Filter>dev</Filter>
     </ClCompile>
+    <ClCompile Include="scanner_io\scanner_io.cpp">
+      <Filter>IO</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@@ -422,6 +428,9 @@
     <ClInclude Include="..\..\code_device\hgdriver\hgdev\hg_scanner_439.h">
       <Filter>dev</Filter>
     </ClInclude>
+    <ClInclude Include="scanner_io\scanner_io.h">
+      <Filter>IO</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="device.def">
diff --git a/device/scanner_io/scanner_io.cpp b/device/scanner_io/scanner_io.cpp
new file mode 100644
index 0000000..08b6a7c
--- /dev/null
+++ b/device/scanner_io/scanner_io.cpp
@@ -0,0 +1,2 @@
+#include "scanner_io.h"
+
diff --git a/device/scanner_io/scanner_io.h b/device/scanner_io/scanner_io.h
new file mode 100644
index 0000000..cfdb32d
--- /dev/null
+++ b/device/scanner_io/scanner_io.h
@@ -0,0 +1,29 @@
+#pragma once
+
+//
+// Base IO class
+// 
+// Date: 2022-08-05
+// 
+
+enum scanner_cmd
+{
+
+};
+enum scanner_event
+{
+	SCANNER_EVENT_NONE = 0,
+	SCANNER_EVENT_DEVICE_ARRIVED,
+	SCANNER_EVENT_DEVICE_LEFT,
+	SCANNER_EVENT_
+};
+
+struct io_handler
+{
+	void (*on_io_event)(int ev_type, void* data, int len);
+};
+
+class scanenr_io
+{
+
+};
diff --git a/sane/sane.rc b/sane/sane.rc
index ef39e1a..38fb119 100644
--- a/sane/sane.rc
+++ b/sane/sane.rc
@@ -248,8 +248,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,14,10000,22216
- PRODUCTVERSION 4,14,10000,22216
+ FILEVERSION 4,15,10000,22217
+ PRODUCTVERSION 4,15,10000,22217
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -266,12 +266,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾"
             VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò"
-            VALUE "FileVersion", "4.14.10000.22216"
+            VALUE "FileVersion", "4.15.10000.22217"
             VALUE "InternalName", "sane.dll"
             VALUE "LegalCopyright", "Copyright (C) 10000"
             VALUE "OriginalFilename", "sane.dll"
             VALUE "ProductName", "HUAGOScan"
-            VALUE "ProductVersion", "4.14.10000.22216"
+            VALUE "ProductVersion", "4.15.10000.22217"
         END
     END
     BLOCK "VarFileInfo"