Windows (#28)

Windows compatibility
* Using xcpQueue32.c for Windows
* Windows MSVC stdatomics emulation

Author: RainerZ

.vscode/settings.json

@@ -1,13 +1,35 @@
 {
     "files.associations": {
-        "stdatomic.h": "c"
+        "stdatomic.h": "c",
+        "malloc.h": "c"
     },
     "cSpell.words": [
+        "ampl",
+        "Appl",
+        "bitflags",
+        "CALPAGE",
+        "calseg",
         "COMPU",
+        "cycletime",
+        "DNLOAD",
         "DONT",
+        "Histogramm",
+        "ifdata",
+        "Informatik",
+        "INSTS",
+        "INTIALIZER",
         "Mainloop",
+        "nonoverlapping",
+        "Plite",
+        "reinit",
         "SBYTE",
+        "serv",
         "SLONG",
-        "UBYTE"
+        "Slonglong",
+        "thiserror",
+        "UBYTE",
+        "Watomic",
+        "xcplib",
+        "XCPTL"
     ]
 }

build.rs

@@ -2,10 +2,10 @@ fn main() {
     build_info_build::build_script();
 
     #[allow(unused_assignments, unused_mut)] // due to feature flag
-    let mut _is_posix = true;
+    let mut is_posix = true;
     #[cfg(target_os = "windows")]
     {
-        _is_posix = false;
+        is_posix = false;
     }
 
     #[allow(unused_assignments, unused_mut)] // due to feature flag
@@ -16,41 +16,41 @@ fn main() {
     }
 
     // Generate C code bindings for xcplib
-    let bindings = bindgen::Builder::default()
-        .header("xcplib/wrapper.h")
-        //
-        //.clang_args(&["-target", "x86_64-pc-windows-msvc"])
-        .clang_arg("-Ixcplib/src")
-        .clang_arg("-Ixcplib")
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
-        //
-        .blocklist_type("T_CLOCK_INFO")
-        .allowlist_type("tXcpDaqLists")
-        // Protocol layer
-        .allowlist_function("XcpInit")
-        .allowlist_function("XcpDisconnect")
-        // Transport layer
-        .allowlist_function("XcpEthTlGetInfo")
-        // Server
-        .allowlist_function("XcpEthServerInit")
-        .allowlist_function("XcpEthServerShutdown")
-        .allowlist_function("XcpEthServerStatus")
-        // DAQ
-        .allowlist_function("XcpEvent")
-        .allowlist_function("XcpEventExt")
-        // Misc
-        .allowlist_function("XcpSetLogLevel")
-        .allowlist_function("XcpPrint")
-        .allowlist_function("XcpSetEpk")
-        .allowlist_function("XcpSendTerminateSessionEvent")
-        //.allowlist_function("ApplXcpGetAddr")
-        .allowlist_function("ApplXcpSetA2lName")
-        .allowlist_function("ApplXcpRegisterCallbacks")
-        .allowlist_function("ApplXcpGetClock64")
-        //
-        .generate()
-        .expect("Unable to generate bindings");
-    bindings.write_to_file("src/xcp/xcplib.rs").expect("Couldn't write bindings!");
+    if is_posix {
+        let bindings = bindgen::Builder::default()
+            .header("xcplib/wrapper.h")
+            //
+            //.clang_args(&["-target", "x86_64-pc-windows-msvc"])
+            .clang_arg("-Ixcplib/src")
+            .clang_arg("-Ixcplib")
+            .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
+            //
+            .blocklist_type("T_CLOCK_INFO")
+            // Protocol layer
+            .allowlist_function("XcpInit")
+            .allowlist_function("XcpDisconnect")
+            // Transport layer
+            .allowlist_function("XcpEthTlGetInfo")
+            // Server
+            .allowlist_function("XcpEthServerInit")
+            .allowlist_function("XcpEthServerShutdown")
+            .allowlist_function("XcpEthServerStatus")
+            // DAQ
+            .allowlist_function("XcpEvent")
+            .allowlist_function("XcpEventExt")
+            // Misc
+            .allowlist_function("XcpSetLogLevel")
+            .allowlist_function("XcpPrint")
+            .allowlist_function("XcpSetEpk")
+            .allowlist_function("ApplXcpSetA2lName")
+            .allowlist_function("ApplXcpRegisterCallbacks")
+            .allowlist_function("XcpSendTerminateSessionEvent")
+            .allowlist_function("ApplXcpGetClock64")
+            //
+            .generate()
+            .expect("Unable to generate bindings");
+        bindings.write_to_file("src/xcp/xcplib.rs").expect("Couldn't write bindings!");
+    }
 
     // Build xcplib
     let mut builder = cc::Build::new();
@@ -60,16 +60,17 @@ fn main() {
         .file("xcplib/src/platform.c")
         .file("xcplib/src/xcpLite.c")
         .file("xcplib/src/xcpQueue64.c")
+        .file("xcplib/src/xcpQueue32.c")
         .file("xcplib/src/xcpEthTl.c")
-        .file("xcplib/src/xcpEthServer.c")
-        .flag("-std=c11");
-
-    if is_release {
-        builder.flag("-O2");
-    } else {
-        builder.flag("-O0").flag("-g");
+        .file("xcplib/src/xcpEthServer.c");
+    if is_posix {
+        builder.flag("-std=c11");
+        if is_release {
+            builder.flag("-O2");
+        } else {
+            builder.flag("-O0").flag("-g");
+        }
     }
-
     builder.compile("xcplib");
 
     // Tell cargo to invalidate the built crate whenever any of these files changed.
@@ -86,6 +87,7 @@ fn main() {
     println!("cargo:rerun-if-changed=xcplib/src/platform.c");
     println!("cargo:rerun-if-changed=xcplib/src/xcpQueue.h");
     println!("cargo:rerun-if-changed=xcplib/src/xcpQueue64.c");
+    println!("cargo:rerun-if-changed=xcplib/src/xcpQueue32.c");
     println!("cargo:rerun-if-changed=xcplib/src/xcpEthTl.h");
     println!("cargo:rerun-if-changed=xcplib/src/xcpEthTl.c");
     println!("cargo:rerun-if-changed=xcplib/src/xcpEthServer.h");